88
81
    except ImportError:
 
89
82
        SO_BINDTODEVICE = None
 
91
 
if sys.version_info.major == 2:
 
95
 
stored_state_file = "clients.pickle"
 
97
 
logger = logging.getLogger()
 
101
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
102
 
                      (ctypes.util.find_library("c"))
 
104
 
except (OSError, AttributeError):
 
105
 
    def if_nametoindex(interface):
 
106
 
        "Get an interface index the hard way, i.e. using fcntl()"
 
107
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
108
 
        with contextlib.closing(socket.socket()) as s:
 
109
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
110
 
                                struct.pack(b"16s16x", interface))
 
111
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
112
 
        return interface_index
 
115
 
def initlogger(debug, level=logging.WARNING):
 
116
 
    """init logger and add loglevel"""
 
119
 
    syslogger = (logging.handlers.SysLogHandler
 
121
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
122
 
                  address = "/dev/log"))
 
123
 
    syslogger.setFormatter(logging.Formatter
 
124
 
                           ('Mandos [%(process)d]: %(levelname)s:'
 
126
 
    logger.addHandler(syslogger)
 
129
 
        console = logging.StreamHandler()
 
130
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
134
 
        logger.addHandler(console)
 
135
 
    logger.setLevel(level)
 
138
 
class PGPError(Exception):
 
139
 
    """Exception if encryption/decryption fails"""
 
143
 
class PGPEngine(object):
 
144
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
146
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
147
 
        self.gnupgargs = ['--batch',
 
148
 
                          '--home', self.tempdir,
 
156
 
    def __exit__(self, exc_type, exc_value, traceback):
 
164
 
        if self.tempdir is not None:
 
165
 
            # Delete contents of tempdir
 
166
 
            for root, dirs, files in os.walk(self.tempdir,
 
168
 
                for filename in files:
 
169
 
                    os.remove(os.path.join(root, filename))
 
171
 
                    os.rmdir(os.path.join(root, dirname))
 
173
 
            os.rmdir(self.tempdir)
 
176
 
    def password_encode(self, password):
 
177
 
        # Passphrase can not be empty and can not contain newlines or
 
178
 
        # NUL bytes.  So we prefix it and hex encode it.
 
179
 
        encoded = b"mandos" + binascii.hexlify(password)
 
180
 
        if len(encoded) > 2048:
 
181
 
            # GnuPG can't handle long passwords, so encode differently
 
182
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
183
 
                       .replace(b"\n", b"\\n")
 
184
 
                       .replace(b"\0", b"\\x00"))
 
187
 
    def encrypt(self, data, password):
 
188
 
        passphrase = self.password_encode(password)
 
189
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
191
 
            passfile.write(passphrase)
 
193
 
            proc = subprocess.Popen(['gpg', '--symmetric',
 
197
 
                                    stdin = subprocess.PIPE,
 
198
 
                                    stdout = subprocess.PIPE,
 
199
 
                                    stderr = subprocess.PIPE)
 
200
 
            ciphertext, err = proc.communicate(input = data)
 
201
 
        if proc.returncode != 0:
 
205
 
    def decrypt(self, data, password):
 
206
 
        passphrase = self.password_encode(password)
 
207
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
209
 
            passfile.write(passphrase)
 
211
 
            proc = subprocess.Popen(['gpg', '--decrypt',
 
215
 
                                    stdin = subprocess.PIPE,
 
216
 
                                    stdout = subprocess.PIPE,
 
217
 
                                    stderr = subprocess.PIPE)
 
218
 
            decrypted_plaintext, err = proc.communicate(input
 
220
 
        if proc.returncode != 0:
 
222
 
        return decrypted_plaintext
 
 
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:'
 
 
95
logger.addHandler(syslogger)
 
 
97
console = logging.StreamHandler()
 
 
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
 
101
logger.addHandler(console)
 
225
103
class AvahiError(Exception):
 
226
104
    def __init__(self, value, *args, **kwargs):
 
227
105
        self.value = value
 
228
 
        return super(AvahiError, self).__init__(value, *args,
 
 
106
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
 
107
    def __unicode__(self):
 
 
108
        return unicode(repr(self.value))
 
231
110
class AvahiServiceError(AvahiError):
 
 
273
151
        self.group = None       # our entry group
 
274
152
        self.server = None
 
276
 
        self.entry_group_state_changed_match = None
 
278
 
    def rename(self, remove=True):
 
279
155
        """Derived from the Avahi example code"""
 
280
156
        if self.rename_count >= self.max_renames:
 
281
157
            logger.critical("No suitable Zeroconf service name found"
 
282
158
                            " after %i retries, exiting.",
 
283
159
                            self.rename_count)
 
284
160
            raise AvahiServiceError("Too many renames")
 
285
 
        self.name = str(self.server
 
286
 
                        .GetAlternativeServiceName(self.name))
 
287
 
        self.rename_count += 1
 
 
161
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
288
162
        logger.info("Changing Zeroconf service name to %r ...",
 
 
164
        syslogger.setFormatter(logging.Formatter
 
 
165
                               ('Mandos (%s) [%%(process)d]:'
 
 
166
                                ' %%(levelname)s: %%(message)s'
 
294
 
        except dbus.exceptions.DBusException as error:
 
295
 
            if (error.get_dbus_name()
 
296
 
                == "org.freedesktop.Avahi.CollisionError"):
 
297
 
                logger.info("Local Zeroconf service name collision.")
 
298
 
                return self.rename(remove=False)
 
300
 
                logger.critical("D-Bus Exception", exc_info=error)
 
 
171
        except dbus.exceptions.DBusException, error:
 
 
172
            logger.critical("DBusException: %s", error)
 
 
175
        self.rename_count += 1
 
304
176
    def remove(self):
 
305
177
        """Derived from the Avahi example code"""
 
306
 
        if self.entry_group_state_changed_match is not None:
 
307
 
            self.entry_group_state_changed_match.remove()
 
308
 
            self.entry_group_state_changed_match = None
 
309
178
        if self.group is not None:
 
310
179
            self.group.Reset()
 
313
181
        """Derived from the Avahi example code"""
 
315
182
        if self.group is None:
 
316
183
            self.group = dbus.Interface(
 
317
184
                self.bus.get_object(avahi.DBUS_NAME,
 
318
185
                                    self.server.EntryGroupNew()),
 
319
186
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
320
 
        self.entry_group_state_changed_match = (
 
321
 
            self.group.connect_to_signal(
 
322
 
                'StateChanged', self.entry_group_state_changed))
 
 
187
            self.group.connect_to_signal('StateChanged',
 
 
189
                                         .entry_group_state_changed)
 
323
190
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
 
324
191
                     self.name, self.type)
 
325
192
        self.group.AddService(
 
 
344
210
        elif state == avahi.ENTRY_GROUP_FAILURE:
 
345
211
            logger.critical("Avahi: Error in group state changed %s",
 
347
 
            raise AvahiGroupError("State changed: {!s}"
 
 
213
            raise AvahiGroupError("State changed: %s"
 
350
215
    def cleanup(self):
 
351
216
        """Derived from the Avahi example code"""
 
352
217
        if self.group is not None:
 
355
 
            except (dbus.exceptions.UnknownMethodException,
 
356
 
                    dbus.exceptions.DBusException):
 
358
219
            self.group = None
 
361
 
    def server_state_changed(self, state, error=None):
 
 
220
    def server_state_changed(self, state):
 
362
221
        """Derived from the Avahi example code"""
 
363
222
        logger.debug("Avahi server state change: %i", state)
 
364
 
        bad_states = { avahi.SERVER_INVALID:
 
365
 
                           "Zeroconf server invalid",
 
366
 
                       avahi.SERVER_REGISTERING: None,
 
367
 
                       avahi.SERVER_COLLISION:
 
368
 
                           "Zeroconf server name collision",
 
369
 
                       avahi.SERVER_FAILURE:
 
370
 
                           "Zeroconf server failure" }
 
371
 
        if state in bad_states:
 
372
 
            if bad_states[state] is not None:
 
374
 
                    logger.error(bad_states[state])
 
376
 
                    logger.error(bad_states[state] + ": %r", error)
 
 
223
        if state == avahi.SERVER_COLLISION:
 
 
224
            logger.error("Zeroconf server name collision")
 
378
226
        elif state == avahi.SERVER_RUNNING:
 
382
 
                logger.debug("Unknown state: %r", state)
 
384
 
                logger.debug("Unknown state: %r: %r", state, error)
 
386
228
    def activate(self):
 
387
229
        """Derived from the Avahi example code"""
 
388
230
        if self.server is None:
 
389
231
            self.server = dbus.Interface(
 
390
232
                self.bus.get_object(avahi.DBUS_NAME,
 
391
 
                                    avahi.DBUS_PATH_SERVER,
 
392
 
                                    follow_name_owner_changes=True),
 
 
233
                                    avahi.DBUS_PATH_SERVER),
 
393
234
                avahi.DBUS_INTERFACE_SERVER)
 
394
235
        self.server.connect_to_signal("StateChanged",
 
395
236
                                 self.server_state_changed)
 
396
237
        self.server_state_changed(self.server.GetState())
 
399
 
class AvahiServiceToSyslog(AvahiService):
 
400
 
    def rename(self, *args, **kwargs):
 
401
 
        """Add the new name to the syslog messages"""
 
402
 
        ret = AvahiService.rename(self, *args, **kwargs)
 
403
 
        syslogger.setFormatter(logging.Formatter
 
404
 
                               ('Mandos ({}) [%(process)d]:'
 
405
 
                                ' %(levelname)s: %(message)s'
 
410
240
class Client(object):
 
411
241
    """A representation of a client host served by this server.
 
414
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
 
244
    _approved:   bool(); 'None' if not yet approved/disapproved
 
415
245
    approval_delay: datetime.timedelta(); Time to wait for approval
 
416
246
    approval_duration: datetime.timedelta(); Duration of one approval
 
417
247
    checker:    subprocess.Popen(); a running checker process used
 
 
435
264
    interval:   datetime.timedelta(); How often to start a new checker
 
436
265
    last_approval_request: datetime.datetime(); (UTC) or None
 
437
266
    last_checked_ok: datetime.datetime(); (UTC) or None
 
438
 
    last_checker_status: integer between 0 and 255 reflecting exit
 
439
 
                         status of last checker. -1 reflects crashed
 
440
 
                         checker, -2 means no checker completed yet.
 
441
 
    last_enabled: datetime.datetime(); (UTC) or None
 
 
267
    last_enabled: datetime.datetime(); (UTC)
 
442
268
    name:       string; from the config file, used in log messages and
 
443
269
                        D-Bus identifiers
 
444
270
    secret:     bytestring; sent verbatim (over TLS) to client
 
445
271
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
446
272
                                      until this client is disabled
 
447
 
    extended_timeout:   extra long timeout when secret has been sent
 
448
273
    runtime_expansions: Allowed attributes for runtime expansion.
 
449
 
    expires:    datetime.datetime(); time (UTC) when a client will be
 
451
 
    server_settings: The server_settings dict from main()
 
454
276
    runtime_expansions = ("approval_delay", "approval_duration",
 
455
 
                          "created", "enabled", "expires",
 
456
 
                          "fingerprint", "host", "interval",
 
457
 
                          "last_approval_request", "last_checked_ok",
 
 
277
                          "created", "enabled", "fingerprint",
 
 
278
                          "host", "interval", "last_checked_ok",
 
458
279
                          "last_enabled", "name", "timeout")
 
459
 
    client_defaults = { "timeout": "PT5M",
 
460
 
                        "extended_timeout": "PT15M",
 
462
 
                        "checker": "fping -q -- %%(host)s",
 
464
 
                        "approval_delay": "PT0S",
 
465
 
                        "approval_duration": "PT1S",
 
466
 
                        "approved_by_default": "True",
 
471
 
    def config_parser(config):
 
472
 
        """Construct a new dict of client settings of this form:
 
473
 
        { client_name: {setting_name: value, ...}, ...}
 
474
 
        with exceptions for any special settings as defined above.
 
475
 
        NOTE: Must be a pure function. Must return the same result
 
476
 
        value given the same arguments.
 
479
 
        for client_name in config.sections():
 
480
 
            section = dict(config.items(client_name))
 
481
 
            client = settings[client_name] = {}
 
483
 
            client["host"] = section["host"]
 
484
 
            # Reformat values from string types to Python types
 
485
 
            client["approved_by_default"] = config.getboolean(
 
486
 
                client_name, "approved_by_default")
 
487
 
            client["enabled"] = config.getboolean(client_name,
 
490
 
            # Uppercase and remove spaces from fingerprint for later
 
491
 
            # comparison purposes with return value from the
 
492
 
            # fingerprint() function
 
493
 
            client["fingerprint"] = (section["fingerprint"].upper()
 
495
 
            if "secret" in section:
 
496
 
                client["secret"] = section["secret"].decode("base64")
 
497
 
            elif "secfile" in section:
 
498
 
                with open(os.path.expanduser(os.path.expandvars
 
499
 
                                             (section["secfile"])),
 
501
 
                    client["secret"] = secfile.read()
 
503
 
                raise TypeError("No secret or secfile for section {}"
 
505
 
            client["timeout"] = string_to_delta(section["timeout"])
 
506
 
            client["extended_timeout"] = string_to_delta(
 
507
 
                section["extended_timeout"])
 
508
 
            client["interval"] = string_to_delta(section["interval"])
 
509
 
            client["approval_delay"] = string_to_delta(
 
510
 
                section["approval_delay"])
 
511
 
            client["approval_duration"] = string_to_delta(
 
512
 
                section["approval_duration"])
 
513
 
            client["checker_command"] = section["checker"]
 
514
 
            client["last_approval_request"] = None
 
515
 
            client["last_checked_ok"] = None
 
516
 
            client["last_checker_status"] = -2
 
520
 
    def __init__(self, settings, name = None, server_settings=None):
 
 
282
    def _timedelta_to_milliseconds(td):
 
 
283
        "Convert a datetime.timedelta() to milliseconds"
 
 
284
        return ((td.days * 24 * 60 * 60 * 1000)
 
 
285
                + (td.seconds * 1000)
 
 
286
                + (td.microseconds // 1000))
 
 
288
    def timeout_milliseconds(self):
 
 
289
        "Return the 'timeout' attribute in milliseconds"
 
 
290
        return self._timedelta_to_milliseconds(self.timeout)
 
 
292
    def interval_milliseconds(self):
 
 
293
        "Return the 'interval' attribute in milliseconds"
 
 
294
        return self._timedelta_to_milliseconds(self.interval)
 
 
296
    def approval_delay_milliseconds(self):
 
 
297
        return self._timedelta_to_milliseconds(self.approval_delay)
 
 
299
    def __init__(self, name = None, disable_hook=None, config=None):
 
 
300
        """Note: the 'checker' key in 'config' sets the
 
 
301
        'checker_command' attribute and *not* the 'checker'
 
522
 
        if server_settings is None:
 
524
 
        self.server_settings = server_settings
 
525
 
        # adding all client settings
 
526
 
        for setting, value in settings.items():
 
527
 
            setattr(self, setting, value)
 
530
 
            if not hasattr(self, "last_enabled"):
 
531
 
                self.last_enabled = datetime.datetime.utcnow()
 
532
 
            if not hasattr(self, "expires"):
 
533
 
                self.expires = (datetime.datetime.utcnow()
 
536
 
            self.last_enabled = None
 
539
306
        logger.debug("Creating client %r", self.name)
 
 
307
        # Uppercase and remove spaces from fingerprint for later
 
 
308
        # comparison purposes with return value from the fingerprint()
 
 
310
        self.fingerprint = (config["fingerprint"].upper()
 
540
312
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
541
 
        self.created = settings.get("created",
 
542
 
                                    datetime.datetime.utcnow())
 
544
 
        # attributes specific for this server instance
 
 
313
        if "secret" in config:
 
 
314
            self.secret = config["secret"].decode("base64")
 
 
315
        elif "secfile" in config:
 
 
316
            with open(os.path.expanduser(os.path.expandvars
 
 
317
                                         (config["secfile"])),
 
 
319
                self.secret = secfile.read()
 
 
321
            raise TypeError("No secret or secfile for client %s"
 
 
323
        self.host = config.get("host", "")
 
 
324
        self.created = datetime.datetime.utcnow()
 
 
326
        self.last_approval_request = None
 
 
327
        self.last_enabled = None
 
 
328
        self.last_checked_ok = None
 
 
329
        self.timeout = string_to_delta(config["timeout"])
 
 
330
        self.interval = string_to_delta(config["interval"])
 
 
331
        self.disable_hook = disable_hook
 
545
332
        self.checker = None
 
546
333
        self.checker_initiator_tag = None
 
547
334
        self.disable_initiator_tag = None
 
548
335
        self.checker_callback_tag = None
 
 
336
        self.checker_command = config["checker"]
 
549
337
        self.current_checker_command = None
 
 
338
        self.last_connect = None
 
 
339
        self._approved = None
 
 
340
        self.approved_by_default = config.get("approved_by_default",
 
551
342
        self.approvals_pending = 0
 
552
 
        self.changedstate = (multiprocessing_manager
 
553
 
                             .Condition(multiprocessing_manager
 
555
 
        self.client_structure = [attr for attr in
 
556
 
                                 self.__dict__.iterkeys()
 
557
 
                                 if not attr.startswith("_")]
 
558
 
        self.client_structure.append("client_structure")
 
560
 
        for name, t in inspect.getmembers(type(self),
 
564
 
            if not name.startswith("_"):
 
565
 
                self.client_structure.append(name)
 
 
343
        self.approval_delay = string_to_delta(
 
 
344
            config["approval_delay"])
 
 
345
        self.approval_duration = string_to_delta(
 
 
346
            config["approval_duration"])
 
 
347
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
567
 
    # Send notice to process children that client state has changed
 
568
349
    def send_changedstate(self):
 
569
 
        with self.changedstate:
 
570
 
            self.changedstate.notify_all()
 
 
350
        self.changedstate.acquire()
 
 
351
        self.changedstate.notify_all()
 
 
352
        self.changedstate.release()
 
572
354
    def enable(self):
 
573
355
        """Start this client's checker and timeout hooks"""
 
574
356
        if getattr(self, "enabled", False):
 
575
357
            # Already enabled
 
577
 
        self.expires = datetime.datetime.utcnow() + self.timeout
 
 
359
        self.send_changedstate()
 
579
360
        self.last_enabled = datetime.datetime.utcnow()
 
581
 
        self.send_changedstate()
 
 
361
        # Schedule a new checker to be started an 'interval' from now,
 
 
362
        # and every interval from then on.
 
 
363
        self.checker_initiator_tag = (gobject.timeout_add
 
 
364
                                      (self.interval_milliseconds(),
 
 
366
        # Schedule a disable() when 'timeout' has passed
 
 
367
        self.disable_initiator_tag = (gobject.timeout_add
 
 
368
                                   (self.timeout_milliseconds(),
 
 
371
        # Also start a new checker *right now*.
 
583
374
    def disable(self, quiet=True):
 
584
375
        """Disable this client."""
 
585
376
        if not getattr(self, "enabled", False):
 
 
379
            self.send_changedstate()
 
588
381
            logger.info("Disabling client %s", self.name)
 
589
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
 
382
        if getattr(self, "disable_initiator_tag", False):
 
590
383
            gobject.source_remove(self.disable_initiator_tag)
 
591
384
            self.disable_initiator_tag = None
 
593
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
 
385
        if getattr(self, "checker_initiator_tag", False):
 
594
386
            gobject.source_remove(self.checker_initiator_tag)
 
595
387
            self.checker_initiator_tag = None
 
596
388
        self.stop_checker()
 
 
389
        if self.disable_hook:
 
 
390
            self.disable_hook(self)
 
597
391
        self.enabled = False
 
599
 
            self.send_changedstate()
 
600
392
        # Do not run this again if called by a gobject.timeout_add
 
603
395
    def __del__(self):
 
 
396
        self.disable_hook = None
 
606
 
    def init_checker(self):
 
607
 
        # Schedule a new checker to be started an 'interval' from now,
 
608
 
        # and every interval from then on.
 
609
 
        if self.checker_initiator_tag is not None:
 
610
 
            gobject.source_remove(self.checker_initiator_tag)
 
611
 
        self.checker_initiator_tag = (gobject.timeout_add
 
613
 
                                           .total_seconds() * 1000),
 
615
 
        # Schedule a disable() when 'timeout' has passed
 
616
 
        if self.disable_initiator_tag is not None:
 
617
 
            gobject.source_remove(self.disable_initiator_tag)
 
618
 
        self.disable_initiator_tag = (gobject.timeout_add
 
620
 
                                           .total_seconds() * 1000),
 
622
 
        # Also start a new checker *right now*.
 
625
399
    def checker_callback(self, pid, condition, command):
 
626
400
        """The checker has completed, so take appropriate actions."""
 
627
401
        self.checker_callback_tag = None
 
628
402
        self.checker = None
 
629
403
        if os.WIFEXITED(condition):
 
630
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
631
 
            if self.last_checker_status == 0:
 
 
404
            exitstatus = os.WEXITSTATUS(condition)
 
632
406
                logger.info("Checker for %(name)s succeeded",
 
634
408
                self.checked_ok()
 
 
853
573
class DBusObjectWithProperties(dbus.service.Object):
 
854
574
    """A D-Bus object with properties.
 
856
576
    Classes inheriting from this can use the dbus_service_property
 
857
577
    decorator to expose methods as D-Bus properties.  It exposes the
 
858
578
    standard Get(), Set(), and GetAll() methods on the D-Bus.
 
862
 
    def _is_dbus_thing(thing):
 
863
 
        """Returns a function testing if an attribute is a D-Bus thing
 
865
 
        If called like _is_dbus_thing("method") it returns a function
 
866
 
        suitable for use as predicate to inspect.getmembers().
 
868
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
 
582
    def _is_dbus_property(obj):
 
 
583
        return getattr(obj, "_dbus_is_property", False)
 
871
 
    def _get_all_dbus_things(self, thing):
 
 
585
    def _get_all_dbus_properties(self):
 
872
586
        """Returns a generator of (name, attribute) pairs
 
874
 
        return ((getattr(athing.__get__(self), "_dbus_name",
 
876
 
                 athing.__get__(self))
 
877
 
                for cls in self.__class__.__mro__
 
879
 
                inspect.getmembers(cls,
 
880
 
                                   self._is_dbus_thing(thing)))
 
 
588
        return ((prop._dbus_name, prop)
 
 
590
                inspect.getmembers(self, self._is_dbus_property))
 
882
592
    def _get_dbus_property(self, interface_name, property_name):
 
883
593
        """Returns a bound method if one exists which is a D-Bus
 
884
594
        property with the specified name and interface.
 
886
 
        for cls in  self.__class__.__mro__:
 
887
 
            for name, value in (inspect.getmembers
 
889
 
                                 self._is_dbus_thing("property"))):
 
890
 
                if (value._dbus_name == property_name
 
891
 
                    and value._dbus_interface == interface_name):
 
892
 
                    return value.__get__(self)
 
 
596
        for name in (property_name,
 
 
597
                     property_name + "_dbus_property"):
 
 
598
            prop = getattr(self, name, None)
 
 
600
                or not self._is_dbus_property(prop)
 
 
601
                or prop._dbus_name != property_name
 
 
602
                or (interface_name and prop._dbus_interface
 
 
603
                    and interface_name != prop._dbus_interface)):
 
894
606
        # No such property
 
895
607
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
896
608
                                   + interface_name + "."
 
 
1036
704
            xmlstring = document.toxml("utf-8")
 
1037
705
            document.unlink()
 
1038
706
        except (AttributeError, xml.dom.DOMException,
 
1039
 
                xml.parsers.expat.ExpatError) as error:
 
 
707
                xml.parsers.expat.ExpatError), error:
 
1040
708
            logger.error("Failed to override Introspection method",
 
1042
710
        return xmlstring
 
1045
 
def datetime_to_dbus(dt, variant_level=0):
 
1046
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
1048
 
        return dbus.String("", variant_level = variant_level)
 
1049
 
    return dbus.String(dt.isoformat(),
 
1050
 
                       variant_level=variant_level)
 
1053
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1054
 
    """A class decorator; applied to a subclass of
 
1055
 
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1056
 
    interface names according to the "alt_interface_names" mapping.
 
1059
 
    @alternate_dbus_interfaces({"org.example.Interface":
 
1060
 
                                    "net.example.AlternateInterface"})
 
1061
 
    class SampleDBusObject(dbus.service.Object):
 
1062
 
        @dbus.service.method("org.example.Interface")
 
1063
 
        def SampleDBusMethod():
 
1066
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1067
 
    reachable via two interfaces: "org.example.Interface" and
 
1068
 
    "net.example.AlternateInterface", the latter of which will have
 
1069
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1070
 
    "true", unless "deprecate" is passed with a False value.
 
1072
 
    This works for methods and signals, and also for D-Bus properties
 
1073
 
    (from DBusObjectWithProperties) and interfaces (from the
 
1074
 
    dbus_interface_annotations decorator).
 
1077
 
        for orig_interface_name, alt_interface_name in (
 
1078
 
            alt_interface_names.items()):
 
1080
 
            interface_names = set()
 
1081
 
            # Go though all attributes of the class
 
1082
 
            for attrname, attribute in inspect.getmembers(cls):
 
1083
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
1084
 
                # with the wrong interface name
 
1085
 
                if (not hasattr(attribute, "_dbus_interface")
 
1086
 
                    or not attribute._dbus_interface
 
1087
 
                    .startswith(orig_interface_name)):
 
1089
 
                # Create an alternate D-Bus interface name based on
 
1091
 
                alt_interface = (attribute._dbus_interface
 
1092
 
                                 .replace(orig_interface_name,
 
1093
 
                                          alt_interface_name))
 
1094
 
                interface_names.add(alt_interface)
 
1095
 
                # Is this a D-Bus signal?
 
1096
 
                if getattr(attribute, "_dbus_is_signal", False):
 
1097
 
                    # Extract the original non-method undecorated
 
1098
 
                    # function by black magic
 
1099
 
                    nonmethod_func = (dict(
 
1100
 
                            zip(attribute.func_code.co_freevars,
 
1101
 
                                attribute.__closure__))["func"]
 
1103
 
                    # Create a new, but exactly alike, function
 
1104
 
                    # object, and decorate it to be a new D-Bus signal
 
1105
 
                    # with the alternate D-Bus interface name
 
1106
 
                    new_function = (dbus.service.signal
 
1108
 
                                     attribute._dbus_signature)
 
1109
 
                                    (types.FunctionType(
 
1110
 
                                nonmethod_func.func_code,
 
1111
 
                                nonmethod_func.func_globals,
 
1112
 
                                nonmethod_func.func_name,
 
1113
 
                                nonmethod_func.func_defaults,
 
1114
 
                                nonmethod_func.func_closure)))
 
1115
 
                    # Copy annotations, if any
 
1117
 
                        new_function._dbus_annotations = (
 
1118
 
                            dict(attribute._dbus_annotations))
 
1119
 
                    except AttributeError:
 
1121
 
                    # Define a creator of a function to call both the
 
1122
 
                    # original and alternate functions, so both the
 
1123
 
                    # original and alternate signals gets sent when
 
1124
 
                    # the function is called
 
1125
 
                    def fixscope(func1, func2):
 
1126
 
                        """This function is a scope container to pass
 
1127
 
                        func1 and func2 to the "call_both" function
 
1128
 
                        outside of its arguments"""
 
1129
 
                        def call_both(*args, **kwargs):
 
1130
 
                            """This function will emit two D-Bus
 
1131
 
                            signals by calling func1 and func2"""
 
1132
 
                            func1(*args, **kwargs)
 
1133
 
                            func2(*args, **kwargs)
 
1135
 
                    # Create the "call_both" function and add it to
 
1137
 
                    attr[attrname] = fixscope(attribute, new_function)
 
1138
 
                # Is this a D-Bus method?
 
1139
 
                elif getattr(attribute, "_dbus_is_method", False):
 
1140
 
                    # Create a new, but exactly alike, function
 
1141
 
                    # object.  Decorate it to be a new D-Bus method
 
1142
 
                    # with the alternate D-Bus interface name.  Add it
 
1144
 
                    attr[attrname] = (dbus.service.method
 
1146
 
                                       attribute._dbus_in_signature,
 
1147
 
                                       attribute._dbus_out_signature)
 
1149
 
                                       (attribute.func_code,
 
1150
 
                                        attribute.func_globals,
 
1151
 
                                        attribute.func_name,
 
1152
 
                                        attribute.func_defaults,
 
1153
 
                                        attribute.func_closure)))
 
1154
 
                    # Copy annotations, if any
 
1156
 
                        attr[attrname]._dbus_annotations = (
 
1157
 
                            dict(attribute._dbus_annotations))
 
1158
 
                    except AttributeError:
 
1160
 
                # Is this a D-Bus property?
 
1161
 
                elif getattr(attribute, "_dbus_is_property", False):
 
1162
 
                    # Create a new, but exactly alike, function
 
1163
 
                    # object, and decorate it to be a new D-Bus
 
1164
 
                    # property with the alternate D-Bus interface
 
1165
 
                    # name.  Add it to the class.
 
1166
 
                    attr[attrname] = (dbus_service_property
 
1168
 
                                       attribute._dbus_signature,
 
1169
 
                                       attribute._dbus_access,
 
1171
 
                                       ._dbus_get_args_options
 
1174
 
                                       (attribute.func_code,
 
1175
 
                                        attribute.func_globals,
 
1176
 
                                        attribute.func_name,
 
1177
 
                                        attribute.func_defaults,
 
1178
 
                                        attribute.func_closure)))
 
1179
 
                    # Copy annotations, if any
 
1181
 
                        attr[attrname]._dbus_annotations = (
 
1182
 
                            dict(attribute._dbus_annotations))
 
1183
 
                    except AttributeError:
 
1185
 
                # Is this a D-Bus interface?
 
1186
 
                elif getattr(attribute, "_dbus_is_interface", False):
 
1187
 
                    # Create a new, but exactly alike, function
 
1188
 
                    # object.  Decorate it to be a new D-Bus interface
 
1189
 
                    # with the alternate D-Bus interface name.  Add it
 
1191
 
                    attr[attrname] = (dbus_interface_annotations
 
1194
 
                                       (attribute.func_code,
 
1195
 
                                        attribute.func_globals,
 
1196
 
                                        attribute.func_name,
 
1197
 
                                        attribute.func_defaults,
 
1198
 
                                        attribute.func_closure)))
 
1200
 
                # Deprecate all alternate interfaces
 
1201
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1202
 
                for interface_name in interface_names:
 
1203
 
                    @dbus_interface_annotations(interface_name)
 
1205
 
                        return { "org.freedesktop.DBus.Deprecated":
 
1207
 
                    # Find an unused name
 
1208
 
                    for aname in (iname.format(i)
 
1209
 
                                  for i in itertools.count()):
 
1210
 
                        if aname not in attr:
 
1214
 
                # Replace the class with a new subclass of it with
 
1215
 
                # methods, signals, etc. as created above.
 
1216
 
                cls = type(b"{}Alternate".format(cls.__name__),
 
1222
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1223
 
                                "se.bsnet.fukt.Mandos"})
 
1224
713
class ClientDBus(Client, DBusObjectWithProperties):
 
1225
714
    """A Client class using D-Bus
 
 
1232
721
    runtime_expansions = (Client.runtime_expansions
 
1233
722
                          + ("dbus_object_path",))
 
1235
 
    _interface = "se.recompile.Mandos.Client"
 
1237
724
    # dbus.service.Object doesn't use super(), so we can't either.
 
1239
726
    def __init__(self, bus = None, *args, **kwargs):
 
 
727
        self._approvals_pending = 0
 
1241
729
        Client.__init__(self, *args, **kwargs)
 
1242
730
        # Only now, when this client is initialized, can it show up on
 
1244
 
        client_object_name = str(self.name).translate(
 
 
732
        client_object_name = unicode(self.name).translate(
 
1245
733
            {ord("."): ord("_"),
 
1246
734
             ord("-"): ord("_")})
 
1247
735
        self.dbus_object_path = (dbus.ObjectPath
 
1248
736
                                 ("/clients/" + client_object_name))
 
1249
737
        DBusObjectWithProperties.__init__(self, self.bus,
 
1250
738
                                          self.dbus_object_path)
 
1252
 
    def notifychangeproperty(transform_func,
 
1253
 
                             dbus_name, type_func=lambda x: x,
 
1254
 
                             variant_level=1, invalidate_only=False,
 
1255
 
                             _interface=_interface):
 
1256
 
        """ Modify a variable so that it's a property which announces
 
1257
 
        its changes to DBus.
 
1259
 
        transform_fun: Function that takes a value and a variant_level
 
1260
 
                       and transforms it to a D-Bus type.
 
1261
 
        dbus_name: D-Bus name of the variable
 
1262
 
        type_func: Function that transform the value before sending it
 
1263
 
                   to the D-Bus.  Default: no transform
 
1264
 
        variant_level: D-Bus variant level.  Default: 1
 
1266
 
        attrname = "_{}".format(dbus_name)
 
1267
 
        def setter(self, value):
 
1268
 
            if hasattr(self, "dbus_object_path"):
 
1269
 
                if (not hasattr(self, attrname) or
 
1270
 
                    type_func(getattr(self, attrname, None))
 
1271
 
                    != type_func(value)):
 
1273
 
                        self.PropertiesChanged(_interface,
 
1278
 
                        dbus_value = transform_func(type_func(value),
 
1281
 
                        self.PropertyChanged(dbus.String(dbus_name),
 
1283
 
                        self.PropertiesChanged(_interface,
 
1285
 
                                    dbus.String(dbus_name):
 
1286
 
                                        dbus_value }), dbus.Array())
 
1287
 
            setattr(self, attrname, value)
 
1289
 
        return property(lambda self: getattr(self, attrname), setter)
 
1291
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1292
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1295
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1296
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1298
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1299
 
                                   type_func = lambda checker:
 
1300
 
                                       checker is not None)
 
1301
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1303
 
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1304
 
                                               "LastCheckerStatus")
 
1305
 
    last_approval_request = notifychangeproperty(
 
1306
 
        datetime_to_dbus, "LastApprovalRequest")
 
1307
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1308
 
                                               "ApprovedByDefault")
 
1309
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1312
 
                                          lambda td: td.total_seconds()
 
1314
 
    approval_duration = notifychangeproperty(
 
1315
 
        dbus.UInt64, "ApprovalDuration",
 
1316
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1317
 
    host = notifychangeproperty(dbus.String, "Host")
 
1318
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1319
 
                                   type_func = lambda td:
 
1320
 
                                       td.total_seconds() * 1000)
 
1321
 
    extended_timeout = notifychangeproperty(
 
1322
 
        dbus.UInt64, "ExtendedTimeout",
 
1323
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1324
 
    interval = notifychangeproperty(dbus.UInt64,
 
1327
 
                                    lambda td: td.total_seconds()
 
1329
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1330
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1331
 
                                  invalidate_only=True)
 
1333
 
    del notifychangeproperty
 
 
740
    def _get_approvals_pending(self):
 
 
741
        return self._approvals_pending
 
 
742
    def _set_approvals_pending(self, value):
 
 
743
        old_value = self._approvals_pending
 
 
744
        self._approvals_pending = value
 
 
746
        if (hasattr(self, "dbus_object_path")
 
 
747
            and bval is not bool(old_value)):
 
 
748
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
 
749
            self.PropertyChanged(dbus.String("ApprovalPending"),
 
 
752
    approvals_pending = property(_get_approvals_pending,
 
 
753
                                 _set_approvals_pending)
 
 
754
    del _get_approvals_pending, _set_approvals_pending
 
 
757
    def _datetime_to_dbus(dt, variant_level=0):
 
 
758
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
 
759
        return dbus.String(dt.isoformat(),
 
 
760
                           variant_level=variant_level)
 
 
763
        oldstate = getattr(self, "enabled", False)
 
 
764
        r = Client.enable(self)
 
 
765
        if oldstate != self.enabled:
 
 
767
            self.PropertyChanged(dbus.String("Enabled"),
 
 
768
                                 dbus.Boolean(True, variant_level=1))
 
 
769
            self.PropertyChanged(
 
 
770
                dbus.String("LastEnabled"),
 
 
771
                self._datetime_to_dbus(self.last_enabled,
 
 
775
    def disable(self, quiet = False):
 
 
776
        oldstate = getattr(self, "enabled", False)
 
 
777
        r = Client.disable(self, quiet=quiet)
 
 
778
        if not quiet and oldstate != self.enabled:
 
 
780
            self.PropertyChanged(dbus.String("Enabled"),
 
 
781
                                 dbus.Boolean(False, variant_level=1))
 
1335
784
    def __del__(self, *args, **kwargs):
 
 
1360
812
        return Client.checker_callback(self, pid, condition, command,
 
1361
813
                                       *args, **kwargs)
 
 
815
    def checked_ok(self, *args, **kwargs):
 
 
816
        r = Client.checked_ok(self, *args, **kwargs)
 
 
818
        self.PropertyChanged(
 
 
819
            dbus.String("LastCheckedOK"),
 
 
820
            (self._datetime_to_dbus(self.last_checked_ok,
 
 
824
    def need_approval(self, *args, **kwargs):
 
 
825
        r = Client.need_approval(self, *args, **kwargs)
 
 
827
        self.PropertyChanged(
 
 
828
            dbus.String("LastApprovalRequest"),
 
 
829
            (self._datetime_to_dbus(self.last_approval_request,
 
1363
833
    def start_checker(self, *args, **kwargs):
 
1364
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
 
834
        old_checker = self.checker
 
 
835
        if self.checker is not None:
 
 
836
            old_checker_pid = self.checker.pid
 
 
838
            old_checker_pid = None
 
1365
839
        r = Client.start_checker(self, *args, **kwargs)
 
1366
840
        # Only if new checker process was started
 
1367
841
        if (self.checker is not None
 
1368
842
            and old_checker_pid != self.checker.pid):
 
1369
843
            # Emit D-Bus signal
 
1370
844
            self.CheckerStarted(self.current_checker_command)
 
 
845
            self.PropertyChanged(
 
 
846
                dbus.String("CheckerRunning"),
 
 
847
                dbus.Boolean(True, variant_level=1))
 
 
850
    def stop_checker(self, *args, **kwargs):
 
 
851
        old_checker = getattr(self, "checker", None)
 
 
852
        r = Client.stop_checker(self, *args, **kwargs)
 
 
853
        if (old_checker is not None
 
 
854
            and getattr(self, "checker", None) is None):
 
 
855
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
 
856
                                 dbus.Boolean(False, variant_level=1))
 
1373
859
    def _reset_approved(self):
 
1374
 
        self.approved = None
 
 
860
        self._approved = None
 
1377
863
    def approve(self, value=True):
 
1378
 
        self.approved = value
 
1379
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1380
 
                                * 1000), self._reset_approved)
 
1381
864
        self.send_changedstate()
 
 
865
        self._approved = value
 
 
866
        gobject.timeout_add(self._timedelta_to_milliseconds
 
 
867
                            (self.approval_duration),
 
 
868
                            self._reset_approved)
 
1383
871
    ## D-Bus methods, signals & properties
 
 
872
    _interface = "se.bsnet.fukt.Mandos.Client"
 
 
1540
1039
        if value is not None:
 
1541
1040
            self.checked_ok()
 
1543
 
        return datetime_to_dbus(self.last_checked_ok)
 
1545
 
    # LastCheckerStatus - property
 
1546
 
    @dbus_service_property(_interface, signature="n",
 
1548
 
    def LastCheckerStatus_dbus_property(self):
 
1549
 
        return dbus.Int16(self.last_checker_status)
 
1551
 
    # Expires - property
 
1552
 
    @dbus_service_property(_interface, signature="s", access="read")
 
1553
 
    def Expires_dbus_property(self):
 
1554
 
        return datetime_to_dbus(self.expires)
 
 
1042
        if self.last_checked_ok is None:
 
 
1043
            return dbus.String("")
 
 
1044
        return dbus.String(self._datetime_to_dbus(self
 
1556
1047
    # LastApprovalRequest - property
 
1557
1048
    @dbus_service_property(_interface, signature="s", access="read")
 
1558
1049
    def LastApprovalRequest_dbus_property(self):
 
1559
 
        return datetime_to_dbus(self.last_approval_request)
 
 
1050
        if self.last_approval_request is None:
 
 
1051
            return dbus.String("")
 
 
1052
        return dbus.String(self.
 
 
1053
                           _datetime_to_dbus(self
 
 
1054
                                             .last_approval_request))
 
1561
1056
    # Timeout - property
 
1562
1057
    @dbus_service_property(_interface, signature="t",
 
1563
1058
                           access="readwrite")
 
1564
1059
    def Timeout_dbus_property(self, value=None):
 
1565
1060
        if value is None:       # get
 
1566
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1567
 
        old_timeout = self.timeout
 
 
1061
            return dbus.UInt64(self.timeout_milliseconds())
 
1568
1062
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1569
 
        # Reschedule disabling
 
1571
 
            now = datetime.datetime.utcnow()
 
1572
 
            self.expires += self.timeout - old_timeout
 
1573
 
            if self.expires <= now:
 
1574
 
                # The timeout has passed
 
1577
 
                if (getattr(self, "disable_initiator_tag", None)
 
1580
 
                gobject.source_remove(self.disable_initiator_tag)
 
1581
 
                self.disable_initiator_tag = (
 
1582
 
                    gobject.timeout_add(
 
1583
 
                        int((self.expires - now).total_seconds()
 
1584
 
                            * 1000), self.disable))
 
1586
 
    # ExtendedTimeout - property
 
1587
 
    @dbus_service_property(_interface, signature="t",
 
1589
 
    def ExtendedTimeout_dbus_property(self, value=None):
 
1590
 
        if value is None:       # get
 
1591
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1593
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
 
1064
        self.PropertyChanged(dbus.String("Timeout"),
 
 
1065
                             dbus.UInt64(value, variant_level=1))
 
 
1066
        if getattr(self, "disable_initiator_tag", None) is None:
 
 
1068
        # Reschedule timeout
 
 
1069
        gobject.source_remove(self.disable_initiator_tag)
 
 
1070
        self.disable_initiator_tag = None
 
 
1071
        time_to_die = (self.
 
 
1072
                       _timedelta_to_milliseconds((self
 
 
1077
        if time_to_die <= 0:
 
 
1078
            # The timeout has passed
 
 
1081
            self.disable_initiator_tag = (gobject.timeout_add
 
 
1082
                                          (time_to_die, self.disable))
 
1595
1084
    # Interval - property
 
1596
1085
    @dbus_service_property(_interface, signature="t",
 
1597
1086
                           access="readwrite")
 
1598
1087
    def Interval_dbus_property(self, value=None):
 
1599
1088
        if value is None:       # get
 
1600
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
 
1089
            return dbus.UInt64(self.interval_milliseconds())
 
1601
1090
        self.interval = datetime.timedelta(0, 0, 0, value)
 
 
1092
        self.PropertyChanged(dbus.String("Interval"),
 
 
1093
                             dbus.UInt64(value, variant_level=1))
 
1602
1094
        if getattr(self, "checker_initiator_tag", None) is None:
 
1605
 
            # Reschedule checker run
 
1606
 
            gobject.source_remove(self.checker_initiator_tag)
 
1607
 
            self.checker_initiator_tag = (gobject.timeout_add
 
1608
 
                                          (value, self.start_checker))
 
1609
 
            self.start_checker()    # Start one now, too
 
 
1096
        # Reschedule checker run
 
 
1097
        gobject.source_remove(self.checker_initiator_tag)
 
 
1098
        self.checker_initiator_tag = (gobject.timeout_add
 
 
1099
                                      (value, self.start_checker))
 
 
1100
        self.start_checker()    # Start one now, too
 
1611
1102
    # Checker - property
 
1612
1103
    @dbus_service_property(_interface, signature="s",
 
1613
1104
                           access="readwrite")
 
1614
1105
    def Checker_dbus_property(self, value=None):
 
1615
1106
        if value is None:       # get
 
1616
1107
            return dbus.String(self.checker_command)
 
1617
 
        self.checker_command = str(value)
 
 
1108
        self.checker_command = value
 
 
1110
        self.PropertyChanged(dbus.String("Checker"),
 
 
1111
                             dbus.String(self.checker_command,
 
1619
1114
    # CheckerRunning - property
 
1620
1115
    @dbus_service_property(_interface, signature="b",
 
 
2030
1487
    def __init__(self, server_address, RequestHandlerClass,
 
2031
1488
                 interface=None, use_ipv6=True, clients=None,
 
2032
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
 
1489
                 gnutls_priority=None, use_dbus=True):
 
2033
1490
        self.enabled = False
 
2034
1491
        self.clients = clients
 
2035
1492
        if self.clients is None:
 
 
1493
            self.clients = set()
 
2037
1494
        self.use_dbus = use_dbus
 
2038
1495
        self.gnutls_priority = gnutls_priority
 
2039
1496
        IPv6_TCPServer.__init__(self, server_address,
 
2040
1497
                                RequestHandlerClass,
 
2041
1498
                                interface = interface,
 
2042
 
                                use_ipv6 = use_ipv6,
 
2043
 
                                socketfd = socketfd)
 
 
1499
                                use_ipv6 = use_ipv6)
 
2044
1500
    def server_activate(self):
 
2045
1501
        if self.enabled:
 
2046
1502
            return socketserver.TCPServer.server_activate(self)
 
2048
1503
    def enable(self):
 
2049
1504
        self.enabled = True
 
2051
 
    def add_pipe(self, parent_pipe, proc):
 
 
1505
    def add_pipe(self, parent_pipe):
 
2052
1506
        # Call "handle_ipc" for both data and EOF events
 
2053
1507
        gobject.io_add_watch(parent_pipe.fileno(),
 
2054
1508
                             gobject.IO_IN | gobject.IO_HUP,
 
2055
1509
                             functools.partial(self.handle_ipc,
 
 
1510
                                               parent_pipe = parent_pipe))
 
2060
1512
    def handle_ipc(self, source, condition, parent_pipe=None,
 
2061
 
                   proc = None, client_object=None):
 
2062
 
        # error, or the other end of multiprocessing.Pipe has closed
 
2063
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
2064
 
            # Wait for other process to exit
 
 
1513
                   client_object=None):
 
 
1515
            gobject.IO_IN: "IN",   # There is data to read.
 
 
1516
            gobject.IO_OUT: "OUT", # Data can be written (without
 
 
1518
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
 
1519
            gobject.IO_ERR: "ERR", # Error condition.
 
 
1520
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
 
1521
                                    # broken, usually for pipes and
 
 
1524
        conditions_string = ' | '.join(name
 
 
1526
                                       condition_names.iteritems()
 
 
1527
                                       if cond & condition)
 
 
1528
        # error or the other end of multiprocessing.Pipe has closed
 
 
1529
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2068
1532
        # Read a request from the child
 
 
2073
1537
            fpr = request[1]
 
2074
1538
            address = request[2]
 
2076
 
            for c in self.clients.itervalues():
 
 
1540
            for c in self.clients:
 
2077
1541
                if c.fingerprint == fpr:
 
2081
 
                logger.info("Client not found for fingerprint: %s, ad"
 
2082
 
                            "dress: %s", fpr, address)
 
 
1545
                logger.warning("Client not found for fingerprint: %s, ad"
 
 
1546
                               "dress: %s", fpr, address)
 
2083
1547
                if self.use_dbus:
 
2084
1548
                    # Emit D-Bus signal
 
2085
 
                    mandos_dbus_service.ClientNotFound(fpr,
 
 
1549
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
2087
1550
                parent_pipe.send(False)
 
2090
1553
            gobject.io_add_watch(parent_pipe.fileno(),
 
2091
1554
                                 gobject.IO_IN | gobject.IO_HUP,
 
2092
1555
                                 functools.partial(self.handle_ipc,
 
 
1556
                                                   parent_pipe = parent_pipe,
 
 
1557
                                                   client_object = client))
 
2098
1558
            parent_pipe.send(True)
 
2099
 
            # remove the old hook in favor of the new above hook on
 
 
1559
            # remove the old hook in favor of the new above hook on same fileno
 
2102
1561
        if command == 'funcall':
 
2103
1562
            funcname = request[1]
 
2104
1563
            args = request[2]
 
2105
1564
            kwargs = request[3]
 
2107
 
            parent_pipe.send(('data', getattr(client_object,
 
 
1566
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
2111
1568
        if command == 'getattr':
 
2112
1569
            attrname = request[1]
 
2113
1570
            if callable(client_object.__getattribute__(attrname)):
 
2114
1571
                parent_pipe.send(('function',))
 
2116
 
                parent_pipe.send(('data', client_object
 
2117
 
                                  .__getattribute__(attrname)))
 
 
1573
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
2119
1575
        if command == 'setattr':
 
2120
1576
            attrname = request[1]
 
2121
1577
            value = request[2]
 
2122
1578
            setattr(client_object, attrname, value)
 
2127
 
def rfc3339_duration_to_delta(duration):
 
2128
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2130
 
    >>> rfc3339_duration_to_delta("P7D")
 
2131
 
    datetime.timedelta(7)
 
2132
 
    >>> rfc3339_duration_to_delta("PT60S")
 
2133
 
    datetime.timedelta(0, 60)
 
2134
 
    >>> rfc3339_duration_to_delta("PT60M")
 
2135
 
    datetime.timedelta(0, 3600)
 
2136
 
    >>> rfc3339_duration_to_delta("PT24H")
 
2137
 
    datetime.timedelta(1)
 
2138
 
    >>> rfc3339_duration_to_delta("P1W")
 
2139
 
    datetime.timedelta(7)
 
2140
 
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2141
 
    datetime.timedelta(0, 330)
 
2142
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2143
 
    datetime.timedelta(1, 200)
 
2146
 
    # Parsing an RFC 3339 duration with regular expressions is not
 
2147
 
    # possible - there would have to be multiple places for the same
 
2148
 
    # values, like seconds.  The current code, while more esoteric, is
 
2149
 
    # cleaner without depending on a parsing library.  If Python had a
 
2150
 
    # built-in library for parsing we would use it, but we'd like to
 
2151
 
    # avoid excessive use of external libraries.
 
2153
 
    # New type for defining tokens, syntax, and semantics all-in-one
 
2154
 
    Token = collections.namedtuple("Token",
 
2155
 
                                   ("regexp", # To match token; if
 
2156
 
                                              # "value" is not None,
 
2157
 
                                              # must have a "group"
 
2159
 
                                    "value",  # datetime.timedelta or
 
2161
 
                                    "followers")) # Tokens valid after
 
2163
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2164
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2165
 
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2166
 
    token_second = Token(re.compile(r"(\d+)S"),
 
2167
 
                         datetime.timedelta(seconds=1),
 
2168
 
                         frozenset((token_end,)))
 
2169
 
    token_minute = Token(re.compile(r"(\d+)M"),
 
2170
 
                         datetime.timedelta(minutes=1),
 
2171
 
                         frozenset((token_second, token_end)))
 
2172
 
    token_hour = Token(re.compile(r"(\d+)H"),
 
2173
 
                       datetime.timedelta(hours=1),
 
2174
 
                       frozenset((token_minute, token_end)))
 
2175
 
    token_time = Token(re.compile(r"T"),
 
2177
 
                       frozenset((token_hour, token_minute,
 
2179
 
    token_day = Token(re.compile(r"(\d+)D"),
 
2180
 
                      datetime.timedelta(days=1),
 
2181
 
                      frozenset((token_time, token_end)))
 
2182
 
    token_month = Token(re.compile(r"(\d+)M"),
 
2183
 
                        datetime.timedelta(weeks=4),
 
2184
 
                        frozenset((token_day, token_end)))
 
2185
 
    token_year = Token(re.compile(r"(\d+)Y"),
 
2186
 
                       datetime.timedelta(weeks=52),
 
2187
 
                       frozenset((token_month, token_end)))
 
2188
 
    token_week = Token(re.compile(r"(\d+)W"),
 
2189
 
                       datetime.timedelta(weeks=1),
 
2190
 
                       frozenset((token_end,)))
 
2191
 
    token_duration = Token(re.compile(r"P"), None,
 
2192
 
                           frozenset((token_year, token_month,
 
2193
 
                                      token_day, token_time,
 
2195
 
    # Define starting values
 
2196
 
    value = datetime.timedelta() # Value so far
 
2198
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2199
 
    s = duration                # String left to parse
 
2200
 
    # Loop until end token is found
 
2201
 
    while found_token is not token_end:
 
2202
 
        # Search for any currently valid tokens
 
2203
 
        for token in followers:
 
2204
 
            match = token.regexp.match(s)
 
2205
 
            if match is not None:
 
2207
 
                if token.value is not None:
 
2208
 
                    # Value found, parse digits
 
2209
 
                    factor = int(match.group(1), 10)
 
2210
 
                    # Add to value so far
 
2211
 
                    value += factor * token.value
 
2212
 
                # Strip token from string
 
2213
 
                s = token.regexp.sub("", s, 1)
 
2216
 
                # Set valid next tokens
 
2217
 
                followers = found_token.followers
 
2220
 
            # No currently valid tokens were found
 
2221
 
            raise ValueError("Invalid RFC 3339 duration")
 
2226
1583
def string_to_delta(interval):
 
2227
1584
    """Parse a string and return a datetime.timedelta
 
 
2376
1731
    # Convert the SafeConfigParser object to a dict
 
2377
1732
    server_settings = server_config.defaults()
 
2378
1733
    # Use the appropriate methods on the non-string config options
 
2379
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
 
1734
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2380
1735
        server_settings[option] = server_config.getboolean("DEFAULT",
 
2382
1737
    if server_settings["port"]:
 
2383
1738
        server_settings["port"] = server_config.getint("DEFAULT",
 
2385
 
    if server_settings["socket"]:
 
2386
 
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2388
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2389
 
        # over with an opened os.devnull.  But we don't want this to
 
2390
 
        # happen with a supplied network socket.
 
2391
 
        if 0 <= server_settings["socket"] <= 2:
 
2392
 
            server_settings["socket"] = os.dup(server_settings
 
2394
1740
    del server_config
 
2396
1742
    # Override the settings from the config file with command line
 
2397
1743
    # options, if set.
 
2398
1744
    for option in ("interface", "address", "port", "debug",
 
2399
1745
                   "priority", "servicename", "configdir",
 
2400
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2401
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
 
1746
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2402
1747
        value = getattr(options, option)
 
2403
1748
        if value is not None:
 
2404
1749
            server_settings[option] = value
 
2406
1751
    # Force all strings to be unicode
 
2407
1752
    for option in server_settings.keys():
 
2408
 
        if isinstance(server_settings[option], bytes):
 
2409
 
            server_settings[option] = (server_settings[option]
 
2411
 
    # Force all boolean options to be boolean
 
2412
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2413
 
                   "foreground", "zeroconf"):
 
2414
 
        server_settings[option] = bool(server_settings[option])
 
2415
 
    # Debug implies foreground
 
2416
 
    if server_settings["debug"]:
 
2417
 
        server_settings["foreground"] = True
 
 
1753
        if type(server_settings[option]) is str:
 
 
1754
            server_settings[option] = unicode(server_settings[option])
 
2418
1755
    # Now we have our good server settings in "server_settings"
 
2420
1757
    ##################################################################
 
2422
 
    if (not server_settings["zeroconf"] and
 
2423
 
        not (server_settings["port"]
 
2424
 
             or server_settings["socket"] != "")):
 
2425
 
            parser.error("Needs port or socket to work without"
 
2428
1759
    # For convenience
 
2429
1760
    debug = server_settings["debug"]
 
2430
1761
    debuglevel = server_settings["debuglevel"]
 
2431
1762
    use_dbus = server_settings["use_dbus"]
 
2432
1763
    use_ipv6 = server_settings["use_ipv6"]
 
2433
 
    stored_state_path = os.path.join(server_settings["statedir"],
 
2435
 
    foreground = server_settings["foreground"]
 
2436
 
    zeroconf = server_settings["zeroconf"]
 
2439
 
        initlogger(debug, logging.DEBUG)
 
2444
 
            level = getattr(logging, debuglevel.upper())
 
2445
 
            initlogger(debug, level)
 
2447
1765
    if server_settings["servicename"] != "Mandos":
 
2448
1766
        syslogger.setFormatter(logging.Formatter
 
2449
 
                               ('Mandos ({}) [%(process)d]:'
 
2450
 
                                ' %(levelname)s: %(message)s'
 
2451
 
                                .format(server_settings
 
 
1767
                               ('Mandos (%s) [%%(process)d]:'
 
 
1768
                                ' %%(levelname)s: %%(message)s'
 
 
1769
                                % server_settings["servicename"]))
 
2454
1771
    # Parse config file with clients
 
2455
 
    client_config = configparser.SafeConfigParser(Client
 
 
1772
    client_defaults = { "timeout": "1h",
 
 
1774
                        "checker": "fping -q -- %%(host)s",
 
 
1776
                        "approval_delay": "0s",
 
 
1777
                        "approval_duration": "1s",
 
 
1779
    client_config = configparser.SafeConfigParser(client_defaults)
 
2457
1780
    client_config.read(os.path.join(server_settings["configdir"],
 
2458
1781
                                    "clients.conf"))
 
2460
1783
    global mandos_dbus_service
 
2461
1784
    mandos_dbus_service = None
 
2464
 
    if server_settings["socket"] != "":
 
2465
 
        socketfd = server_settings["socket"]
 
2466
1786
    tcp_server = MandosServer((server_settings["address"],
 
2467
1787
                               server_settings["port"]),
 
 
2516
1843
         .gnutls_global_set_log_function(debug_gnutls))
 
2518
1845
        # Redirect stdin so all checkers get /dev/null
 
2519
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
 
1846
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2520
1847
        os.dup2(null, sys.stdin.fileno())
 
 
1851
        # No console logging
 
 
1852
        logger.removeHandler(console)
 
2524
1854
    # Need to fork before connecting to D-Bus
 
2526
1856
        # Close all input and output, do double fork, etc.
 
2529
 
    # multiprocessing will use threads, so before we use gobject we
 
2530
 
    # need to inform gobject that threads will be used.
 
2531
 
    gobject.threads_init()
 
2533
1859
    global main_loop
 
2534
1860
    # From the Avahi example code
 
2535
 
    DBusGMainLoop(set_as_default=True)
 
 
1861
    DBusGMainLoop(set_as_default=True )
 
2536
1862
    main_loop = gobject.MainLoop()
 
2537
1863
    bus = dbus.SystemBus()
 
2538
1864
    # End of Avahi example code
 
2541
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
 
1867
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
2542
1868
                                            bus, do_not_queue=True)
 
2543
 
            old_bus_name = (dbus.service.BusName
 
2544
 
                            ("se.bsnet.fukt.Mandos", bus,
 
2546
 
        except dbus.exceptions.NameExistsException as e:
 
2547
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
 
1869
        except dbus.exceptions.NameExistsException, e:
 
 
1870
            logger.error(unicode(e) + ", disabling D-Bus")
 
2548
1871
            use_dbus = False
 
2549
1872
            server_settings["use_dbus"] = False
 
2550
1873
            tcp_server.use_dbus = False
 
2552
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2553
 
        service = AvahiServiceToSyslog(name =
 
2554
 
                                       server_settings["servicename"],
 
2555
 
                                       servicetype = "_mandos._tcp",
 
2556
 
                                       protocol = protocol, bus = bus)
 
2557
 
        if server_settings["interface"]:
 
2558
 
            service.interface = (if_nametoindex
 
2559
 
                                 (server_settings["interface"]
 
 
1874
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
 
1875
    service = AvahiService(name = server_settings["servicename"],
 
 
1876
                           servicetype = "_mandos._tcp",
 
 
1877
                           protocol = protocol, bus = bus)
 
 
1878
    if server_settings["interface"]:
 
 
1879
        service.interface = (if_nametoindex
 
 
1880
                             (str(server_settings["interface"])))
 
2562
1882
    global multiprocessing_manager
 
2563
1883
    multiprocessing_manager = multiprocessing.Manager()
 
 
2565
1885
    client_class = Client
 
2567
1887
        client_class = functools.partial(ClientDBus, bus = bus)
 
2569
 
    client_settings = Client.config_parser(client_config)
 
2570
 
    old_client_settings = {}
 
2573
 
    # This is used to redirect stdout and stderr for checker processes
 
2575
 
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2576
 
    # Only used if server is running in foreground but not in debug
 
2578
 
    if debug or not foreground:
 
2581
 
    # Get client data and settings from last running state.
 
2582
 
    if server_settings["restore"]:
 
2584
 
            with open(stored_state_path, "rb") as stored_state:
 
2585
 
                clients_data, old_client_settings = (pickle.load
 
2587
 
            os.remove(stored_state_path)
 
2588
 
        except IOError as e:
 
2589
 
            if e.errno == errno.ENOENT:
 
2590
 
                logger.warning("Could not load persistent state: {}"
 
2591
 
                                .format(os.strerror(e.errno)))
 
2593
 
                logger.critical("Could not load persistent state:",
 
2596
 
        except EOFError as e:
 
2597
 
            logger.warning("Could not load persistent state: "
 
2598
 
                           "EOFError:", exc_info=e)
 
2600
 
    with PGPEngine() as pgp:
 
2601
 
        for client_name, client in clients_data.items():
 
2602
 
            # Skip removed clients
 
2603
 
            if client_name not in client_settings:
 
2606
 
            # Decide which value to use after restoring saved state.
 
2607
 
            # We have three different values: Old config file,
 
2608
 
            # new config file, and saved state.
 
2609
 
            # New config value takes precedence if it differs from old
 
2610
 
            # config value, otherwise use saved state.
 
2611
 
            for name, value in client_settings[client_name].items():
 
2613
 
                    # For each value in new config, check if it
 
2614
 
                    # differs from the old config value (Except for
 
2615
 
                    # the "secret" attribute)
 
2616
 
                    if (name != "secret" and
 
2617
 
                        value != old_client_settings[client_name]
 
2619
 
                        client[name] = value
 
2623
 
            # Clients who has passed its expire date can still be
 
2624
 
            # enabled if its last checker was successful.  Clients
 
2625
 
            # whose checker succeeded before we stored its state is
 
2626
 
            # assumed to have successfully run all checkers during
 
2628
 
            if client["enabled"]:
 
2629
 
                if datetime.datetime.utcnow() >= client["expires"]:
 
2630
 
                    if not client["last_checked_ok"]:
 
2632
 
                            "disabling client {} - Client never "
 
2633
 
                            "performed a successful checker"
 
2634
 
                            .format(client_name))
 
2635
 
                        client["enabled"] = False
 
2636
 
                    elif client["last_checker_status"] != 0:
 
2638
 
                            "disabling client {} - Client last"
 
2639
 
                            " checker failed with error code {}"
 
2640
 
                            .format(client_name,
 
2641
 
                                    client["last_checker_status"]))
 
2642
 
                        client["enabled"] = False
 
2644
 
                        client["expires"] = (datetime.datetime
 
2646
 
                                             + client["timeout"])
 
2647
 
                        logger.debug("Last checker succeeded,"
 
2648
 
                                     " keeping {} enabled"
 
2649
 
                                     .format(client_name))
 
 
1888
    def client_config_items(config, section):
 
 
1889
        special_settings = {
 
 
1890
            "approved_by_default":
 
 
1891
                lambda: config.getboolean(section,
 
 
1892
                                          "approved_by_default"),
 
 
1894
        for name, value in config.items(section):
 
2651
 
                client["secret"] = (
 
2652
 
                    pgp.decrypt(client["encrypted_secret"],
 
2653
 
                                client_settings[client_name]
 
2656
 
                # If decryption fails, we use secret from new settings
 
2657
 
                logger.debug("Failed to decrypt {} old secret"
 
2658
 
                             .format(client_name))
 
2659
 
                client["secret"] = (
 
2660
 
                    client_settings[client_name]["secret"])
 
2662
 
    # Add/remove clients based on new changes made to config
 
2663
 
    for client_name in (set(old_client_settings)
 
2664
 
                        - set(client_settings)):
 
2665
 
        del clients_data[client_name]
 
2666
 
    for client_name in (set(client_settings)
 
2667
 
                        - set(old_client_settings)):
 
2668
 
        clients_data[client_name] = client_settings[client_name]
 
2670
 
    # Create all client objects
 
2671
 
    for client_name, client in clients_data.items():
 
2672
 
        tcp_server.clients[client_name] = client_class(
 
2673
 
            name = client_name, settings = client,
 
2674
 
            server_settings = server_settings)
 
 
1896
                yield (name, special_settings[name]())
 
 
1900
    tcp_server.clients.update(set(
 
 
1901
            client_class(name = section,
 
 
1902
                         config= dict(client_config_items(
 
 
1903
                        client_config, section)))
 
 
1904
            for section in client_config.sections()))
 
2676
1905
    if not tcp_server.clients:
 
2677
1906
        logger.warning("No clients defined")
 
2680
 
        if pidfile is not None:
 
2684
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
 
2686
 
                logger.error("Could not write to file %r with PID %d",
 
 
1912
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
 
1915
            logger.error("Could not write to file %r with PID %d",
 
 
1918
            # "pidfile" was never created
 
2689
1920
        del pidfilename
 
 
1922
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
2691
1924
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2692
1925
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
 
2695
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2696
 
                                        "se.bsnet.fukt.Mandos"})
 
2697
 
        class MandosDBusService(DBusObjectWithProperties):
 
 
1928
        class MandosDBusService(dbus.service.Object):
 
2698
1929
            """A D-Bus proxy object"""
 
2699
1930
            def __init__(self):
 
2700
1931
                dbus.service.Object.__init__(self, bus, "/")
 
2701
 
            _interface = "se.recompile.Mandos"
 
2703
 
            @dbus_interface_annotations(_interface)
 
2705
 
                return { "org.freedesktop.DBus.Property"
 
2706
 
                         ".EmitsChangedSignal":
 
 
1932
            _interface = "se.bsnet.fukt.Mandos"
 
2709
1934
            @dbus.service.signal(_interface, signature="o")
 
2710
1935
            def ClientAdded(self, objpath):
 
 
2759
1983
        "Cleanup function; run on exit"
 
2763
 
        multiprocessing.active_children()
 
2765
 
        if not (tcp_server.clients or client_settings):
 
2768
 
        # Store client before exiting. Secrets are encrypted with key
 
2769
 
        # based on what config file has. If config file is
 
2770
 
        # removed/edited, old secret will thus be unrecovable.
 
2772
 
        with PGPEngine() as pgp:
 
2773
 
            for client in tcp_server.clients.itervalues():
 
2774
 
                key = client_settings[client.name]["secret"]
 
2775
 
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2779
 
                # A list of attributes that can not be pickled
 
2781
 
                exclude = { "bus", "changedstate", "secret",
 
2782
 
                            "checker", "server_settings" }
 
2783
 
                for name, typ in (inspect.getmembers
 
2784
 
                                  (dbus.service.Object)):
 
2787
 
                client_dict["encrypted_secret"] = (client
 
2789
 
                for attr in client.client_structure:
 
2790
 
                    if attr not in exclude:
 
2791
 
                        client_dict[attr] = getattr(client, attr)
 
2793
 
                clients[client.name] = client_dict
 
2794
 
                del client_settings[client.name]["secret"]
 
2797
 
            with (tempfile.NamedTemporaryFile
 
2798
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2799
 
                   dir=os.path.dirname(stored_state_path),
 
2800
 
                   delete=False)) as stored_state:
 
2801
 
                pickle.dump((clients, client_settings), stored_state)
 
2802
 
                tempname=stored_state.name
 
2803
 
            os.rename(tempname, stored_state_path)
 
2804
 
        except (IOError, OSError) as e:
 
2810
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2811
 
                logger.warning("Could not save persistent state: {}"
 
2812
 
                               .format(os.strerror(e.errno)))
 
2814
 
                logger.warning("Could not save persistent state:",
 
2818
 
        # Delete all clients, and settings from config
 
2819
1986
        while tcp_server.clients:
 
2820
 
            name, client = tcp_server.clients.popitem()
 
 
1987
            client = tcp_server.clients.pop()
 
2822
1989
                client.remove_from_connection()
 
 
1990
            client.disable_hook = None
 
2823
1991
            # Don't signal anything except ClientRemoved
 
2824
1992
            client.disable(quiet=True)
 
2826
1994
                # Emit D-Bus signal
 
2827
 
                mandos_dbus_service.ClientRemoved(client
 
 
1995
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2830
 
        client_settings.clear()
 
2832
1998
    atexit.register(cleanup)
 
2834
 
    for client in tcp_server.clients.itervalues():
 
 
2000
    for client in tcp_server.clients:
 
2836
2002
            # Emit D-Bus signal
 
2837
2003
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
2838
 
        # Need to initiate checking of clients
 
2840
 
            client.init_checker()
 
2842
2006
    tcp_server.enable()
 
2843
2007
    tcp_server.server_activate()
 
2845
2009
    # Find out what port we got
 
2847
 
        service.port = tcp_server.socket.getsockname()[1]
 
 
2010
    service.port = tcp_server.socket.getsockname()[1]
 
2849
2012
        logger.info("Now listening on address %r, port %d,"
 
2850
 
                    " flowinfo %d, scope_id %d",
 
2851
 
                    *tcp_server.socket.getsockname())
 
 
2013
                    " flowinfo %d, scope_id %d"
 
 
2014
                    % tcp_server.socket.getsockname())
 
2853
 
        logger.info("Now listening on address %r, port %d",
 
2854
 
                    *tcp_server.socket.getsockname())
 
 
2016
        logger.info("Now listening on address %r, port %d"
 
 
2017
                    % tcp_server.socket.getsockname())
 
2856
2019
    #service.interface = tcp_server.socket.getsockname()[3]
 
2860
 
            # From the Avahi example code
 
2863
 
            except dbus.exceptions.DBusException as error:
 
2864
 
                logger.critical("D-Bus Exception", exc_info=error)
 
2867
 
            # End of Avahi example code
 
 
2022
        # From the Avahi example code
 
 
2025
        except dbus.exceptions.DBusException, error:
 
 
2026
            logger.critical("DBusException: %s", error)
 
 
2029
        # End of Avahi example code
 
2869
2031
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
2870
2032
                             lambda *args, **kwargs: