/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-07-20 03:03:33 UTC
  • Revision ID: teddy@recompile.se-20150720030333-203m2aeblypcsfte
Bug fix for GnuTLS 3: be compatible with old 2048-bit DSA keys.

The mandos-keygen program in Mandos version 1.6.0 and older generated
2048-bit DSA keys, and when GnuTLS uses these it has trouble
connecting using the Mandos default priority string.  This was
previously fixed in Mandos 1.6.2, but the bug reappeared when using
GnuTLS 3, so the default priority string has to change again; this
time also the Mandos client has to change its default, so now the
server and the client should use the same default priority string:

SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA:+SIGN-DSA-SHA256

* mandos (main/server_defaults): Changed default priority string.
* mandos-options.xml (/section/para[id="priority_compat"]): Removed.
  (/section/para[id="priority"]): Changed default priority string.
* mandos.conf ([DEFAULT]/priority): - '' -
* mandos.conf.xml (OPTIONS/priority): Refer to the id "priority"
                                      instead of "priority_compat".
* mandos.xml (OPTIONS/--priority): - '' -
* plugins.d/mandos-client.c (main): Changed default priority string.

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-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 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
36
36
 
37
37
from future_builtins import *
38
38
 
39
 
import SocketServer as socketserver
 
39
try:
 
40
    import SocketServer as socketserver
 
41
except ImportError:
 
42
    import socketserver
40
43
import socket
41
44
import argparse
42
45
import datetime
47
50
import gnutls.library.functions
48
51
import gnutls.library.constants
49
52
import gnutls.library.types
50
 
import ConfigParser as configparser
 
53
try:
 
54
    import ConfigParser as configparser
 
55
except ImportError:
 
56
    import configparser
51
57
import sys
52
58
import re
53
59
import os
62
68
import struct
63
69
import fcntl
64
70
import functools
65
 
import cPickle as pickle
 
71
try:
 
72
    import cPickle as pickle
 
73
except ImportError:
 
74
    import pickle
66
75
import multiprocessing
67
76
import types
68
77
import binascii
69
78
import tempfile
70
79
import itertools
71
80
import collections
 
81
import codecs
72
82
 
73
83
import dbus
74
84
import dbus.service
75
 
import gobject
 
85
try:
 
86
    import gobject
 
87
except ImportError:
 
88
    from gi.repository import GObject as gobject
76
89
import avahi
77
90
from dbus.mainloop.glib import DBusGMainLoop
78
91
import ctypes
88
101
    except ImportError:
89
102
        SO_BINDTODEVICE = None
90
103
 
91
 
version = "1.6.5"
 
104
if sys.version_info.major == 2:
 
105
    str = unicode
 
106
 
 
107
version = "1.6.9"
92
108
stored_state_file = "clients.pickle"
93
109
 
94
110
logger = logging.getLogger()
95
111
syslogger = None
96
112
 
97
113
try:
98
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
99
 
                      (ctypes.util.find_library("c"))
100
 
                      .if_nametoindex)
 
114
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
115
        ctypes.util.find_library("c")).if_nametoindex
101
116
except (OSError, AttributeError):
 
117
    
102
118
    def if_nametoindex(interface):
103
119
        "Get an interface index the hard way, i.e. using fcntl()"
104
120
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
105
121
        with contextlib.closing(socket.socket()) as s:
106
122
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
 
                                struct.pack(str("16s16x"),
108
 
                                            interface))
109
 
        interface_index = struct.unpack(str("I"),
110
 
                                        ifreq[16:20])[0]
 
123
                                struct.pack(b"16s16x", interface))
 
124
        interface_index = struct.unpack("I", ifreq[16:20])[0]
111
125
        return interface_index
112
126
 
113
127
 
115
129
    """init logger and add loglevel"""
116
130
    
117
131
    global syslogger
118
 
    syslogger = (logging.handlers.SysLogHandler
119
 
                 (facility =
120
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
121
 
                  address = str("/dev/log")))
 
132
    syslogger = (logging.handlers.SysLogHandler(
 
133
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
134
        address = "/dev/log"))
122
135
    syslogger.setFormatter(logging.Formatter
123
136
                           ('Mandos [%(process)d]: %(levelname)s:'
124
137
                            ' %(message)s'))
141
154
 
142
155
class PGPEngine(object):
143
156
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
157
    
144
158
    def __init__(self):
145
159
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
146
160
        self.gnupgargs = ['--batch',
185
199
    
186
200
    def encrypt(self, data, password):
187
201
        passphrase = self.password_encode(password)
188
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
189
 
                                         ) as passfile:
 
202
        with tempfile.NamedTemporaryFile(
 
203
                dir=self.tempdir) as passfile:
190
204
            passfile.write(passphrase)
191
205
            passfile.flush()
192
206
            proc = subprocess.Popen(['gpg', '--symmetric',
203
217
    
204
218
    def decrypt(self, data, password):
205
219
        passphrase = self.password_encode(password)
206
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
207
 
                                         ) as passfile:
 
220
        with tempfile.NamedTemporaryFile(
 
221
                dir = self.tempdir) as passfile:
208
222
            passfile.write(passphrase)
209
223
            passfile.flush()
210
224
            proc = subprocess.Popen(['gpg', '--decrypt',
214
228
                                    stdin = subprocess.PIPE,
215
229
                                    stdout = subprocess.PIPE,
216
230
                                    stderr = subprocess.PIPE)
217
 
            decrypted_plaintext, err = proc.communicate(input
218
 
                                                        = data)
 
231
            decrypted_plaintext, err = proc.communicate(input = data)
219
232
        if proc.returncode != 0:
220
233
            raise PGPError(err)
221
234
        return decrypted_plaintext
224
237
class AvahiError(Exception):
225
238
    def __init__(self, value, *args, **kwargs):
226
239
        self.value = value
227
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
228
 
    def __unicode__(self):
229
 
        return unicode(repr(self.value))
 
240
        return super(AvahiError, self).__init__(value, *args,
 
241
                                                **kwargs)
 
242
 
230
243
 
231
244
class AvahiServiceError(AvahiError):
232
245
    pass
233
246
 
 
247
 
234
248
class AvahiGroupError(AvahiError):
235
249
    pass
236
250
 
256
270
    bus: dbus.SystemBus()
257
271
    """
258
272
    
259
 
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
260
 
                 servicetype = None, port = None, TXT = None,
261
 
                 domain = "", host = "", max_renames = 32768,
262
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
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):
263
284
        self.interface = interface
264
285
        self.name = name
265
286
        self.type = servicetype
275
296
        self.bus = bus
276
297
        self.entry_group_state_changed_match = None
277
298
    
278
 
    def rename(self):
 
299
    def rename(self, remove=True):
279
300
        """Derived from the Avahi example code"""
280
301
        if self.rename_count >= self.max_renames:
281
302
            logger.critical("No suitable Zeroconf service name found"
282
303
                            " after %i retries, exiting.",
283
304
                            self.rename_count)
284
305
            raise AvahiServiceError("Too many renames")
285
 
        self.name = unicode(self.server
286
 
                            .GetAlternativeServiceName(self.name))
 
306
        self.name = str(
 
307
            self.server.GetAlternativeServiceName(self.name))
 
308
        self.rename_count += 1
287
309
        logger.info("Changing Zeroconf service name to %r ...",
288
310
                    self.name)
289
 
        self.remove()
 
311
        if remove:
 
312
            self.remove()
290
313
        try:
291
314
            self.add()
292
315
        except dbus.exceptions.DBusException as error:
293
 
            logger.critical("D-Bus Exception", exc_info=error)
294
 
            self.cleanup()
295
 
            os._exit(1)
296
 
        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)
297
324
    
298
325
    def remove(self):
299
326
        """Derived from the Avahi example code"""
337
364
            self.rename()
338
365
        elif state == avahi.ENTRY_GROUP_FAILURE:
339
366
            logger.critical("Avahi: Error in group state changed %s",
340
 
                            unicode(error))
341
 
            raise AvahiGroupError("State changed: {0!s}"
342
 
                                  .format(error))
 
367
                            str(error))
 
368
            raise AvahiGroupError("State changed: {!s}".format(error))
343
369
    
344
370
    def cleanup(self):
345
371
        """Derived from the Avahi example code"""
355
381
    def server_state_changed(self, state, error=None):
356
382
        """Derived from the Avahi example code"""
357
383
        logger.debug("Avahi server state change: %i", state)
358
 
        bad_states = { avahi.SERVER_INVALID:
359
 
                           "Zeroconf server invalid",
360
 
                       avahi.SERVER_REGISTERING: None,
361
 
                       avahi.SERVER_COLLISION:
362
 
                           "Zeroconf server name collision",
363
 
                       avahi.SERVER_FAILURE:
364
 
                           "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
        }
365
390
        if state in bad_states:
366
391
            if bad_states[state] is not None:
367
392
                if error is None:
370
395
                    logger.error(bad_states[state] + ": %r", error)
371
396
            self.cleanup()
372
397
        elif state == avahi.SERVER_RUNNING:
373
 
            self.add()
 
398
            try:
 
399
                self.add()
 
400
            except dbus.exceptions.DBusException as error:
 
401
                if (error.get_dbus_name()
 
402
                    == "org.freedesktop.Avahi.CollisionError"):
 
403
                    logger.info("Local Zeroconf service name"
 
404
                                " collision.")
 
405
                    return self.rename(remove=False)
 
406
                else:
 
407
                    logger.critical("D-Bus Exception", exc_info=error)
 
408
                    self.cleanup()
 
409
                    os._exit(1)
374
410
        else:
375
411
            if error is None:
376
412
                logger.debug("Unknown state: %r", state)
386
422
                                    follow_name_owner_changes=True),
387
423
                avahi.DBUS_INTERFACE_SERVER)
388
424
        self.server.connect_to_signal("StateChanged",
389
 
                                 self.server_state_changed)
 
425
                                      self.server_state_changed)
390
426
        self.server_state_changed(self.server.GetState())
391
427
 
392
428
 
393
429
class AvahiServiceToSyslog(AvahiService):
394
 
    def rename(self):
 
430
    def rename(self, *args, **kwargs):
395
431
        """Add the new name to the syslog messages"""
396
 
        ret = AvahiService.rename(self)
397
 
        syslogger.setFormatter(logging.Formatter
398
 
                               ('Mandos ({0}) [%(process)d]:'
399
 
                                ' %(levelname)s: %(message)s'
400
 
                                .format(self.name)))
 
432
        ret = AvahiService.rename(self, *args, **kwargs)
 
433
        syslogger.setFormatter(logging.Formatter(
 
434
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
435
            .format(self.name)))
401
436
        return ret
402
437
 
403
 
 
404
 
def timedelta_to_milliseconds(td):
405
 
    "Convert a datetime.timedelta() to milliseconds"
406
 
    return ((td.days * 24 * 60 * 60 * 1000)
407
 
            + (td.seconds * 1000)
408
 
            + (td.microseconds // 1000))
409
 
 
 
438
def call_pipe(connection,       # : multiprocessing.Connection
 
439
              func, *args, **kwargs):
 
440
    """This function is meant to be called by multiprocessing.Process
 
441
    
 
442
    This function runs func(*args, **kwargs), and writes the resulting
 
443
    return value on the provided multiprocessing.Connection.
 
444
    """
 
445
    connection.send(func(*args, **kwargs))
 
446
    connection.close()
410
447
 
411
448
class Client(object):
412
449
    """A representation of a client host served by this server.
439
476
    last_checker_status: integer between 0 and 255 reflecting exit
440
477
                         status of last checker. -1 reflects crashed
441
478
                         checker, -2 means no checker completed yet.
 
479
    last_checker_signal: The signal which killed the last checker, if
 
480
                         last_checker_status is -1
442
481
    last_enabled: datetime.datetime(); (UTC) or None
443
482
    name:       string; from the config file, used in log messages and
444
483
                        D-Bus identifiers
457
496
                          "fingerprint", "host", "interval",
458
497
                          "last_approval_request", "last_checked_ok",
459
498
                          "last_enabled", "name", "timeout")
460
 
    client_defaults = { "timeout": "PT5M",
461
 
                        "extended_timeout": "PT15M",
462
 
                        "interval": "PT2M",
463
 
                        "checker": "fping -q -- %%(host)s",
464
 
                        "host": "",
465
 
                        "approval_delay": "PT0S",
466
 
                        "approval_duration": "PT1S",
467
 
                        "approved_by_default": "True",
468
 
                        "enabled": "True",
469
 
                        }
470
 
    
471
 
    def timeout_milliseconds(self):
472
 
        "Return the 'timeout' attribute in milliseconds"
473
 
        return timedelta_to_milliseconds(self.timeout)
474
 
    
475
 
    def extended_timeout_milliseconds(self):
476
 
        "Return the 'extended_timeout' attribute in milliseconds"
477
 
        return timedelta_to_milliseconds(self.extended_timeout)
478
 
    
479
 
    def interval_milliseconds(self):
480
 
        "Return the 'interval' attribute in milliseconds"
481
 
        return timedelta_to_milliseconds(self.interval)
482
 
    
483
 
    def approval_delay_milliseconds(self):
484
 
        return timedelta_to_milliseconds(self.approval_delay)
 
499
    client_defaults = {
 
500
        "timeout": "PT5M",
 
501
        "extended_timeout": "PT15M",
 
502
        "interval": "PT2M",
 
503
        "checker": "fping -q -- %%(host)s",
 
504
        "host": "",
 
505
        "approval_delay": "PT0S",
 
506
        "approval_duration": "PT1S",
 
507
        "approved_by_default": "True",
 
508
        "enabled": "True",
 
509
    }
485
510
    
486
511
    @staticmethod
487
512
    def config_parser(config):
503
528
            client["enabled"] = config.getboolean(client_name,
504
529
                                                  "enabled")
505
530
            
 
531
            # Uppercase and remove spaces from fingerprint for later
 
532
            # comparison purposes with return value from the
 
533
            # fingerprint() function
506
534
            client["fingerprint"] = (section["fingerprint"].upper()
507
535
                                     .replace(" ", ""))
508
536
            if "secret" in section:
513
541
                          "rb") as secfile:
514
542
                    client["secret"] = secfile.read()
515
543
            else:
516
 
                raise TypeError("No secret or secfile for section {0}"
 
544
                raise TypeError("No secret or secfile for section {}"
517
545
                                .format(section))
518
546
            client["timeout"] = string_to_delta(section["timeout"])
519
547
            client["extended_timeout"] = string_to_delta(
536
564
            server_settings = {}
537
565
        self.server_settings = server_settings
538
566
        # adding all client settings
539
 
        for setting, value in settings.iteritems():
 
567
        for setting, value in settings.items():
540
568
            setattr(self, setting, value)
541
569
        
542
570
        if self.enabled:
550
578
            self.expires = None
551
579
        
552
580
        logger.debug("Creating client %r", self.name)
553
 
        # Uppercase and remove spaces from fingerprint for later
554
 
        # comparison purposes with return value from the fingerprint()
555
 
        # function
556
581
        logger.debug("  Fingerprint: %s", self.fingerprint)
557
582
        self.created = settings.get("created",
558
583
                                    datetime.datetime.utcnow())
565
590
        self.current_checker_command = None
566
591
        self.approved = None
567
592
        self.approvals_pending = 0
568
 
        self.changedstate = (multiprocessing_manager
569
 
                             .Condition(multiprocessing_manager
570
 
                                        .Lock()))
571
 
        self.client_structure = [attr for attr in
572
 
                                 self.__dict__.iterkeys()
 
593
        self.changedstate = multiprocessing_manager.Condition(
 
594
            multiprocessing_manager.Lock())
 
595
        self.client_structure = [attr
 
596
                                 for attr in self.__dict__.iterkeys()
573
597
                                 if not attr.startswith("_")]
574
598
        self.client_structure.append("client_structure")
575
599
        
576
 
        for name, t in inspect.getmembers(type(self),
577
 
                                          lambda obj:
578
 
                                              isinstance(obj,
579
 
                                                         property)):
 
600
        for name, t in inspect.getmembers(
 
601
                type(self), lambda obj: isinstance(obj, property)):
580
602
            if not name.startswith("_"):
581
603
                self.client_structure.append(name)
582
604
    
624
646
        # and every interval from then on.
625
647
        if self.checker_initiator_tag is not None:
626
648
            gobject.source_remove(self.checker_initiator_tag)
627
 
        self.checker_initiator_tag = (gobject.timeout_add
628
 
                                      (self.interval_milliseconds(),
629
 
                                       self.start_checker))
 
649
        self.checker_initiator_tag = gobject.timeout_add(
 
650
            int(self.interval.total_seconds() * 1000),
 
651
            self.start_checker)
630
652
        # Schedule a disable() when 'timeout' has passed
631
653
        if self.disable_initiator_tag is not None:
632
654
            gobject.source_remove(self.disable_initiator_tag)
633
 
        self.disable_initiator_tag = (gobject.timeout_add
634
 
                                   (self.timeout_milliseconds(),
635
 
                                    self.disable))
 
655
        self.disable_initiator_tag = gobject.timeout_add(
 
656
            int(self.timeout.total_seconds() * 1000), self.disable)
636
657
        # Also start a new checker *right now*.
637
658
        self.start_checker()
638
659
    
639
 
    def checker_callback(self, pid, condition, command):
 
660
    def checker_callback(self, source, condition, connection,
 
661
                         command):
640
662
        """The checker has completed, so take appropriate actions."""
641
663
        self.checker_callback_tag = None
642
664
        self.checker = None
643
 
        if os.WIFEXITED(condition):
644
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
665
        # Read return code from connection (see call_pipe)
 
666
        returncode = connection.recv()
 
667
        connection.close()
 
668
        
 
669
        if returncode >= 0:
 
670
            self.last_checker_status = returncode
 
671
            self.last_checker_signal = None
645
672
            if self.last_checker_status == 0:
646
673
                logger.info("Checker for %(name)s succeeded",
647
674
                            vars(self))
648
675
                self.checked_ok()
649
676
            else:
650
 
                logger.info("Checker for %(name)s failed",
651
 
                            vars(self))
 
677
                logger.info("Checker for %(name)s failed", vars(self))
652
678
        else:
653
679
            self.last_checker_status = -1
 
680
            self.last_checker_signal = -returncode
654
681
            logger.warning("Checker for %(name)s crashed?",
655
682
                           vars(self))
 
683
        return False
656
684
    
657
685
    def checked_ok(self):
658
686
        """Assert that the client has been seen, alive and well."""
659
687
        self.last_checked_ok = datetime.datetime.utcnow()
660
688
        self.last_checker_status = 0
 
689
        self.last_checker_signal = None
661
690
        self.bump_timeout()
662
691
    
663
692
    def bump_timeout(self, timeout=None):
668
697
            gobject.source_remove(self.disable_initiator_tag)
669
698
            self.disable_initiator_tag = None
670
699
        if getattr(self, "enabled", False):
671
 
            self.disable_initiator_tag = (gobject.timeout_add
672
 
                                          (timedelta_to_milliseconds
673
 
                                           (timeout), self.disable))
 
700
            self.disable_initiator_tag = gobject.timeout_add(
 
701
                int(timeout.total_seconds() * 1000), self.disable)
674
702
            self.expires = datetime.datetime.utcnow() + timeout
675
703
    
676
704
    def need_approval(self):
690
718
        # than 'timeout' for the client to be disabled, which is as it
691
719
        # should be.
692
720
        
693
 
        # If a checker exists, make sure it is not a zombie
694
 
        try:
695
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
696
 
        except AttributeError:
697
 
            pass
698
 
        except OSError as error:
699
 
            if error.errno != errno.ECHILD:
700
 
                raise
701
 
        else:
702
 
            if pid:
703
 
                logger.warning("Checker was a zombie")
704
 
                gobject.source_remove(self.checker_callback_tag)
705
 
                self.checker_callback(pid, status,
706
 
                                      self.current_checker_command)
 
721
        if self.checker is not None and not self.checker.is_alive():
 
722
            logger.warning("Checker was not alive; joining")
 
723
            self.checker.join()
 
724
            self.checker = None
707
725
        # Start a new checker if needed
708
726
        if self.checker is None:
709
727
            # Escape attributes for the shell
710
 
            escaped_attrs = dict(
711
 
                (attr, re.escape(unicode(getattr(self, attr))))
712
 
                for attr in
713
 
                self.runtime_expansions)
 
728
            escaped_attrs = {
 
729
                attr: re.escape(str(getattr(self, attr)))
 
730
                for attr in self.runtime_expansions }
714
731
            try:
715
732
                command = self.checker_command % escaped_attrs
716
733
            except TypeError as error:
717
734
                logger.error('Could not format string "%s"',
718
 
                             self.checker_command, exc_info=error)
719
 
                return True # Try again later
 
735
                             self.checker_command,
 
736
                             exc_info=error)
 
737
                return True     # Try again later
720
738
            self.current_checker_command = command
721
 
            try:
722
 
                logger.info("Starting checker %r for %s",
723
 
                            command, self.name)
724
 
                # We don't need to redirect stdout and stderr, since
725
 
                # in normal mode, that is already done by daemon(),
726
 
                # and in debug mode we don't want to.  (Stdin is
727
 
                # always replaced by /dev/null.)
728
 
                # The exception is when not debugging but nevertheless
729
 
                # running in the foreground; use the previously
730
 
                # created wnull.
731
 
                popen_args = {}
732
 
                if (not self.server_settings["debug"]
733
 
                    and self.server_settings["foreground"]):
734
 
                    popen_args.update({"stdout": wnull,
735
 
                                       "stderr": wnull })
736
 
                self.checker = subprocess.Popen(command,
737
 
                                                close_fds=True,
738
 
                                                shell=True, cwd="/",
739
 
                                                **popen_args)
740
 
            except OSError as error:
741
 
                logger.error("Failed to start subprocess",
742
 
                             exc_info=error)
743
 
                return True
744
 
            self.checker_callback_tag = (gobject.child_watch_add
745
 
                                         (self.checker.pid,
746
 
                                          self.checker_callback,
747
 
                                          data=command))
748
 
            # The checker may have completed before the gobject
749
 
            # watch was added.  Check for this.
750
 
            try:
751
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
752
 
            except OSError as error:
753
 
                if error.errno == errno.ECHILD:
754
 
                    # This should never happen
755
 
                    logger.error("Child process vanished",
756
 
                                 exc_info=error)
757
 
                    return True
758
 
                raise
759
 
            if pid:
760
 
                gobject.source_remove(self.checker_callback_tag)
761
 
                self.checker_callback(pid, status, command)
 
739
            logger.info("Starting checker %r for %s", command,
 
740
                        self.name)
 
741
            # We don't need to redirect stdout and stderr, since
 
742
            # in normal mode, that is already done by daemon(),
 
743
            # and in debug mode we don't want to.  (Stdin is
 
744
            # always replaced by /dev/null.)
 
745
            # The exception is when not debugging but nevertheless
 
746
            # running in the foreground; use the previously
 
747
            # created wnull.
 
748
            popen_args = { "close_fds": True,
 
749
                           "shell": True,
 
750
                           "cwd": "/" }
 
751
            if (not self.server_settings["debug"]
 
752
                and self.server_settings["foreground"]):
 
753
                popen_args.update({"stdout": wnull,
 
754
                                   "stderr": wnull })
 
755
            pipe = multiprocessing.Pipe(duplex = False)
 
756
            self.checker = multiprocessing.Process(
 
757
                target = call_pipe,
 
758
                args = (pipe[1], subprocess.call, command),
 
759
                kwargs = popen_args)
 
760
            self.checker.start()
 
761
            self.checker_callback_tag = gobject.io_add_watch(
 
762
                pipe[0].fileno(), gobject.IO_IN,
 
763
                self.checker_callback, pipe[0], command)
762
764
        # Re-run this periodically if run by gobject.timeout_add
763
765
        return True
764
766
    
770
772
        if getattr(self, "checker", None) is None:
771
773
            return
772
774
        logger.debug("Stopping checker for %(name)s", vars(self))
773
 
        try:
774
 
            self.checker.terminate()
775
 
            #time.sleep(0.5)
776
 
            #if self.checker.poll() is None:
777
 
            #    self.checker.kill()
778
 
        except OSError as error:
779
 
            if error.errno != errno.ESRCH: # No such process
780
 
                raise
 
775
        self.checker.terminate()
781
776
        self.checker = None
782
777
 
783
778
 
784
 
def dbus_service_property(dbus_interface, signature="v",
785
 
                          access="readwrite", byte_arrays=False):
 
779
def dbus_service_property(dbus_interface,
 
780
                          signature="v",
 
781
                          access="readwrite",
 
782
                          byte_arrays=False):
786
783
    """Decorators for marking methods of a DBusObjectWithProperties to
787
784
    become properties on the D-Bus.
788
785
    
797
794
    # "Set" method, so we fail early here:
798
795
    if byte_arrays and signature != "ay":
799
796
        raise ValueError("Byte arrays not supported for non-'ay'"
800
 
                         " signature {0!r}".format(signature))
 
797
                         " signature {!r}".format(signature))
 
798
    
801
799
    def decorator(func):
802
800
        func._dbus_is_property = True
803
801
        func._dbus_interface = dbus_interface
808
806
            func._dbus_name = func._dbus_name[:-14]
809
807
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
810
808
        return func
 
809
    
811
810
    return decorator
812
811
 
813
812
 
822
821
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
823
822
                    "false"}
824
823
    """
 
824
    
825
825
    def decorator(func):
826
826
        func._dbus_is_interface = True
827
827
        func._dbus_interface = dbus_interface
828
828
        func._dbus_name = dbus_interface
829
829
        return func
 
830
    
830
831
    return decorator
831
832
 
832
833
 
834
835
    """Decorator to annotate D-Bus methods, signals or properties
835
836
    Usage:
836
837
    
 
838
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
839
                       "org.freedesktop.DBus.Property."
 
840
                       "EmitsChangedSignal": "false"})
837
841
    @dbus_service_property("org.example.Interface", signature="b",
838
842
                           access="r")
839
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
840
 
                        "org.freedesktop.DBus.Property."
841
 
                        "EmitsChangedSignal": "false"})
842
843
    def Property_dbus_property(self):
843
844
        return dbus.Boolean(False)
844
845
    """
 
846
    
845
847
    def decorator(func):
846
848
        func._dbus_annotations = annotations
847
849
        return func
 
850
    
848
851
    return decorator
849
852
 
850
853
 
851
854
class DBusPropertyException(dbus.exceptions.DBusException):
852
855
    """A base class for D-Bus property-related exceptions
853
856
    """
854
 
    def __unicode__(self):
855
 
        return unicode(str(self))
 
857
    pass
856
858
 
857
859
 
858
860
class DBusPropertyAccessException(DBusPropertyException):
882
884
        If called like _is_dbus_thing("method") it returns a function
883
885
        suitable for use as predicate to inspect.getmembers().
884
886
        """
885
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
887
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
886
888
                                   False)
887
889
    
888
890
    def _get_all_dbus_things(self, thing):
889
891
        """Returns a generator of (name, attribute) pairs
890
892
        """
891
 
        return ((getattr(athing.__get__(self), "_dbus_name",
892
 
                         name),
 
893
        return ((getattr(athing.__get__(self), "_dbus_name", name),
893
894
                 athing.__get__(self))
894
895
                for cls in self.__class__.__mro__
895
896
                for name, athing in
896
 
                inspect.getmembers(cls,
897
 
                                   self._is_dbus_thing(thing)))
 
897
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
898
898
    
899
899
    def _get_dbus_property(self, interface_name, property_name):
900
900
        """Returns a bound method if one exists which is a D-Bus
901
901
        property with the specified name and interface.
902
902
        """
903
 
        for cls in  self.__class__.__mro__:
904
 
            for name, value in (inspect.getmembers
905
 
                                (cls,
906
 
                                 self._is_dbus_thing("property"))):
 
903
        for cls in self.__class__.__mro__:
 
904
            for name, value in inspect.getmembers(
 
905
                    cls, self._is_dbus_thing("property")):
907
906
                if (value._dbus_name == property_name
908
907
                    and value._dbus_interface == interface_name):
909
908
                    return value.__get__(self)
910
909
        
911
910
        # No such property
912
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
913
 
                                   + interface_name + "."
914
 
                                   + property_name)
 
911
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
912
            self.dbus_object_path, interface_name, property_name))
915
913
    
916
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
914
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
915
                         in_signature="ss",
917
916
                         out_signature="v")
918
917
    def Get(self, interface_name, property_name):
919
918
        """Standard D-Bus property Get() method, see D-Bus standard.
938
937
            # signatures other than "ay".
939
938
            if prop._dbus_signature != "ay":
940
939
                raise ValueError("Byte arrays not supported for non-"
941
 
                                 "'ay' signature {0!r}"
 
940
                                 "'ay' signature {!r}"
942
941
                                 .format(prop._dbus_signature))
943
942
            value = dbus.ByteArray(b''.join(chr(byte)
944
943
                                            for byte in value))
945
944
        prop(value)
946
945
    
947
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
946
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
947
                         in_signature="s",
948
948
                         out_signature="a{sv}")
949
949
    def GetAll(self, interface_name):
950
950
        """Standard D-Bus property GetAll() method, see D-Bus
965
965
            if not hasattr(value, "variant_level"):
966
966
                properties[name] = value
967
967
                continue
968
 
            properties[name] = type(value)(value, variant_level=
969
 
                                           value.variant_level+1)
 
968
            properties[name] = type(value)(
 
969
                value, variant_level = value.variant_level + 1)
970
970
        return dbus.Dictionary(properties, signature="sv")
971
971
    
 
972
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
973
    def PropertiesChanged(self, interface_name, changed_properties,
 
974
                          invalidated_properties):
 
975
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
976
        standard.
 
977
        """
 
978
        pass
 
979
    
972
980
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
973
981
                         out_signature="s",
974
982
                         path_keyword='object_path',
982
990
                                                   connection)
983
991
        try:
984
992
            document = xml.dom.minidom.parseString(xmlstring)
 
993
            
985
994
            def make_tag(document, name, prop):
986
995
                e = document.createElement("property")
987
996
                e.setAttribute("name", name)
988
997
                e.setAttribute("type", prop._dbus_signature)
989
998
                e.setAttribute("access", prop._dbus_access)
990
999
                return e
 
1000
            
991
1001
            for if_tag in document.getElementsByTagName("interface"):
992
1002
                # Add property tags
993
1003
                for tag in (make_tag(document, name, prop)
1005
1015
                            if (name == tag.getAttribute("name")
1006
1016
                                and prop._dbus_interface
1007
1017
                                == if_tag.getAttribute("name")):
1008
 
                                annots.update(getattr
1009
 
                                              (prop,
1010
 
                                               "_dbus_annotations",
1011
 
                                               {}))
1012
 
                        for name, value in annots.iteritems():
 
1018
                                annots.update(getattr(
 
1019
                                    prop, "_dbus_annotations", {}))
 
1020
                        for name, value in annots.items():
1013
1021
                            ann_tag = document.createElement(
1014
1022
                                "annotation")
1015
1023
                            ann_tag.setAttribute("name", name)
1018
1026
                # Add interface annotation tags
1019
1027
                for annotation, value in dict(
1020
1028
                    itertools.chain.from_iterable(
1021
 
                        annotations().iteritems()
1022
 
                        for name, annotations in
1023
 
                        self._get_all_dbus_things("interface")
 
1029
                        annotations().items()
 
1030
                        for name, annotations
 
1031
                        in self._get_all_dbus_things("interface")
1024
1032
                        if name == if_tag.getAttribute("name")
1025
 
                        )).iteritems():
 
1033
                        )).items():
1026
1034
                    ann_tag = document.createElement("annotation")
1027
1035
                    ann_tag.setAttribute("name", annotation)
1028
1036
                    ann_tag.setAttribute("value", value)
1055
1063
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1056
1064
    if dt is None:
1057
1065
        return dbus.String("", variant_level = variant_level)
1058
 
    return dbus.String(dt.isoformat(),
1059
 
                       variant_level=variant_level)
 
1066
    return dbus.String(dt.isoformat(), variant_level=variant_level)
1060
1067
 
1061
1068
 
1062
1069
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1082
1089
    (from DBusObjectWithProperties) and interfaces (from the
1083
1090
    dbus_interface_annotations decorator).
1084
1091
    """
 
1092
    
1085
1093
    def wrapper(cls):
1086
1094
        for orig_interface_name, alt_interface_name in (
1087
 
            alt_interface_names.iteritems()):
 
1095
                alt_interface_names.items()):
1088
1096
            attr = {}
1089
1097
            interface_names = set()
1090
1098
            # Go though all attributes of the class
1092
1100
                # Ignore non-D-Bus attributes, and D-Bus attributes
1093
1101
                # with the wrong interface name
1094
1102
                if (not hasattr(attribute, "_dbus_interface")
1095
 
                    or not attribute._dbus_interface
1096
 
                    .startswith(orig_interface_name)):
 
1103
                    or not attribute._dbus_interface.startswith(
 
1104
                        orig_interface_name)):
1097
1105
                    continue
1098
1106
                # Create an alternate D-Bus interface name based on
1099
1107
                # the current name
1100
 
                alt_interface = (attribute._dbus_interface
1101
 
                                 .replace(orig_interface_name,
1102
 
                                          alt_interface_name))
 
1108
                alt_interface = attribute._dbus_interface.replace(
 
1109
                    orig_interface_name, alt_interface_name)
1103
1110
                interface_names.add(alt_interface)
1104
1111
                # Is this a D-Bus signal?
1105
1112
                if getattr(attribute, "_dbus_is_signal", False):
1106
 
                    # Extract the original non-method undecorated
1107
 
                    # function by black magic
1108
 
                    nonmethod_func = (dict(
 
1113
                    if sys.version_info.major == 2:
 
1114
                        # Extract the original non-method undecorated
 
1115
                        # function by black magic
 
1116
                        nonmethod_func = (dict(
1109
1117
                            zip(attribute.func_code.co_freevars,
1110
 
                                attribute.__closure__))["func"]
1111
 
                                      .cell_contents)
 
1118
                                attribute.__closure__))
 
1119
                                          ["func"].cell_contents)
 
1120
                    else:
 
1121
                        nonmethod_func = attribute
1112
1122
                    # Create a new, but exactly alike, function
1113
1123
                    # object, and decorate it to be a new D-Bus signal
1114
1124
                    # with the alternate D-Bus interface name
1115
 
                    new_function = (dbus.service.signal
1116
 
                                    (alt_interface,
1117
 
                                     attribute._dbus_signature)
1118
 
                                    (types.FunctionType(
1119
 
                                nonmethod_func.func_code,
1120
 
                                nonmethod_func.func_globals,
1121
 
                                nonmethod_func.func_name,
1122
 
                                nonmethod_func.func_defaults,
1123
 
                                nonmethod_func.func_closure)))
 
1125
                    if sys.version_info.major == 2:
 
1126
                        new_function = types.FunctionType(
 
1127
                            nonmethod_func.func_code,
 
1128
                            nonmethod_func.func_globals,
 
1129
                            nonmethod_func.func_name,
 
1130
                            nonmethod_func.func_defaults,
 
1131
                            nonmethod_func.func_closure)
 
1132
                    else:
 
1133
                        new_function = types.FunctionType(
 
1134
                            nonmethod_func.__code__,
 
1135
                            nonmethod_func.__globals__,
 
1136
                            nonmethod_func.__name__,
 
1137
                            nonmethod_func.__defaults__,
 
1138
                            nonmethod_func.__closure__)
 
1139
                    new_function = (dbus.service.signal(
 
1140
                        alt_interface,
 
1141
                        attribute._dbus_signature)(new_function))
1124
1142
                    # Copy annotations, if any
1125
1143
                    try:
1126
 
                        new_function._dbus_annotations = (
1127
 
                            dict(attribute._dbus_annotations))
 
1144
                        new_function._dbus_annotations = dict(
 
1145
                            attribute._dbus_annotations)
1128
1146
                    except AttributeError:
1129
1147
                        pass
1130
1148
                    # Define a creator of a function to call both the
1135
1153
                        """This function is a scope container to pass
1136
1154
                        func1 and func2 to the "call_both" function
1137
1155
                        outside of its arguments"""
 
1156
                        
1138
1157
                        def call_both(*args, **kwargs):
1139
1158
                            """This function will emit two D-Bus
1140
1159
                            signals by calling func1 and func2"""
1141
1160
                            func1(*args, **kwargs)
1142
1161
                            func2(*args, **kwargs)
 
1162
                        
1143
1163
                        return call_both
1144
1164
                    # Create the "call_both" function and add it to
1145
1165
                    # the class
1150
1170
                    # object.  Decorate it to be a new D-Bus method
1151
1171
                    # with the alternate D-Bus interface name.  Add it
1152
1172
                    # to the class.
1153
 
                    attr[attrname] = (dbus.service.method
1154
 
                                      (alt_interface,
1155
 
                                       attribute._dbus_in_signature,
1156
 
                                       attribute._dbus_out_signature)
1157
 
                                      (types.FunctionType
1158
 
                                       (attribute.func_code,
1159
 
                                        attribute.func_globals,
1160
 
                                        attribute.func_name,
1161
 
                                        attribute.func_defaults,
1162
 
                                        attribute.func_closure)))
 
1173
                    attr[attrname] = (
 
1174
                        dbus.service.method(
 
1175
                            alt_interface,
 
1176
                            attribute._dbus_in_signature,
 
1177
                            attribute._dbus_out_signature)
 
1178
                        (types.FunctionType(attribute.func_code,
 
1179
                                            attribute.func_globals,
 
1180
                                            attribute.func_name,
 
1181
                                            attribute.func_defaults,
 
1182
                                            attribute.func_closure)))
1163
1183
                    # Copy annotations, if any
1164
1184
                    try:
1165
 
                        attr[attrname]._dbus_annotations = (
1166
 
                            dict(attribute._dbus_annotations))
 
1185
                        attr[attrname]._dbus_annotations = dict(
 
1186
                            attribute._dbus_annotations)
1167
1187
                    except AttributeError:
1168
1188
                        pass
1169
1189
                # Is this a D-Bus property?
1172
1192
                    # object, and decorate it to be a new D-Bus
1173
1193
                    # property with the alternate D-Bus interface
1174
1194
                    # name.  Add it to the class.
1175
 
                    attr[attrname] = (dbus_service_property
1176
 
                                      (alt_interface,
1177
 
                                       attribute._dbus_signature,
1178
 
                                       attribute._dbus_access,
1179
 
                                       attribute
1180
 
                                       ._dbus_get_args_options
1181
 
                                       ["byte_arrays"])
1182
 
                                      (types.FunctionType
1183
 
                                       (attribute.func_code,
1184
 
                                        attribute.func_globals,
1185
 
                                        attribute.func_name,
1186
 
                                        attribute.func_defaults,
1187
 
                                        attribute.func_closure)))
 
1195
                    attr[attrname] = (dbus_service_property(
 
1196
                        alt_interface, attribute._dbus_signature,
 
1197
                        attribute._dbus_access,
 
1198
                        attribute._dbus_get_args_options
 
1199
                        ["byte_arrays"])
 
1200
                                      (types.FunctionType(
 
1201
                                          attribute.func_code,
 
1202
                                          attribute.func_globals,
 
1203
                                          attribute.func_name,
 
1204
                                          attribute.func_defaults,
 
1205
                                          attribute.func_closure)))
1188
1206
                    # Copy annotations, if any
1189
1207
                    try:
1190
 
                        attr[attrname]._dbus_annotations = (
1191
 
                            dict(attribute._dbus_annotations))
 
1208
                        attr[attrname]._dbus_annotations = dict(
 
1209
                            attribute._dbus_annotations)
1192
1210
                    except AttributeError:
1193
1211
                        pass
1194
1212
                # Is this a D-Bus interface?
1197
1215
                    # object.  Decorate it to be a new D-Bus interface
1198
1216
                    # with the alternate D-Bus interface name.  Add it
1199
1217
                    # to the class.
1200
 
                    attr[attrname] = (dbus_interface_annotations
1201
 
                                      (alt_interface)
1202
 
                                      (types.FunctionType
1203
 
                                       (attribute.func_code,
1204
 
                                        attribute.func_globals,
1205
 
                                        attribute.func_name,
1206
 
                                        attribute.func_defaults,
1207
 
                                        attribute.func_closure)))
 
1218
                    attr[attrname] = (
 
1219
                        dbus_interface_annotations(alt_interface)
 
1220
                        (types.FunctionType(attribute.func_code,
 
1221
                                            attribute.func_globals,
 
1222
                                            attribute.func_name,
 
1223
                                            attribute.func_defaults,
 
1224
                                            attribute.func_closure)))
1208
1225
            if deprecate:
1209
1226
                # Deprecate all alternate interfaces
1210
 
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1227
                iname="_AlternateDBusNames_interface_annotation{}"
1211
1228
                for interface_name in interface_names:
 
1229
                    
1212
1230
                    @dbus_interface_annotations(interface_name)
1213
1231
                    def func(self):
1214
1232
                        return { "org.freedesktop.DBus.Deprecated":
1215
 
                                     "true" }
 
1233
                                 "true" }
1216
1234
                    # Find an unused name
1217
1235
                    for aname in (iname.format(i)
1218
1236
                                  for i in itertools.count()):
1222
1240
            if interface_names:
1223
1241
                # Replace the class with a new subclass of it with
1224
1242
                # methods, signals, etc. as created above.
1225
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1226
 
                           (cls,), attr)
 
1243
                cls = type(b"{}Alternate".format(cls.__name__),
 
1244
                           (cls, ), attr)
1227
1245
        return cls
 
1246
    
1228
1247
    return wrapper
1229
1248
 
1230
1249
 
1231
1250
@alternate_dbus_interfaces({"se.recompile.Mandos":
1232
 
                                "se.bsnet.fukt.Mandos"})
 
1251
                            "se.bsnet.fukt.Mandos"})
1233
1252
class ClientDBus(Client, DBusObjectWithProperties):
1234
1253
    """A Client class using D-Bus
1235
1254
    
1239
1258
    """
1240
1259
    
1241
1260
    runtime_expansions = (Client.runtime_expansions
1242
 
                          + ("dbus_object_path",))
 
1261
                          + ("dbus_object_path", ))
 
1262
    
 
1263
    _interface = "se.recompile.Mandos.Client"
1243
1264
    
1244
1265
    # dbus.service.Object doesn't use super(), so we can't either.
1245
1266
    
1248
1269
        Client.__init__(self, *args, **kwargs)
1249
1270
        # Only now, when this client is initialized, can it show up on
1250
1271
        # the D-Bus
1251
 
        client_object_name = unicode(self.name).translate(
 
1272
        client_object_name = str(self.name).translate(
1252
1273
            {ord("."): ord("_"),
1253
1274
             ord("-"): ord("_")})
1254
 
        self.dbus_object_path = (dbus.ObjectPath
1255
 
                                 ("/clients/" + client_object_name))
 
1275
        self.dbus_object_path = dbus.ObjectPath(
 
1276
            "/clients/" + client_object_name)
1256
1277
        DBusObjectWithProperties.__init__(self, self.bus,
1257
1278
                                          self.dbus_object_path)
1258
1279
    
1259
 
    def notifychangeproperty(transform_func,
1260
 
                             dbus_name, type_func=lambda x: x,
1261
 
                             variant_level=1):
 
1280
    def notifychangeproperty(transform_func, dbus_name,
 
1281
                             type_func=lambda x: x,
 
1282
                             variant_level=1,
 
1283
                             invalidate_only=False,
 
1284
                             _interface=_interface):
1262
1285
        """ Modify a variable so that it's a property which announces
1263
1286
        its changes to DBus.
1264
1287
        
1269
1292
                   to the D-Bus.  Default: no transform
1270
1293
        variant_level: D-Bus variant level.  Default: 1
