/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

Merge change to add local route when network is "unreachable".

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python
 
1
#!/usr/bin/python2.7
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2015 Teddy Hogeborn
 
15
# Copyright © 2008-2015 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
31
# Contact the authors at <mandos@recompile.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
import SocketServer as socketserver
 
37
from future_builtins import *
 
38
 
 
39
try:
 
40
    import SocketServer as socketserver
 
41
except ImportError:
 
42
    import socketserver
38
43
import socket
39
44
import argparse
40
45
import datetime
45
50
import gnutls.library.functions
46
51
import gnutls.library.constants
47
52
import gnutls.library.types
48
 
import ConfigParser as configparser
 
53
try:
 
54
    import ConfigParser as configparser
 
55
except ImportError:
 
56
    import configparser
49
57
import sys
50
58
import re
51
59
import os
60
68
import struct
61
69
import fcntl
62
70
import functools
63
 
import cPickle as pickle
 
71
try:
 
72
    import cPickle as pickle
 
73
except ImportError:
 
74
    import pickle
64
75
import multiprocessing
 
76
import types
 
77
import binascii
 
78
import tempfile
 
79
import itertools
 
80
import collections
 
81
import codecs
65
82
 
66
83
import dbus
67
84
import dbus.service
68
 
import gobject
 
85
try:
 
86
    import gobject
 
87
except ImportError:
 
88
    from gi.repository import GObject as gobject
69
89
import avahi
70
90
from dbus.mainloop.glib import DBusGMainLoop
71
91
import ctypes
81
101
    except ImportError:
82
102
        SO_BINDTODEVICE = None
83
103
 
84
 
 
85
 
version = "1.3.1"
86
 
 
87
 
#logger = logging.getLogger('mandos')
88
 
logger = logging.Logger('mandos')
89
 
syslogger = (logging.handlers.SysLogHandler
90
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
 
              address = str("/dev/log")))
92
 
syslogger.setFormatter(logging.Formatter
93
 
                       ('Mandos [%(process)d]: %(levelname)s:'
94
 
                        ' %(message)s'))
95
 
logger.addHandler(syslogger)
96
 
 
97
 
console = logging.StreamHandler()
98
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
 
                                       ' %(levelname)s:'
100
 
                                       ' %(message)s'))
101
 
logger.addHandler(console)
 
104
if sys.version_info.major == 2:
 
105
    str = unicode
 
106
 
 
107
version = "1.6.9"
 
108
stored_state_file = "clients.pickle"
 
109
 
 
110
logger = logging.getLogger()
 
111
syslogger = None
 
112
 
 
113
try:
 
114
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
115
        ctypes.util.find_library("c")).if_nametoindex
 
116
except (OSError, AttributeError):
 
117
    
 
118
    def if_nametoindex(interface):
 
119
        "Get an interface index the hard way, i.e. using fcntl()"
 
120
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
121
        with contextlib.closing(socket.socket()) as s:
 
122
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
123
                                struct.pack(b"16s16x", interface))
 
124
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
125
        return interface_index
 
126
 
 
127
 
 
128
def initlogger(debug, level=logging.WARNING):
 
129
    """init logger and add loglevel"""
 
130
    
 
131
    global syslogger
 
132
    syslogger = (logging.handlers.SysLogHandler(
 
133
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
134
        address = "/dev/log"))
 
135
    syslogger.setFormatter(logging.Formatter
 
136
                           ('Mandos [%(process)d]: %(levelname)s:'
 
137
                            ' %(message)s'))
 
138
    logger.addHandler(syslogger)
 
139
    
 
140
    if debug:
 
141
        console = logging.StreamHandler()
 
142
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
143
                                               ' [%(process)d]:'
 
144
                                               ' %(levelname)s:'
 
145
                                               ' %(message)s'))
 
146
        logger.addHandler(console)
 
147
    logger.setLevel(level)
 
148
 
 
149
 
 
150
class PGPError(Exception):
 
151
    """Exception if encryption/decryption fails"""
 
152
    pass
 
153
 
 
154
 
 
155
class PGPEngine(object):
 
156
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
157
    
 
158
    def __init__(self):
 
159
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
160
        self.gnupgargs = ['--batch',
 
161
                          '--home', self.tempdir,
 
162
                          '--force-mdc',
 
163
                          '--quiet',
 
164
                          '--no-use-agent']
 
165
    
 
166
    def __enter__(self):
 
167
        return self
 
168
    
 
169
    def __exit__(self, exc_type, exc_value, traceback):
 
170
        self._cleanup()
 
171
        return False
 
172
    
 
173
    def __del__(self):
 
174
        self._cleanup()
 
175
    
 
176
    def _cleanup(self):
 
177
        if self.tempdir is not None:
 
178
            # Delete contents of tempdir
 
179
            for root, dirs, files in os.walk(self.tempdir,
 
180
                                             topdown = False):
 
181
                for filename in files:
 
182
                    os.remove(os.path.join(root, filename))
 
183
                for dirname in dirs:
 
184
                    os.rmdir(os.path.join(root, dirname))
 
185
            # Remove tempdir
 
186
            os.rmdir(self.tempdir)
 
187
            self.tempdir = None
 
188
    
 
189
    def password_encode(self, password):
 
190
        # Passphrase can not be empty and can not contain newlines or
 
191
        # NUL bytes.  So we prefix it and hex encode it.
 
192
        encoded = b"mandos" + binascii.hexlify(password)
 
193
        if len(encoded) > 2048:
 
194
            # GnuPG can't handle long passwords, so encode differently
 
195
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
196
                       .replace(b"\n", b"\\n")
 
197
                       .replace(b"\0", b"\\x00"))
 
198
        return encoded
 
199
    
 
200
    def encrypt(self, data, password):
 
201
        passphrase = self.password_encode(password)
 
202
        with tempfile.NamedTemporaryFile(
 
203
                dir=self.tempdir) as passfile:
 
204
            passfile.write(passphrase)
 
205
            passfile.flush()
 
206
            proc = subprocess.Popen(['gpg', '--symmetric',
 
207
                                     '--passphrase-file',
 
208
                                     passfile.name]
 
209
                                    + self.gnupgargs,
 
210
                                    stdin = subprocess.PIPE,
 
211
                                    stdout = subprocess.PIPE,
 
212
                                    stderr = subprocess.PIPE)
 
213
            ciphertext, err = proc.communicate(input = data)
 
214
        if proc.returncode != 0:
 
215
            raise PGPError(err)
 
216
        return ciphertext
 
217
    
 
218
    def decrypt(self, data, password):
 
219
        passphrase = self.password_encode(password)
 
220
        with tempfile.NamedTemporaryFile(
 
221
                dir = self.tempdir) as passfile:
 
222
            passfile.write(passphrase)
 
223
            passfile.flush()
 
224
            proc = subprocess.Popen(['gpg', '--decrypt',
 
225
                                     '--passphrase-file',
 
226
                                     passfile.name]
 
227
                                    + self.gnupgargs,
 
228
                                    stdin = subprocess.PIPE,
 
229
                                    stdout = subprocess.PIPE,
 
230
                                    stderr = subprocess.PIPE)
 
231
            decrypted_plaintext, err = proc.communicate(input = data)
 
232
        if proc.returncode != 0:
 
233
            raise PGPError(err)
 
234
        return decrypted_plaintext
 
235
 
102
236
 
103
237
class AvahiError(Exception):
104
238
    def __init__(self, value, *args, **kwargs):
105
239
        self.value = value
106
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
107
 
    def __unicode__(self):
108
 
        return unicode(repr(self.value))
 
240
        return super(AvahiError, self).__init__(value, *args,
 
241
                                                **kwargs)
 
242
 
109
243
 
110
244
class AvahiServiceError(AvahiError):
111
245
    pass
112
246
 
 
247
 
113
248
class AvahiGroupError(AvahiError):
114
249
    pass
115
250
 
122
257
               Used to optionally bind to the specified interface.
123
258
    name: string; Example: 'Mandos'
124
259
    type: string; Example: '_mandos._tcp'.
125
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
260
     See <https://www.iana.org/assignments/service-names-port-numbers>
126
261
    port: integer; what port to announce
127
262
    TXT: list of strings; TXT record for the service
128
263
    domain: string; Domain to publish on, default to .local if empty.
134
269
    server: D-Bus Server
135
270
    bus: dbus.SystemBus()
136
271
    """
137
 
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
138
 
                 servicetype = None, port = None, TXT = None,
139
 
                 domain = "", host = "", max_renames = 32768,
140
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
272
    
 
273
    def __init__(self,
 
274
                 interface = avahi.IF_UNSPEC,
 
275
                 name = None,
 
276
                 servicetype = None,
 
277
                 port = None,
 
278
                 TXT = None,
 
279
                 domain = "",
 
280
                 host = "",
 
281
                 max_renames = 32768,
 
282
                 protocol = avahi.PROTO_UNSPEC,
 
283
                 bus = None):
141
284
        self.interface = interface
142
285
        self.name = name
143
286
        self.type = servicetype
152
295
        self.server = None
153
296
        self.bus = bus
154
297
        self.entry_group_state_changed_match = None
155
 
    def rename(self):
 
298
    
 
299
    def rename(self, remove=True):
156
300
        """Derived from the Avahi example code"""
157
301
        if self.rename_count >= self.max_renames:
158
302
            logger.critical("No suitable Zeroconf service name found"
159
303
                            " after %i retries, exiting.",
160
304
                            self.rename_count)
161
305
            raise AvahiServiceError("Too many renames")
162
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
306
        self.name = str(
 
307
            self.server.GetAlternativeServiceName(self.name))
 
308
        self.rename_count += 1
163
309
        logger.info("Changing Zeroconf service name to %r ...",
164
310
                    self.name)
165
 
        syslogger.setFormatter(logging.Formatter
166
 
                               ('Mandos (%s) [%%(process)d]:'
167
 
                                ' %%(levelname)s: %%(message)s'
168
 
                                % self.name))
169
 
        self.remove()
 
311
        if remove:
 
312
            self.remove()
170
313
        try:
171
314
            self.add()
172
315
        except dbus.exceptions.DBusException as error:
173
 
            logger.critical("DBusException: %s", error)
174
 
            self.cleanup()
175
 
            os._exit(1)
176
 
        self.rename_count += 1
 
316
            if (error.get_dbus_name()
 
317
                == "org.freedesktop.Avahi.CollisionError"):
 
318
                logger.info("Local Zeroconf service name collision.")
 
319
                return self.rename(remove=False)
 
320
            else:
 
321
                logger.critical("D-Bus Exception", exc_info=error)
 
322
                self.cleanup()
 
323
                os._exit(1)
 
324
    
177
325
    def remove(self):
178
326
        """Derived from the Avahi example code"""
179
327
        if self.entry_group_state_changed_match is not None:
181
329
            self.entry_group_state_changed_match = None
182
330
        if self.group is not None:
183
331
            self.group.Reset()
 
332
    
184
333
    def add(self):
185
334
        """Derived from the Avahi example code"""
186
335
        self.remove()
191
340
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
192
341
        self.entry_group_state_changed_match = (
193
342
            self.group.connect_to_signal(
194
 
                'StateChanged', self .entry_group_state_changed))
 
343
                'StateChanged', self.entry_group_state_changed))
195
344
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
196
345
                     self.name, self.type)
197
346
        self.group.AddService(
203
352
            dbus.UInt16(self.port),
204
353
            avahi.string_array_to_txt_array(self.TXT))
205
354
        self.group.Commit()
 
355
    
206
356
    def entry_group_state_changed(self, state, error):
207
357
        """Derived from the Avahi example code"""
208
358
        logger.debug("Avahi entry group state change: %i", state)
214
364
            self.rename()
215
365
        elif state == avahi.ENTRY_GROUP_FAILURE:
216
366
            logger.critical("Avahi: Error in group state changed %s",
217
 
                            unicode(error))
218
 
            raise AvahiGroupError("State changed: %s"
219
 
                                  % unicode(error))
 
367
                            str(error))
 
368
            raise AvahiGroupError("State changed: {!s}".format(error))
 
369
    
220
370
    def cleanup(self):
221
371
        """Derived from the Avahi example code"""
222
372
        if self.group is not None:
223
373
            try:
224
374
                self.group.Free()
225
375
            except (dbus.exceptions.UnknownMethodException,
226
 
                    dbus.exceptions.DBusException) as e:
 
376
                    dbus.exceptions.DBusException):
227
377
                pass
228
378
            self.group = None
229
379
        self.remove()
 
380
    
230
381
    def server_state_changed(self, state, error=None):
231
382
        """Derived from the Avahi example code"""
232
383
        logger.debug("Avahi server state change: %i", state)
233
 
        bad_states = { avahi.SERVER_INVALID:
234
 
                           "Zeroconf server invalid",
235
 
                       avahi.SERVER_REGISTERING: None,
236
 
                       avahi.SERVER_COLLISION:
237
 
                           "Zeroconf server name collision",
238
 
                       avahi.SERVER_FAILURE:
239
 
                           "Zeroconf server failure" }
 
384
        bad_states = {
 
385
            avahi.SERVER_INVALID: "Zeroconf server invalid",
 
386
            avahi.SERVER_REGISTERING: None,
 
387
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
 
388
            avahi.SERVER_FAILURE: "Zeroconf server failure",
 
389
        }
240
390
        if state in bad_states:
241
391
            if bad_states[state] is not None:
242
392
                if error is None:
251
401
                logger.debug("Unknown state: %r", state)
252
402
            else:
253
403
                logger.debug("Unknown state: %r: %r", state, error)
 
404
    
254
405
    def activate(self):
255
406
        """Derived from the Avahi example code"""
256
407
        if self.server is None:
260
411
                                    follow_name_owner_changes=True),
261
412
                avahi.DBUS_INTERFACE_SERVER)
262
413
        self.server.connect_to_signal("StateChanged",
263
 
                                 self.server_state_changed)
 
414
                                      self.server_state_changed)
264
415
        self.server_state_changed(self.server.GetState())
265
416
 
266
417
 
 
418
class AvahiServiceToSyslog(AvahiService):
 
419
    def rename(self, *args, **kwargs):
 
420
        """Add the new name to the syslog messages"""
 
421
        ret = AvahiService.rename(self, *args, **kwargs)
 
422
        syslogger.setFormatter(logging.Formatter(
 
423
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
424
            .format(self.name)))
 
425
        return ret
 
426
 
 
427
def call_pipe(connection,       # : multiprocessing.Connection
 
428
              func, *args, **kwargs):
 
429
    """This function is meant to be called by multiprocessing.Process
 
430
    
 
431
    This function runs func(*args, **kwargs), and writes the resulting
 
432
    return value on the provided multiprocessing.Connection.
 
433
    """
 
434
    connection.send(func(*args, **kwargs))
 
435
    connection.close()
 
436
 
267
437
class Client(object):
268
438
    """A representation of a client host served by this server.
269
439
    
270
440
    Attributes:
271
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
441
    approved:   bool(); 'None' if not yet approved/disapproved
272
442
    approval_delay: datetime.timedelta(); Time to wait for approval
273
443
    approval_duration: datetime.timedelta(); Duration of one approval
274
444
    checker:    subprocess.Popen(); a running checker process used
281
451
                     instance %(name)s can be used in the command.
282
452
    checker_initiator_tag: a gobject event source tag, or None
283
453
    created:    datetime.datetime(); (UTC) object creation
 
454
    client_structure: Object describing what attributes a client has
 
455
                      and is used for storing the client at exit
284
456
    current_checker_command: string; current running checker_command
285
 
    disable_hook:  If set, called by disable() as disable_hook(self)
286
457
    disable_initiator_tag: a gobject event source tag, or None
287
458
    enabled:    bool()
288
459
    fingerprint: string (40 or 32 hexadecimal digits); used to
291
462
    interval:   datetime.timedelta(); How often to start a new checker
292
463
    last_approval_request: datetime.datetime(); (UTC) or None
293
464
    last_checked_ok: datetime.datetime(); (UTC) or None
294
 
    last_enabled: datetime.datetime(); (UTC)
 
465
    last_checker_status: integer between 0 and 255 reflecting exit
 
466
                         status of last checker. -1 reflects crashed
 
467
                         checker, -2 means no checker completed yet.
 
468
    last_checker_signal: The signal which killed the last checker, if
 
469
                         last_checker_status is -1
 
470
    last_enabled: datetime.datetime(); (UTC) or None
295
471
    name:       string; from the config file, used in log messages and
296
472
                        D-Bus identifiers
297
473
    secret:     bytestring; sent verbatim (over TLS) to client
298
474
    timeout:    datetime.timedelta(); How long from last_checked_ok
299
475
                                      until this client is disabled
300
 
    extended_timeout:   extra long timeout when password has been sent
 
476
    extended_timeout:   extra long timeout when secret has been sent
301
477
    runtime_expansions: Allowed attributes for runtime expansion.
302
478
    expires:    datetime.datetime(); time (UTC) when a client will be
303
479
                disabled, or None
 
480
    server_settings: The server_settings dict from main()
304
481
    """
305
482
    
306
483
    runtime_expansions = ("approval_delay", "approval_duration",
307
 
                          "created", "enabled", "fingerprint",
308
 
                          "host", "interval", "last_checked_ok",
 
484
                          "created", "enabled", "expires",
 
485
                          "fingerprint", "host", "interval",
 
486
                          "last_approval_request", "last_checked_ok",
309
487
                          "last_enabled", "name", "timeout")
 
488
    client_defaults = {
 
489
        "timeout": "PT5M",
 
490
        "extended_timeout": "PT15M",
 
491
        "interval": "PT2M",
 
492
        "checker": "fping -q -- %%(host)s",
 
493
        "host": "",
 
494
        "approval_delay": "PT0S",
 
495
        "approval_duration": "PT1S",
 
496
        "approved_by_default": "True",
 
497
        "enabled": "True",
 
498
    }
310
499
    
311
500
    @staticmethod
312
 
    def _timedelta_to_milliseconds(td):
313
 
        "Convert a datetime.timedelta() to milliseconds"
314
 
        return ((td.days * 24 * 60 * 60 * 1000)
315
 
                + (td.seconds * 1000)
316
 
                + (td.microseconds // 1000))
317
 
    
318
 
    def timeout_milliseconds(self):
319
 
        "Return the 'timeout' attribute in milliseconds"
320
 
        return self._timedelta_to_milliseconds(self.timeout)
321
 
 
322
 
    def extended_timeout_milliseconds(self):
323
 
        "Return the 'extended_timeout' attribute in milliseconds"
324
 
        return self._timedelta_to_milliseconds(self.extended_timeout)    
325
 
    
326
 
    def interval_milliseconds(self):
327
 
        "Return the 'interval' attribute in milliseconds"
328
 
        return self._timedelta_to_milliseconds(self.interval)
329
 
 
330
 
    def approval_delay_milliseconds(self):
331
 
        return self._timedelta_to_milliseconds(self.approval_delay)
332
 
    
333
 
    def __init__(self, name = None, disable_hook=None, config=None):
334
 
        """Note: the 'checker' key in 'config' sets the
335
 
        'checker_command' attribute and *not* the 'checker'
336
 
        attribute."""
 
501
    def config_parser(config):
 
502
        """Construct a new dict of client settings of this form:
 
503
        { client_name: {setting_name: value, ...}, ...}
 
504
        with exceptions for any special settings as defined above.
 
505
        NOTE: Must be a pure function. Must return the same result
 
506
        value given the same arguments.
 
507
        """
 
508
        settings = {}
 
509
        for client_name in config.sections():
 
510
            section = dict(config.items(client_name))
 
511
            client = settings[client_name] = {}
 
512
            
 
513
            client["host"] = section["host"]
 
514
            # Reformat values from string types to Python types
 
515
            client["approved_by_default"] = config.getboolean(
 
516
                client_name, "approved_by_default")
 
517
            client["enabled"] = config.getboolean(client_name,
 
518
                                                  "enabled")
 
519
            
 
520
            # Uppercase and remove spaces from fingerprint for later
 
521
            # comparison purposes with return value from the
 
522
            # fingerprint() function
 
523
            client["fingerprint"] = (section["fingerprint"].upper()
 
524
                                     .replace(" ", ""))
 
525
            if "secret" in section:
 
526
                client["secret"] = section["secret"].decode("base64")
 
527
            elif "secfile" in section:
 
528
                with open(os.path.expanduser(os.path.expandvars
 
529
                                             (section["secfile"])),
 
530
                          "rb") as secfile:
 
531
                    client["secret"] = secfile.read()
 
532
            else:
 
533
                raise TypeError("No secret or secfile for section {}"
 
534
                                .format(section))
 
535
            client["timeout"] = string_to_delta(section["timeout"])
 
536
            client["extended_timeout"] = string_to_delta(
 
537
                section["extended_timeout"])
 
538
            client["interval"] = string_to_delta(section["interval"])
 
539
            client["approval_delay"] = string_to_delta(
 
540
                section["approval_delay"])
 
541
            client["approval_duration"] = string_to_delta(
 
542
                section["approval_duration"])
 
543
            client["checker_command"] = section["checker"]
 
544
            client["last_approval_request"] = None
 
545
            client["last_checked_ok"] = None
 
546
            client["last_checker_status"] = -2
 
547
        
 
548
        return settings
 
549
    
 
550
    def __init__(self, settings, name = None, server_settings=None):
337
551
        self.name = name
338
 
        if config is None:
339
 
            config = {}
 
552
        if server_settings is None:
 
553
            server_settings = {}
 
554
        self.server_settings = server_settings
 
555
        # adding all client settings
 
556
        for setting, value in settings.items():
 
557
            setattr(self, setting, value)
 
558
        
 
559
        if self.enabled:
 
560
            if not hasattr(self, "last_enabled"):
 
561
                self.last_enabled = datetime.datetime.utcnow()
 
562
            if not hasattr(self, "expires"):
 
563
                self.expires = (datetime.datetime.utcnow()
 
564
                                + self.timeout)
 
565
        else:
 
566
            self.last_enabled = None
 
567
            self.expires = None
 
568
        
340
569
        logger.debug("Creating client %r", self.name)
341
 
        # Uppercase and remove spaces from fingerprint for later
342
 
        # comparison purposes with return value from the fingerprint()
343
 
        # function
344
 
        self.fingerprint = (config["fingerprint"].upper()
345
 
                            .replace(" ", ""))
346
570
        logger.debug("  Fingerprint: %s", self.fingerprint)
347
 
        if "secret" in config:
348
 
            self.secret = config["secret"].decode("base64")
349
 
        elif "secfile" in config:
350
 
            with open(os.path.expanduser(os.path.expandvars
351
 
                                         (config["secfile"])),
352
 
                      "rb") as secfile:
353
 
                self.secret = secfile.read()
354
 
        else:
355
 
            raise TypeError("No secret or secfile for client %s"
356
 
                            % self.name)
357
 
        self.host = config.get("host", "")
358
 
        self.created = datetime.datetime.utcnow()
359
 
        self.enabled = False
360
 
        self.last_approval_request = None
361
 
        self.last_enabled = None
362
 
        self.last_checked_ok = None
363
 
        self.timeout = string_to_delta(config["timeout"])
364
 
        self.extended_timeout = string_to_delta(config["extended_timeout"])
365
 
        self.interval = string_to_delta(config["interval"])
366
 
        self.disable_hook = disable_hook
 
571
        self.created = settings.get("created",
 
572
                                    datetime.datetime.utcnow())
 
573
        
 
574
        # attributes specific for this server instance
367
575
        self.checker = None
368
576
        self.checker_initiator_tag = None
369
577
        self.disable_initiator_tag = None
370
 
        self.expires = None
371
578
        self.checker_callback_tag = None
372
 
        self.checker_command = config["checker"]
373
579
        self.current_checker_command = None
374
 
        self.last_connect = None
375
 
        self._approved = None
376
 
        self.approved_by_default = config.get("approved_by_default",
377
 
                                              True)
 
580
        self.approved = None
378
581
        self.approvals_pending = 0
379
 
        self.approval_delay = string_to_delta(
380
 
            config["approval_delay"])
381
 
        self.approval_duration = string_to_delta(
382
 
            config["approval_duration"])
383
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
582
        self.changedstate = multiprocessing_manager.Condition(
 
583
            multiprocessing_manager.Lock())
 
584
        self.client_structure = [attr
 
585
                                 for attr in self.__dict__.iterkeys()
 
586
                                 if not attr.startswith("_")]
 
587
        self.client_structure.append("client_structure")
 
588
        
 
589
        for name, t in inspect.getmembers(
 
590
                type(self), lambda obj: isinstance(obj, property)):
 
591
            if not name.startswith("_"):
 
592
                self.client_structure.append(name)
384
593
    
 
594
    # Send notice to process children that client state has changed
385
595
    def send_changedstate(self):
386
 
        self.changedstate.acquire()
387
 
        self.changedstate.notify_all()
388
 
        self.changedstate.release()
389
 
        
 
596
        with self.changedstate:
 
597
            self.changedstate.notify_all()
 
598
    
390
599
    def enable(self):
391
600
        """Start this client's checker and timeout hooks"""
392
601
        if getattr(self, "enabled", False):
393
602
            # Already enabled
394
603
            return
395
 
        self.send_changedstate()
 
604
        self.expires = datetime.datetime.utcnow() + self.timeout
 
605
        self.enabled = True
396
606
        self.last_enabled = datetime.datetime.utcnow()
397
 
        # Schedule a new checker to be started an 'interval' from now,
398
 
        # and every interval from then on.
399
 
        self.checker_initiator_tag = (gobject.timeout_add
400
 
                                      (self.interval_milliseconds(),
401
 
                                       self.start_checker))
402
 
        # Schedule a disable() when 'timeout' has passed
403
 
        self.expires = datetime.datetime.utcnow() + self.timeout
404
 
        self.disable_initiator_tag = (gobject.timeout_add
405
 
                                   (self.timeout_milliseconds(),
406
 
                                    self.disable))
407
 
        self.enabled = True
408
 
        # Also start a new checker *right now*.
409
 
        self.start_checker()
 
607
        self.init_checker()
 
608
        self.send_changedstate()
410
609
    
411
610
    def disable(self, quiet=True):
412
611
        """Disable this client."""
413
612
        if not getattr(self, "enabled", False):
414
613
            return False
415
614
        if not quiet:
416
 
            self.send_changedstate()
417
 
        if not quiet:
418
615
            logger.info("Disabling client %s", self.name)
419
 
        if getattr(self, "disable_initiator_tag", False):
 
616
        if getattr(self, "disable_initiator_tag", None) is not None:
420
617
            gobject.source_remove(self.disable_initiator_tag)
421
618
            self.disable_initiator_tag = None
422
619
        self.expires = None
423
 
        if getattr(self, "checker_initiator_tag", False):
 
620
        if getattr(self, "checker_initiator_tag", None) is not None:
424
621
            gobject.source_remove(self.checker_initiator_tag)
425
622
            self.checker_initiator_tag = None
426
623
        self.stop_checker()
427
 
        if self.disable_hook:
428
 
            self.disable_hook(self)
429
624
        self.enabled = False
 
625
        if not quiet:
 
626
            self.send_changedstate()
430
627
        # Do not run this again if called by a gobject.timeout_add
431
628
        return False
432
629
    
433
630
    def __del__(self):
434
 
        self.disable_hook = None
435
631
        self.disable()
436
632
    
437
 
    def checker_callback(self, pid, condition, command):
 
633
    def init_checker(self):
 
634
        # Schedule a new checker to be started an 'interval' from now,
 
635
        # and every interval from then on.
 
636
        if self.checker_initiator_tag is not None:
 
637
            gobject.source_remove(self.checker_initiator_tag)
 
638
        self.checker_initiator_tag = gobject.timeout_add(
 
639
            int(self.interval.total_seconds() * 1000),
 
640
            self.start_checker)
 
641
        # Schedule a disable() when 'timeout' has passed
 
642
        if self.disable_initiator_tag is not None:
 
643
            gobject.source_remove(self.disable_initiator_tag)
 
644
        self.disable_initiator_tag = gobject.timeout_add(
 
645
            int(self.timeout.total_seconds() * 1000), self.disable)
 
646
        # Also start a new checker *right now*.
 
647
        self.start_checker()
 
648
    
 
649
    def checker_callback(self, source, condition, connection,
 
650
                         command):
438
651
        """The checker has completed, so take appropriate actions."""
439
652
        self.checker_callback_tag = None
440
653
        self.checker = None
441
 
        if os.WIFEXITED(condition):
442
 
            exitstatus = os.WEXITSTATUS(condition)
443
 
            if exitstatus == 0:
 
654
        # Read return code from connection (see call_pipe)
 
655
        returncode = connection.recv()
 
656
        connection.close()
 
657
        
 
658
        if returncode >= 0:
 
659
            self.last_checker_status = returncode
 
660
            self.last_checker_signal = None
 
661
            if self.last_checker_status == 0:
444
662
                logger.info("Checker for %(name)s succeeded",
445
663
                            vars(self))
446
664
                self.checked_ok()
447
665
            else:
448
 
                logger.info("Checker for %(name)s failed",
449
 
                            vars(self))
 
666
                logger.info("Checker for %(name)s failed", vars(self))
450
667
        else:
 
668
            self.last_checker_status = -1
 
669
            self.last_checker_signal = -returncode
451
670
            logger.warning("Checker for %(name)s crashed?",
452
671
                           vars(self))
453
 
    
454
 
    def checked_ok(self, timeout=None):
455
 
        """Bump up the timeout for this client.
456
 
        
457
 
        This should only be called when the client has been seen,
458
 
        alive and well.
459
 
        """
 
672
        return False
 
673
    
 
674
    def checked_ok(self):
 
675
        """Assert that the client has been seen, alive and well."""
 
676
        self.last_checked_ok = datetime.datetime.utcnow()
 
677
        self.last_checker_status = 0
 
678
        self.last_checker_signal = None
 
679
        self.bump_timeout()
 
680
    
 
681
    def bump_timeout(self, timeout=None):
 
682
        """Bump up the timeout for this client."""
460
683
        if timeout is None:
461
684
            timeout = self.timeout
462
 
        self.last_checked_ok = datetime.datetime.utcnow()
463
 
        gobject.source_remove(self.disable_initiator_tag)
464
 
        self.expires = datetime.datetime.utcnow() + timeout
465
 
        self.disable_initiator_tag = (gobject.timeout_add
466
 
                                      (self._timedelta_to_milliseconds(timeout),
467
 
                                       self.disable))
 
685
        if self.disable_initiator_tag is not None:
 
686
            gobject.source_remove(self.disable_initiator_tag)
 
687
            self.disable_initiator_tag = None
 
688
        if getattr(self, "enabled", False):
 
689
            self.disable_initiator_tag = gobject.timeout_add(
 
690
                int(timeout.total_seconds() * 1000), self.disable)
 
691
            self.expires = datetime.datetime.utcnow() + timeout
468
692
    
469
693
    def need_approval(self):
470
694
        self.last_approval_request = datetime.datetime.utcnow()
475
699
        If a checker already exists, leave it running and do
476
700
        nothing."""
477
701
        # The reason for not killing a running checker is that if we
478
 
        # did that, then if a checker (for some reason) started
479
 
        # running slowly and taking more than 'interval' time, the
480
 
        # client would inevitably timeout, since no checker would get
481
 
        # a chance to run to completion.  If we instead leave running
 
702
        # did that, and if a checker (for some reason) started running
 
703
        # slowly and taking more than 'interval' time, then the client
 
704
        # would inevitably timeout, since no checker would get a
 
705
        # chance to run to completion.  If we instead leave running
482
706
        # checkers alone, the checker would have to take more time
483
707
        # than 'timeout' for the client to be disabled, which is as it
484
708
        # should be.
485
709
        
486
 
        # If a checker exists, make sure it is not a zombie
487
 
        try:
488
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
489
 
        except (AttributeError, OSError) as error:
490
 
            if (isinstance(error, OSError)
491
 
                and error.errno != errno.ECHILD):
492
 
                raise error
493
 
        else:
494
 
            if pid:
495
 
                logger.warning("Checker was a zombie")
496
 
                gobject.source_remove(self.checker_callback_tag)
497
 
                self.checker_callback(pid, status,
498
 
                                      self.current_checker_command)
 
710
        if self.checker is not None and not self.checker.is_alive():
 
711
            logger.warning("Checker was not alive; joining")
 
712
            self.checker.join()
 
713
            self.checker = None
499
714
        # Start a new checker if needed
500
715
        if self.checker is None:
 
716
            # Escape attributes for the shell
 
717
            escaped_attrs = {
 
718
                attr: re.escape(str(getattr(self, attr)))
 
719
                for attr in self.runtime_expansions }
501
720
            try:
502
 
                # In case checker_command has exactly one % operator
503
 
                command = self.checker_command % self.host
504
 
            except TypeError:
505
 
                # Escape attributes for the shell
506
 
                escaped_attrs = dict(
507
 
                    (attr,
508
 
                     re.escape(unicode(str(getattr(self, attr, "")),
509
 
                                       errors=
510
 
                                       'replace')))
511
 
                    for attr in
512
 
                    self.runtime_expansions)
513
 
 
514
 
                try:
515
 
                    command = self.checker_command % escaped_attrs
516
 
                except TypeError as error:
517
 
                    logger.error('Could not format string "%s":'
518
 
                                 ' %s', self.checker_command, error)
519
 
                    return True # Try again later
 
721
                command = self.checker_command % escaped_attrs
 
722
            except TypeError as error:
 
723
                logger.error('Could not format string "%s"',
 
724
                             self.checker_command,
 
725
                             exc_info=error)
 
726
                return True     # Try again later
520
727
            self.current_checker_command = command
521
 
            try:
522
 
                logger.info("Starting checker %r for %s",
523
 
                            command, self.name)
524
 
                # We don't need to redirect stdout and stderr, since
525
 
                # in normal mode, that is already done by daemon(),
526
 
                # and in debug mode we don't want to.  (Stdin is
527
 
                # always replaced by /dev/null.)
528
 
                self.checker = subprocess.Popen(command,
529
 
                                                close_fds=True,
530
 
                                                shell=True, cwd="/")
531
 
                self.checker_callback_tag = (gobject.child_watch_add
532
 
                                             (self.checker.pid,
533
 
                                              self.checker_callback,
534
 
                                              data=command))
535
 
                # The checker may have completed before the gobject
536
 
                # watch was added.  Check for this.
537
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
538
 
                if pid:
539
 
                    gobject.source_remove(self.checker_callback_tag)
540
 
                    self.checker_callback(pid, status, command)
541
 
            except OSError as error:
542
 
                logger.error("Failed to start subprocess: %s",
543
 
                             error)
 
728
            logger.info("Starting checker %r for %s", command,
 
729
                        self.name)
 
730
            # We don't need to redirect stdout and stderr, since
 
731
            # in normal mode, that is already done by daemon(),
 
732
            # and in debug mode we don't want to.  (Stdin is
 
733
            # always replaced by /dev/null.)
 
734
            # The exception is when not debugging but nevertheless
 
735
            # running in the foreground; use the previously
 
736
            # created wnull.
 
737
            popen_args = { "close_fds": True,
 
738
                           "shell": True,
 
739
                           "cwd": "/" }
 
740
            if (not self.server_settings["debug"]
 
741
                and self.server_settings["foreground"]):
 
742
                popen_args.update({"stdout": wnull,
 
743
                                   "stderr": wnull })
 
744
            pipe = multiprocessing.Pipe(duplex = False)
 
745
            self.checker = multiprocessing.Process(
 
746
                target = call_pipe,
 
747
                args = (pipe[1], subprocess.call, command),
 
748
                kwargs = popen_args)
 
749
            self.checker.start()
 
750
            self.checker_callback_tag = gobject.io_add_watch(
 
751
                pipe[0].fileno(), gobject.IO_IN,
 
752
                self.checker_callback, pipe[0], command)
544
753
        # Re-run this periodically if run by gobject.timeout_add
545
754
        return True
546
755
    
552
761
        if getattr(self, "checker", None) is None:
553
762
            return
554
763
        logger.debug("Stopping checker for %(name)s", vars(self))
555
 
        try:
556
 
            os.kill(self.checker.pid, signal.SIGTERM)
557
 
            #time.sleep(0.5)
558
 
            #if self.checker.poll() is None:
559
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
560
 
        except OSError as error:
561
 
            if error.errno != errno.ESRCH: # No such process
562
 
                raise
 
764
        self.checker.terminate()
563
765
        self.checker = None
564
766
 
565
 
def dbus_service_property(dbus_interface, signature="v",
566
 
                          access="readwrite", byte_arrays=False):
 
767
 
 
768
def dbus_service_property(dbus_interface,
 
769
                          signature="v",
 
770
                          access="readwrite",
 
771
                          byte_arrays=False):
567
772
    """Decorators for marking methods of a DBusObjectWithProperties to
568
773
    become properties on the D-Bus.
569
774
    
578
783
    # "Set" method, so we fail early here:
579
784
    if byte_arrays and signature != "ay":
580
785
        raise ValueError("Byte arrays not supported for non-'ay'"
581
 
                         " signature %r" % signature)
 
786
                         " signature {!r}".format(signature))
 
787
    
582
788
    def decorator(func):
583
789
        func._dbus_is_property = True
584
790
        func._dbus_interface = dbus_interface
589
795
            func._dbus_name = func._dbus_name[:-14]
590
796
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
591
797
        return func
 
798
    
 
799
    return decorator
 
800
 
 
801
 
 
802
def dbus_interface_annotations(dbus_interface):
 
803
    """Decorator for marking functions returning interface annotations
 
804
    
 
805
    Usage:
 
806
    
 
807
    @dbus_interface_annotations("org.example.Interface")
 
808
    def _foo(self):  # Function name does not matter
 
809
        return {"org.freedesktop.DBus.Deprecated": "true",
 
810
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
811
                    "false"}
 
812
    """
 
813
    
 
814
    def decorator(func):
 
815
        func._dbus_is_interface = True
 
816
        func._dbus_interface = dbus_interface
 
817
        func._dbus_name = dbus_interface
 
818
        return func
 
819
    
 
820
    return decorator
 
821
 
 
822
 
 
823
def dbus_annotations(annotations):
 
824
    """Decorator to annotate D-Bus methods, signals or properties
 
825
    Usage:
 
826
    
 
827
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
828
                       "org.freedesktop.DBus.Property."
 
829
                       "EmitsChangedSignal": "false"})
 
830
    @dbus_service_property("org.example.Interface", signature="b",
 
831
                           access="r")
 
832
    def Property_dbus_property(self):
 
833
        return dbus.Boolean(False)
 
834
    """
 
835
    
 
836
    def decorator(func):
 
837
        func._dbus_annotations = annotations
 
838
        return func
 
839
    
592
840
    return decorator
593
841
 
594
842
 
595
843
class DBusPropertyException(dbus.exceptions.DBusException):
596
844
    """A base class for D-Bus property-related exceptions
597
845
    """
598
 
    def __unicode__(self):
599
 
        return unicode(str(self))
 
846
    pass
600
847
 
601
848
 
602
849
class DBusPropertyAccessException(DBusPropertyException):
613
860
 
614
861
class DBusObjectWithProperties(dbus.service.Object):
615
862
    """A D-Bus object with properties.
616
 
 
 
863
    
617
864
    Classes inheriting from this can use the dbus_service_property
618
865
    decorator to expose methods as D-Bus properties.  It exposes the
619
866
    standard Get(), Set(), and GetAll() methods on the D-Bus.
620
867
    """
621
868
    
622
869
    @staticmethod
623
 
    def _is_dbus_property(obj):
624
 
        return getattr(obj, "_dbus_is_property", False)
 
870
    def _is_dbus_thing(thing):
 
871
        """Returns a function testing if an attribute is a D-Bus thing
 
872
        
 
873
        If called like _is_dbus_thing("method") it returns a function
 
874
        suitable for use as predicate to inspect.getmembers().
 
875
        """
 
876
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
877
                                   False)
625
878
    
626
 
    def _get_all_dbus_properties(self):
 
879
    def _get_all_dbus_things(self, thing):
627
880
        """Returns a generator of (name, attribute) pairs
628
881
        """
629
 
        return ((prop._dbus_name, prop)
630
 
                for name, prop in
631
 
                inspect.getmembers(self, self._is_dbus_property))
 
882
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
883
                 athing.__get__(self))
 
884
                for cls in self.__class__.__mro__
 
885
                for name, athing in
 
886
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
632
887
    
633
888
    def _get_dbus_property(self, interface_name, property_name):
634
889
        """Returns a bound method if one exists which is a D-Bus
635
890
        property with the specified name and interface.
636
891
        """
637
 
        for name in (property_name,
638
 
                     property_name + "_dbus_property"):
639
 
            prop = getattr(self, name, None)
640
 
            if (prop is None
641
 
                or not self._is_dbus_property(prop)
642
 
                or prop._dbus_name != property_name
643
 
                or (interface_name and prop._dbus_interface
644
 
                    and interface_name != prop._dbus_interface)):
645
 
                continue
646
 
            return prop
 
892
        for cls in self.__class__.__mro__:
 
893
            for name, value in inspect.getmembers(
 
894
                    cls, self._is_dbus_thing("property")):
 
895
                if (value._dbus_name == property_name
 
896
                    and value._dbus_interface == interface_name):
 
897
                    return value.__get__(self)
 
898
        
647
899
        # No such property
648
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
649
 
                                   + interface_name + "."
650
 
                                   + property_name)
 
900
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
901
            self.dbus_object_path, interface_name, property_name))
651
902
    
652
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
903
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
904
                         in_signature="ss",
653
905
                         out_signature="v")
654
906
    def Get(self, interface_name, property_name):
655
907
        """Standard D-Bus property Get() method, see D-Bus standard.
673
925
            # The byte_arrays option is not supported yet on
674
926
            # signatures other than "ay".
675
927
            if prop._dbus_signature != "ay":
676
 
                raise ValueError
677
 
            value = dbus.ByteArray(''.join(unichr(byte)
678
 
                                           for byte in value))
 
928
                raise ValueError("Byte arrays not supported for non-"
 
929
                                 "'ay' signature {!r}"
 
930
                                 .format(prop._dbus_signature))
 
931
            value = dbus.ByteArray(b''.join(chr(byte)
 
932
                                            for byte in value))
679
933
        prop(value)
680
934
    
681
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
935
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
936
                         in_signature="s",
682
937
                         out_signature="a{sv}")
683
938
    def GetAll(self, interface_name):
684
939
        """Standard D-Bus property GetAll() method, see D-Bus
685
940
        standard.
686
 
 
 
941
        
687
942
        Note: Will not include properties with access="write".
688
943
        """
689
 
        all = {}
690
 
        for name, prop in self._get_all_dbus_properties():
 
944
        properties = {}
 
945
        for name, prop in self._get_all_dbus_things("property"):
691
946
            if (interface_name
692
947
                and interface_name != prop._dbus_interface):
693
948
                # Interface non-empty but did not match
697
952
                continue
698
953
            value = prop()
699
954
            if not hasattr(value, "variant_level"):
700
 
                all[name] = value
 
955
                properties[name] = value
701
956
                continue
702
 
            all[name] = type(value)(value, variant_level=
703
 
                                    value.variant_level+1)
704
 
        return dbus.Dictionary(all, signature="sv")
 
957
            properties[name] = type(value)(
 
958
                value, variant_level = value.variant_level + 1)
 
959
        return dbus.Dictionary(properties, signature="sv")
 
960
    
 
961
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
962
    def PropertiesChanged(self, interface_name, changed_properties,
 
963
                          invalidated_properties):
 
964
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
965
        standard.
 
966
        """
 
967
        pass
705
968
    
706
969
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
707
970
                         out_signature="s",
708
971
                         path_keyword='object_path',
709
972
                         connection_keyword='connection')
710
973
    def Introspect(self, object_path, connection):
711
 
        """Standard D-Bus method, overloaded to insert property tags.
 
974
        """Overloading of standard D-Bus method.
 
975
        
 
976
        Inserts property tags and interface annotation tags.
712
977
        """
713
978
        xmlstring = dbus.service.Object.Introspect(self, object_path,
714
979
                                                   connection)
715
980
        try:
716
981
            document = xml.dom.minidom.parseString(xmlstring)
 
982
            
717
983
            def make_tag(document, name, prop):
718
984
                e = document.createElement("property")
719
985
                e.setAttribute("name", name)
720
986
                e.setAttribute("type", prop._dbus_signature)
721
987
                e.setAttribute("access", prop._dbus_access)
722
988
                return e
 
989
            
723
990
            for if_tag in document.getElementsByTagName("interface"):
 
991
                # Add property tags
724
992
                for tag in (make_tag(document, name, prop)
725
993
                            for name, prop
726
 
                            in self._get_all_dbus_properties()
 
994
                            in self._get_all_dbus_things("property")
727
995
                            if prop._dbus_interface
728
996
                            == if_tag.getAttribute("name")):
729
997
                    if_tag.appendChild(tag)
 
998
                # Add annotation tags
 
999
                for typ in ("method", "signal", "property"):
 
1000
                    for tag in if_tag.getElementsByTagName(typ):
 
1001
                        annots = dict()
 
1002
                        for name, prop in (self.
 
1003
                                           _get_all_dbus_things(typ)):
 
1004
                            if (name == tag.getAttribute("name")
 
1005
                                and prop._dbus_interface
 
1006
                                == if_tag.getAttribute("name")):
 
1007
                                annots.update(getattr(
 
1008
                                    prop, "_dbus_annotations", {}))
 
1009
                        for name, value in annots.items():
 
1010
                            ann_tag = document.createElement(
 
1011
                                "annotation")
 
1012
                            ann_tag.setAttribute("name", name)
 
1013
                            ann_tag.setAttribute("value", value)
 
1014
                            tag.appendChild(ann_tag)
 
1015
                # Add interface annotation tags
 
1016
                for annotation, value in dict(
 
1017
                    itertools.chain.from_iterable(
 
1018
                        annotations().items()
 
1019
                        for name, annotations
 
1020
                        in self._get_all_dbus_things("interface")
 
1021
                        if name == if_tag.getAttribute("name")
 
1022
                        )).items():
 
1023
                    ann_tag = document.createElement("annotation")
 
1024
                    ann_tag.setAttribute("name", annotation)
 
1025
                    ann_tag.setAttribute("value", value)
 
1026
                    if_tag.appendChild(ann_tag)
730
1027
                # Add the names to the return values for the
731
1028
                # "org.freedesktop.DBus.Properties" methods
732
1029
                if (if_tag.getAttribute("name")
747
1044
        except (AttributeError, xml.dom.DOMException,
748
1045
                xml.parsers.expat.ExpatError) as error:
749
1046
            logger.error("Failed to override Introspection method",
750
 
                         error)
 
1047
                         exc_info=error)
751
1048
        return xmlstring
752
1049
 
753
1050
 
 
1051
def datetime_to_dbus(dt, variant_level=0):
 
1052
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1053
    if dt is None:
 
1054
        return dbus.String("", variant_level = variant_level)
 
1055
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1056
 
 
1057
 
 
1058
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1059
    """A class decorator; applied to a subclass of
 
1060
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1061
    interface names according to the "alt_interface_names" mapping.
 
1062
    Usage:
 
1063
    
 
1064
    @alternate_dbus_interfaces({"org.example.Interface":
 
1065
                                    "net.example.AlternateInterface"})
 
1066
    class SampleDBusObject(dbus.service.Object):
 
1067
        @dbus.service.method("org.example.Interface")
 
1068
        def SampleDBusMethod():
 
1069
            pass
 
1070
    
 
1071
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1072
    reachable via two interfaces: "org.example.Interface" and
 
1073
    "net.example.AlternateInterface", the latter of which will have
 
1074
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1075
    "true", unless "deprecate" is passed with a False value.
 
1076
    
 
1077
    This works for methods and signals, and also for D-Bus properties
 
1078
    (from DBusObjectWithProperties) and interfaces (from the
 
1079
    dbus_interface_annotations decorator).
 
1080
    """
 
1081
    
 
1082
    def wrapper(cls):
 
1083
        for orig_interface_name, alt_interface_name in (
 
1084
                alt_interface_names.items()):
 
1085
            attr = {}
 
1086
            interface_names = set()
 
1087
            # Go though all attributes of the class
 
1088
            for attrname, attribute in inspect.getmembers(cls):
 
1089
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1090
                # with the wrong interface name
 
1091
                if (not hasattr(attribute, "_dbus_interface")
 
1092
                    or not attribute._dbus_interface.startswith(
 
1093
                        orig_interface_name)):
 
1094
                    continue
 
1095
                # Create an alternate D-Bus interface name based on
 
1096
                # the current name
 
1097
                alt_interface = attribute._dbus_interface.replace(
 
1098
                    orig_interface_name, alt_interface_name)
 
1099
                interface_names.add(alt_interface)
 
1100
                # Is this a D-Bus signal?
 
1101
                if getattr(attribute, "_dbus_is_signal", False):
 
1102
                    if sys.version_info.major == 2:
 
1103
                        # Extract the original non-method undecorated
 
1104
                        # function by black magic
 
1105
                        nonmethod_func = (dict(
 
1106
                            zip(attribute.func_code.co_freevars,
 
1107
                                attribute.__closure__))
 
1108
                                          ["func"].cell_contents)
 
1109
                    else:
 
1110
                        nonmethod_func = attribute
 
1111
                    # Create a new, but exactly alike, function
 
1112
                    # object, and decorate it to be a new D-Bus signal
 
1113
                    # with the alternate D-Bus interface name
 
1114
                    if sys.version_info.major == 2:
 
1115
                        new_function = types.FunctionType(
 
1116
                            nonmethod_func.func_code,
 
1117
                            nonmethod_func.func_globals,
 
1118
                            nonmethod_func.func_name,
 
1119
                            nonmethod_func.func_defaults,
 
1120
                            nonmethod_func.func_closure)
 
1121
                    else:
 
1122
                        new_function = types.FunctionType(
 
1123
                            nonmethod_func.__code__,
 
1124
                            nonmethod_func.__globals__,
 
1125
                            nonmethod_func.__name__,
 
1126
                            nonmethod_func.__defaults__,
 
1127
                            nonmethod_func.__closure__)
 
1128
                    new_function = (dbus.service.signal(
 
1129
                        alt_interface,
 
1130
                        attribute._dbus_signature)(new_function))
 
1131
                    # Copy annotations, if any
 
1132
                    try:
 
1133
                        new_function._dbus_annotations = dict(
 
1134
                            attribute._dbus_annotations)
 
1135
                    except AttributeError:
 
1136
                        pass
 
1137
                    # Define a creator of a function to call both the
 
1138
                    # original and alternate functions, so both the
 
1139
                    # original and alternate signals gets sent when
 
1140
                    # the function is called
 
1141
                    def fixscope(func1, func2):
 
1142
                        """This function is a scope container to pass
 
1143
                        func1 and func2 to the "call_both" function
 
1144
                        outside of its arguments"""
 
1145
                        
 
1146
                        def call_both(*args, **kwargs):
 
1147
                            """This function will emit two D-Bus
 
1148
                            signals by calling func1 and func2"""
 
1149
                            func1(*args, **kwargs)
 
1150
                            func2(*args, **kwargs)
 
1151
                        
 
1152
                        return call_both
 
1153
                    # Create the "call_both" function and add it to
 
1154
                    # the class
 
1155
                    attr[attrname] = fixscope(attribute, new_function)
 
1156
                # Is this a D-Bus method?
 
1157
                elif getattr(attribute, "_dbus_is_method", False):
 
1158
                    # Create a new, but exactly alike, function
 
1159
                    # object.  Decorate it to be a new D-Bus method
 
1160
                    # with the alternate D-Bus interface name.  Add it
 
1161
                    # to the class.
 
1162
                    attr[attrname] = (
 
1163
                        dbus.service.method(
 
1164
                            alt_interface,
 
1165
                            attribute._dbus_in_signature,
 
1166
                            attribute._dbus_out_signature)
 
1167
                        (types.FunctionType(attribute.func_code,
 
1168
                                            attribute.func_globals,
 
1169
                                            attribute.func_name,
 
1170
                                            attribute.func_defaults,
 
1171
                                            attribute.func_closure)))
 
1172
                    # Copy annotations, if any
 
1173
                    try:
 
1174
                        attr[attrname]._dbus_annotations = dict(
 
1175
                            attribute._dbus_annotations)
 
1176
                    except AttributeError:
 
1177
                        pass
 
1178
                # Is this a D-Bus property?
 
1179
                elif getattr(attribute, "_dbus_is_property", False):
 
1180
                    # Create a new, but exactly alike, function
 
1181
                    # object, and decorate it to be a new D-Bus
 
1182
                    # property with the alternate D-Bus interface
 
1183
                    # name.  Add it to the class.
 
1184
                    attr[attrname] = (dbus_service_property(
 
1185
                        alt_interface, attribute._dbus_signature,
 
1186
                        attribute._dbus_access,
 
1187
                        attribute._dbus_get_args_options
 
1188
                        ["byte_arrays"])
 
1189
                                      (types.FunctionType(
 
1190
                                          attribute.func_code,
 
1191
                                          attribute.func_globals,
 
1192
                                          attribute.func_name,
 
1193
                                          attribute.func_defaults,
 
1194
                                          attribute.func_closure)))
 
1195
                    # Copy annotations, if any
 
1196
                    try:
 
1197
                        attr[attrname]._dbus_annotations = dict(
 
1198
                            attribute._dbus_annotations)
 
1199
                    except AttributeError:
 
1200
                        pass
 
1201
                # Is this a D-Bus interface?
 
1202
                elif getattr(attribute, "_dbus_is_interface", False):
 
1203
                    # Create a new, but exactly alike, function
 
1204
                    # object.  Decorate it to be a new D-Bus interface
 
1205
                    # with the alternate D-Bus interface name.  Add it
 
1206
                    # to the class.
 
1207
                    attr[attrname] = (
 
1208
                        dbus_interface_annotations(alt_interface)
 
1209
                        (types.FunctionType(attribute.func_code,
 
1210
                                            attribute.func_globals,
 
1211
                                            attribute.func_name,
 
1212
                                            attribute.func_defaults,
 
1213
                                            attribute.func_closure)))
 
1214
            if deprecate:
 
1215
                # Deprecate all alternate interfaces
 
1216
                iname="_AlternateDBusNames_interface_annotation{}"
 
1217
                for interface_name in interface_names:
 
1218
                    
 
1219
                    @dbus_interface_annotations(interface_name)
 
1220
                    def func(self):
 
1221
                        return { "org.freedesktop.DBus.Deprecated":
 
1222
                                 "true" }
 
1223
                    # Find an unused name
 
1224
                    for aname in (iname.format(i)
 
1225
                                  for i in itertools.count()):
 
1226
                        if aname not in attr:
 
1227
                            attr[aname] = func
 
1228
                            break
 
1229
            if interface_names:
 
1230
                # Replace the class with a new subclass of it with
 
1231
                # methods, signals, etc. as created above.
 
1232
                cls = type(b"{}Alternate".format(cls.__name__),
 
1233
                           (cls, ), attr)
 
1234
        return cls
 
1235
    
 
1236
    return wrapper
 
1237
 
 
1238
 
 
1239
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1240
                            "se.bsnet.fukt.Mandos"})
754
1241
class ClientDBus(Client, DBusObjectWithProperties):
755
1242
    """A Client class using D-Bus
756
1243
    
760
1247
    """
761
1248
    
762
1249
    runtime_expansions = (Client.runtime_expansions
763
 
                          + ("dbus_object_path",))
 
1250
                          + ("dbus_object_path", ))
 
1251
    
 
1252
    _interface = "se.recompile.Mandos.Client"
764
1253
    
765
1254
    # dbus.service.Object doesn't use super(), so we can't either.
766
1255
    
767
1256
    def __init__(self, bus = None, *args, **kwargs):
768
 
        self._approvals_pending = 0
769
1257
        self.bus = bus
770
1258
        Client.__init__(self, *args, **kwargs)
771
1259
        # Only now, when this client is initialized, can it show up on
772
1260
        # the D-Bus
773
 
        client_object_name = unicode(self.name).translate(
 
1261
        client_object_name = str(self.name).translate(
774
1262
            {ord("."): ord("_"),
775
1263
             ord("-"): ord("_")})
776
 
        self.dbus_object_path = (dbus.ObjectPath
777
 
                                 ("/clients/" + client_object_name))
 
1264
        self.dbus_object_path = dbus.ObjectPath(
 
1265
            "/clients/" + client_object_name)
778
1266
        DBusObjectWithProperties.__init__(self, self.bus,
779
1267
                                          self.dbus_object_path)
780
 
    def _set_expires(self, value):
781
 
        old_value = getattr(self, "_expires", None)
782
 
        self._expires = value
783
 
        if hasattr(self, "dbus_object_path") and old_value != value:
784
 
            dbus_time = (self._datetime_to_dbus(self._expires,
785
 
                                                variant_level=1))
786
 
            self.PropertyChanged(dbus.String("Expires"),
787
 
                                 dbus_time)
788
 
    expires = property(lambda self: self._expires, _set_expires)
789
 
    del _set_expires
790
 
        
791
 
    def _get_approvals_pending(self):
792
 
        return self._approvals_pending
793
 
    def _set_approvals_pending(self, value):
794
 
        old_value = self._approvals_pending
795
 
        self._approvals_pending = value
796
 
        bval = bool(value)
797
 
        if (hasattr(self, "dbus_object_path")
798
 
            and bval is not bool(old_value)):
799
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
800
 
            self.PropertyChanged(dbus.String("ApprovalPending"),
801
 
                                 dbus_bool)
802
 
 
803
 
    approvals_pending = property(_get_approvals_pending,
804
 
                                 _set_approvals_pending)
805
 
    del _get_approvals_pending, _set_approvals_pending
806
 
    
807
 
    @staticmethod
808
 
    def _datetime_to_dbus(dt, variant_level=0):
809
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
810
 
        if dt is None:
811
 
            return dbus.String("", variant_level = variant_level)
812
 
        return dbus.String(dt.isoformat(),
813
 
                           variant_level=variant_level)
814
 
    
815
 
    def enable(self):
816
 
        oldstate = getattr(self, "enabled", False)
817
 
        r = Client.enable(self)
818
 
        if oldstate != self.enabled:
819
 
            # Emit D-Bus signals
820
 
            self.PropertyChanged(dbus.String("Enabled"),
821
 
                                 dbus.Boolean(True, variant_level=1))
822
 
            self.PropertyChanged(
823
 
                dbus.String("LastEnabled"),
824
 
                self._datetime_to_dbus(self.last_enabled,
825
 
                                       variant_level=1))
826
 
        return r
827
 
    
828
 
    def disable(self, quiet = False):
829
 
        oldstate = getattr(self, "enabled", False)
830
 
        r = Client.disable(self, quiet=quiet)
831
 
        if not quiet and oldstate != self.enabled:
832
 
            # Emit D-Bus signal
833
 
            self.PropertyChanged(dbus.String("Enabled"),
834
 
                                 dbus.Boolean(False, variant_level=1))
835
 
        return r
 
1268
    
 
1269
    def notifychangeproperty(transform_func, dbus_name,
 
1270
                             type_func=lambda x: x,
 
1271
                             variant_level=1,
 
1272
                             invalidate_only=False,
 
1273
                             _interface=_interface):
 
1274
        """ Modify a variable so that it's a property which announces
 
1275
        its changes to DBus.
 
1276
        
 
1277
        transform_fun: Function that takes a value and a variant_level
 
1278
                       and transforms it to a D-Bus type.
 
1279
        dbus_name: D-Bus name of the variable
 
1280
        type_func: Function that transform the value before sending it
 
1281
                   to the D-Bus.  Default: no transform
 
1282
        variant_level: D-Bus variant level.  Default: 1
 