1271
1294
        """
1272
 
        attrname = "_{0}".format(dbus_name)
 
1295
        attrname = "_{}".format(dbus_name)
 
1296
        
1273
1297
        def setter(self, value):
1274
1298
            if hasattr(self, "dbus_object_path"):
1275
1299
                if (not hasattr(self, attrname) or
1276
1300
                    type_func(getattr(self, attrname, None))
1277
1301
                    != type_func(value)):
1278
 
                    dbus_value = transform_func(type_func(value),
1279
 
                                                variant_level
1280
 
                                                =variant_level)
1281
 
                    self.PropertyChanged(dbus.String(dbus_name),
1282
 
                                         dbus_value)
 
1302
                    if invalidate_only:
 
1303
                        self.PropertiesChanged(
 
1304
                            _interface, dbus.Dictionary(),
 
1305
                            dbus.Array((dbus_name, )))
 
1306
                    else:
 
1307
                        dbus_value = transform_func(
 
1308
                            type_func(value),
 
1309
                            variant_level = variant_level)
 
1310
                        self.PropertyChanged(dbus.String(dbus_name),
 
1311
                                             dbus_value)
 
1312
                        self.PropertiesChanged(
 
1313
                            _interface,
 
1314
                            dbus.Dictionary({ dbus.String(dbus_name):
 
1315
                                              dbus_value }),
 
1316
                            dbus.Array())
1283
1317
            setattr(self, attrname, value)
1284
1318
        
1285
1319
        return property(lambda self: getattr(self, attrname), setter)
1291
1325
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1292
1326
    last_enabled = notifychangeproperty(datetime_to_dbus,
1293
1327
                                        "LastEnabled")
1294
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1295
 
                                   type_func = lambda checker:
1296
 
                                       checker is not None)
 
1328
    checker = notifychangeproperty(
 
1329
        dbus.Boolean, "CheckerRunning",
 
1330
        type_func = lambda checker: checker is not None)
1297
1331
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1298
1332
                                           "LastCheckedOK")
1299
1333
    last_checker_status = notifychangeproperty(dbus.Int16,
1302
1336
        datetime_to_dbus, "LastApprovalRequest")
1303
1337
    approved_by_default = notifychangeproperty(dbus.Boolean,
1304
1338
                                               "ApprovedByDefault")
1305
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1306
 
                                          "ApprovalDelay",
1307
 
                                          type_func =
1308
 
                                          timedelta_to_milliseconds)
 
1339
    approval_delay = notifychangeproperty(
 
1340
        dbus.UInt64, "ApprovalDelay",
 
1341
        type_func = lambda td: td.total_seconds() * 1000)
1309
1342
    approval_duration = notifychangeproperty(
1310
1343
        dbus.UInt64, "ApprovalDuration",
1311
 
        type_func = timedelta_to_milliseconds)
 
1344
        type_func = lambda td: td.total_seconds() * 1000)
1312
1345
    host = notifychangeproperty(dbus.String, "Host")
1313
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1314
 
                                   type_func =
1315
 
                                   timedelta_to_milliseconds)
 
1346
    timeout = notifychangeproperty(
 
1347
        dbus.UInt64, "Timeout",
 
1348
        type_func = lambda td: td.total_seconds() * 1000)
1316
1349
    extended_timeout = notifychangeproperty(
1317
1350
        dbus.UInt64, "ExtendedTimeout",
1318
 
        type_func = timedelta_to_milliseconds)
1319
 
    interval = notifychangeproperty(dbus.UInt64,
1320
 
                                    "Interval",
1321
 
                                    type_func =
1322
 
                                    timedelta_to_milliseconds)
 
1351
        type_func = lambda td: td.total_seconds() * 1000)
 
1352
    interval = notifychangeproperty(
 
1353
        dbus.UInt64, "Interval",
 
1354
        type_func = lambda td: td.total_seconds() * 1000)
1323
1355
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1356
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1357
                                  invalidate_only=True)
1324
1358
    
1325
1359
    del notifychangeproperty
1326
1360
    
1333
1367
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1334
1368
        Client.__del__(self, *args, **kwargs)
1335
1369
    
1336
 
    def checker_callback(self, pid, condition, command,
1337
 
                         *args, **kwargs):
1338
 
        self.checker_callback_tag = None
1339
 
        self.checker = None
1340
 
        if os.WIFEXITED(condition):
1341
 
            exitstatus = os.WEXITSTATUS(condition)
 
1370
    def checker_callback(self, source, condition,
 
1371
                         connection, command, *args, **kwargs):
 
1372
        ret = Client.checker_callback(self, source, condition,
 
1373
                                      connection, command, *args,
 
1374
                                      **kwargs)
 
1375
        exitstatus = self.last_checker_status
 
1376
        if exitstatus >= 0:
1342
1377
            # Emit D-Bus signal
1343
1378
            self.CheckerCompleted(dbus.Int16(exitstatus),
1344
 
                                  dbus.Int64(condition),
 
1379
                                  dbus.Int64(0),
1345
1380
                                  dbus.String(command))
1346
1381
        else:
1347
1382
            # Emit D-Bus signal
1348
1383
            self.CheckerCompleted(dbus.Int16(-1),
1349
 
                                  dbus.Int64(condition),
 
1384
                                  dbus.Int64(
 
1385
                                      self.last_checker_signal),
1350
1386
                                  dbus.String(command))
1351
 
        
1352
 
        return Client.checker_callback(self, pid, condition, command,
1353
 
                                       *args, **kwargs)
 
1387
        return ret
1354
1388
    
1355
1389
    def start_checker(self, *args, **kwargs):
1356
1390
        old_checker_pid = getattr(self.checker, "pid", None)
1368
1402
    
1369
1403
    def approve(self, value=True):
1370
1404
        self.approved = value
1371
 
        gobject.timeout_add(timedelta_to_milliseconds
1372
 
                            (self.approval_duration),
1373
 
                            self._reset_approved)
 
1405
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1406
                                * 1000), self._reset_approved)
1374
1407
        self.send_changedstate()
1375
1408
    
1376
1409
    ## D-Bus methods, signals & properties
1377
 
    _interface = "se.recompile.Mandos.Client"
1378
1410
    
1379
1411
    ## Interfaces
1380
1412
    
1381
 
    @dbus_interface_annotations(_interface)
1382
 
    def _foo(self):
1383
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1384
 
                     "false"}
1385
 
    
1386
1413
    ## Signals
1387
1414
    
1388
1415
    # CheckerCompleted - signal
1398
1425
        pass
1399
1426
    
1400
1427
    # PropertyChanged - signal
 
1428
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1401
1429
    @dbus.service.signal(_interface, signature="sv")
1402
1430
    def PropertyChanged(self, property, value):
1403
1431
        "D-Bus signal"
1467
1495
        return dbus.Boolean(bool(self.approvals_pending))
1468
1496
    
1469
1497
    # ApprovedByDefault - property
1470
 
    @dbus_service_property(_interface, signature="b",
 
1498
    @dbus_service_property(_interface,
 
1499
                           signature="b",
1471
1500
                           access="readwrite")
1472
1501
    def ApprovedByDefault_dbus_property(self, value=None):
1473
1502
        if value is None:       # get
1475
1504
        self.approved_by_default = bool(value)
1476
1505
    
1477
1506
    # ApprovalDelay - property
1478
 
    @dbus_service_property(_interface, signature="t",
 
1507
    @dbus_service_property(_interface,
 
1508
                           signature="t",
1479
1509
                           access="readwrite")
1480
1510
    def ApprovalDelay_dbus_property(self, value=None):
1481
1511
        if value is None:       # get
1482
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1512
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1513
                               * 1000)
1483
1514
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1484
1515
    
1485
1516
    # ApprovalDuration - property
1486
 
    @dbus_service_property(_interface, signature="t",
 
1517
    @dbus_service_property(_interface,
 
1518
                           signature="t",
1487
1519
                           access="readwrite")
1488
1520
    def ApprovalDuration_dbus_property(self, value=None):
1489
1521
        if value is None:       # get
1490
 
            return dbus.UInt64(timedelta_to_milliseconds(
1491
 
                    self.approval_duration))
 
1522
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1523
                               * 1000)
1492
1524
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1493
1525
    
1494
1526
    # Name - property
1502
1534
        return dbus.String(self.fingerprint)
1503
1535
    
1504
1536
    # Host - property
1505
 
    @dbus_service_property(_interface, signature="s",
 
1537
    @dbus_service_property(_interface,
 
1538
                           signature="s",
1506
1539
                           access="readwrite")
1507
1540
    def Host_dbus_property(self, value=None):
1508
1541
        if value is None:       # get
1509
1542
            return dbus.String(self.host)
1510
 
        self.host = unicode(value)
 
1543
        self.host = str(value)
1511
1544
    
1512
1545
    # Created - property
1513
1546
    @dbus_service_property(_interface, signature="s", access="read")
1520
1553
        return datetime_to_dbus(self.last_enabled)
1521
1554
    
1522
1555
    # Enabled - property
1523
 
    @dbus_service_property(_interface, signature="b",
 
1556
    @dbus_service_property(_interface,
 
1557
                           signature="b",
1524
1558
                           access="readwrite")
1525
1559
    def Enabled_dbus_property(self, value=None):
1526
1560
        if value is None:       # get
1531
1565
            self.disable()
1532
1566
    
1533
1567
    # LastCheckedOK - property
1534
 
    @dbus_service_property(_interface, signature="s",
 
1568
    @dbus_service_property(_interface,
 
1569
                           signature="s",
1535
1570
                           access="readwrite")
1536
1571
    def LastCheckedOK_dbus_property(self, value=None):
1537
1572
        if value is not None:
1540
1575
        return datetime_to_dbus(self.last_checked_ok)
1541
1576
    
1542
1577
    # LastCheckerStatus - property
1543
 
    @dbus_service_property(_interface, signature="n",
1544
 
                           access="read")
 
1578
    @dbus_service_property(_interface, signature="n", access="read")
1545
1579
    def LastCheckerStatus_dbus_property(self):
1546
1580
        return dbus.Int16(self.last_checker_status)
1547
1581
    
1556
1590
        return datetime_to_dbus(self.last_approval_request)
1557
1591
    
1558
1592
    # Timeout - property
1559
 
    @dbus_service_property(_interface, signature="t",
 
1593
    @dbus_service_property(_interface,
 
1594
                           signature="t",
1560
1595
                           access="readwrite")
1561
1596
    def Timeout_dbus_property(self, value=None):
1562
1597
        if value is None:       # get
1563
 
            return dbus.UInt64(self.timeout_milliseconds())
 
1598
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
1564
1599
        old_timeout = self.timeout
1565
1600
        self.timeout = datetime.timedelta(0, 0, 0, value)
1566
1601
        # Reschedule disabling
1575
1610
                    is None):
1576
1611
                    return
1577
1612
                gobject.source_remove(self.disable_initiator_tag)
1578
 
                self.disable_initiator_tag = (
1579
 
                    gobject.timeout_add(
1580
 
                        timedelta_to_milliseconds(self.expires - now),
1581
 
                        self.disable))
 
1613
                self.disable_initiator_tag = gobject.timeout_add(
 
1614
                    int((self.expires - now).total_seconds() * 1000),
 
1615
                    self.disable)
1582
1616
    
1583
1617
    # ExtendedTimeout - property
1584
 
    @dbus_service_property(_interface, signature="t",
 
1618
    @dbus_service_property(_interface,
 
1619
                           signature="t",
1585
1620
                           access="readwrite")
1586
1621
    def ExtendedTimeout_dbus_property(self, value=None):
1587
1622
        if value is None:       # get
1588
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1623
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1624
                               * 1000)
1589
1625
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1590
1626
    
1591
1627
    # Interval - property
1592
 
    @dbus_service_property(_interface, signature="t",
 
1628
    @dbus_service_property(_interface,
 
1629
                           signature="t",
1593
1630
                           access="readwrite")
1594
1631
    def Interval_dbus_property(self, value=None):
1595
1632
        if value is None:       # get
1596
 
            return dbus.UInt64(self.interval_milliseconds())
 
1633
            return dbus.UInt64(self.interval.total_seconds() * 1000)
1597
1634
        self.interval = datetime.timedelta(0, 0, 0, value)
1598
1635
        if getattr(self, "checker_initiator_tag", None) is None:
1599
1636
            return
1600
1637
        if self.enabled:
1601
1638
            # Reschedule checker run
1602
1639
            gobject.source_remove(self.checker_initiator_tag)
1603
 
            self.checker_initiator_tag = (gobject.timeout_add
1604
 
                                          (value, self.start_checker))
1605
 
            self.start_checker()    # Start one now, too
 
1640
            self.checker_initiator_tag = gobject.timeout_add(
 
1641
                value, self.start_checker)
 
1642
            self.start_checker() # Start one now, too
1606
1643
    
1607
1644
    # Checker - property
1608
 
    @dbus_service_property(_interface, signature="s",
 
1645
    @dbus_service_property(_interface,
 
1646
                           signature="s",
1609
1647
                           access="readwrite")
1610
1648
    def Checker_dbus_property(self, value=None):
1611
1649
        if value is None:       # get
1612
1650
            return dbus.String(self.checker_command)
1613
 
        self.checker_command = unicode(value)
 
1651
        self.checker_command = str(value)
1614
1652
    
1615
1653
    # CheckerRunning - property
1616
 
    @dbus_service_property(_interface, signature="b",
 
1654
    @dbus_service_property(_interface,
 
1655
                           signature="b",
1617
1656
                           access="readwrite")
1618
1657
    def CheckerRunning_dbus_property(self, value=None):
1619
1658
        if value is None:       # get
1629
1668
        return self.dbus_object_path # is already a dbus.ObjectPath
1630
1669
    
1631
1670
    # Secret = property
1632
 
    @dbus_service_property(_interface, signature="ay",
1633
 
                           access="write", byte_arrays=True)
 
1671
    @dbus_service_property(_interface,
 
1672
                           signature="ay",
 
1673
                           access="write",
 
1674
                           byte_arrays=True)
1634
1675
    def Secret_dbus_property(self, value):
1635
 
        self.secret = str(value)
 
1676
        self.secret = bytes(value)
1636
1677
    
1637
1678
    del _interface
1638
1679
 
1642
1683
        self._pipe = child_pipe
1643
1684
        self._pipe.send(('init', fpr, address))
1644
1685
        if not self._pipe.recv():
1645
 
            raise KeyError()
 
1686
            raise KeyError(fpr)
1646
1687
    
1647
1688
    def __getattribute__(self, name):
1648
1689
        if name == '_pipe':
1652
1693
        if data[0] == 'data':
1653
1694
            return data[1]
1654
1695
        if data[0] == 'function':
 
1696
            
1655
1697
            def func(*args, **kwargs):
1656
1698
                self._pipe.send(('funcall', name, args, kwargs))
1657
1699
                return self._pipe.recv()[1]
 
1700
            
1658
1701
            return func
1659
1702
    
1660
1703
    def __setattr__(self, name, value):
1672
1715
    def handle(self):
1673
1716
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1674
1717
            logger.info("TCP connection from: %s",
1675
 
                        unicode(self.client_address))
 
1718
                        str(self.client_address))
1676
1719
            logger.debug("Pipe FD: %d",
1677
1720
                         self.server.child_pipe.fileno())
1678
1721
            
1679
 
            session = (gnutls.connection
1680
 
                       .ClientSession(self.request,
1681
 
                                      gnutls.connection
1682
 
                                      .X509Credentials()))
 
1722
            session = gnutls.connection.ClientSession(
 
1723
                self.request, gnutls.connection .X509Credentials())
1683
1724
            
1684
1725
            # Note: gnutls.connection.X509Credentials is really a
1685
1726
            # generic GnuTLS certificate credentials object so long as
1694
1735
            priority = self.server.gnutls_priority
1695
1736
            if priority is None:
1696
1737
                priority = "NORMAL"
1697
 
            (gnutls.library.functions
1698
 
             .gnutls_priority_set_direct(session._c_object,
1699
 
                                         priority, None))
 
1738
            gnutls.library.functions.gnutls_priority_set_direct(
 
1739
                session._c_object, priority, None)
1700
1740
            
1701
1741
            # Start communication using the Mandos protocol
1702
1742
            # Get protocol number
1722
1762
            approval_required = False
1723
1763
            try:
1724
1764
                try:
1725
 
                    fpr = self.fingerprint(self.peer_certificate
1726
 
                                           (session))
 
1765
                    fpr = self.fingerprint(
 
1766
                        self.peer_certificate(session))
1727
1767
                except (TypeError,
1728
1768
                        gnutls.errors.GNUTLSError) as error:
1729
1769
                    logger.warning("Bad certificate: %s", error)
1744
1784
                while True:
1745
1785
                    if not client.enabled:
1746
1786
                        logger.info("Client %s is disabled",
1747
 
                                       client.name)
 
1787
                                    client.name)
1748
1788
                        if self.server.use_dbus:
1749
1789
                            # Emit D-Bus signal
1750
1790
                            client.Rejected("Disabled")
1759
1799
                        if self.server.use_dbus:
1760
1800
                            # Emit D-Bus signal
1761
1801
                            client.NeedApproval(
1762
 
                                client.approval_delay_milliseconds(),
1763
 
                                client.approved_by_default)
 
1802
                                client.approval_delay.total_seconds()
 
1803
                                * 1000, client.approved_by_default)
1764
1804
                    else:
1765
1805
                        logger.warning("Client %s was not approved",
1766
1806
                                       client.name)
1772
1812
                    #wait until timeout or approved
1773
1813
                    time = datetime.datetime.now()
1774
1814
                    client.changedstate.acquire()
1775
 
                    client.changedstate.wait(
1776
 
                        float(timedelta_to_milliseconds(delay)
1777
 
                              / 1000))
 
1815
                    client.changedstate.wait(delay.total_seconds())
1778
1816
                    client.changedstate.release()
1779
1817
                    time2 = datetime.datetime.now()
1780
1818
                    if (time2 - time) >= delay:
1799
1837
                        logger.warning("gnutls send failed",
1800
1838
                                       exc_info=error)
1801
1839
                        return
1802
 
                    logger.debug("Sent: %d, remaining: %d",
1803
 
                                 sent, len(client.secret)
1804
 
                                 - (sent_size + sent))
 
1840
                    logger.debug("Sent: %d, remaining: %d", sent,
 
1841
                                 len(client.secret) - (sent_size
 
1842
                                                       + sent))
1805
1843
                    sent_size += sent
1806
1844
                
1807
1845
                logger.info("Sending secret to %s", client.name)
1824
1862
    def peer_certificate(session):
1825
1863
        "Return the peer's OpenPGP certificate as a bytestring"
1826
1864
        # If not an OpenPGP certificate...
1827
 
        if (gnutls.library.functions
1828
 
            .gnutls_certificate_type_get(session._c_object)
 
1865
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
1866
                session._c_object)
1829
1867
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1830
1868
            # ...do the normal thing
1831
1869
            return session.peer_certificate
1845
1883
    def fingerprint(openpgp):
1846
1884
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1847
1885
        # New GnuTLS "datum" with the OpenPGP public key
1848
 
        datum = (gnutls.library.types
1849
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1850
 
                                             ctypes.POINTER
1851
 
                                             (ctypes.c_ubyte)),
1852
 
                                 ctypes.c_uint(len(openpgp))))
 
1886
        datum = gnutls.library.types.gnutls_datum_t(
 
1887
            ctypes.cast(ctypes.c_char_p(openpgp),
 
1888
                        ctypes.POINTER(ctypes.c_ubyte)),
 
1889
            ctypes.c_uint(len(openpgp)))
1853
1890
        # New empty GnuTLS certificate
1854
1891
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1855
 
        (gnutls.library.functions
1856
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
1892
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
1893
            ctypes.byref(crt))
1857
1894
        # Import the OpenPGP public key into the certificate
1858
 
        (gnutls.library.functions
1859
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1860
 
                                    gnutls.library.constants
1861
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
1895
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
1896
            crt, ctypes.byref(datum),
 
1897
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1862
1898
        # Verify the self signature in the key
1863
1899
        crtverify = ctypes.c_uint()
1864
 
        (gnutls.library.functions
1865
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
1866
 
                                         ctypes.byref(crtverify)))
 
1900
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
1901
            crt, 0, ctypes.byref(crtverify))
1867
1902
        if crtverify.value != 0:
1868
1903
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1869
 
            raise (gnutls.errors.CertificateSecurityError
1870
 
                   ("Verify failed"))
 
1904
            raise gnutls.errors.CertificateSecurityError(
 
1905
                "Verify failed")
1871
1906
        # New buffer for the fingerprint
1872
1907
        buf = ctypes.create_string_buffer(20)
1873
1908
        buf_len = ctypes.c_size_t()
1874
1909
        # Get the fingerprint from the certificate into the buffer
1875
 
        (gnutls.library.functions
1876
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1877
 
                                             ctypes.byref(buf_len)))
 
1910
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
1911
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
1878
1912
        # Deinit the certificate
1879
1913
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1880
1914
        # Convert the buffer to a Python bytestring
1886
1920
 
1887
1921
class MultiprocessingMixIn(object):
1888
1922
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1923
    
1889
1924
    def sub_process_main(self, request, address):
1890
1925
        try:
1891
1926
            self.finish_request(request, address)
1903
1938
 
1904
1939
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1905
1940
    """ adds a pipe to the MixIn """
 
1941
    
1906
1942
    def process_request(self, request, client_address):
1907
1943
        """Overrides and wraps the original process_request().