1283
        """
 
1284
        attrname = "_{}".format(dbus_name)
 
1285
        
 
1286
        def setter(self, value):
 
1287
            if hasattr(self, "dbus_object_path"):
 
1288
                if (not hasattr(self, attrname) or
 
1289
                    type_func(getattr(self, attrname, None))
 
1290
                    != type_func(value)):
 
1291
                    if invalidate_only:
 
1292
                        self.PropertiesChanged(
 
1293
                            _interface, dbus.Dictionary(),
 
1294
                            dbus.Array((dbus_name, )))
 
1295
                    else:
 
1296
                        dbus_value = transform_func(
 
1297
                            type_func(value),
 
1298
                            variant_level = variant_level)
 
1299
                        self.PropertyChanged(dbus.String(dbus_name),
 
1300
                                             dbus_value)
 
1301
                        self.PropertiesChanged(
 
1302
                            _interface,
 
1303
                            dbus.Dictionary({ dbus.String(dbus_name):
 
1304
                                              dbus_value }),
 
1305
                            dbus.Array())
 
1306
            setattr(self, attrname, value)
 
1307
        
 
1308
        return property(lambda self: getattr(self, attrname), setter)
 
1309
    
 
1310
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1311
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1312
                                             "ApprovalPending",
 
1313
                                             type_func = bool)
 
1314
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1315
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1316
                                        "LastEnabled")
 
1317
    checker = notifychangeproperty(
 
1318
        dbus.Boolean, "CheckerRunning",
 
1319
        type_func = lambda checker: checker is not None)
 
1320
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1321
                                           "LastCheckedOK")
 
1322
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1323
                                               "LastCheckerStatus")
 
1324
    last_approval_request = notifychangeproperty(
 
1325
        datetime_to_dbus, "LastApprovalRequest")
 
1326
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1327
                                               "ApprovedByDefault")
 
1328
    approval_delay = notifychangeproperty(
 
1329
        dbus.UInt64, "ApprovalDelay",
 
1330
        type_func = lambda td: td.total_seconds() * 1000)
 
1331
    approval_duration = notifychangeproperty(
 
1332
        dbus.UInt64, "ApprovalDuration",
 
1333
        type_func = lambda td: td.total_seconds() * 1000)
 
1334
    host = notifychangeproperty(dbus.String, "Host")
 
1335
    timeout = notifychangeproperty(
 
1336
        dbus.UInt64, "Timeout",
 
1337
        type_func = lambda td: td.total_seconds() * 1000)
 
1338
    extended_timeout = notifychangeproperty(
 
1339
        dbus.UInt64, "ExtendedTimeout",
 
1340
        type_func = lambda td: td.total_seconds() * 1000)
 
1341
    interval = notifychangeproperty(
 
1342
        dbus.UInt64, "Interval",
 
1343
        type_func = lambda td: td.total_seconds() * 1000)
 
1344
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1345
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1346
                                  invalidate_only=True)
 
1347
    
 
1348
    del notifychangeproperty
836
1349
    
837
1350
    def __del__(self, *args, **kwargs):
838
1351
        try:
843
1356
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
844
1357
        Client.__del__(self, *args, **kwargs)
845
1358
    
846
 
    def checker_callback(self, pid, condition, command,
847
 
                         *args, **kwargs):
848
 
        self.checker_callback_tag = None
849
 
        self.checker = None
850
 
        # Emit D-Bus signal
851
 
        self.PropertyChanged(dbus.String("CheckerRunning"),
852
 
                             dbus.Boolean(False, variant_level=1))
853
 
        if os.WIFEXITED(condition):
854
 
            exitstatus = os.WEXITSTATUS(condition)
 
1359
    def checker_callback(self, source, condition,
 
1360
                         connection, command, *args, **kwargs):
 
1361
        ret = Client.checker_callback(self, source, condition,
 
1362
                                      connection, command, *args,
 
1363
                                      **kwargs)
 
1364
        exitstatus = self.last_checker_status
 
1365
        if exitstatus >= 0:
855
1366
            # Emit D-Bus signal
856
1367
            self.CheckerCompleted(dbus.Int16(exitstatus),
857
 
                                  dbus.Int64(condition),
 
1368
                                  dbus.Int64(0),
858
1369
                                  dbus.String(command))
859
1370
        else:
860
1371
            # Emit D-Bus signal
861
1372
            self.CheckerCompleted(dbus.Int16(-1),
862
 
                                  dbus.Int64(condition),
 
1373
                                  dbus.Int64(
 
1374
                                      self.last_checker_signal),
863
1375
                                  dbus.String(command))
864
 
        
865
 
        return Client.checker_callback(self, pid, condition, command,
866
 
                                       *args, **kwargs)
867
 
    
868
 
    def checked_ok(self, *args, **kwargs):
869
 
        Client.checked_ok(self, *args, **kwargs)
870
 
        # Emit D-Bus signal
871
 
        self.PropertyChanged(
872
 
            dbus.String("LastCheckedOK"),
873
 
            (self._datetime_to_dbus(self.last_checked_ok,
874
 
                                    variant_level=1)))
875
 
    
876
 
    def need_approval(self, *args, **kwargs):
877
 
        r = Client.need_approval(self, *args, **kwargs)
878
 
        # Emit D-Bus signal
879
 
        self.PropertyChanged(
880
 
            dbus.String("LastApprovalRequest"),
881
 
            (self._datetime_to_dbus(self.last_approval_request,
882
 
                                    variant_level=1)))
883
 
        return r
 
1376
        return ret
884
1377
    
885
1378
    def start_checker(self, *args, **kwargs):
886
 
        old_checker = self.checker
887
 
        if self.checker is not None:
888
 
            old_checker_pid = self.checker.pid
889
 
        else:
890
 
            old_checker_pid = None
 
1379
        old_checker_pid = getattr(self.checker, "pid", None)
891
1380
        r = Client.start_checker(self, *args, **kwargs)
892
1381
        # Only if new checker process was started
893
1382
        if (self.checker is not None
894
1383
            and old_checker_pid != self.checker.pid):
895
1384
            # Emit D-Bus signal
896
1385
            self.CheckerStarted(self.current_checker_command)
897
 
            self.PropertyChanged(
898
 
                dbus.String("CheckerRunning"),
899
 
                dbus.Boolean(True, variant_level=1))
900
1386
        return r
901
1387
    
902
 
    def stop_checker(self, *args, **kwargs):
903
 
        old_checker = getattr(self, "checker", None)
904
 
        r = Client.stop_checker(self, *args, **kwargs)
905
 
        if (old_checker is not None
906
 
            and getattr(self, "checker", None) is None):
907
 
            self.PropertyChanged(dbus.String("CheckerRunning"),
908
 
                                 dbus.Boolean(False, variant_level=1))
909
 
        return r
910
 
 
911
1388
    def _reset_approved(self):
912
 
        self._approved = None
 
1389
        self.approved = None
913
1390
        return False
914
1391
    
915
1392
    def approve(self, value=True):
 
1393
        self.approved = value
 
1394
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1395
                                * 1000), self._reset_approved)
916
1396
        self.send_changedstate()
917
 
        self._approved = value
918
 
        gobject.timeout_add(self._timedelta_to_milliseconds
919
 
                            (self.approval_duration),
920
 
                            self._reset_approved)
921
 
    
922
1397
    
923
1398
    ## D-Bus methods, signals & properties
924
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
1399
    
 
1400
    ## Interfaces
925
1401
    
926
1402
    ## Signals
927
1403
    
938
1414
        pass
939
1415
    
940
1416
    # PropertyChanged - signal
 
1417
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
941
1418
    @dbus.service.signal(_interface, signature="sv")
942
1419
    def PropertyChanged(self, property, value):
943
1420
        "D-Bus signal"
1007
1484
        return dbus.Boolean(bool(self.approvals_pending))
1008
1485
    
1009
1486
    # ApprovedByDefault - property
1010
 
    @dbus_service_property(_interface, signature="b",
 
1487
    @dbus_service_property(_interface,
 
1488
                           signature="b",
1011
1489
                           access="readwrite")
1012
1490
    def ApprovedByDefault_dbus_property(self, value=None):
1013
1491
        if value is None:       # get
1014
1492
            return dbus.Boolean(self.approved_by_default)
1015
 
        old_value = self.approved_by_default
1016
1493
        self.approved_by_default = bool(value)
1017
 
        # Emit D-Bus signal
1018
 
        if old_value != self.approved_by_default:
1019
 
            self.PropertyChanged(dbus.String("ApprovedByDefault"),
1020
 
                                 dbus.Boolean(value, variant_level=1))
1021
1494
    
1022
1495
    # ApprovalDelay - property
1023
 
    @dbus_service_property(_interface, signature="t",
 
1496
    @dbus_service_property(_interface,
 
1497
                           signature="t",
1024
1498
                           access="readwrite")
1025
1499
    def ApprovalDelay_dbus_property(self, value=None):
1026
1500
        if value is None:       # get
1027
 
            return dbus.UInt64(self.approval_delay_milliseconds())
1028
 
        old_value = self.approval_delay
 
1501
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1502
                               * 1000)
1029
1503
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1030
 
        # Emit D-Bus signal
1031
 
        if old_value != self.approval_delay:
1032
 
            self.PropertyChanged(dbus.String("ApprovalDelay"),
1033
 
                                 dbus.UInt64(value, variant_level=1))
1034
1504
    
1035
1505
    # ApprovalDuration - property
1036
 
    @dbus_service_property(_interface, signature="t",
 
1506
    @dbus_service_property(_interface,
 
1507
                           signature="t",
1037
1508
                           access="readwrite")
1038
1509
    def ApprovalDuration_dbus_property(self, value=None):
1039
1510
        if value is None:       # get
1040
 
            return dbus.UInt64(self._timedelta_to_milliseconds(
1041
 
                    self.approval_duration))
1042
 
        old_value = self.approval_duration
 
1511
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1512
                               * 1000)
1043
1513
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1044
 
        # Emit D-Bus signal
1045
 
        if old_value != self.approval_duration:
1046
 
            self.PropertyChanged(dbus.String("ApprovalDuration"),
1047
 
                                 dbus.UInt64(value, variant_level=1))
1048
1514
    
1049
1515
    # Name - property
1050
1516
    @dbus_service_property(_interface, signature="s", access="read")
1057
1523
        return dbus.String(self.fingerprint)
1058
1524
    
1059
1525
    # Host - property
1060
 
    @dbus_service_property(_interface, signature="s",
 
1526
    @dbus_service_property(_interface,
 
1527
                           signature="s",
1061
1528
                           access="readwrite")
1062
1529
    def Host_dbus_property(self, value=None):
1063
1530
        if value is None:       # get
1064
1531
            return dbus.String(self.host)
1065
 
        old_value = self.host
1066
 
        self.host = value
1067
 
        # Emit D-Bus signal
1068
 
        if old_value != self.host:
1069
 
            self.PropertyChanged(dbus.String("Host"),
1070
 
                                 dbus.String(value, variant_level=1))
 
1532
        self.host = str(value)
1071
1533
    
1072
1534
    # Created - property
1073
1535
    @dbus_service_property(_interface, signature="s", access="read")
1074
1536
    def Created_dbus_property(self):
1075
 
        return dbus.String(self._datetime_to_dbus(self.created))
 
1537
        return datetime_to_dbus(self.created)
1076
1538
    
1077
1539
    # LastEnabled - property
1078
1540
    @dbus_service_property(_interface, signature="s", access="read")
1079
1541
    def LastEnabled_dbus_property(self):
1080
 
        return self._datetime_to_dbus(self.last_enabled)
 
1542
        return datetime_to_dbus(self.last_enabled)
1081
1543
    
1082
1544
    # Enabled - property
1083
 
    @dbus_service_property(_interface, signature="b",
 
1545
    @dbus_service_property(_interface,
 
1546
                           signature="b",
1084
1547
                           access="readwrite")
1085
1548
    def Enabled_dbus_property(self, value=None):
1086
1549
        if value is None:       # get
1091
1554
            self.disable()
1092
1555
    
1093
1556
    # LastCheckedOK - property
1094
 
    @dbus_service_property(_interface, signature="s",
 
1557
    @dbus_service_property(_interface,
 
1558
                           signature="s",
1095
1559
                           access="readwrite")
1096
1560
    def LastCheckedOK_dbus_property(self, value=None):
1097
1561
        if value is not None:
1098
1562
            self.checked_ok()
1099
1563
            return
1100
 
        return self._datetime_to_dbus(self.last_checked_ok)
 
1564
        return datetime_to_dbus(self.last_checked_ok)
 
1565
    
 
1566
    # LastCheckerStatus - property
 
1567
    @dbus_service_property(_interface, signature="n", access="read")
 
1568
    def LastCheckerStatus_dbus_property(self):
 
1569
        return dbus.Int16(self.last_checker_status)
1101
1570
    
1102
1571
    # Expires - property
1103
1572
    @dbus_service_property(_interface, signature="s", access="read")
1104
1573
    def Expires_dbus_property(self):
1105
 
        return self._datetime_to_dbus(self.expires)
 
1574
        return datetime_to_dbus(self.expires)
1106
1575
    
1107
1576
    # LastApprovalRequest - property
1108
1577
    @dbus_service_property(_interface, signature="s", access="read")
1109
1578
    def LastApprovalRequest_dbus_property(self):
1110
 
        return self._datetime_to_dbus(self.last_approval_request)
 
1579
        return datetime_to_dbus(self.last_approval_request)
1111
1580
    
1112
1581
    # Timeout - property
1113
 
    @dbus_service_property(_interface, signature="t",
 
1582
    @dbus_service_property(_interface,
 
1583
                           signature="t",
1114
1584
                           access="readwrite")
1115
1585
    def Timeout_dbus_property(self, value=None):
1116
1586
        if value is None:       # get
1117
 
            return dbus.UInt64(self.timeout_milliseconds())
1118
 
        old_value = self.timeout
 
1587
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1588
        old_timeout = self.timeout
1119
1589
        self.timeout = datetime.timedelta(0, 0, 0, value)
1120
 
        # Emit D-Bus signal
1121
 
        if old_value != self.timeout:
1122
 
            self.PropertyChanged(dbus.String("Timeout"),
1123
 
                                 dbus.UInt64(value, variant_level=1))
1124
 
        if getattr(self, "disable_initiator_tag", None) is None:
1125
 
            return
1126
 
        # Reschedule timeout
1127
 
        gobject.source_remove(self.disable_initiator_tag)
1128
 
        self.disable_initiator_tag = None
1129
 
        self.expires = None
1130
 
        time_to_die = (self.
1131
 
                       _timedelta_to_milliseconds((self
1132
 
                                                   .last_checked_ok
1133
 
                                                   + self.timeout)
1134
 
                                                  - datetime.datetime
1135
 
                                                  .utcnow()))
1136
 
        if time_to_die <= 0:
1137
 
            # The timeout has passed
1138
 
            self.disable()
1139
 
        else:
1140
 
            self.expires = (datetime.datetime.utcnow()
1141
 
                            + datetime.timedelta(milliseconds = time_to_die))
1142
 
            self.disable_initiator_tag = (gobject.timeout_add
1143
 
                                          (time_to_die, self.disable))
1144
 
 
 
1590
        # Reschedule disabling
 
1591
        if self.enabled:
 
1592
            now = datetime.datetime.utcnow()
 
1593
            self.expires += self.timeout - old_timeout
 
1594
            if self.expires <= now:
 
1595
                # The timeout has passed
 
1596
                self.disable()
 
1597
            else:
 
1598
                if (getattr(self, "disable_initiator_tag", None)
 
1599
                    is None):
 
1600
                    return
 
1601
                gobject.source_remove(self.disable_initiator_tag)
 
1602
                self.disable_initiator_tag = gobject.timeout_add(
 
1603
                    int((self.expires - now).total_seconds() * 1000),
 
1604
                    self.disable)
 
1605
    
1145
1606
    # ExtendedTimeout - property
1146
 
    @dbus_service_property(_interface, signature="t",
 
1607
    @dbus_service_property(_interface,
 
1608
                           signature="t",
1147
1609
                           access="readwrite")
1148
1610
    def ExtendedTimeout_dbus_property(self, value=None):
1149
1611
        if value is None:       # get
1150
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
1151
 
        old_value = self.extended_timeout
 
1612
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1613
                               * 1000)
1152
1614
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1153
 
        # Emit D-Bus signal
1154
 
        if old_value != self.extended_timeout:
1155
 
            self.PropertyChanged(dbus.String("ExtendedTimeout"),
1156
 
                                 dbus.UInt64(value, variant_level=1))
1157
 
 
 
1615
    
1158
1616
    # Interval - property
1159
 
    @dbus_service_property(_interface, signature="t",
 
1617
    @dbus_service_property(_interface,
 
1618
                           signature="t",
1160
1619
                           access="readwrite")
1161
1620
    def Interval_dbus_property(self, value=None):
1162
1621
        if value is None:       # get
1163
 
            return dbus.UInt64(self.interval_milliseconds())
1164
 
        old_value = self.interval
 
1622
            return dbus.UInt64(self.interval.total_seconds() * 1000)
1165
1623
        self.interval = datetime.timedelta(0, 0, 0, value)
1166
 
        # Emit D-Bus signal
1167
 
        if old_value != self.interval:
1168
 
            self.PropertyChanged(dbus.String("Interval"),
1169
 
                                 dbus.UInt64(value, variant_level=1))
1170
1624
        if getattr(self, "checker_initiator_tag", None) is None:
1171
1625
            return
1172
 
        # Reschedule checker run
1173
 
        gobject.source_remove(self.checker_initiator_tag)
1174
 
        self.checker_initiator_tag = (gobject.timeout_add
1175
 
                                      (value, self.start_checker))
1176
 
        self.start_checker()    # Start one now, too
1177
 
 
 
1626
        if self.enabled:
 
1627
            # Reschedule checker run
 
1628
            gobject.source_remove(self.checker_initiator_tag)
 
1629
            self.checker_initiator_tag = gobject.timeout_add(
 
1630
                value, self.start_checker)
 
1631
            self.start_checker() # Start one now, too
 
1632
    
1178
1633
    # Checker - property
1179
 
    @dbus_service_property(_interface, signature="s",
 
1634
    @dbus_service_property(_interface,
 
1635
                           signature="s",
1180
1636
                           access="readwrite")
1181
1637
    def Checker_dbus_property(self, value=None):
1182
1638
        if value is None:       # get
1183
1639
            return dbus.String(self.checker_command)
1184
 
        old_value = self.checker_command
1185
 
        self.checker_command = value
1186
 
        # Emit D-Bus signal
1187
 
        if old_value != self.checker_command:
1188
 
            self.PropertyChanged(dbus.String("Checker"),
1189
 
                                 dbus.String(self.checker_command,
1190
 
                                             variant_level=1))
 
1640
        self.checker_command = str(value)
1191
1641
    
1192
1642
    # CheckerRunning - property
1193
 
    @dbus_service_property(_interface, signature="b",
 
1643
    @dbus_service_property(_interface,
 
1644
                           signature="b",
1194
1645
                           access="readwrite")
1195
1646
    def CheckerRunning_dbus_property(self, value=None):
1196
1647
        if value is None:       # get
1206
1657
        return self.dbus_object_path # is already a dbus.ObjectPath
1207
1658
    
1208
1659
    # Secret = property
1209
 
    @dbus_service_property(_interface, signature="ay",
1210
 
                           access="write", byte_arrays=True)
 
1660
    @dbus_service_property(_interface,
 
1661
                           signature="ay",
 
1662
                           access="write",
 
1663
                           byte_arrays=True)
1211
1664
    def Secret_dbus_property(self, value):
1212
 
        self.secret = str(value)
 
1665
        self.secret = bytes(value)
1213
1666
    
1214
1667
    del _interface
1215
1668
 
1219
1672
        self._pipe = child_pipe
1220
1673
        self._pipe.send(('init', fpr, address))
1221
1674
        if not self._pipe.recv():
1222
 
            raise KeyError()
1223
 
 
 
1675
            raise KeyError(fpr)
 
1676
    
1224
1677
    def __getattribute__(self, name):
1225
 
        if(name == '_pipe'):
 
1678
        if name == '_pipe':
1226
1679
            return super(ProxyClient, self).__getattribute__(name)
1227
1680
        self._pipe.send(('getattr', name))
1228
1681
        data = self._pipe.recv()
1229
1682
        if data[0] == 'data':
1230
1683
            return data[1]
1231
1684
        if data[0] == 'function':
 
1685
            
1232
1686
            def func(*args, **kwargs):
1233
1687
                self._pipe.send(('funcall', name, args, kwargs))
1234
1688
                return self._pipe.recv()[1]
 
1689
            
1235
1690
            return func
1236
 
 
 
1691
    
1237
1692
    def __setattr__(self, name, value):
1238
 
        if(name == '_pipe'):
 
1693
        if name == '_pipe':
1239
1694
            return super(ProxyClient, self).__setattr__(name, value)
1240
1695
        self._pipe.send(('setattr', name, value))
1241
1696
 
1249
1704
    def handle(self):
1250
1705
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1251
1706
            logger.info("TCP connection from: %s",
1252
 
                        unicode(self.client_address))
 
1707
                        str(self.client_address))
1253
1708
            logger.debug("Pipe FD: %d",
1254
1709
                         self.server.child_pipe.fileno())
1255
 
 
1256
 
            session = (gnutls.connection
1257
 
                       .ClientSession(self.request,
1258
 
                                      gnutls.connection
1259
 
                                      .X509Credentials()))
1260
 
 
 
1710
            
 
1711
            session = gnutls.connection.ClientSession(
 
1712
                self.request, gnutls.connection .X509Credentials())
 
1713
            
1261
1714
            # Note: gnutls.connection.X509Credentials is really a
1262
1715
            # generic GnuTLS certificate credentials object so long as
1263
1716
            # no X.509 keys are added to it.  Therefore, we can use it
1264
1717
            # here despite using OpenPGP certificates.
1265
 
 
 
1718
            
1266
1719
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1267
1720
            #                      "+AES-256-CBC", "+SHA1",
1268
1721
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1271
1724
            priority = self.server.gnutls_priority
1272
1725
            if priority is None:
1273
1726
                priority = "NORMAL"
1274
 
            (gnutls.library.functions
1275
 
             .gnutls_priority_set_direct(session._c_object,
1276
 
                                         priority, None))
1277
 
 
 
1727
            gnutls.library.functions.gnutls_priority_set_direct(
 
1728
                session._c_object, priority, None)
 
1729
            
1278
1730
            # Start communication using the Mandos protocol
1279
1731
            # Get protocol number
1280
1732
            line = self.request.makefile().readline()
1281
1733
            logger.debug("Protocol version: %r", line)
1282
1734
            try:
1283
1735
                if int(line.strip().split()[0]) > 1:
1284
 
                    raise RuntimeError
 
1736
                    raise RuntimeError(line)
1285
1737
            except (ValueError, IndexError, RuntimeError) as error:
1286
1738
                logger.error("Unknown protocol version: %s", error)
1287
1739
                return
1288
 
 
 
1740
            
1289
1741
            # Start GnuTLS connection
1290
1742
            try:
1291
1743
                session.handshake()
1295
1747
                # established.  Just abandon the request.
1296
1748
                return
1297
1749
            logger.debug("Handshake succeeded")
1298
 
 
 
1750
            
1299
1751
            approval_required = False
1300
1752
            try:
1301
1753
                try:
1302
 
                    fpr = self.fingerprint(self.peer_certificate
1303
 
                                           (session))
 
1754
                    fpr = self.fingerprint(
 
1755
                        self.peer_certificate(session))
1304
1756
                except (TypeError,
1305
1757
                        gnutls.errors.GNUTLSError) as error:
1306
1758
                    logger.warning("Bad certificate: %s", error)
1307
1759
                    return
1308
1760
                logger.debug("Fingerprint: %s", fpr)
1309
 
 
 
1761
                
1310
1762
                try:
1311
1763
                    client = ProxyClient(child_pipe, fpr,
1312
1764
                                         self.client_address)
1321
1773
                while True:
1322
1774
                    if not client.enabled:
1323
1775
                        logger.info("Client %s is disabled",
1324
 
                                       client.name)
 
1776
                                    client.name)
1325
1777
                        if self.server.use_dbus:
1326
1778
                            # Emit D-Bus signal
1327
 
                            client.Rejected("Disabled")                    
 
1779
                            client.Rejected("Disabled")
1328
1780
                        return
1329
1781
                    
1330
 
                    if client._approved or not client.approval_delay:
 
1782
                    if client.approved or not client.approval_delay:
1331
1783
                        #We are approved or approval is disabled
1332
1784
                        break
1333
 
                    elif client._approved is None:
 
1785
                    elif client.approved is None:
1334
1786
                        logger.info("Client %s needs approval",
1335
1787
                                    client.name)
1336
1788
                        if self.server.use_dbus:
1337
1789
                            # Emit D-Bus signal
1338
1790
                            client.NeedApproval(
1339
 
                                client.approval_delay_milliseconds(),
1340
 
                                client.approved_by_default)
 
1791
                                client.approval_delay.total_seconds()
 
1792
                                * 1000, client.approved_by_default)
1341
1793
                    else:
1342
1794
                        logger.warning("Client %s was not approved",
1343
1795
                                       client.name)
1347
1799
                        return
1348
1800
                    
1349
1801
                    #wait until timeout or approved
1350
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1351
1802
                    time = datetime.datetime.now()
1352
1803
                    client.changedstate.acquire()
1353
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1804
                    client.changedstate.wait(delay.total_seconds())
1354
1805
                    client.changedstate.release()
1355
1806
                    time2 = datetime.datetime.now()
1356
1807
                    if (time2 - time) >= delay:
1372
1823
                    try:
1373
1824
                        sent = session.send(client.secret[sent_size:])
1374
1825
                    except gnutls.errors.GNUTLSError as error:
1375
 
                        logger.warning("gnutls send failed")
 
1826
                        logger.warning("gnutls send failed",
 
1827
                                       exc_info=error)
1376
1828
                        return
1377
 
                    logger.debug("Sent: %d, remaining: %d",
1378
 
                                 sent, len(client.secret)
1379
 
                                 - (sent_size + sent))
 
1829
                    logger.debug("Sent: %d, remaining: %d", sent,
 
1830
                                 len(client.secret) - (sent_size
 
1831
                                                       + sent))
1380
1832
                    sent_size += sent
1381
 
 
 
1833
                
1382
1834
                logger.info("Sending secret to %s", client.name)
1383
 
                # bump the timeout as if seen
1384
 
                client.checked_ok(client.extended_timeout)
 
1835
                # bump the timeout using extended_timeout
 
1836
                client.bump_timeout(client.extended_timeout)
1385
1837
                if self.server.use_dbus:
1386
1838
                    # Emit D-Bus signal
1387
1839
                    client.GotSecret()
1392
1844
                try:
1393
1845
                    session.bye()
1394
1846
                except gnutls.errors.GNUTLSError as error:
1395
 
                    logger.warning("GnuTLS bye failed")
 
1847
                    logger.warning("GnuTLS bye failed",
 
1848
                                   exc_info=error)
1396
1849
    
1397
1850
    @staticmethod
1398
1851
    def peer_certificate(session):
1399
1852
        "Return the peer's OpenPGP certificate as a bytestring"
1400
1853
        # If not an OpenPGP certificate...
1401
 
        if (gnutls.library.functions
1402
 
            .gnutls_certificate_type_get(session._c_object)
 
1854
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
1855
                session._c_object)
1403
1856
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1404
1857
            # ...do the normal thing
1405
1858
            return session.peer_certificate
1419
1872
    def fingerprint(openpgp):
1420
1873
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1421
1874
        # New GnuTLS "datum" with the OpenPGP public key
1422
 
        datum = (gnutls.library.types
1423
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1424
 
                                             ctypes.POINTER
1425
 
                                             (ctypes.c_ubyte)),
1426
 
                                 ctypes.c_uint(len(openpgp))))
 
1875
        datum = gnutls.library.types.gnutls_datum_t(
 
1876
            ctypes.cast(ctypes.c_char_p(openpgp),
 
1877
                        ctypes.POINTER(ctypes.c_ubyte)),
 
1878
            ctypes.c_uint(len(openpgp)))
1427
1879
        # New empty GnuTLS certificate
1428
1880
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1429
 
        (gnutls.library.functions
1430
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
1881
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
1882
            ctypes.byref(crt))
1431
1883
        # Import the OpenPGP public key into the certificate
1432
 
        (gnutls.library.functions
1433
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1434
 
                                    gnutls.library.constants
1435
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
1884
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
1885
            crt, ctypes.byref(datum),
 
1886
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1436
1887
        # Verify the self signature in the key
1437
1888
        crtverify = ctypes.c_uint()
1438
 
        (gnutls.library.functions
1439
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
1440
 
                                         ctypes.byref(crtverify)))
 
1889
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
1890
            crt, 0, ctypes.byref(crtverify))
1441
1891
        if crtverify.value != 0:
1442
1892
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1443
 
            raise (gnutls.errors.CertificateSecurityError
1444
 
                   ("Verify failed"))
 
1893
            raise gnutls.errors.CertificateSecurityError(
 
1894
                "Verify failed")
1445
1895
        # New buffer for the fingerprint
1446
1896
        buf = ctypes.create_string_buffer(20)
1447
1897
        buf_len = ctypes.c_size_t()
1448
1898
        # Get the fingerprint from the certificate into the buffer
1449
 
        (gnutls.library.functions
1450
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1451
 
                                             ctypes.byref(buf_len)))
 
1899
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
1900
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
1452
1901
        # Deinit the certificate
1453
1902
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1454
1903
        # Convert the buffer to a Python bytestring
1455
1904
        fpr = ctypes.string_at(buf, buf_len.value)
1456
1905
        # Convert the bytestring to hexadecimal notation
1457
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1906
        hex_fpr = binascii.hexlify(fpr).upper()
1458
1907
        return hex_fpr
1459
1908
 
1460
1909
 
1461
1910
class MultiprocessingMixIn(object):
1462
1911
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1912
    
1463
1913
    def sub_process_main(self, request, address):
1464
1914
        try:
1465
1915
            self.finish_request(request, address)
1466
 
        except:
 
1916
        except Exception:
1467
1917
            self.handle_error(request, address)
1468
1918
        self.close_request(request)
1469
 
            
 
1919
    
1470
1920
    def process_request(self, request, address):
1471
1921
        """Start a new process to process the request."""
1472
 
        multiprocessing.Process(target = self.sub_process_main,
1473
 
                                args = (request, address)).start()
 
1922
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1923
                                       args = (request, address))
 
1924
        proc.start()
 
1925
        return proc
 
1926
 
1474
1927
 
1475
1928
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1476
1929
    """ adds a pipe to the MixIn """
 
1930
    
1477
1931
    def process_request(self, request, client_address):
1478
1932
        """Overrides and wraps the original process_request().
1479
1933
        
1480
1934
        This function creates a new pipe in self.pipe
1481
1935
        """
1482
1936
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1483
 
 
1484
 
        super(MultiprocessingMixInWithPipe,
1485
 
              self).process_request(request, client_address)
 
1937
        
 
1938
        proc = MultiprocessingMixIn.process_request(self, request,
 
1939
                                                    client_address)
1486
1940
        self.child_pipe.close()
1487
 
        self.add_pipe(parent_pipe)
1488
 
 
1489
 
    def add_pipe(self, parent_pipe):
 
1941
        self.add_pipe(parent_pipe, proc)
 
1942
    
 
1943
    def add_pipe(self, parent_pipe, proc):
1490
1944
        """Dummy function; override as necessary"""
1491
 
        raise NotImplementedError
 
1945
        raise NotImplementedError()
 
1946
 
1492
1947
 
1493
1948
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1494
1949
                     socketserver.TCPServer, object):
1499
1954
        interface:      None or a network interface name (string)
1500
1955
        use_ipv6:       Boolean; to use IPv6 or not
1501
1956
    """
 
1957
    
1502
1958
    def __init__(self, server_address, RequestHandlerClass,
1503
 
                 interface=None, use_ipv6=True):
 
1959
                 interface=None,
 
1960
                 use_ipv6=True,
 
1961
                 socketfd=None):
 
1962
        """If socketfd is set, use that file descriptor instead of
 
1963
        creating a new one with socket.socket().
 
1964
        """
1504
1965
        self.interface = interface
1505
1966
        if use_ipv6:
1506
1967
            self.address_family = socket.AF_INET6
 
1968
        if socketfd is not None:
 
1969
            # Save the file descriptor
 
1970
            self.socketfd = socketfd
 
1971
            # Save the original socket.socket() function
 
1972
            self.socket_socket = socket.socket
 
1973
            # To implement --socket, we monkey patch socket.socket.
 
1974
            # 
 
1975
            # (When socketserver.TCPServer is a new-style class, we
 
1976
            # could make self.socket into a property instead of monkey
 
1977
            # patching socket.socket.)
 
1978
            # 
 
1979
            # Create a one-time-only replacement for socket.socket()
 
1980
            @functools.wraps(socket.socket)
 
1981
            def socket_wrapper(*args, **kwargs):
 
1982
                # Restore original function so subsequent calls are
 
1983
                # not affected.
 
1984
                socket.socket = self.socket_socket
 
1985
                del self.socket_socket
 
1986
                # This time only, return a new socket object from the
 
1987
                # saved file descriptor.
 
1988
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1989
            # Replace socket.socket() function with wrapper
 
1990
            socket.socket = socket_wrapper
 
1991
        # The socketserver.TCPServer.__init__ will call
 
1992
        # socket.socket(), which might be our replacement,
 
1993
        # socket_wrapper(), if socketfd was set.
1507
1994
        socketserver.TCPServer.__init__(self, server_address,
1508
1995
                                        RequestHandlerClass)
 
1996
    
1509
1997
    def server_bind(self):
1510
1998
        """This overrides the normal server_bind() function
1511
1999
        to bind to an interface if one was specified, and also NOT to
1517
2005
                             self.interface)
1518
2006
            else:
1519
2007
                try:
1520
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1521
 
                                           SO_BINDTODEVICE,
1522
 
                                           str(self.interface
1523
 
                                               + '\0'))
 
2008
                    self.socket.setsockopt(
 
2009
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2010
                        (self.interface + "\0").encode("utf-8"))
1524
2011
                except socket.error as error:
1525
 
                    if error[0] == errno.EPERM:
1526
 
                        logger.error("No permission to"
1527
 
                                     " bind to interface %s",
1528
 
                                     self.interface)
1529
 
                    elif error[0] == errno.ENOPROTOOPT:
 
2012
                    if error.errno == errno.EPERM:
 
2013
                        logger.error("No permission to bind to"
 
2014
                                     " interface %s", self.interface)
 
2015
                    elif error.errno == errno.ENOPROTOOPT:
1530
2016
                        logger.error("SO_BINDTODEVICE not available;"
1531
2017
                                     " cannot bind to interface %s",
1532
2018
                                     self.interface)
 
2019
                    elif error.errno == errno.ENODEV:
 
2020
                        logger.error("Interface %s does not exist,"
 
2021
                                     " cannot bind", self.interface)
1533
2022
                    else:
1534
2023
                        raise
1535
2024
        # Only bind(2) the socket if we really need to.
1538
2027
                if self.address_family == socket.AF_INET6:
1539
2028
                    any_address = "::" # in6addr_any
1540
2029
                else:
1541
 
                    any_address = socket.INADDR_ANY
 
2030
                    any_address = "0.0.0.0" # INADDR_ANY
1542
2031
                self.server_address = (any_address,
1543
2032
                                       self.server_address[1])
1544
2033
            elif not self.server_address[1]:
1545
 
                self.server_address = (self.server_address[0],
1546
 
                                       0)
 
2034
                self.server_address = (self.server_address[0], 0)
1547
2035
#                 if self.interface:
1548
2036
#                     self.server_address = (self.server_address[0],
1549
2037
#                                            0, # port
1563
2051
    
1564
2052
    Assumes a gobject.MainLoop event loop.
1565
2053
    """
 
2054
    
1566
2055
    def __init__(self, server_address, RequestHandlerClass,
1567
 
                 interface=None, use_ipv6=True, clients=None,
1568
 
                 gnutls_priority=None, use_dbus=True):
 
2056
                 interface=None,
 
2057
                 use_ipv6=True,
 
2058
                 clients=None,
 
2059
                 gnutls_priority=None,
 
2060
                 use_dbus=True,
 
2061
                 socketfd=None):
1569
2062
        self.enabled = False
1570
2063
        self.clients = clients
1571
2064
        if self.clients is None:
1572
 
            self.clients = set()
 
2065
            self.clients = {}
1573
2066
        self.use_dbus = use_dbus
1574
2067
        self.gnutls_priority = gnutls_priority
1575
2068
        IPv6_TCPServer.__init__(self, server_address,
1576
2069
                                RequestHandlerClass,
1577
2070
                                interface = interface,
1578
 
                                use_ipv6 = use_ipv6)
 
2071
                                use_ipv6 = use_ipv6,
 
2072
                                socketfd = socketfd)
 
2073
    
1579
2074
    def server_activate(self):
1580
2075
        if self.enabled:
1581
2076
            return socketserver.TCPServer.server_activate(self)
 
2077
    
1582
2078
    def enable(self):
1583
2079
        self.enabled = True
1584
 
    def add_pipe(self, parent_pipe):
 
2080
    
 
2081
    def add_pipe(self, parent_pipe, proc):
1585
2082
        # Call "handle_ipc" for both data and EOF events
1586
 
        gobject.io_add_watch(parent_pipe.fileno(),
1587
 
                             gobject.IO_IN | gobject.IO_HUP,
1588
 
                             functools.partial(self.handle_ipc,
1589
 
                                               parent_pipe = parent_pipe))
1590
 
        
1591
 
    def handle_ipc(self, source, condition, parent_pipe=None,
 
2083
        gobject.io_add_watch(
 
2084
            parent_pipe.fileno(),
 
2085
            gobject.IO_IN | gobject.IO_HUP,
 
2086
            functools.partial(self.handle_ipc,
 
2087
                              parent_pipe = parent_pipe,
 
2088
                              proc = proc))
 
2089
    
 
2090
    def handle_ipc(self, source, condition,
 
2091
                   parent_pipe=None,
 
2092
                   proc = None,
1592
2093
                   client_object=None):
1593
 
        condition_names = {
1594
 
            gobject.IO_IN: "IN",   # There is data to read.
1595
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1596
 
                                    # blocking).
1597
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1598
 
            gobject.IO_ERR: "ERR", # Error condition.
1599
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1600
 
                                    # broken, usually for pipes and
1601
 
                                    # sockets).
1602
 
            }
1603
 
        conditions_string = ' | '.join(name
1604
 
                                       for cond, name in
1605
 
                                       condition_names.iteritems()
1606
 
                                       if cond & condition)
1607
 
        # error or the other end of multiprocessing.Pipe has closed
1608
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2094
        # error, or the other end of multiprocessing.Pipe has closed
 
2095
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
2096
            # Wait for other process to exit
 
2097
            proc.join()
1609
2098
            return False
1610
2099
        
1611
2100
        # Read a request from the child
1616
2105
            fpr = request[1]
1617
2106
            address = request[2]
1618
2107
            
1619
 
            for c in self.clients:
 
2108
            for c in self.clients.itervalues():
1620
2109
                if c.fingerprint == fpr:
1621
2110
                    client = c
1622
2111
                    break
1625
2114
                            "dress: %s", fpr, address)
1626
2115
                if self.use_dbus:
1627
2116
                    # Emit D-Bus signal
1628
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
2117
                    mandos_dbus_service.ClientNotFound(fpr,
 
2118
                                                       address[0])
1629
2119
                parent_pipe.send(False)
1630
2120
                return False
1631
2121
            
1632
 
            gobject.io_add_watch(parent_pipe.fileno(),
1633
 
                                 gobject.IO_IN | gobject.IO_HUP,
1634
 
                                 functools.partial(self.handle_ipc,
1635
 
                                                   parent_pipe = parent_pipe,
1636
 
                                                   client_object = client))
 
2122
            gobject.io_add_watch(
 
2123
                parent_pipe.fileno(),
 
2124
                gobject.IO_IN | gobject.IO_HUP,
 
2125
                functools.partial(self.handle_ipc,
 
2126
                                  parent_pipe = parent_pipe,
 
2127
                                  proc = proc,
 
2128
                                  client_object = client))
1637
2129
            parent_pipe.send(True)
1638
 
            # remove the old hook in favor of the new above hook on same fileno
 
2130
            # remove the old hook in favor of the new above hook on
 
2131
            # same fileno
1639
2132
            return False
1640
2133
        if command == 'funcall':
1641
2134
            funcname = request[1]
1642
2135
            args = request[2]
1643
2136
            kwargs = request[3]
1644
2137
            
1645
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1646
 
 
 
2138
            parent_pipe.send(('data', getattr(client_object,
 
2139
                                              funcname)(*args,
 
2140
                                                        **kwargs)))
 
2141
        
1647
2142
        if command == 'getattr':
1648
2143
            attrname = request[1]
1649
 
            if callable(client_object.__getattribute__(attrname)):
1650
 
                parent_pipe.send(('function',))
 
2144
            if isinstance(client_object.__getattribute__(attrname),
 
2145
                          collections.Callable):
 
2146
                parent_pipe.send(('function', ))
1651
2147
            else:
1652
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
2148
                parent_pipe.send((
 
2149
                    'data', client_object.__getattribute__(attrname)))
1653
2150
        
1654
2151
        if command == 'setattr':
1655
2152
            attrname = request[1]
1656
2153
            value = request[2]
1657
2154
            setattr(client_object, attrname, value)
1658
 
 
 
2155
        
1659
2156
        return True
1660
2157
 
1661
2158
 
 
2159
def rfc3339_duration_to_delta(duration):
 
2160
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2161
    
 
2162
    >>> rfc3339_duration_to_delta("P7D")
 
2163
    datetime.timedelta(7)
 
2164
    >>> rfc3339_duration_to_delta("PT60S")
 
2165
    datetime.timedelta(0, 60)
 
2166
    >>> rfc3339_duration_to_delta("PT60M")
 
2167
    datetime.timedelta(0, 3600)
 
2168
    >>> rfc3339_duration_to_delta("PT24H")
 
2169
    datetime.timedelta(1)
 
2170
    >>> rfc3339_duration_to_delta("P1W")
 
2171
    datetime.timedelta(7)
 
2172
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2173
    datetime.timedelta(0, 330)
 
2174
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2175
    datetime.timedelta(1, 200)
 