1908
1944
        
1929
1965
        interface:      None or a network interface name (string)
1930
1966
        use_ipv6:       Boolean; to use IPv6 or not
1931
1967
    """
 
1968
    
1932
1969
    def __init__(self, server_address, RequestHandlerClass,
1933
 
                 interface=None, use_ipv6=True, socketfd=None):
 
1970
                 interface=None,
 
1971
                 use_ipv6=True,
 
1972
                 socketfd=None):
1934
1973
        """If socketfd is set, use that file descriptor instead of
1935
1974
        creating a new one with socket.socket().
1936
1975
        """
1977
2016
                             self.interface)
1978
2017
            else:
1979
2018
                try:
1980
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1981
 
                                           SO_BINDTODEVICE,
1982
 
                                           str(self.interface + '\0'))
 
2019
                    self.socket.setsockopt(
 
2020
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2021
                        (self.interface + "\0").encode("utf-8"))
1983
2022
                except socket.error as error:
1984
2023
                    if error.errno == errno.EPERM:
1985
2024
                        logger.error("No permission to bind to"
2003
2042
                self.server_address = (any_address,
2004
2043
                                       self.server_address[1])
2005
2044
            elif not self.server_address[1]:
2006
 
                self.server_address = (self.server_address[0],
2007
 
                                       0)
 
2045
                self.server_address = (self.server_address[0], 0)
2008
2046
#                 if self.interface:
2009
2047
#                     self.server_address = (self.server_address[0],
2010
2048
#                                            0, # port
2024
2062
    
2025
2063
    Assumes a gobject.MainLoop event loop.
2026
2064
    """
 
2065
    
2027
2066
    def __init__(self, server_address, RequestHandlerClass,
2028
 
                 interface=None, use_ipv6=True, clients=None,
2029
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
2067
                 interface=None,
 
2068
                 use_ipv6=True,
 
2069
                 clients=None,
 
2070
                 gnutls_priority=None,
 
2071
                 use_dbus=True,
 
2072
                 socketfd=None):
2030
2073
        self.enabled = False
2031
2074
        self.clients = clients
2032
2075
        if self.clients is None:
2038
2081
                                interface = interface,
2039
2082
                                use_ipv6 = use_ipv6,
2040
2083
                                socketfd = socketfd)
 
2084
    
2041
2085
    def server_activate(self):
2042
2086
        if self.enabled:
2043
2087
            return socketserver.TCPServer.server_activate(self)
2047
2091
    
2048
2092
    def add_pipe(self, parent_pipe, proc):
2049
2093
        # Call "handle_ipc" for both data and EOF events
2050
 
        gobject.io_add_watch(parent_pipe.fileno(),
2051
 
                             gobject.IO_IN | gobject.IO_HUP,
2052
 
                             functools.partial(self.handle_ipc,
2053
 
                                               parent_pipe =
2054
 
                                               parent_pipe,
2055
 
                                               proc = proc))
 
2094
        gobject.io_add_watch(
 
2095
            parent_pipe.fileno(),
 
2096
            gobject.IO_IN | gobject.IO_HUP,
 
2097
            functools.partial(self.handle_ipc,
 
2098
                              parent_pipe = parent_pipe,
 
2099
                              proc = proc))
2056
2100
    
2057
 
    def handle_ipc(self, source, condition, parent_pipe=None,
2058
 
                   proc = None, client_object=None):
 
2101
    def handle_ipc(self, source, condition,
 
2102
                   parent_pipe=None,
 
2103
                   proc = None,
 
2104
                   client_object=None):
2059
2105
        # error, or the other end of multiprocessing.Pipe has closed
2060
2106
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2061
2107
            # Wait for other process to exit
2084
2130
                parent_pipe.send(False)
2085
2131
                return False
2086
2132
            
2087
 
            gobject.io_add_watch(parent_pipe.fileno(),
2088
 
                                 gobject.IO_IN | gobject.IO_HUP,
2089
 
                                 functools.partial(self.handle_ipc,
2090
 
                                                   parent_pipe =
2091
 
                                                   parent_pipe,
2092
 
                                                   proc = proc,
2093
 
                                                   client_object =
2094
 
                                                   client))
 
2133
            gobject.io_add_watch(
 
2134
                parent_pipe.fileno(),
 
2135
                gobject.IO_IN | gobject.IO_HUP,
 
2136
                functools.partial(self.handle_ipc,
 
2137
                                  parent_pipe = parent_pipe,
 
2138
                                  proc = proc,
 
2139
                                  client_object = client))
2095
2140
            parent_pipe.send(True)
2096
2141
            # remove the old hook in favor of the new above hook on
2097
2142
            # same fileno
2103
2148
            
2104
2149
            parent_pipe.send(('data', getattr(client_object,
2105
2150
                                              funcname)(*args,
2106
 
                                                         **kwargs)))
 
2151
                                                        **kwargs)))
2107
2152
        
2108
2153
        if command == 'getattr':
2109
2154
            attrname = request[1]
2110
 
            if callable(client_object.__getattribute__(attrname)):
2111
 
                parent_pipe.send(('function',))
 
2155
            if isinstance(client_object.__getattribute__(attrname),
 
2156
                          collections.Callable):
 
2157
                parent_pipe.send(('function', ))
2112
2158
            else:
2113
 
                parent_pipe.send(('data', client_object
2114
 
                                  .__getattribute__(attrname)))
 
2159
                parent_pipe.send((
 
2160
                    'data', client_object.__getattribute__(attrname)))
2115
2161
        
2116
2162
        if command == 'setattr':
2117
2163
            attrname = request[1]
2148
2194
    # avoid excessive use of external libraries.
2149
2195
    
2150
2196
    # New type for defining tokens, syntax, and semantics all-in-one
2151
 
    Token = collections.namedtuple("Token",
2152
 
                                   ("regexp", # To match token; if
2153
 
                                              # "value" is not None,
2154
 
                                              # must have a "group"
2155
 
                                              # containing digits
2156
 
                                    "value",  # datetime.timedelta or
2157
 
                                              # None
2158
 
                                    "followers")) # Tokens valid after
2159
 
                                                  # this token
 
2197
    Token = collections.namedtuple("Token", (
 
2198
        "regexp",  # To match token; if "value" is not None, must have
 
2199
                   # a "group" containing digits
 
2200
        "value",   # datetime.timedelta or None
 
2201
        "followers"))           # Tokens valid after this token
2160
2202
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2161
2203
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2162
2204
    token_end = Token(re.compile(r"$"), None, frozenset())
2163
2205
    token_second = Token(re.compile(r"(\d+)S"),
2164
2206
                         datetime.timedelta(seconds=1),
2165
 
                         frozenset((token_end,)))
 
2207
                         frozenset((token_end, )))
2166
2208
    token_minute = Token(re.compile(r"(\d+)M"),
2167
2209
                         datetime.timedelta(minutes=1),
2168
2210
                         frozenset((token_second, token_end)))
2184
2226
                       frozenset((token_month, token_end)))
2185
2227
    token_week = Token(re.compile(r"(\d+)W"),
2186
2228
                       datetime.timedelta(weeks=1),
2187
 
                       frozenset((token_end,)))
 
2229
                       frozenset((token_end, )))
2188
2230
    token_duration = Token(re.compile(r"P"), None,
2189
2231
                           frozenset((token_year, token_month,
2190
2232
                                      token_day, token_time,
2191
 
                                      token_week))),
 
2233
                                      token_week)))
2192
2234
    # Define starting values
2193
2235
    value = datetime.timedelta() # Value so far
2194
2236
    found_token = None
2195
 
    followers = frozenset(token_duration,) # Following valid tokens
 
2237
    followers = frozenset((token_duration, )) # Following valid tokens
2196
2238
    s = duration                # String left to parse
2197
2239
    # Loop until end token is found
2198
2240
    while found_token is not token_end:
2215
2257
                break
2216
2258
        else:
2217
2259
            # No currently valid tokens were found
2218
 
            raise ValueError("Invalid RFC 3339 duration")
 
2260
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2261
                             .format(duration))
2219
2262
    # End token found
2220
2263
    return value
2221
2264
 
2245
2288
    timevalue = datetime.timedelta(0)
2246
2289
    for s in interval.split():
2247
2290
        try:
2248
 
            suffix = unicode(s[-1])
 
2291
            suffix = s[-1]
2249
2292
            value = int(s[:-1])
2250
2293
            if suffix == "d":
2251
2294
                delta = datetime.timedelta(value)
2258
2301
            elif suffix == "w":
2259
2302
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2260
2303
            else:
2261
 
                raise ValueError("Unknown suffix {0!r}"
2262
 
                                 .format(suffix))
 
2304
                raise ValueError("Unknown suffix {!r}".format(suffix))
2263
2305
        except IndexError as e:
2264
2306
            raise ValueError(*(e.args))
2265
2307
        timevalue += delta
2282
2324
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2283
2325
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2284
2326
            raise OSError(errno.ENODEV,
2285
 
                          "{0} not a character device"
 
2327
                          "{} not a character device"
2286
2328
                          .format(os.devnull))
2287
2329
        os.dup2(null, sys.stdin.fileno())
2288
2330
        os.dup2(null, sys.stdout.fileno())
2298
2340
    
2299
2341
    parser = argparse.ArgumentParser()
2300
2342
    parser.add_argument("-v", "--version", action="version",
2301
 
                        version = "%(prog)s {0}".format(version),
 
2343
                        version = "%(prog)s {}".format(version),
2302
2344
                        help="show version number and exit")
2303
2345
    parser.add_argument("-i", "--interface", metavar="IF",
2304
2346
                        help="Bind to interface IF")
2354
2396
                        "port": "",
2355
2397
                        "debug": "False",
2356
2398
                        "priority":
2357
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2399
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2400
                        ":+SIGN-DSA-SHA256",
2358
2401
                        "servicename": "Mandos",
2359
2402
                        "use_dbus": "True",
2360
2403
                        "use_ipv6": "True",
2364
2407
                        "statedir": "/var/lib/mandos",
2365
2408
                        "foreground": "False",
2366
2409
                        "zeroconf": "True",
2367
 
                        }
 
2410
                    }
2368
2411
    
2369
2412
    # Parse config file for server-global settings
2370
2413
    server_config = configparser.SafeConfigParser(server_defaults)
2371
2414
    del server_defaults
2372
 
    server_config.read(os.path.join(options.configdir,
2373
 
                                    "mandos.conf"))
 
2415
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
2374
2416
    # Convert the SafeConfigParser object to a dict
2375
2417
    server_settings = server_config.defaults()
2376
2418
    # Use the appropriate methods on the non-string config options
2394
2436
    # Override the settings from the config file with command line
2395
2437
    # options, if set.
2396
2438
    for option in ("interface", "address", "port", "debug",
2397
 
                   "priority", "servicename", "configdir",
2398
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2399
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2439
                   "priority", "servicename", "configdir", "use_dbus",
 
2440
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2441
                   "socket", "foreground", "zeroconf"):
2400
2442
        value = getattr(options, option)
2401
2443
        if value is not None:
2402
2444
            server_settings[option] = value
2403
2445
    del options
2404
2446
    # Force all strings to be unicode
2405
2447
    for option in server_settings.keys():
2406
 
        if type(server_settings[option]) is str:
2407
 
            server_settings[option] = unicode(server_settings[option])
 
2448
        if isinstance(server_settings[option], bytes):
 
2449
            server_settings[option] = (server_settings[option]
 
2450
                                       .decode("utf-8"))
2408
2451
    # Force all boolean options to be boolean
2409
2452
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2410
2453
                   "foreground", "zeroconf"):
2416
2459
    
2417
2460
    ##################################################################
2418
2461
    
2419
 
    if (not server_settings["zeroconf"] and
2420
 
        not (server_settings["port"]
2421
 
             or server_settings["socket"] != "")):
2422
 
            parser.error("Needs port or socket to work without"
2423
 
                         " Zeroconf")
 
2462
    if (not server_settings["zeroconf"]
 
2463
        and not (server_settings["port"]
 
2464
                 or server_settings["socket"] != "")):
 
2465
        parser.error("Needs port or socket to work without Zeroconf")
2424
2466
    
2425
2467
    # For convenience
2426
2468
    debug = server_settings["debug"]
2442
2484
            initlogger(debug, level)
2443
2485
    
2444
2486
    if server_settings["servicename"] != "Mandos":
2445
 
        syslogger.setFormatter(logging.Formatter
2446
 
                               ('Mandos ({0}) [%(process)d]:'
2447
 
                                ' %(levelname)s: %(message)s'
2448
 
                                .format(server_settings
2449
 
                                        ["servicename"])))
 
2487
        syslogger.setFormatter(
 
2488
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2489
                              ' %(levelname)s: %(message)s'.format(
 
2490
                                  server_settings["servicename"])))
2450
2491
    
2451
2492
    # Parse config file with clients
2452
2493
    client_config = configparser.SafeConfigParser(Client
2460
2501
    socketfd = None
2461
2502
    if server_settings["socket"] != "":
2462
2503
        socketfd = server_settings["socket"]
2463
 
    tcp_server = MandosServer((server_settings["address"],
2464
 
                               server_settings["port"]),
2465
 
                              ClientHandler,
2466
 
                              interface=(server_settings["interface"]
2467
 
                                         or None),
2468
 
                              use_ipv6=use_ipv6,
2469
 
                              gnutls_priority=
2470
 
                              server_settings["priority"],
2471
 
                              use_dbus=use_dbus,
2472
 
                              socketfd=socketfd)
 
2504
    tcp_server = MandosServer(
 
2505
        (server_settings["address"], server_settings["port"]),
 
2506
        ClientHandler,
 
2507
        interface=(server_settings["interface"] or None),
 
2508
        use_ipv6=use_ipv6,
 
2509
        gnutls_priority=server_settings["priority"],
 
2510
        use_dbus=use_dbus,
 
2511
        socketfd=socketfd)
2473
2512
    if not foreground:
2474
2513
        pidfilename = "/run/mandos.pid"
2475
2514
        if not os.path.isdir("/run/."):
2476
2515
            pidfilename = "/var/run/mandos.pid"
2477
2516
        pidfile = None
2478
2517
        try:
2479
 
            pidfile = open(pidfilename, "w")
 
2518
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2480
2519
        except IOError as e:
2481
2520
            logger.error("Could not open file %r", pidfilename,
2482
2521
                         exc_info=e)
2509
2548
        def debug_gnutls(level, string):
2510
2549
            logger.debug("GnuTLS: %s", string[:-1])
2511
2550
        
2512
 
        (gnutls.library.functions
2513
 
         .gnutls_global_set_log_function(debug_gnutls))
 
2551
        gnutls.library.functions.gnutls_global_set_log_function(
 
2552
            debug_gnutls)
2514
2553
        
2515
2554
        # Redirect stdin so all checkers get /dev/null
2516
2555
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2536
2575
    if use_dbus:
2537
2576
        try:
2538
2577
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2539
 
                                            bus, do_not_queue=True)
2540
 
            old_bus_name = (dbus.service.BusName
2541
 
                            ("se.bsnet.fukt.Mandos", bus,
2542
 
                             do_not_queue=True))
2543
 
        except dbus.exceptions.NameExistsException as e:
 
2578
                                            bus,
 