2176
    """
 
2177
    
 
2178
    # Parsing an RFC 3339 duration with regular expressions is not
 
2179
    # possible - there would have to be multiple places for the same
 
2180
    # values, like seconds.  The current code, while more esoteric, is
 
2181
    # cleaner without depending on a parsing library.  If Python had a
 
2182
    # built-in library for parsing we would use it, but we'd like to
 
2183
    # avoid excessive use of external libraries.
 
2184
    
 
2185
    # New type for defining tokens, syntax, and semantics all-in-one
 
2186
    Token = collections.namedtuple("Token", (
 
2187
        "regexp",  # To match token; if "value" is not None, must have
 
2188
                   # a "group" containing digits
 
2189
        "value",   # datetime.timedelta or None
 
2190
        "followers"))           # Tokens valid after this token
 
2191
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2192
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2193
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2194
    token_second = Token(re.compile(r"(\d+)S"),
 
2195
                         datetime.timedelta(seconds=1),
 
2196
                         frozenset((token_end, )))
 
2197
    token_minute = Token(re.compile(r"(\d+)M"),
 
2198
                         datetime.timedelta(minutes=1),
 
2199
                         frozenset((token_second, token_end)))
 
2200
    token_hour = Token(re.compile(r"(\d+)H"),
 
2201
                       datetime.timedelta(hours=1),
 
2202
                       frozenset((token_minute, token_end)))
 
2203
    token_time = Token(re.compile(r"T"),
 
2204
                       None,
 
2205
                       frozenset((token_hour, token_minute,
 
2206
                                  token_second)))
 
2207
    token_day = Token(re.compile(r"(\d+)D"),
 
2208
                      datetime.timedelta(days=1),
 
2209
                      frozenset((token_time, token_end)))
 
2210
    token_month = Token(re.compile(r"(\d+)M"),
 
2211
                        datetime.timedelta(weeks=4),
 
2212
                        frozenset((token_day, token_end)))
 
2213
    token_year = Token(re.compile(r"(\d+)Y"),
 
2214
                       datetime.timedelta(weeks=52),
 
2215
                       frozenset((token_month, token_end)))
 
2216
    token_week = Token(re.compile(r"(\d+)W"),
 
2217
                       datetime.timedelta(weeks=1),
 
2218
                       frozenset((token_end, )))
 
2219
    token_duration = Token(re.compile(r"P"), None,
 
2220
                           frozenset((token_year, token_month,
 
2221
                                      token_day, token_time,
 
2222
                                      token_week)))
 
2223
    # Define starting values
 
2224
    value = datetime.timedelta() # Value so far
 
2225
    found_token = None
 
2226
    followers = frozenset((token_duration, )) # Following valid tokens
 
2227
    s = duration                # String left to parse
 
2228
    # Loop until end token is found
 
2229
    while found_token is not token_end:
 
2230
        # Search for any currently valid tokens
 
2231
        for token in followers:
 
2232
            match = token.regexp.match(s)
 
2233
            if match is not None:
 
2234
                # Token found
 
2235
                if token.value is not None:
 
2236
                    # Value found, parse digits
 
2237
                    factor = int(match.group(1), 10)
 
2238
                    # Add to value so far
 
2239
                    value += factor * token.value
 
2240
                # Strip token from string
 
2241
                s = token.regexp.sub("", s, 1)
 
2242
                # Go to found token
 
2243
                found_token = token
 
2244
                # Set valid next tokens
 
2245
                followers = found_token.followers
 
2246
                break
 
2247
        else:
 
2248
            # No currently valid tokens were found
 
2249
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2250
                             .format(duration))
 
2251
    # End token found
 
2252
    return value
 
2253
 
 
2254
 
1662
2255
def string_to_delta(interval):
1663
2256
    """Parse a string and return a datetime.timedelta
1664
2257
    
1675
2268
    >>> string_to_delta('5m 30s')
1676
2269
    datetime.timedelta(0, 330)
1677
2270
    """
 
2271
    
 
2272
    try:
 
2273
        return rfc3339_duration_to_delta(interval)
 
2274
    except ValueError:
 
2275
        pass
 
2276
    
1678
2277
    timevalue = datetime.timedelta(0)
1679
2278
    for s in interval.split():
1680
2279
        try:
1681
 
            suffix = unicode(s[-1])
 
2280
            suffix = s[-1]
1682
2281
            value = int(s[:-1])
1683
2282
            if suffix == "d":
1684
2283
                delta = datetime.timedelta(value)
1691
2290
            elif suffix == "w":
1692
2291
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1693
2292
            else:
1694
 
                raise ValueError("Unknown suffix %r" % suffix)
1695
 
        except (ValueError, IndexError) as e:
 
2293
                raise ValueError("Unknown suffix {!r}".format(suffix))
 
2294
        except IndexError as e:
1696
2295
            raise ValueError(*(e.args))
1697
2296
        timevalue += delta
1698
2297
    return timevalue
1699
2298
 
1700
2299
 
1701
 
def if_nametoindex(interface):
1702
 
    """Call the C function if_nametoindex(), or equivalent
1703
 
    
1704
 
    Note: This function cannot accept a unicode string."""
1705
 
    global if_nametoindex
1706
 
    try:
1707
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1708
 
                          (ctypes.util.find_library("c"))
1709
 
                          .if_nametoindex)
1710
 
    except (OSError, AttributeError):
1711
 
        logger.warning("Doing if_nametoindex the hard way")
1712
 
        def if_nametoindex(interface):
1713
 
            "Get an interface index the hard way, i.e. using fcntl()"
1714
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1715
 
            with contextlib.closing(socket.socket()) as s:
1716
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1717
 
                                    struct.pack(str("16s16x"),
1718
 
                                                interface))
1719
 
            interface_index = struct.unpack(str("I"),
1720
 
                                            ifreq[16:20])[0]
1721
 
            return interface_index
1722
 
    return if_nametoindex(interface)
1723
 
 
1724
 
 
1725
2300
def daemon(nochdir = False, noclose = False):
1726
2301
    """See daemon(3).  Standard BSD Unix function.
1727
2302
    
1735
2310
        sys.exit()
1736
2311
    if not noclose:
1737
2312
        # Close all standard open file descriptors
1738
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2313
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1739
2314
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1740
2315
            raise OSError(errno.ENODEV,
1741
 
                          "%s not a character device"
1742
 
                          % os.path.devnull)
 
2316
                          "{} not a character device"
 
2317
                          .format(os.devnull))
1743
2318
        os.dup2(null, sys.stdin.fileno())
1744
2319
        os.dup2(null, sys.stdout.fileno())
1745
2320
        os.dup2(null, sys.stderr.fileno())
1754
2329
    
1755
2330
    parser = argparse.ArgumentParser()
1756
2331
    parser.add_argument("-v", "--version", action="version",
1757
 
                        version = "%%(prog)s %s" % version,
 
2332
                        version = "%(prog)s {}".format(version),
1758
2333
                        help="show version number and exit")
1759
2334
    parser.add_argument("-i", "--interface", metavar="IF",
1760
2335
                        help="Bind to interface IF")
1766
2341
                        help="Run self-test")
1767
2342
    parser.add_argument("--debug", action="store_true",
1768
2343
                        help="Debug mode; run in foreground and log"
1769
 
                        " to terminal")
 
2344
                        " to terminal", default=None)
1770
2345
    parser.add_argument("--debuglevel", metavar="LEVEL",
1771
2346
                        help="Debug level for stdout output")
1772
2347
    parser.add_argument("--priority", help="GnuTLS"
1779
2354
                        " files")
1780
2355
    parser.add_argument("--no-dbus", action="store_false",
1781
2356
                        dest="use_dbus", help="Do not provide D-Bus"
1782
 
                        " system bus interface")
 
2357
                        " system bus interface", default=None)
1783
2358
    parser.add_argument("--no-ipv6", action="store_false",
1784
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2359
                        dest="use_ipv6", help="Do not use IPv6",
 
2360
                        default=None)
 
2361
    parser.add_argument("--no-restore", action="store_false",
 
2362
                        dest="restore", help="Do not restore stored"
 
2363
                        " state", default=None)
 
2364
    parser.add_argument("--socket", type=int,
 
2365
                        help="Specify a file descriptor to a network"
 
2366
                        " socket to use instead of creating one")
 
2367
    parser.add_argument("--statedir", metavar="DIR",
 
2368
                        help="Directory to save/restore state in")
 
2369
    parser.add_argument("--foreground", action="store_true",
 
2370
                        help="Run in foreground", default=None)
 
2371
    parser.add_argument("--no-zeroconf", action="store_false",
 
2372
                        dest="zeroconf", help="Do not use Zeroconf",
 
2373
                        default=None)
 
2374
    
1785
2375
    options = parser.parse_args()
1786
2376
    
1787
2377
    if options.check:
1788
2378
        import doctest
1789
 
        doctest.testmod()
1790
 
        sys.exit()
 
2379
        fail_count, test_count = doctest.testmod()
 
2380
        sys.exit(os.EX_OK if fail_count == 0 else 1)
1791
2381
    
1792
2382
    # Default values for config file for server-global settings
1793
2383
    server_defaults = { "interface": "",
1795
2385
                        "port": "",
1796
2386
                        "debug": "False",
1797
2387
                        "priority":
1798
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2388
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2389
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
1799
2390
                        "servicename": "Mandos",
1800
2391
                        "use_dbus": "True",
1801
2392
                        "use_ipv6": "True",
1802
2393
                        "debuglevel": "",
1803
 
                        }
 
2394
                        "restore": "True",
 
2395
                        "socket": "",
 
2396
                        "statedir": "/var/lib/mandos",
 
2397
                        "foreground": "False",
 
2398
                        "zeroconf": "True",
 
2399
                    }
1804
2400
    
1805
2401
    # Parse config file for server-global settings
1806
2402
    server_config = configparser.SafeConfigParser(server_defaults)
1807
2403
    del server_defaults
1808
 
    server_config.read(os.path.join(options.configdir,
1809
 
                                    "mandos.conf"))
 
2404
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
1810
2405
    # Convert the SafeConfigParser object to a dict
1811
2406
    server_settings = server_config.defaults()
1812
2407
    # Use the appropriate methods on the non-string config options
1813
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2408
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
1814
2409
        server_settings[option] = server_config.getboolean("DEFAULT",
1815
2410
                                                           option)
1816
2411
    if server_settings["port"]:
1817
2412
        server_settings["port"] = server_config.getint("DEFAULT",
1818
2413
                                                       "port")
 
2414
    if server_settings["socket"]:
 
2415
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2416
                                                         "socket")
 
2417
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2418
        # over with an opened os.devnull.  But we don't want this to
 
2419
        # happen with a supplied network socket.
 
2420
        if 0 <= server_settings["socket"] <= 2:
 
2421
            server_settings["socket"] = os.dup(server_settings
 
2422
                                               ["socket"])
1819
2423
    del server_config
1820
2424
    
1821
2425
    # Override the settings from the config file with command line
1822
2426
    # options, if set.
1823
2427
    for option in ("interface", "address", "port", "debug",
1824
 
                   "priority", "servicename", "configdir",
1825
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2428
                   "priority", "servicename", "configdir", "use_dbus",
 
2429
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2430
                   "socket", "foreground", "zeroconf"):
1826
2431
        value = getattr(options, option)
1827
2432
        if value is not None:
1828
2433
            server_settings[option] = value
1829
2434
    del options
1830
2435
    # Force all strings to be unicode
1831
2436
    for option in server_settings.keys():
1832
 
        if type(server_settings[option]) is str:
1833
 
            server_settings[option] = unicode(server_settings[option])
 
2437
        if isinstance(server_settings[option], bytes):
 
2438
            server_settings[option] = (server_settings[option]
 
2439
                                       .decode("utf-8"))
 
2440
    # Force all boolean options to be boolean
 
2441
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2442
                   "foreground", "zeroconf"):
 
2443
        server_settings[option] = bool(server_settings[option])
 
2444
    # Debug implies foreground
 
2445
    if server_settings["debug"]:
 
2446
        server_settings["foreground"] = True
1834
2447
    # Now we have our good server settings in "server_settings"
1835
2448
    
1836
2449
    ##################################################################
1837
2450
    
 
2451
    if (not server_settings["zeroconf"]
 
2452
        and not (server_settings["port"]
 
2453
                 or server_settings["socket"] != "")):
 
2454
        parser.error("Needs port or socket to work without Zeroconf")
 
2455
    
1838
2456
    # For convenience
1839
2457
    debug = server_settings["debug"]
1840
2458
    debuglevel = server_settings["debuglevel"]
1841
2459
    use_dbus = server_settings["use_dbus"]
1842
2460
    use_ipv6 = server_settings["use_ipv6"]
1843
 
 
 
2461
    stored_state_path = os.path.join(server_settings["statedir"],
 
2462
                                     stored_state_file)
 
2463
    foreground = server_settings["foreground"]
 
2464
    zeroconf = server_settings["zeroconf"]
 
2465
    
 
2466
    if debug:
 
2467
        initlogger(debug, logging.DEBUG)
 
2468
    else:
 
2469
        if not debuglevel:
 
2470
            initlogger(debug)
 
2471
        else:
 
2472
            level = getattr(logging, debuglevel.upper())
 
2473
            initlogger(debug, level)
 
2474
    
1844
2475
    if server_settings["servicename"] != "Mandos":
1845
 
        syslogger.setFormatter(logging.Formatter
1846
 
                               ('Mandos (%s) [%%(process)d]:'
1847
 
                                ' %%(levelname)s: %%(message)s'
1848
 
                                % server_settings["servicename"]))
 
2476
        syslogger.setFormatter(
 
2477
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2478
                              ' %(levelname)s: %(message)s'.format(
 
2479
                                  server_settings["servicename"])))
1849
2480
    
1850
2481
    # Parse config file with clients
1851
 
    client_defaults = { "timeout": "5m",
1852
 
                        "extended_timeout": "15m",
1853
 
                        "interval": "2m",
1854
 
                        "checker": "fping -q -- %%(host)s",
1855
 
                        "host": "",
1856
 
                        "approval_delay": "0s",
1857
 
                        "approval_duration": "1s",
1858
 
                        }
1859
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2482
    client_config = configparser.SafeConfigParser(Client
 
2483
                                                  .client_defaults)
1860
2484
    client_config.read(os.path.join(server_settings["configdir"],
1861
2485
                                    "clients.conf"))
1862
2486
    
1863
2487
    global mandos_dbus_service
1864
2488
    mandos_dbus_service = None
1865
2489
    
1866
 
    tcp_server = MandosServer((server_settings["address"],
1867
 
                               server_settings["port"]),
1868
 
                              ClientHandler,
1869
 
                              interface=(server_settings["interface"]
1870
 
                                         or None),
1871
 
                              use_ipv6=use_ipv6,
1872
 
                              gnutls_priority=
1873
 
                              server_settings["priority"],
1874
 
                              use_dbus=use_dbus)
1875
 
    if not debug:
1876
 
        pidfilename = "/var/run/mandos.pid"
 
2490
    socketfd = None
 
2491
    if server_settings["socket"] != "":
 
2492
        socketfd = server_settings["socket"]
 
2493
    tcp_server = MandosServer(
 
2494
        (server_settings["address"], server_settings["port"]),
 
2495
        ClientHandler,
 
2496
        interface=(server_settings["interface"] or None),
 
2497
        use_ipv6=use_ipv6,
 
2498
        gnutls_priority=server_settings["priority"],
 
2499
        use_dbus=use_dbus,
 
2500
        socketfd=socketfd)
 
2501
    if not foreground:
 
2502
        pidfilename = "/run/mandos.pid"
 
2503
        if not os.path.isdir("/run/."):
 
2504
            pidfilename = "/var/run/mandos.pid"
 
2505
        pidfile = None
1877
2506
        try:
1878
 
            pidfile = open(pidfilename, "w")
1879
 
        except IOError:
1880
 
            logger.error("Could not open file %r", pidfilename)
 
2507
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
2508
        except IOError as e:
 
2509
            logger.error("Could not open file %r", pidfilename,
 
2510
                         exc_info=e)
1881
2511
    
1882
 
    try:
1883
 
        uid = pwd.getpwnam("_mandos").pw_uid
1884
 
        gid = pwd.getpwnam("_mandos").pw_gid
1885
 
    except KeyError:
 
2512
    for name in ("_mandos", "mandos", "nobody"):
1886
2513
        try:
1887
 
            uid = pwd.getpwnam("mandos").pw_uid
1888
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2514
            uid = pwd.getpwnam(name).pw_uid
 
2515
            gid = pwd.getpwnam(name).pw_gid
 
2516
            break
1889
2517
        except KeyError:
1890
 
            try:
1891
 
                uid = pwd.getpwnam("nobody").pw_uid
1892
 
                gid = pwd.getpwnam("nobody").pw_gid
1893
 
            except KeyError:
1894
 
                uid = 65534
1895
 
                gid = 65534
 
2518
            continue
 
2519
    else:
 
2520
        uid = 65534
 
2521
        gid = 65534
1896
2522
    try:
1897
2523
        os.setgid(gid)
1898
2524
        os.setuid(uid)
1899
2525
    except OSError as error:
1900
 
        if error[0] != errno.EPERM:
1901
 
            raise error
 
2526
        if error.errno != errno.EPERM:
 
2527
            raise
1902
2528
    
1903
 
    if not debug and not debuglevel:
1904
 
        syslogger.setLevel(logging.WARNING)
1905
 
        console.setLevel(logging.WARNING)
1906
 
    if debuglevel:
1907
 
        level = getattr(logging, debuglevel.upper())
1908
 
        syslogger.setLevel(level)
1909
 
        console.setLevel(level)
1910
 
 
1911
2529
    if debug:
1912
2530
        # Enable all possible GnuTLS debugging
1913
2531
        
1919
2537
        def debug_gnutls(level, string):
1920
2538
            logger.debug("GnuTLS: %s", string[:-1])
1921
2539
        
1922
 
        (gnutls.library.functions
1923
 
         .gnutls_global_set_log_function(debug_gnutls))
 
2540
        gnutls.library.functions.gnutls_global_set_log_function(
 
2541
            debug_gnutls)
1924
2542
        
1925
2543
        # Redirect stdin so all checkers get /dev/null
1926
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2544
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1927
2545
        os.dup2(null, sys.stdin.fileno())
1928
2546
        if null > 2:
1929
2547
            os.close(null)
1930
 
    else:
1931
 
        # No console logging