2579
                                            do_not_queue=True)
 
2580
            old_bus_name = dbus.service.BusName(
 
2581
                "se.bsnet.fukt.Mandos", bus,
 
2582
                do_not_queue=True)
 
2583
        except dbus.exceptions.DBusException as e:
2544
2584
            logger.error("Disabling D-Bus:", exc_info=e)
2545
2585
            use_dbus = False
2546
2586
            server_settings["use_dbus"] = False
2547
2587
            tcp_server.use_dbus = False
2548
2588
    if zeroconf:
2549
2589
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2550
 
        service = AvahiServiceToSyslog(name =
2551
 
                                       server_settings["servicename"],
2552
 
                                       servicetype = "_mandos._tcp",
2553
 
                                       protocol = protocol, bus = bus)
 
2590
        service = AvahiServiceToSyslog(
 
2591
            name = server_settings["servicename"],
 
2592
            servicetype = "_mandos._tcp",
 
2593
            protocol = protocol,
 
2594
            bus = bus)
2554
2595
        if server_settings["interface"]:
2555
 
            service.interface = (if_nametoindex
2556
 
                                 (str(server_settings["interface"])))
 
2596
            service.interface = if_nametoindex(
 
2597
                server_settings["interface"].encode("utf-8"))
2557
2598
    
2558
2599
    global multiprocessing_manager
2559
2600
    multiprocessing_manager = multiprocessing.Manager()
2578
2619
    if server_settings["restore"]:
2579
2620
        try:
2580
2621
            with open(stored_state_path, "rb") as stored_state:
2581
 
                clients_data, old_client_settings = (pickle.load
2582
 
                                                     (stored_state))
 
2622
                clients_data, old_client_settings = pickle.load(
 
2623
                    stored_state)
2583
2624
            os.remove(stored_state_path)
2584
2625
        except IOError as e:
2585
2626
            if e.errno == errno.ENOENT:
2586
 
                logger.warning("Could not load persistent state: {0}"
2587
 
                                .format(os.strerror(e.errno)))
 
2627
                logger.warning("Could not load persistent state:"
 
2628
                               " {}".format(os.strerror(e.errno)))
2588
2629
            else:
2589
2630
                logger.critical("Could not load persistent state:",
2590
2631
                                exc_info=e)
2591
2632
                raise
2592
2633
        except EOFError as e:
2593
2634
            logger.warning("Could not load persistent state: "
2594
 
                           "EOFError:", exc_info=e)
 
2635
                           "EOFError:",
 
2636
                           exc_info=e)
2595
2637
    
2596
2638
    with PGPEngine() as pgp:
2597
 
        for client_name, client in clients_data.iteritems():
 
2639
        for client_name, client in clients_data.items():
2598
2640
            # Skip removed clients
2599
2641
            if client_name not in client_settings:
2600
2642
                continue
2609
2651
                    # For each value in new config, check if it
2610
2652
                    # differs from the old config value (Except for
2611
2653
                    # the "secret" attribute)
2612
 
                    if (name != "secret" and
2613
 
                        value != old_client_settings[client_name]
2614
 
                        [name]):
 
2654
                    if (name != "secret"
 
2655
                        and (value !=
 
2656
                             old_client_settings[client_name][name])):
2615
2657
                        client[name] = value
2616
2658
                except KeyError:
2617
2659
                    pass
2618
2660
            
2619
2661
            # Clients who has passed its expire date can still be
2620
 
            # enabled if its last checker was successful.  Clients
 
2662
            # enabled if its last checker was successful.  A Client
2621
2663
            # whose checker succeeded before we stored its state is
2622
2664
            # assumed to have successfully run all checkers during
2623
2665
            # downtime.
2625
2667
                if datetime.datetime.utcnow() >= client["expires"]:
2626
2668
                    if not client["last_checked_ok"]:
2627
2669
                        logger.warning(
2628
 
                            "disabling client {0} - Client never "
2629
 
                            "performed a successful checker"
2630
 
                            .format(client_name))
 
2670
                            "disabling client {} - Client never "
 
2671
                            "performed a successful checker".format(
 
2672
                                client_name))
2631
2673
                        client["enabled"] = False
2632
2674
                    elif client["last_checker_status"] != 0:
2633
2675
                        logger.warning(
2634
 
                            "disabling client {0} - Client "
2635
 
                            "last checker failed with error code {1}"
2636
 
                            .format(client_name,
2637
 
                                    client["last_checker_status"]))
 
2676
                            "disabling client {} - Client last"
 
2677
                            " checker failed with error code"
 
2678
                            " {}".format(
 
2679
                                client_name,
 
2680
                                client["last_checker_status"]))
2638
2681
                        client["enabled"] = False
2639
2682
                    else:
2640
 
                        client["expires"] = (datetime.datetime
2641
 
                                             .utcnow()
2642
 
                                             + client["timeout"])
 
2683
                        client["expires"] = (
 
2684
                            datetime.datetime.utcnow()
 
2685
                            + client["timeout"])
2643
2686
                        logger.debug("Last checker succeeded,"
2644
 
                                     " keeping {0} enabled"
2645
 
                                     .format(client_name))
 
2687
                                     " keeping {} enabled".format(
 
2688
                                         client_name))
2646
2689
            try:
2647
 
                client["secret"] = (
2648
 
                    pgp.decrypt(client["encrypted_secret"],
2649
 
                                client_settings[client_name]
2650
 
                                ["secret"]))
 
2690
                client["secret"] = pgp.decrypt(
 
2691
                    client["encrypted_secret"],
 
2692
                    client_settings[client_name]["secret"])
2651
2693
            except PGPError:
2652
2694
                # If decryption fails, we use secret from new settings
2653
 
                logger.debug("Failed to decrypt {0} old secret"
2654
 
                             .format(client_name))
2655
 
                client["secret"] = (
2656
 
                    client_settings[client_name]["secret"])
 
2695
                logger.debug("Failed to decrypt {} old secret".format(
 
2696
                    client_name))
 
2697
                client["secret"] = (client_settings[client_name]
 
2698
                                    ["secret"])
2657
2699
    
2658
2700
    # Add/remove clients based on new changes made to config
2659
2701
    for client_name in (set(old_client_settings)
2664
2706
        clients_data[client_name] = client_settings[client_name]
2665
2707
    
2666
2708
    # Create all client objects
2667
 
    for client_name, client in clients_data.iteritems():
 
2709
    for client_name, client in clients_data.items():
2668
2710
        tcp_server.clients[client_name] = client_class(
2669
 
            name = client_name, settings = client,
 
2711
            name = client_name,
 
2712
            settings = client,
2670
2713
            server_settings = server_settings)
2671
2714
    
2672
2715
    if not tcp_server.clients:
2674
2717
    
2675
2718
    if not foreground:
2676
2719
        if pidfile is not None:
 
2720
            pid = os.getpid()
2677
2721
            try:
2678
2722
                with pidfile:
2679
 
                    pid = os.getpid()
2680
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2723
                    print(pid, file=pidfile)
2681
2724
            except IOError:
2682
2725
                logger.error("Could not write to file %r with PID %d",
2683
2726
                             pidfilename, pid)
2688
2731
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2689
2732
    
2690
2733
    if use_dbus:
2691
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2692
 
                                        "se.bsnet.fukt.Mandos"})
 
2734
        
 
2735
        @alternate_dbus_interfaces(
 
2736
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2693
2737
        class MandosDBusService(DBusObjectWithProperties):
2694
2738
            """A D-Bus proxy object"""
 
2739
            
2695
2740
            def __init__(self):
2696
2741
                dbus.service.Object.__init__(self, bus, "/")
 
2742
            
2697
2743
            _interface = "se.recompile.Mandos"
2698
2744
            
2699
2745
            @dbus_interface_annotations(_interface)
2700
2746
            def _foo(self):
2701
 
                return { "org.freedesktop.DBus.Property"
2702
 
                         ".EmitsChangedSignal":
2703
 
                             "false"}
 
2747
                return {
 
2748
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2749
                    "false" }
2704
2750
            
2705
2751
            @dbus.service.signal(_interface, signature="o")
2706
2752
            def ClientAdded(self, objpath):
2720
2766
            @dbus.service.method(_interface, out_signature="ao")
2721
2767
            def GetAllClients(self):
2722
2768
                "D-Bus method"
2723
 
                return dbus.Array(c.dbus_object_path
2724
 
                                  for c in
 
2769
                return dbus.Array(c.dbus_object_path for c in
2725
2770
                                  tcp_server.clients.itervalues())
2726
2771
            
2727
2772
            @dbus.service.method(_interface,
2729
2774
            def GetAllClientsWithProperties(self):
2730
2775
                "D-Bus method"
2731
2776
                return dbus.Dictionary(
2732
 
                    ((c.dbus_object_path, c.GetAll(""))
2733
 
                     for c in tcp_server.clients.itervalues()),
 
2777
                    { c.dbus_object_path: c.GetAll("")
 
2778
                      for c in tcp_server.clients.itervalues() },
2734
2779
                    signature="oa{sv}")
2735
2780
            
2736
2781
            @dbus.service.method(_interface, in_signature="o")
2774
2819
                
2775
2820
                # A list of attributes that can not be pickled
2776
2821
                # + secret.
2777
 
                exclude = set(("bus", "changedstate", "secret",
2778
 
                               "checker", "server_settings"))
2779
 
                for name, typ in (inspect.getmembers
2780
 
                                  (dbus.service.Object)):
 
2822
                exclude = { "bus", "changedstate", "secret",
 
2823
                            "checker", "server_settings" }
 
2824
                for name, typ in inspect.getmembers(dbus.service
 
2825
                                                    .Object):
2781
2826
                    exclude.add(name)
2782
2827
                
2783
2828
                client_dict["encrypted_secret"] = (client
2790
2835
                del client_settings[client.name]["secret"]
2791
2836
        
2792
2837
        try:
2793
 
            with (tempfile.NamedTemporaryFile
2794
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2795
 
                   dir=os.path.dirname(stored_state_path),
2796
 
                   delete=False)) as stored_state:
 
2838
            with tempfile.NamedTemporaryFile(
 
2839
                    mode='wb',
 
2840
                    suffix=".pickle",
 
2841
                    prefix='clients-',
 
2842
                    dir=os.path.dirname(stored_state_path),
 
2843
                    delete=False) as stored_state:
2797
2844
                pickle.dump((clients, client_settings), stored_state)
2798
 
                tempname=stored_state.name
 
2845
                tempname = stored_state.name
2799
2846
            os.rename(tempname, stored_state_path)
2800
2847
        except (IOError, OSError) as e:
2801
2848
            if not debug:
2804
2851
                except NameError:
2805
2852
                    pass
2806
2853
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2807
 
                logger.warning("Could not save persistent state: {0}"
 
2854
                logger.warning("Could not save persistent state: {}"
2808
2855
                               .format(os.strerror(e.errno)))
2809
2856
            else:
2810
2857
                logger.warning("Could not save persistent state:",
2820
2867
            client.disable(quiet=True)
2821
2868
            if use_dbus:
2822
2869
                # Emit D-Bus signal
2823
 
                mandos_dbus_service.ClientRemoved(client
2824
 
                                                  .dbus_object_path,
2825
 
                                                  client.name)
 
2870
                mandos_dbus_service.ClientRemoved(
 
2871
                    client.dbus_object_path, client.name)
2826
2872
        client_settings.clear()
2827
2873
    
2828
2874
    atexit.register(cleanup)
2881
2927
    # Must run before the D-Bus bus name gets deregistered
2882
2928
    cleanup()
2883
2929
 
 
2930
 
2884
2931
if __name__ == '__main__':
2885
2932
    main()