1932
 
        logger.removeHandler(console)
1933
2548
    
1934
2549
    # Need to fork before connecting to D-Bus
1935
 
    if not debug:
 
2550
    if not foreground:
1936
2551
        # Close all input and output, do double fork, etc.
1937
2552
        daemon()
1938
2553
    
 
2554
    # multiprocessing will use threads, so before we use gobject we
 
2555
    # need to inform gobject that threads will be used.
 
2556
    gobject.threads_init()
 
2557
    
1939
2558
    global main_loop
1940
2559
    # From the Avahi example code
1941
 
    DBusGMainLoop(set_as_default=True )
 
2560
    DBusGMainLoop(set_as_default=True)
1942
2561
    main_loop = gobject.MainLoop()
1943
2562
    bus = dbus.SystemBus()
1944
2563
    # End of Avahi example code
1945
2564
    if use_dbus:
1946
2565
        try:
1947
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1948
 
                                            bus, do_not_queue=True)
1949
 
        except dbus.exceptions.NameExistsException as e:
1950
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2566
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
2567
                                            bus,
 
2568
                                            do_not_queue=True)
 
2569
            old_bus_name = dbus.service.BusName(
 
2570
                "se.bsnet.fukt.Mandos", bus,
 
2571
                do_not_queue=True)
 
2572
        except dbus.exceptions.DBusException as e:
 
2573
            logger.error("Disabling D-Bus:", exc_info=e)
1951
2574
            use_dbus = False
1952
2575
            server_settings["use_dbus"] = False
1953
2576
            tcp_server.use_dbus = False
1954
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1955
 
    service = AvahiService(name = server_settings["servicename"],
1956
 
                           servicetype = "_mandos._tcp",
1957
 
                           protocol = protocol, bus = bus)
1958
 
    if server_settings["interface"]:
1959
 
        service.interface = (if_nametoindex
1960
 
                             (str(server_settings["interface"])))
 
2577
    if zeroconf:
 
2578
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2579
        service = AvahiServiceToSyslog(
 
2580
            name = server_settings["servicename"],
 
2581
            servicetype = "_mandos._tcp",
 
2582
            protocol = protocol,
 
2583
            bus = bus)
 
2584
        if server_settings["interface"]:
 
2585
            service.interface = if_nametoindex(
 
2586
                server_settings["interface"].encode("utf-8"))
1961
2587
    
1962
2588
    global multiprocessing_manager
1963
2589
    multiprocessing_manager = multiprocessing.Manager()
1965
2591
    client_class = Client
1966
2592
    if use_dbus:
1967
2593
        client_class = functools.partial(ClientDBus, bus = bus)
1968
 
    def client_config_items(config, section):
1969
 
        special_settings = {
1970
 
            "approved_by_default":
1971
 
                lambda: config.getboolean(section,
1972
 
                                          "approved_by_default"),
1973
 
            }
1974
 
        for name, value in config.items(section):
 
2594
    
 
2595
    client_settings = Client.config_parser(client_config)
 
2596
    old_client_settings = {}
 
2597
    clients_data = {}
 
2598
    
 
2599
    # This is used to redirect stdout and stderr for checker processes
 
2600
    global wnull
 
2601
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2602
    # Only used if server is running in foreground but not in debug
 
2603
    # mode
 
2604
    if debug or not foreground:
 
2605
        wnull.close()
 
2606
    
 
2607
    # Get client data and settings from last running state.
 
2608
    if server_settings["restore"]:
 
2609
        try:
 
2610
            with open(stored_state_path, "rb") as stored_state:
 
2611
                clients_data, old_client_settings = pickle.load(
 
2612
                    stored_state)
 
2613
            os.remove(stored_state_path)
 
2614
        except IOError as e:
 
2615
            if e.errno == errno.ENOENT:
 
2616
                logger.warning("Could not load persistent state:"
 
2617
                               " {}".format(os.strerror(e.errno)))
 
2618
            else:
 
2619
                logger.critical("Could not load persistent state:",
 
2620
                                exc_info=e)
 
2621
                raise
 
2622
        except EOFError as e:
 
2623
            logger.warning("Could not load persistent state: "
 
2624
                           "EOFError:",
 
2625
                           exc_info=e)
 
2626
    
 
2627
    with PGPEngine() as pgp:
 
2628
        for client_name, client in clients_data.items():
 
2629
            # Skip removed clients
 
2630
            if client_name not in client_settings:
 
2631
                continue
 
2632
            
 
2633
            # Decide which value to use after restoring saved state.
 
2634
            # We have three different values: Old config file,
 
2635
            # new config file, and saved state.
 
2636
            # New config value takes precedence if it differs from old
 
2637
            # config value, otherwise use saved state.
 
2638
            for name, value in client_settings[client_name].items():
 
2639
                try:
 
2640
                    # For each value in new config, check if it
 
2641
                    # differs from the old config value (Except for
 
2642
                    # the "secret" attribute)
 
2643
                    if (name != "secret"
 
2644
                        and (value !=
 
2645
                             old_client_settings[client_name][name])):
 
2646
                        client[name] = value
 
2647
                except KeyError:
 
2648
                    pass
 
2649
            
 
2650
            # Clients who has passed its expire date can still be
 
2651
            # enabled if its last checker was successful.  A Client
 
2652
            # whose checker succeeded before we stored its state is
 
2653
            # assumed to have successfully run all checkers during
 
2654
            # downtime.
 
2655
            if client["enabled"]:
 
2656
                if datetime.datetime.utcnow() >= client["expires"]:
 
2657
                    if not client["last_checked_ok"]:
 
2658
                        logger.warning(
 
2659
                            "disabling client {} - Client never "
 
2660
                            "performed a successful checker".format(
 
2661
                                client_name))
 
2662
                        client["enabled"] = False
 
2663
                    elif client["last_checker_status"] != 0:
 
2664
                        logger.warning(
 
2665
                            "disabling client {} - Client last"
 
2666
                            " checker failed with error code"
 
2667
                            " {}".format(
 
2668
                                client_name,
 
2669
                                client["last_checker_status"]))
 
2670
                        client["enabled"] = False
 
2671
                    else:
 
2672
                        client["expires"] = (
 
2673
                            datetime.datetime.utcnow()
 
2674
                            + client["timeout"])
 
2675
                        logger.debug("Last checker succeeded,"
 
2676
                                     " keeping {} enabled".format(
 
2677
                                         client_name))
1975
2678
            try:
1976
 
                yield (name, special_settings[name]())
1977
 
            except KeyError:
1978
 
                yield (name, value)
1979
 
    
1980
 
    tcp_server.clients.update(set(
1981
 
            client_class(name = section,
1982
 
                         config= dict(client_config_items(
1983
 
                        client_config, section)))
1984
 
            for section in client_config.sections()))
 
2679
                client["secret"] = pgp.decrypt(
 
2680
                    client["encrypted_secret"],
 
2681
                    client_settings[client_name]["secret"])
 
2682
            except PGPError:
 
2683
                # If decryption fails, we use secret from new settings
 
2684
                logger.debug("Failed to decrypt {} old secret".format(
 
2685
                    client_name))
 
2686
                client["secret"] = (client_settings[client_name]
 
2687
                                    ["secret"])
 
2688
    
 
2689
    # Add/remove clients based on new changes made to config
 
2690
    for client_name in (set(old_client_settings)
 
2691
                        - set(client_settings)):
 
2692
        del clients_data[client_name]
 
2693
    for client_name in (set(client_settings)
 
2694
                        - set(old_client_settings)):
 
2695
        clients_data[client_name] = client_settings[client_name]
 
2696
    
 
2697
    # Create all client objects
 
2698
    for client_name, client in clients_data.items():
 
2699
        tcp_server.clients[client_name] = client_class(
 
2700
            name = client_name,
 
2701
            settings = client,
 
2702
            server_settings = server_settings)
 
2703
    
1985
2704
    if not tcp_server.clients:
1986
2705
        logger.warning("No clients defined")
1987
 
        
1988
 
    if not debug:
1989
 
        try:
1990
 
            with pidfile:
1991
 
                pid = os.getpid()
1992
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
1993
 
            del pidfile
1994
 
        except IOError:
1995
 
            logger.error("Could not write to file %r with PID %d",
1996
 
                         pidfilename, pid)
1997
 
        except NameError:
1998
 
            # "pidfile" was never created
1999
 
            pass
 
2706
    
 
2707
    if not foreground:
 
2708
        if pidfile is not None:
 
2709
            pid = os.getpid()
 
2710
            try:
 
2711
                with pidfile:
 
2712
                    print(pid, file=pidfile)
 
2713
            except IOError:
 
2714
                logger.error("Could not write to file %r with PID %d",
 
2715
                             pidfilename, pid)
 
2716
        del pidfile
2000
2717
        del pidfilename
2001
 
        
2002
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2003
 
 
 
2718
    
2004
2719
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2005
2720
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2006
2721
    
2007
2722
    if use_dbus:
2008
 
        class MandosDBusService(dbus.service.Object):
 
2723
        
 
2724
        @alternate_dbus_interfaces(
 
2725
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
 
2726
        class MandosDBusService(DBusObjectWithProperties):
2009
2727
            """A D-Bus proxy object"""
 
2728
            
2010
2729
            def __init__(self):
2011
2730
                dbus.service.Object.__init__(self, bus, "/")
2012
 
            _interface = "se.bsnet.fukt.Mandos"
 
2731
            
 
2732
            _interface = "se.recompile.Mandos"
 
2733
            
 
2734
            @dbus_interface_annotations(_interface)
 
2735
            def _foo(self):
 
2736
                return {
 
2737
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2738
                    "false" }
2013
2739
            
2014
2740
            @dbus.service.signal(_interface, signature="o")
2015
2741
            def ClientAdded(self, objpath):
2029
2755
            @dbus.service.method(_interface, out_signature="ao")
2030
2756
            def GetAllClients(self):
2031
2757
                "D-Bus method"
2032
 
                return dbus.Array(c.dbus_object_path
2033
 
                                  for c in tcp_server.clients)
 
2758
                return dbus.Array(c.dbus_object_path for c in
 
2759
                                  tcp_server.clients.itervalues())
2034
2760
            
2035
2761
            @dbus.service.method(_interface,
2036
2762
                                 out_signature="a{oa{sv}}")
2037
2763
            def GetAllClientsWithProperties(self):
2038
2764
                "D-Bus method"
2039
2765
                return dbus.Dictionary(
2040
 
                    ((c.dbus_object_path, c.GetAll(""))
2041
 
                     for c in tcp_server.clients),
 
2766
                    { c.dbus_object_path: c.GetAll("")
 
2767
                      for c in tcp_server.clients.itervalues() },
2042
2768
                    signature="oa{sv}")
2043
2769
            
2044
2770
            @dbus.service.method(_interface, in_signature="o")
2045
2771
            def RemoveClient(self, object_path):
2046
2772
                "D-Bus method"
2047
 
                for c in tcp_server.clients:
 
2773
                for c in tcp_server.clients.itervalues():
2048
2774
                    if c.dbus_object_path == object_path:
2049
 
                        tcp_server.clients.remove(c)
 
2775
                        del tcp_server.clients[c.name]
2050
2776
                        c.remove_from_connection()
2051
2777
                        # Don't signal anything except ClientRemoved
2052
2778
                        c.disable(quiet=True)
2061
2787
    
2062
2788
    def cleanup():
2063
2789
        "Cleanup function; run on exit"
2064
 
        service.cleanup()
2065
 
        
 
2790
        if zeroconf:
 
2791
            service.cleanup()
 
2792
        
 
2793
        multiprocessing.active_children()
 
2794
        wnull.close()
 
2795
        if not (tcp_server.clients or client_settings):
 
2796
            return
 
2797
        
 
2798
        # Store client before exiting. Secrets are encrypted with key
 
2799
        # based on what config file has. If config file is
 
2800
        # removed/edited, old secret will thus be unrecovable.
 
2801
        clients = {}
 
2802
        with PGPEngine() as pgp:
 
2803
            for client in tcp_server.clients.itervalues():
 
2804
                key = client_settings[client.name]["secret"]
 
2805
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2806
                                                      key)
 
2807
                client_dict = {}
 
2808
                
 
2809
                # A list of attributes that can not be pickled
 
2810
                # + secret.
 
2811
                exclude = { "bus", "changedstate", "secret",
 
2812
                            "checker", "server_settings" }
 
2813
                for name, typ in inspect.getmembers(dbus.service
 
2814
                                                    .Object):
 
2815
                    exclude.add(name)
 
2816
                
 
2817
                client_dict["encrypted_secret"] = (client
 
2818
                                                   .encrypted_secret)
 
2819
                for attr in client.client_structure:
 
2820
                    if attr not in exclude:
 
2821
                        client_dict[attr] = getattr(client, attr)
 
2822
                
 
2823
                clients[client.name] = client_dict
 
2824
                del client_settings[client.name]["secret"]
 
2825
        
 
2826
        try:
 
2827
            with tempfile.NamedTemporaryFile(
 
2828
                    mode='wb',
 
2829
                    suffix=".pickle",
 
2830
                    prefix='clients-',
 
2831
                    dir=os.path.dirname(stored_state_path),
 
2832
                    delete=False) as stored_state:
 
2833
                pickle.dump((clients, client_settings), stored_state)
 
2834
                tempname = stored_state.name
 
2835
            os.rename(tempname, stored_state_path)
 
2836
        except (IOError, OSError) as e:
 
2837
            if not debug:
 
2838
                try:
 
2839
                    os.remove(tempname)
 
2840
                except NameError:
 
2841
                    pass
 
2842
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2843
                logger.warning("Could not save persistent state: {}"
 
2844
                               .format(os.strerror(e.errno)))
 
2845
            else:
 
2846
                logger.warning("Could not save persistent state:",
 
2847
                               exc_info=e)
 
2848
                raise
 
2849
        
 
2850
        # Delete all clients, and settings from config
2066
2851
        while tcp_server.clients:
2067
 
            client = tcp_server.clients.pop()
 
2852
            name, client = tcp_server.clients.popitem()
2068
2853
            if use_dbus:
2069
2854
                client.remove_from_connection()
2070
 
            client.disable_hook = None
2071
2855
            # Don't signal anything except ClientRemoved
2072
2856
            client.disable(quiet=True)
2073
2857
            if use_dbus:
2074
2858
                # Emit D-Bus signal
2075
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2076
 
                                                  client.name)
 
2859
                mandos_dbus_service.ClientRemoved(
 
2860
                    client.dbus_object_path, client.name)
 
2861
        client_settings.clear()
2077
2862
    
2078
2863
    atexit.register(cleanup)
2079
2864
    
2080
 
    for client in tcp_server.clients:
 
2865
    for client in tcp_server.clients.itervalues():
2081
2866
        if use_dbus:
2082
2867
            # Emit D-Bus signal
2083
2868
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2084
 
        client.enable()
 
2869
        # Need to initiate checking of clients
 
2870
        if client.enabled:
 
2871
            client.init_checker()
2085
2872
    
2086
2873
    tcp_server.enable()
2087
2874
    tcp_server.server_activate()
2088
2875
    
2089
2876
    # Find out what port we got
2090
 
    service.port = tcp_server.socket.getsockname()[1]
 
2877
    if zeroconf:
 
2878
        service.port = tcp_server.socket.getsockname()[1]
2091
2879
    if use_ipv6:
2092
2880
        logger.info("Now listening on address %r, port %d,"
2093
 
                    " flowinfo %d, scope_id %d"
2094
 
                    % tcp_server.socket.getsockname())
 
2881
                    " flowinfo %d, scope_id %d",
 
2882
                    *tcp_server.socket.getsockname())
2095
2883
    else:                       # IPv4
2096
 
        logger.info("Now listening on address %r, port %d"
2097
 
                    % tcp_server.socket.getsockname())
 
2884
        logger.info("Now listening on address %r, port %d",
 
2885
                    *tcp_server.socket.getsockname())
2098
2886
    
2099
2887
    #service.interface = tcp_server.socket.getsockname()[3]
2100
2888
    
2101
2889
    try:
2102
 
        # From the Avahi example code
2103
 
        try:
2104
 
            service.activate()
2105
 
        except dbus.exceptions.DBusException as error:
2106
 
            logger.critical("DBusException: %s", error)
2107
 
            cleanup()
2108
 
            sys.exit(1)
2109
 
        # End of Avahi example code
 
2890
        if zeroconf:
 
2891
            # From the Avahi example code
 
2892
            try:
 
2893
                service.activate()
 
2894
            except dbus.exceptions.DBusException as error:
 
2895
                logger.critical("D-Bus Exception", exc_info=error)
 
2896
                cleanup()
 
2897
                sys.exit(1)
 
2898
            # End of Avahi example code
2110
2899
        
2111
2900
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2112
2901
                             lambda *args, **kwargs:
2116
2905
        logger.debug("Starting main loop")
2117
2906
        main_loop.run()
2118
2907
    except AvahiError as error:
2119
 
        logger.critical("AvahiError: %s", error)
 
2908
        logger.critical("Avahi Error", exc_info=error)
2120
2909
        cleanup()
2121
2910
        sys.exit(1)
2122
2911
    except KeyboardInterrupt:
2127
2916
    # Must run before the D-Bus bus name gets deregistered
2128
2917
    cleanup()
2129
2918
 
 
2919
 
2130
2920
if __name__ == '__main__':
2131
2921
    main()