/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: 2012-05-07 19:13:15 UTC
  • Revision ID: teddy@recompile.se-20120507191315-tbe55n4u1uq3l7ft
* mandos: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python2.7
 
1
#!/usr/bin/python
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-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 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
68
68
import binascii
69
69
import tempfile
70
70
import itertools
71
 
import collections
72
71
 
73
72
import dbus
74
73
import dbus.service
79
78
import ctypes.util
80
79
import xml.dom.minidom
81
80
import inspect
 
81
import GnuPGInterface
82
82
 
83
83
try:
84
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
88
    except ImportError:
89
89
        SO_BINDTODEVICE = None
90
90
 
91
 
version = "1.6.7"
 
91
version = "1.5.3"
92
92
stored_state_file = "clients.pickle"
93
93
 
94
94
logger = logging.getLogger()
95
 
syslogger = None
 
95
syslogger = (logging.handlers.SysLogHandler
 
96
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
97
              address = str("/dev/log")))
96
98
 
97
99
try:
98
100
    if_nametoindex = (ctypes.cdll.LoadLibrary
114
116
def initlogger(debug, level=logging.WARNING):
115
117
    """init logger and add loglevel"""
116
118
    
117
 
    global syslogger
118
 
    syslogger = (logging.handlers.SysLogHandler
119
 
                 (facility =
120
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
121
 
                  address = str("/dev/log")))
122
119
    syslogger.setFormatter(logging.Formatter
123
120
                           ('Mandos [%(process)d]: %(levelname)s:'
124
121
                            ' %(message)s'))
142
139
class PGPEngine(object):
143
140
    """A simple class for OpenPGP symmetric encryption & decryption"""
144
141
    def __init__(self):
 
142
        self.gnupg = GnuPGInterface.GnuPG()
145
143
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
146
 
        self.gnupgargs = ['--batch',
147
 
                          '--home', self.tempdir,
148
 
                          '--force-mdc',
149
 
                          '--quiet',
150
 
                          '--no-use-agent']
 
144
        self.gnupg = GnuPGInterface.GnuPG()
 
145
        self.gnupg.options.meta_interactive = False
 
146
        self.gnupg.options.homedir = self.tempdir
 
147
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
148
                                              '--quiet',
 
149
                                              '--no-use-agent'])
151
150
    
152
151
    def __enter__(self):
153
152
        return self
154
153
    
155
 
    def __exit__(self, exc_type, exc_value, traceback):
 
154
    def __exit__ (self, exc_type, exc_value, traceback):
156
155
        self._cleanup()
157
156
        return False
158
157
    
175
174
    def password_encode(self, password):
176
175
        # Passphrase can not be empty and can not contain newlines or
177
176
        # NUL bytes.  So we prefix it and hex encode it.
178
 
        encoded = b"mandos" + binascii.hexlify(password)
179
 
        if len(encoded) > 2048:
180
 
            # GnuPG can't handle long passwords, so encode differently
181
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
182
 
                       .replace(b"\n", b"\\n")
183
 
                       .replace(b"\0", b"\\x00"))
184
 
        return encoded
 
177
        return b"mandos" + binascii.hexlify(password)
185
178
    
186
179
    def encrypt(self, data, password):
187
 
        passphrase = self.password_encode(password)
188
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
189
 
                                         ) as passfile:
190
 
            passfile.write(passphrase)
191
 
            passfile.flush()
192
 
            proc = subprocess.Popen(['gpg', '--symmetric',
193
 
                                     '--passphrase-file',
194
 
                                     passfile.name]
195
 
                                    + self.gnupgargs,
196
 
                                    stdin = subprocess.PIPE,
197
 
                                    stdout = subprocess.PIPE,
198
 
                                    stderr = subprocess.PIPE)
199
 
            ciphertext, err = proc.communicate(input = data)
200
 
        if proc.returncode != 0:
201
 
            raise PGPError(err)
 
180
        self.gnupg.passphrase = self.password_encode(password)
 
181
        with open(os.devnull, "w") as devnull:
 
182
            try:
 
183
                proc = self.gnupg.run(['--symmetric'],
 
184
                                      create_fhs=['stdin', 'stdout'],
 
185
                                      attach_fhs={'stderr': devnull})
 
186
                with contextlib.closing(proc.handles['stdin']) as f:
 
187
                    f.write(data)
 
188
                with contextlib.closing(proc.handles['stdout']) as f:
 
189
                    ciphertext = f.read()
 
190
                proc.wait()
 
191
            except IOError as e:
 
192
                raise PGPError(e)
 
193
        self.gnupg.passphrase = None
202
194
        return ciphertext
203
195
    
204
196
    def decrypt(self, data, password):
205
 
        passphrase = self.password_encode(password)
206
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
207
 
                                         ) as passfile:
208
 
            passfile.write(passphrase)
209
 
            passfile.flush()
210
 
            proc = subprocess.Popen(['gpg', '--decrypt',
211
 
                                     '--passphrase-file',
212
 
                                     passfile.name]
213
 
                                    + self.gnupgargs,
214
 
                                    stdin = subprocess.PIPE,
215
 
                                    stdout = subprocess.PIPE,
216
 
                                    stderr = subprocess.PIPE)
217
 
            decrypted_plaintext, err = proc.communicate(input
218
 
                                                        = data)
219
 
        if proc.returncode != 0:
220
 
            raise PGPError(err)
 
197
        self.gnupg.passphrase = self.password_encode(password)
 
198
        with open(os.devnull, "w") as devnull:
 
199
            try:
 
200
                proc = self.gnupg.run(['--decrypt'],
 
201
                                      create_fhs=['stdin', 'stdout'],
 
202
                                      attach_fhs={'stderr': devnull})
 
203
                with contextlib.closing(proc.handles['stdin']) as f:
 
204
                    f.write(data)
 
205
                with contextlib.closing(proc.handles['stdout']) as f:
 
206
                    decrypted_plaintext = f.read()
 
207
                proc.wait()
 
208
            except IOError as e:
 
209
                raise PGPError(e)
 
210
        self.gnupg.passphrase = None
221
211
        return decrypted_plaintext
222
212
 
223
213
 
243
233
               Used to optionally bind to the specified interface.
244
234
    name: string; Example: 'Mandos'
245
235
    type: string; Example: '_mandos._tcp'.
246
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
236
                  See <http://www.dns-sd.org/ServiceTypes.html>
247
237
    port: integer; what port to announce
248
238
    TXT: list of strings; TXT record for the service
249
239
    domain: string; Domain to publish on, default to .local if empty.
338
328
        elif state == avahi.ENTRY_GROUP_FAILURE:
339
329
            logger.critical("Avahi: Error in group state changed %s",
340
330
                            unicode(error))
341
 
            raise AvahiGroupError("State changed: {!s}"
 
331
            raise AvahiGroupError("State changed: {0!s}"
342
332
                                  .format(error))
343
333
    
344
334
    def cleanup(self):
389
379
                                 self.server_state_changed)
390
380
        self.server_state_changed(self.server.GetState())
391
381
 
392
 
 
393
382
class AvahiServiceToSyslog(AvahiService):
394
383
    def rename(self):
395
384
        """Add the new name to the syslog messages"""
396
385
        ret = AvahiService.rename(self)
397
386
        syslogger.setFormatter(logging.Formatter
398
 
                               ('Mandos ({}) [%(process)d]:'
 
387
                               ('Mandos ({0}) [%(process)d]:'
399
388
                                ' %(levelname)s: %(message)s'
400
389
                                .format(self.name)))
401
390
        return ret
402
391
 
 
392
def timedelta_to_milliseconds(td):
 
393
    "Convert a datetime.timedelta() to milliseconds"
 
394
    return ((td.days * 24 * 60 * 60 * 1000)
 
395
            + (td.seconds * 1000)
 
396
            + (td.microseconds // 1000))
403
397
 
404
398
class Client(object):
405
399
    """A representation of a client host served by this server.
442
436
    runtime_expansions: Allowed attributes for runtime expansion.
443
437
    expires:    datetime.datetime(); time (UTC) when a client will be
444
438
                disabled, or None
445
 
    server_settings: The server_settings dict from main()
446
439
    """
447
440
    
448
441
    runtime_expansions = ("approval_delay", "approval_duration",
449
 
                          "created", "enabled", "expires",
450
 
                          "fingerprint", "host", "interval",
451
 
                          "last_approval_request", "last_checked_ok",
 
442
                          "created", "enabled", "fingerprint",
 
443
                          "host", "interval", "last_checked_ok",
452
444
                          "last_enabled", "name", "timeout")
453
 
    client_defaults = { "timeout": "PT5M",
454
 
                        "extended_timeout": "PT15M",
455
 
                        "interval": "PT2M",
 
445
    client_defaults = { "timeout": "5m",
 
446
                        "extended_timeout": "15m",
 
447
                        "interval": "2m",
456
448
                        "checker": "fping -q -- %%(host)s",
457
449
                        "host": "",
458
 
                        "approval_delay": "PT0S",
459
 
                        "approval_duration": "PT1S",
 
450
                        "approval_delay": "0s",
 
451
                        "approval_duration": "1s",
460
452
                        "approved_by_default": "True",
461
453
                        "enabled": "True",
462
454
                        }
463
455
    
 
456
    def timeout_milliseconds(self):
 
457
        "Return the 'timeout' attribute in milliseconds"
 
458
        return timedelta_to_milliseconds(self.timeout)
 
459
    
 
460
    def extended_timeout_milliseconds(self):
 
461
        "Return the 'extended_timeout' attribute in milliseconds"
 
462
        return timedelta_to_milliseconds(self.extended_timeout)
 
463
    
 
464
    def interval_milliseconds(self):
 
465
        "Return the 'interval' attribute in milliseconds"
 
466
        return timedelta_to_milliseconds(self.interval)
 
467
    
 
468
    def approval_delay_milliseconds(self):
 
469
        return timedelta_to_milliseconds(self.approval_delay)
 
470
    
464
471
    @staticmethod
465
472
    def config_parser(config):
466
473
        """Construct a new dict of client settings of this form:
491
498
                          "rb") as secfile:
492
499
                    client["secret"] = secfile.read()
493
500
            else:
494
 
                raise TypeError("No secret or secfile for section {}"
 
501
                raise TypeError("No secret or secfile for section {0}"
495
502
                                .format(section))
496
503
            client["timeout"] = string_to_delta(section["timeout"])
497
504
            client["extended_timeout"] = string_to_delta(
508
515
        
509
516
        return settings
510
517
    
511
 
    def __init__(self, settings, name = None, server_settings=None):
 
518
    def __init__(self, settings, name = None):
512
519
        self.name = name
513
 
        if server_settings is None:
514
 
            server_settings = {}
515
 
        self.server_settings = server_settings
516
520
        # adding all client settings
517
 
        for setting, value in settings.items():
 
521
        for setting, value in settings.iteritems():
518
522
            setattr(self, setting, value)
519
523
        
520
524
        if self.enabled:
568
572
        if getattr(self, "enabled", False):
569
573
            # Already enabled
570
574
            return
 
575
        self.send_changedstate()
571
576
        self.expires = datetime.datetime.utcnow() + self.timeout
572
577
        self.enabled = True
573
578
        self.last_enabled = datetime.datetime.utcnow()
574
579
        self.init_checker()
575
 
        self.send_changedstate()
576
580
    
577
581
    def disable(self, quiet=True):
578
582
        """Disable this client."""
579
583
        if not getattr(self, "enabled", False):
580
584
            return False
581
585
        if not quiet:
 
586
            self.send_changedstate()
 
587
        if not quiet:
582
588
            logger.info("Disabling client %s", self.name)
583
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
589
        if getattr(self, "disable_initiator_tag", False):
584
590
            gobject.source_remove(self.disable_initiator_tag)
585
591
            self.disable_initiator_tag = None
586
592
        self.expires = None
587
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
593
        if getattr(self, "checker_initiator_tag", False):
588
594
            gobject.source_remove(self.checker_initiator_tag)
589
595
            self.checker_initiator_tag = None
590
596
        self.stop_checker()
591
597
        self.enabled = False
592
 
        if not quiet:
593
 
            self.send_changedstate()
594
598
        # Do not run this again if called by a gobject.timeout_add
595
599
        return False
596
600
    
600
604
    def init_checker(self):
601
605
        # Schedule a new checker to be started an 'interval' from now,
602
606
        # and every interval from then on.
603
 
        if self.checker_initiator_tag is not None:
604
 
            gobject.source_remove(self.checker_initiator_tag)
605
607
        self.checker_initiator_tag = (gobject.timeout_add
606
 
                                      (int(self.interval
607
 
                                           .total_seconds() * 1000),
 
608
                                      (self.interval_milliseconds(),
608
609
                                       self.start_checker))
609
610
        # Schedule a disable() when 'timeout' has passed
610
 
        if self.disable_initiator_tag is not None:
611
 
            gobject.source_remove(self.disable_initiator_tag)
612
611
        self.disable_initiator_tag = (gobject.timeout_add
613
 
                                      (int(self.timeout
614
 
                                           .total_seconds() * 1000),
615
 
                                       self.disable))
 
612
                                   (self.timeout_milliseconds(),
 
613
                                    self.disable))
616
614
        # Also start a new checker *right now*.
617
615
        self.start_checker()
618
616
    
646
644
            timeout = self.timeout
647
645
        if self.disable_initiator_tag is not None:
648
646
            gobject.source_remove(self.disable_initiator_tag)
649
 
            self.disable_initiator_tag = None
650
647
        if getattr(self, "enabled", False):
651
648
            self.disable_initiator_tag = (gobject.timeout_add
652
 
                                          (int(timeout.total_seconds()
653
 
                                               * 1000), self.disable))
 
649
                                          (timedelta_to_milliseconds
 
650
                                           (timeout), self.disable))
654
651
            self.expires = datetime.datetime.utcnow() + timeout
655
652
    
656
653
    def need_approval(self):
673
670
        # If a checker exists, make sure it is not a zombie
674
671
        try:
675
672
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
676
 
        except AttributeError:
677
 
            pass
678
 
        except OSError as error:
679
 
            if error.errno != errno.ECHILD:
680
 
                raise
 
673
        except (AttributeError, OSError) as error:
 
674
            if (isinstance(error, OSError)
 
675
                and error.errno != errno.ECHILD):
 
676
                raise error
681
677
        else:
682
678
            if pid:
683
679
                logger.warning("Checker was a zombie")
686
682
                                      self.current_checker_command)
687
683
        # Start a new checker if needed
688
684
        if self.checker is None:
689
 
            # Escape attributes for the shell
690
 
            escaped_attrs = { attr:
691
 
                                  re.escape(unicode(getattr(self,
692
 
                                                            attr)))
693
 
                              for attr in self.runtime_expansions }
694
685
            try:
695
 
                command = self.checker_command % escaped_attrs
696
 
            except TypeError as error:
697
 
                logger.error('Could not format string "%s"',
698
 
                             self.checker_command, exc_info=error)
699
 
                return True # Try again later
 
686
                # In case checker_command has exactly one % operator
 
687
                command = self.checker_command % self.host
 
688
            except TypeError:
 
689
                # Escape attributes for the shell
 
690
                escaped_attrs = dict(
 
691
                    (attr,
 
692
                     re.escape(unicode(str(getattr(self, attr, "")),
 
693
                                       errors=
 
694
                                       'replace')))
 
695
                    for attr in
 
696
                    self.runtime_expansions)
 
697
                
 
698
                try:
 
699
                    command = self.checker_command % escaped_attrs
 
700
                except TypeError as error:
 
701
                    logger.error('Could not format string "%s"',
 
702
                                 self.checker_command, exc_info=error)
 
703
                    return True # Try again later
700
704
            self.current_checker_command = command
701
705
            try:
702
706
                logger.info("Starting checker %r for %s",
705
709
                # in normal mode, that is already done by daemon(),
706
710
                # and in debug mode we don't want to.  (Stdin is
707
711
                # always replaced by /dev/null.)
708
 
                # The exception is when not debugging but nevertheless
709
 
                # running in the foreground; use the previously
710
 
                # created wnull.
711
 
                popen_args = {}
712
 
                if (not self.server_settings["debug"]
713
 
                    and self.server_settings["foreground"]):
714
 
                    popen_args.update({"stdout": wnull,
715
 
                                       "stderr": wnull })
716
712
                self.checker = subprocess.Popen(command,
717
713
                                                close_fds=True,
718
 
                                                shell=True, cwd="/",
719
 
                                                **popen_args)
 
714
                                                shell=True, cwd="/")
 
715
                self.checker_callback_tag = (gobject.child_watch_add
 
716
                                             (self.checker.pid,
 
717
                                              self.checker_callback,
 
718
                                              data=command))
 
719
                # The checker may have completed before the gobject
 
720
                # watch was added.  Check for this.
 
721
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
722
                if pid:
 
723
                    gobject.source_remove(self.checker_callback_tag)
 
724
                    self.checker_callback(pid, status, command)
720
725
            except OSError as error:
721
726
                logger.error("Failed to start subprocess",
722
727
                             exc_info=error)
723
 
                return True
724
 
            self.checker_callback_tag = (gobject.child_watch_add
725
 
                                         (self.checker.pid,
726
 
                                          self.checker_callback,
727
 
                                          data=command))
728
 
            # The checker may have completed before the gobject
729
 
            # watch was added.  Check for this.
730
 
            try:
731
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
732
 
            except OSError as error:
733
 
                if error.errno == errno.ECHILD:
734
 
                    # This should never happen
735
 
                    logger.error("Child process vanished",
736
 
                                 exc_info=error)
737
 
                    return True
738
 
                raise
739
 
            if pid:
740
 
                gobject.source_remove(self.checker_callback_tag)
741
 
                self.checker_callback(pid, status, command)
742
728
        # Re-run this periodically if run by gobject.timeout_add
743
729
        return True
744
730
    
777
763
    # "Set" method, so we fail early here:
778
764
    if byte_arrays and signature != "ay":
779
765
        raise ValueError("Byte arrays not supported for non-'ay'"
780
 
                         " signature {!r}".format(signature))
 
766
                         " signature {0!r}".format(signature))
781
767
    def decorator(func):
782
768
        func._dbus_is_property = True
783
769
        func._dbus_interface = dbus_interface
862
848
        If called like _is_dbus_thing("method") it returns a function
863
849
        suitable for use as predicate to inspect.getmembers().
864
850
        """
865
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
851
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
866
852
                                   False)
867
853
    
868
854
    def _get_all_dbus_things(self, thing):
917
903
            # The byte_arrays option is not supported yet on
918
904
            # signatures other than "ay".
919
905
            if prop._dbus_signature != "ay":
920
 
                raise ValueError("Byte arrays not supported for non-"
921
 
                                 "'ay' signature {!r}"
922
 
                                 .format(prop._dbus_signature))
 
906
                raise ValueError
923
907
            value = dbus.ByteArray(b''.join(chr(byte)
924
908
                                            for byte in value))
925
909
        prop(value)
989
973
                                              (prop,
990
974
                                               "_dbus_annotations",
991
975
                                               {}))
992
 
                        for name, value in annots.items():
 
976
                        for name, value in annots.iteritems():
993
977
                            ann_tag = document.createElement(
994
978
                                "annotation")
995
979
                            ann_tag.setAttribute("name", name)
998
982
                # Add interface annotation tags
999
983
                for annotation, value in dict(
1000
984
                    itertools.chain.from_iterable(
1001
 
                        annotations().items()
 
985
                        annotations().iteritems()
1002
986
                        for name, annotations in
1003
987
                        self._get_all_dbus_things("interface")
1004
988
                        if name == if_tag.getAttribute("name")
1005
 
                        )).items():
 
989
                        )).iteritems():
1006
990
                    ann_tag = document.createElement("annotation")
1007
991
                    ann_tag.setAttribute("name", annotation)
1008
992
                    ann_tag.setAttribute("value", value)
1031
1015
        return xmlstring
1032
1016
 
1033
1017
 
1034
 
def datetime_to_dbus(dt, variant_level=0):
 
1018
def datetime_to_dbus (dt, variant_level=0):
1035
1019
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1036
1020
    if dt is None:
1037
1021
        return dbus.String("", variant_level = variant_level)
1045
1029
    interface names according to the "alt_interface_names" mapping.
1046
1030
    Usage:
1047
1031
    
1048
 
    @alternate_dbus_interfaces({"org.example.Interface":
1049
 
                                    "net.example.AlternateInterface"})
 
1032
    @alternate_dbus_names({"org.example.Interface":
 
1033
                               "net.example.AlternateInterface"})
1050
1034
    class SampleDBusObject(dbus.service.Object):
1051
1035
        @dbus.service.method("org.example.Interface")
1052
1036
        def SampleDBusMethod():
1064
1048
    """
1065
1049
    def wrapper(cls):
1066
1050
        for orig_interface_name, alt_interface_name in (
1067
 
            alt_interface_names.items()):
 
1051
            alt_interface_names.iteritems()):
1068
1052
            attr = {}
1069
1053
            interface_names = set()
1070
1054
            # Go though all attributes of the class
1083
1067
                interface_names.add(alt_interface)
1084
1068
                # Is this a D-Bus signal?
1085
1069
                if getattr(attribute, "_dbus_is_signal", False):
1086
 
                    # Extract the original non-method undecorated
1087
 
                    # function by black magic
 
1070
                    # Extract the original non-method function by
 
1071
                    # black magic
1088
1072
                    nonmethod_func = (dict(
1089
1073
                            zip(attribute.func_code.co_freevars,
1090
1074
                                attribute.__closure__))["func"]
1187
1171
                                        attribute.func_closure)))
1188
1172
            if deprecate:
1189
1173
                # Deprecate all alternate interfaces
1190
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1174
                iname="_AlternateDBusNames_interface_annotation{0}"
1191
1175
                for interface_name in interface_names:
1192
1176
                    @dbus_interface_annotations(interface_name)
1193
1177
                    def func(self):
1202
1186
            if interface_names:
1203
1187
                # Replace the class with a new subclass of it with
1204
1188
                # methods, signals, etc. as created above.
1205
 
                cls = type(b"{}Alternate".format(cls.__name__),
 
1189
                cls = type(b"{0}Alternate".format(cls.__name__),
1206
1190
                           (cls,), attr)
1207
1191
        return cls
1208
1192
    return wrapper
1249
1233
                   to the D-Bus.  Default: no transform
1250
1234
        variant_level: D-Bus variant level.  Default: 1
1251
1235
        """
1252
 
        attrname = "_{}".format(dbus_name)
 
1236
        attrname = "_{0}".format(dbus_name)
1253
1237
        def setter(self, value):
1254
1238
            if hasattr(self, "dbus_object_path"):
1255
1239
                if (not hasattr(self, attrname) or
1285
1269
    approval_delay = notifychangeproperty(dbus.UInt64,
1286
1270
                                          "ApprovalDelay",
1287
1271
                                          type_func =
1288
 
                                          lambda td: td.total_seconds()
1289
 
                                          * 1000)
 
1272
                                          timedelta_to_milliseconds)
1290
1273
    approval_duration = notifychangeproperty(
1291
1274
        dbus.UInt64, "ApprovalDuration",
1292
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1275
        type_func = timedelta_to_milliseconds)
1293
1276
    host = notifychangeproperty(dbus.String, "Host")
1294
1277
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1295
 
                                   type_func = lambda td:
1296
 
                                       td.total_seconds() * 1000)
 
1278
                                   type_func =
 
1279
                                   timedelta_to_milliseconds)
1297
1280
    extended_timeout = notifychangeproperty(
1298
1281
        dbus.UInt64, "ExtendedTimeout",
1299
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1282
        type_func = timedelta_to_milliseconds)
1300
1283
    interval = notifychangeproperty(dbus.UInt64,
1301
1284
                                    "Interval",
1302
1285
                                    type_func =
1303
 
                                    lambda td: td.total_seconds()
1304
 
                                    * 1000)
 
1286
                                    timedelta_to_milliseconds)
1305
1287
    checker_command = notifychangeproperty(dbus.String, "Checker")
1306
1288
    
1307
1289
    del notifychangeproperty
1335
1317
                                       *args, **kwargs)
1336
1318
    
1337
1319
    def start_checker(self, *args, **kwargs):
1338
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1320
        old_checker = self.checker
 
1321
        if self.checker is not None:
 
1322
            old_checker_pid = self.checker.pid
 
1323
        else:
 
1324
            old_checker_pid = None
1339
1325
        r = Client.start_checker(self, *args, **kwargs)
1340
1326
        # Only if new checker process was started
1341
1327
        if (self.checker is not None
1349
1335
        return False
1350
1336
    
1351
1337
    def approve(self, value=True):
 
1338
        self.send_changedstate()
1352
1339
        self.approved = value
1353
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1354
 
                                * 1000), self._reset_approved)
1355
 
        self.send_changedstate()
 
1340
        gobject.timeout_add(timedelta_to_milliseconds
 
1341
                            (self.approval_duration),
 
1342
                            self._reset_approved)
1356
1343
    
1357
1344
    ## D-Bus methods, signals & properties
1358
1345
    _interface = "se.recompile.Mandos.Client"
1460
1447
                           access="readwrite")
1461
1448
    def ApprovalDelay_dbus_property(self, value=None):
1462
1449
        if value is None:       # get
1463
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1464
 
                               * 1000)
 
1450
            return dbus.UInt64(self.approval_delay_milliseconds())
1465
1451
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1466
1452
    
1467
1453
    # ApprovalDuration - property
1469
1455
                           access="readwrite")
1470
1456
    def ApprovalDuration_dbus_property(self, value=None):
1471
1457
        if value is None:       # get
1472
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1473
 
                               * 1000)
 
1458
            return dbus.UInt64(timedelta_to_milliseconds(
 
1459
                    self.approval_duration))
1474
1460
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1475
1461
    
1476
1462
    # Name - property
1542
1528
                           access="readwrite")
1543
1529
    def Timeout_dbus_property(self, value=None):
1544
1530
        if value is None:       # get
1545
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
1546
 
        old_timeout = self.timeout
 
1531
            return dbus.UInt64(self.timeout_milliseconds())
1547
1532
        self.timeout = datetime.timedelta(0, 0, 0, value)
1548
 
        # Reschedule disabling
 
1533
        # Reschedule timeout
1549
1534
        if self.enabled:
1550
1535
            now = datetime.datetime.utcnow()
1551
 
            self.expires += self.timeout - old_timeout
1552
 
            if self.expires <= now:
 
1536
            time_to_die = timedelta_to_milliseconds(
 
1537
                (self.last_checked_ok + self.timeout) - now)
 
1538
            if time_to_die <= 0:
1553
1539
                # The timeout has passed
1554
1540
                self.disable()
1555
1541
            else:
 
1542
                self.expires = (now +
 
1543
                                datetime.timedelta(milliseconds =
 
1544
                                                   time_to_die))
1556
1545
                if (getattr(self, "disable_initiator_tag", None)
1557
1546
                    is None):
1558
1547
                    return
1559
1548
                gobject.source_remove(self.disable_initiator_tag)
1560
 
                self.disable_initiator_tag = (
1561
 
                    gobject.timeout_add(
1562
 
                        int((self.expires - now).total_seconds()
1563
 
                            * 1000), self.disable))
 
1549
                self.disable_initiator_tag = (gobject.timeout_add
 
1550
                                              (time_to_die,
 
1551
                                               self.disable))
1564
1552
    
1565
1553
    # ExtendedTimeout - property
1566
1554
    @dbus_service_property(_interface, signature="t",
1567
1555
                           access="readwrite")
1568
1556
    def ExtendedTimeout_dbus_property(self, value=None):
1569
1557
        if value is None:       # get
1570
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1571
 
                               * 1000)
 
1558
            return dbus.UInt64(self.extended_timeout_milliseconds())
1572
1559
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1573
1560
    
1574
1561
    # Interval - property
1576
1563
                           access="readwrite")
1577
1564
    def Interval_dbus_property(self, value=None):
1578
1565
        if value is None:       # get
1579
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1566
            return dbus.UInt64(self.interval_milliseconds())
1580
1567
        self.interval = datetime.timedelta(0, 0, 0, value)
1581
1568
        if getattr(self, "checker_initiator_tag", None) is None:
1582
1569
            return
1687
1674
            logger.debug("Protocol version: %r", line)
1688
1675
            try:
1689
1676
                if int(line.strip().split()[0]) > 1:
1690
 
                    raise RuntimeError(line)
 
1677
                    raise RuntimeError
1691
1678
            except (ValueError, IndexError, RuntimeError) as error:
1692
1679
                logger.error("Unknown protocol version: %s", error)
1693
1680
                return
1742
1729
                        if self.server.use_dbus:
1743
1730
                            # Emit D-Bus signal
1744
1731
                            client.NeedApproval(
1745
 
                                client.approval_delay.total_seconds()
1746
 
                                * 1000, client.approved_by_default)
 
1732
                                client.approval_delay_milliseconds(),
 
1733
                                client.approved_by_default)
1747
1734
                    else:
1748
1735
                        logger.warning("Client %s was not approved",
1749
1736
                                       client.name)
1755
1742
                    #wait until timeout or approved
1756
1743
                    time = datetime.datetime.now()
1757
1744
                    client.changedstate.acquire()
1758
 
                    client.changedstate.wait(delay.total_seconds())
 
1745
                    (client.changedstate.wait
 
1746
                     (float(client.timedelta_to_milliseconds(delay)
 
1747
                            / 1000)))
1759
1748
                    client.changedstate.release()
1760
1749
                    time2 = datetime.datetime.now()
1761
1750
                    if (time2 - time) >= delay:
1898
1887
    
1899
1888
    def add_pipe(self, parent_pipe, proc):
1900
1889
        """Dummy function; override as necessary"""
1901
 
        raise NotImplementedError()
 
1890
        raise NotImplementedError
1902
1891
 
1903
1892
 
1904
1893
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1911
1900
        use_ipv6:       Boolean; to use IPv6 or not
1912
1901
    """
1913
1902
    def __init__(self, server_address, RequestHandlerClass,
1914
 
                 interface=None, use_ipv6=True, socketfd=None):
1915
 
        """If socketfd is set, use that file descriptor instead of
1916
 
        creating a new one with socket.socket().
1917
 
        """
 
1903
                 interface=None, use_ipv6=True):
1918
1904
        self.interface = interface
1919
1905
        if use_ipv6:
1920
1906
            self.address_family = socket.AF_INET6
1921
 
        if socketfd is not None:
1922
 
            # Save the file descriptor
1923
 
            self.socketfd = socketfd
1924
 
            # Save the original socket.socket() function
1925
 
            self.socket_socket = socket.socket
1926
 
            # To implement --socket, we monkey patch socket.socket.
1927
 
            # 
1928
 
            # (When socketserver.TCPServer is a new-style class, we
1929
 
            # could make self.socket into a property instead of monkey
1930
 
            # patching socket.socket.)
1931
 
            # 
1932
 
            # Create a one-time-only replacement for socket.socket()
1933
 
            @functools.wraps(socket.socket)
1934
 
            def socket_wrapper(*args, **kwargs):
1935
 
                # Restore original function so subsequent calls are
1936
 
                # not affected.
1937
 
                socket.socket = self.socket_socket
1938
 
                del self.socket_socket
1939
 
                # This time only, return a new socket object from the
1940
 
                # saved file descriptor.
1941
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1942
 
            # Replace socket.socket() function with wrapper
1943
 
            socket.socket = socket_wrapper
1944
 
        # The socketserver.TCPServer.__init__ will call
1945
 
        # socket.socket(), which might be our replacement,
1946
 
        # socket_wrapper(), if socketfd was set.
1947
1907
        socketserver.TCPServer.__init__(self, server_address,
1948
1908
                                        RequestHandlerClass)
1949
 
    
1950
1909
    def server_bind(self):
1951
1910
        """This overrides the normal server_bind() function
1952
1911
        to bind to an interface if one was specified, and also NOT to
1960
1919
                try:
1961
1920
                    self.socket.setsockopt(socket.SOL_SOCKET,
1962
1921
                                           SO_BINDTODEVICE,
1963
 
                                           str(self.interface + '\0'))
 
1922
                                           str(self.interface
 
1923
                                               + '\0'))
1964
1924
                except socket.error as error:
1965
 
                    if error.errno == errno.EPERM:
1966
 
                        logger.error("No permission to bind to"
1967
 
                                     " interface %s", self.interface)
1968
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1925
                    if error[0] == errno.EPERM:
 
1926
                        logger.error("No permission to"
 
1927
                                     " bind to interface %s",
 
1928
                                     self.interface)
 
1929
                    elif error[0] == errno.ENOPROTOOPT:
1969
1930
                        logger.error("SO_BINDTODEVICE not available;"
1970
1931
                                     " cannot bind to interface %s",
1971
1932
                                     self.interface)
1972
 
                    elif error.errno == errno.ENODEV:
1973
 
                        logger.error("Interface %s does not exist,"
1974
 
                                     " cannot bind", self.interface)
1975
1933
                    else:
1976
1934
                        raise
1977
1935
        # Only bind(2) the socket if we really need to.
1980
1938
                if self.address_family == socket.AF_INET6:
1981
1939
                    any_address = "::" # in6addr_any
1982
1940
                else:
1983
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1941
                    any_address = socket.INADDR_ANY
1984
1942
                self.server_address = (any_address,
1985
1943
                                       self.server_address[1])
1986
1944
            elif not self.server_address[1]:
2007
1965
    """
2008
1966
    def __init__(self, server_address, RequestHandlerClass,
2009
1967
                 interface=None, use_ipv6=True, clients=None,
2010
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1968
                 gnutls_priority=None, use_dbus=True):
2011
1969
        self.enabled = False
2012
1970
        self.clients = clients
2013
1971
        if self.clients is None:
2017
1975
        IPv6_TCPServer.__init__(self, server_address,
2018
1976
                                RequestHandlerClass,
2019
1977
                                interface = interface,
2020
 
                                use_ipv6 = use_ipv6,
2021
 
                                socketfd = socketfd)
 
1978
                                use_ipv6 = use_ipv6)
2022
1979
    def server_activate(self):
2023
1980
        if self.enabled:
2024
1981
            return socketserver.TCPServer.server_activate(self)
2102
2059
        return True
2103
2060
 
2104
2061
 
2105
 
def rfc3339_duration_to_delta(duration):
2106
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2107
 
    
2108
 
    >>> rfc3339_duration_to_delta("P7D")
2109
 
    datetime.timedelta(7)
2110
 
    >>> rfc3339_duration_to_delta("PT60S")
2111
 
    datetime.timedelta(0, 60)
2112
 
    >>> rfc3339_duration_to_delta("PT60M")
2113
 
    datetime.timedelta(0, 3600)
2114
 
    >>> rfc3339_duration_to_delta("PT24H")
2115
 
    datetime.timedelta(1)
2116
 
    >>> rfc3339_duration_to_delta("P1W")
2117
 
    datetime.timedelta(7)
2118
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2119
 
    datetime.timedelta(0, 330)
2120
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2121
 
    datetime.timedelta(1, 200)
2122
 
    """
2123
 
    
2124
 
    # Parsing an RFC 3339 duration with regular expressions is not
2125
 
    # possible - there would have to be multiple places for the same
2126
 
    # values, like seconds.  The current code, while more esoteric, is
2127
 
    # cleaner without depending on a parsing library.  If Python had a
2128
 
    # built-in library for parsing we would use it, but we'd like to
2129
 
    # avoid excessive use of external libraries.
2130
 
    
2131
 
    # New type for defining tokens, syntax, and semantics all-in-one
2132
 
    Token = collections.namedtuple("Token",
2133
 
                                   ("regexp", # To match token; if
2134
 
                                              # "value" is not None,
2135
 
                                              # must have a "group"
2136
 
                                              # containing digits
2137
 
                                    "value",  # datetime.timedelta or
2138
 
                                              # None
2139
 
                                    "followers")) # Tokens valid after
2140
 
                                                  # this token
2141
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2142
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2143
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2144
 
    token_second = Token(re.compile(r"(\d+)S"),
2145
 
                         datetime.timedelta(seconds=1),
2146
 
                         frozenset((token_end,)))
2147
 
    token_minute = Token(re.compile(r"(\d+)M"),
2148
 
                         datetime.timedelta(minutes=1),
2149
 
                         frozenset((token_second, token_end)))
2150
 
    token_hour = Token(re.compile(r"(\d+)H"),
2151
 
                       datetime.timedelta(hours=1),
2152
 
                       frozenset((token_minute, token_end)))
2153
 
    token_time = Token(re.compile(r"T"),
2154
 
                       None,
2155
 
                       frozenset((token_hour, token_minute,
2156
 
                                  token_second)))
2157
 
    token_day = Token(re.compile(r"(\d+)D"),
2158
 
                      datetime.timedelta(days=1),
2159
 
                      frozenset((token_time, token_end)))
2160
 
    token_month = Token(re.compile(r"(\d+)M"),
2161
 
                        datetime.timedelta(weeks=4),
2162
 
                        frozenset((token_day, token_end)))
2163
 
    token_year = Token(re.compile(r"(\d+)Y"),
2164
 
                       datetime.timedelta(weeks=52),
2165
 
                       frozenset((token_month, token_end)))
2166
 
    token_week = Token(re.compile(r"(\d+)W"),
2167
 
                       datetime.timedelta(weeks=1),
2168
 
                       frozenset((token_end,)))
2169
 
    token_duration = Token(re.compile(r"P"), None,
2170
 
                           frozenset((token_year, token_month,
2171
 
                                      token_day, token_time,
2172
 
                                      token_week)))
2173
 
    # Define starting values
2174
 
    value = datetime.timedelta() # Value so far
2175
 
    found_token = None
2176
 
    followers = frozenset((token_duration,)) # Following valid tokens
2177
 
    s = duration                # String left to parse
2178
 
    # Loop until end token is found
2179
 
    while found_token is not token_end:
2180
 
        # Search for any currently valid tokens
2181
 
        for token in followers:
2182
 
            match = token.regexp.match(s)
2183
 
            if match is not None:
2184
 
                # Token found
2185
 
                if token.value is not None:
2186
 
                    # Value found, parse digits
2187
 
                    factor = int(match.group(1), 10)
2188
 
                    # Add to value so far
2189
 
                    value += factor * token.value
2190
 
                # Strip token from string
2191
 
                s = token.regexp.sub("", s, 1)
2192
 
                # Go to found token
2193
 
                found_token = token
2194
 
                # Set valid next tokens
2195
 
                followers = found_token.followers
2196
 
                break
2197
 
        else:
2198
 
            # No currently valid tokens were found
2199
 
            raise ValueError("Invalid RFC 3339 duration")
2200
 
    # End token found
2201
 
    return value
2202
 
 
2203
 
 
2204
2062
def string_to_delta(interval):
2205
2063
    """Parse a string and return a datetime.timedelta
2206
2064
    
2217
2075
    >>> string_to_delta('5m 30s')
2218
2076
    datetime.timedelta(0, 330)
2219
2077
    """
2220
 
    
2221
 
    try:
2222
 
        return rfc3339_duration_to_delta(interval)
2223
 
    except ValueError:
2224
 
        pass
2225
 
    
2226
2078
    timevalue = datetime.timedelta(0)
2227
2079
    for s in interval.split():
2228
2080
        try:
2239
2091
            elif suffix == "w":
2240
2092
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2241
2093
            else:
2242
 
                raise ValueError("Unknown suffix {!r}"
 
2094
                raise ValueError("Unknown suffix {0!r}"
2243
2095
                                 .format(suffix))
2244
 
        except IndexError as e:
 
2096
        except (ValueError, IndexError) as e:
2245
2097
            raise ValueError(*(e.args))
2246
2098
        timevalue += delta
2247
2099
    return timevalue
2262
2114
        # Close all standard open file descriptors
2263
2115
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2264
2116
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2265
 
            raise OSError(errno.ENODEV, "{} not a character device"
 
2117
            raise OSError(errno.ENODEV,
 
2118
                          "{0} not a character device"
2266
2119
                          .format(os.devnull))
2267
2120
        os.dup2(null, sys.stdin.fileno())
2268
2121
        os.dup2(null, sys.stdout.fileno())
2278
2131
    
2279
2132
    parser = argparse.ArgumentParser()
2280
2133
    parser.add_argument("-v", "--version", action="version",
2281
 
                        version = "%(prog)s {}".format(version),
 
2134
                        version = "%(prog)s {0}".format(version),
2282
2135
                        help="show version number and exit")
2283
2136
    parser.add_argument("-i", "--interface", metavar="IF",
2284
2137
                        help="Bind to interface IF")
2290
2143
                        help="Run self-test")
2291
2144
    parser.add_argument("--debug", action="store_true",
2292
2145
                        help="Debug mode; run in foreground and log"
2293
 
                        " to terminal", default=None)
 
2146
                        " to terminal")
2294
2147
    parser.add_argument("--debuglevel", metavar="LEVEL",
2295
2148
                        help="Debug level for stdout output")
2296
2149
    parser.add_argument("--priority", help="GnuTLS"
2303
2156
                        " files")
2304
2157
    parser.add_argument("--no-dbus", action="store_false",
2305
2158
                        dest="use_dbus", help="Do not provide D-Bus"
2306
 
                        " system bus interface", default=None)
 
2159
                        " system bus interface")
2307
2160
    parser.add_argument("--no-ipv6", action="store_false",
2308
 
                        dest="use_ipv6", help="Do not use IPv6",
2309
 
                        default=None)
 
2161
                        dest="use_ipv6", help="Do not use IPv6")
2310
2162
    parser.add_argument("--no-restore", action="store_false",
2311
2163
                        dest="restore", help="Do not restore stored"
2312
 
                        " state", default=None)
2313
 
    parser.add_argument("--socket", type=int,
2314
 
                        help="Specify a file descriptor to a network"
2315
 
                        " socket to use instead of creating one")
 
2164
                        " state")
2316
2165
    parser.add_argument("--statedir", metavar="DIR",
2317
2166
                        help="Directory to save/restore state in")
2318
 
    parser.add_argument("--foreground", action="store_true",
2319
 
                        help="Run in foreground", default=None)
2320
 
    parser.add_argument("--no-zeroconf", action="store_false",
2321
 
                        dest="zeroconf", help="Do not use Zeroconf",
2322
 
                        default=None)
2323
2167
    
2324
2168
    options = parser.parse_args()
2325
2169
    
2326
2170
    if options.check:
2327
2171
        import doctest
2328
 
        fail_count, test_count = doctest.testmod()
2329
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2172
        doctest.testmod()
 
2173
        sys.exit()
2330
2174
    
2331
2175
    # Default values for config file for server-global settings
2332
2176
    server_defaults = { "interface": "",
2334
2178
                        "port": "",
2335
2179
                        "debug": "False",
2336
2180
                        "priority":
2337
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2181
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2338
2182
                        "servicename": "Mandos",
2339
2183
                        "use_dbus": "True",
2340
2184
                        "use_ipv6": "True",
2341
2185
                        "debuglevel": "",
2342
2186
                        "restore": "True",
2343
 
                        "socket": "",
2344
 
                        "statedir": "/var/lib/mandos",
2345
 
                        "foreground": "False",
2346
 
                        "zeroconf": "True",
 
2187
                        "statedir": "/var/lib/mandos"
2347
2188
                        }
2348
2189
    
2349
2190
    # Parse config file for server-global settings
2354
2195
    # Convert the SafeConfigParser object to a dict
2355
2196
    server_settings = server_config.defaults()
2356
2197
    # Use the appropriate methods on the non-string config options
2357
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2198
    for option in ("debug", "use_dbus", "use_ipv6"):
2358
2199
        server_settings[option] = server_config.getboolean("DEFAULT",
2359
2200
                                                           option)
2360
2201
    if server_settings["port"]:
2361
2202
        server_settings["port"] = server_config.getint("DEFAULT",
2362
2203
                                                       "port")
2363
 
    if server_settings["socket"]:
2364
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2365
 
                                                         "socket")
2366
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2367
 
        # over with an opened os.devnull.  But we don't want this to
2368
 
        # happen with a supplied network socket.
2369
 
        if 0 <= server_settings["socket"] <= 2:
2370
 
            server_settings["socket"] = os.dup(server_settings
2371
 
                                               ["socket"])
2372
2204
    del server_config
2373
2205
    
2374
2206
    # Override the settings from the config file with command line
2376
2208
    for option in ("interface", "address", "port", "debug",
2377
2209
                   "priority", "servicename", "configdir",
2378
2210
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2379
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2211
                   "statedir"):
2380
2212
        value = getattr(options, option)
2381
2213
        if value is not None:
2382
2214
            server_settings[option] = value
2385
2217
    for option in server_settings.keys():
2386
2218
        if type(server_settings[option]) is str:
2387
2219
            server_settings[option] = unicode(server_settings[option])
2388
 
    # Force all boolean options to be boolean
2389
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2390
 
                   "foreground", "zeroconf"):
2391
 
        server_settings[option] = bool(server_settings[option])
2392
 
    # Debug implies foreground
2393
 
    if server_settings["debug"]:
2394
 
        server_settings["foreground"] = True
2395
2220
    # Now we have our good server settings in "server_settings"
2396
2221
    
2397
2222
    ##################################################################
2398
2223
    
2399
 
    if (not server_settings["zeroconf"] and
2400
 
        not (server_settings["port"]
2401
 
             or server_settings["socket"] != "")):
2402
 
            parser.error("Needs port or socket to work without"
2403
 
                         " Zeroconf")
2404
 
    
2405
2224
    # For convenience
2406
2225
    debug = server_settings["debug"]
2407
2226
    debuglevel = server_settings["debuglevel"]
2409
2228
    use_ipv6 = server_settings["use_ipv6"]
2410
2229
    stored_state_path = os.path.join(server_settings["statedir"],
2411
2230
                                     stored_state_file)
2412
 
    foreground = server_settings["foreground"]
2413
 
    zeroconf = server_settings["zeroconf"]
2414
2231
    
2415
2232
    if debug:
2416
2233
        initlogger(debug, logging.DEBUG)
2423
2240
    
2424
2241
    if server_settings["servicename"] != "Mandos":
2425
2242
        syslogger.setFormatter(logging.Formatter
2426
 
                               ('Mandos ({}) [%(process)d]:'
 
2243
                               ('Mandos ({0}) [%(process)d]:'
2427
2244
                                ' %(levelname)s: %(message)s'
2428
2245
                                .format(server_settings
2429
2246
                                        ["servicename"])))
2437
2254
    global mandos_dbus_service
2438
2255
    mandos_dbus_service = None
2439
2256
    
2440
 
    socketfd = None
2441
 
    if server_settings["socket"] != "":
2442
 
        socketfd = server_settings["socket"]
2443
2257
    tcp_server = MandosServer((server_settings["address"],
2444
2258
                               server_settings["port"]),
2445
2259
                              ClientHandler,
2448
2262
                              use_ipv6=use_ipv6,
2449
2263
                              gnutls_priority=
2450
2264
                              server_settings["priority"],
2451
 
                              use_dbus=use_dbus,
2452
 
                              socketfd=socketfd)
2453
 
    if not foreground:
2454
 
        pidfilename = "/run/mandos.pid"
2455
 
        if not os.path.isdir("/run/."):
2456
 
            pidfilename = "/var/run/mandos.pid"
2457
 
        pidfile = None
 
2265
                              use_dbus=use_dbus)
 
2266
    if not debug:
 
2267
        pidfilename = "/var/run/mandos.pid"
2458
2268
        try:
2459
2269
            pidfile = open(pidfilename, "w")
2460
2270
        except IOError as e:
2475
2285
        os.setgid(gid)
2476
2286
        os.setuid(uid)
2477
2287
    except OSError as error:
2478
 
        if error.errno != errno.EPERM:
2479
 
            raise
 
2288
        if error[0] != errno.EPERM:
 
2289
            raise error
2480
2290
    
2481
2291
    if debug:
2482
2292
        # Enable all possible GnuTLS debugging
2499
2309
            os.close(null)
2500
2310
    
2501
2311
    # Need to fork before connecting to D-Bus
2502
 
    if not foreground:
 
2312
    if not debug:
2503
2313
        # Close all input and output, do double fork, etc.
2504
2314
        daemon()
2505
2315
    
2506
 
    # multiprocessing will use threads, so before we use gobject we
2507
 
    # need to inform gobject that threads will be used.
2508
2316
    gobject.threads_init()
2509
2317
    
2510
2318
    global main_loop
2525
2333
            use_dbus = False
2526
2334
            server_settings["use_dbus"] = False
2527
2335
            tcp_server.use_dbus = False
2528
 
    if zeroconf:
2529
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2530
 
        service = AvahiServiceToSyslog(name =
2531
 
                                       server_settings["servicename"],
2532
 
                                       servicetype = "_mandos._tcp",
2533
 
                                       protocol = protocol, bus = bus)
2534
 
        if server_settings["interface"]:
2535
 
            service.interface = (if_nametoindex
2536
 
                                 (str(server_settings["interface"])))
 
2336
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2337
    service = AvahiServiceToSyslog(name =
 
2338
                                   server_settings["servicename"],
 
2339
                                   servicetype = "_mandos._tcp",
 
2340
                                   protocol = protocol, bus = bus)
 
2341
    if server_settings["interface"]:
 
2342
        service.interface = (if_nametoindex
 
2343
                             (str(server_settings["interface"])))
2537
2344
    
2538
2345
    global multiprocessing_manager
2539
2346
    multiprocessing_manager = multiprocessing.Manager()
2546
2353
    old_client_settings = {}
2547
2354
    clients_data = {}
2548
2355
    
2549
 
    # This is used to redirect stdout and stderr for checker processes
2550
 
    global wnull
2551
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2552
 
    # Only used if server is running in foreground but not in debug
2553
 
    # mode
2554
 
    if debug or not foreground:
2555
 
        wnull.close()
2556
 
    
2557
2356
    # Get client data and settings from last running state.
2558
2357
    if server_settings["restore"]:
2559
2358
        try:
2563
2362
            os.remove(stored_state_path)
2564
2363
        except IOError as e:
2565
2364
            if e.errno == errno.ENOENT:
2566
 
                logger.warning("Could not load persistent state: {}"
 
2365
                logger.warning("Could not load persistent state: {0}"
2567
2366
                                .format(os.strerror(e.errno)))
2568
2367
            else:
2569
2368
                logger.critical("Could not load persistent state:",
2574
2373
                           "EOFError:", exc_info=e)
2575
2374
    
2576
2375
    with PGPEngine() as pgp:
2577
 
        for client_name, client in clients_data.items():
2578
 
            # Skip removed clients
2579
 
            if client_name not in client_settings:
2580
 
                continue
2581
 
            
 
2376
        for client_name, client in clients_data.iteritems():
2582
2377
            # Decide which value to use after restoring saved state.
2583
2378
            # We have three different values: Old config file,
2584
2379
            # new config file, and saved state.
2605
2400
                if datetime.datetime.utcnow() >= client["expires"]:
2606
2401
                    if not client["last_checked_ok"]:
2607
2402
                        logger.warning(
2608
 
                            "disabling client {} - Client never "
 
2403
                            "disabling client {0} - Client never "
2609
2404
                            "performed a successful checker"
2610
2405
                            .format(client_name))
2611
2406
                        client["enabled"] = False
2612
2407
                    elif client["last_checker_status"] != 0:
2613
2408
                        logger.warning(
2614
 
                            "disabling client {} - Client last"
2615
 
                            " checker failed with error code {}"
 
2409
                            "disabling client {0} - Client "
 
2410
                            "last checker failed with error code {1}"
2616
2411
                            .format(client_name,
2617
2412
                                    client["last_checker_status"]))
2618
2413
                        client["enabled"] = False
2621
2416
                                             .utcnow()
2622
2417
                                             + client["timeout"])
2623
2418
                        logger.debug("Last checker succeeded,"
2624
 
                                     " keeping {} enabled"
 
2419
                                     " keeping {0} enabled"
2625
2420
                                     .format(client_name))
2626
2421
            try:
2627
2422
                client["secret"] = (
2630
2425
                                ["secret"]))
2631
2426
            except PGPError:
2632
2427
                # If decryption fails, we use secret from new settings
2633
 
                logger.debug("Failed to decrypt {} old secret"
 
2428
                logger.debug("Failed to decrypt {0} old secret"
2634
2429
                             .format(client_name))
2635
2430
                client["secret"] = (
2636
2431
                    client_settings[client_name]["secret"])
2644
2439
        clients_data[client_name] = client_settings[client_name]
2645
2440
    
2646
2441
    # Create all client objects
2647
 
    for client_name, client in clients_data.items():
 
2442
    for client_name, client in clients_data.iteritems():
2648
2443
        tcp_server.clients[client_name] = client_class(
2649
 
            name = client_name, settings = client,
2650
 
            server_settings = server_settings)
 
2444
            name = client_name, settings = client)
2651
2445
    
2652
2446
    if not tcp_server.clients:
2653
2447
        logger.warning("No clients defined")
2654
2448
    
2655
 
    if not foreground:
2656
 
        if pidfile is not None:
2657
 
            try:
2658
 
                with pidfile:
2659
 
                    pid = os.getpid()
2660
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2661
 
            except IOError:
2662
 
                logger.error("Could not write to file %r with PID %d",
2663
 
                             pidfilename, pid)
2664
 
        del pidfile
 
2449
    if not debug:
 
2450
        try:
 
2451
            with pidfile:
 
2452
                pid = os.getpid()
 
2453
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2454
            del pidfile
 
2455
        except IOError:
 
2456
            logger.error("Could not write to file %r with PID %d",
 
2457
                         pidfilename, pid)
 
2458
        except NameError:
 
2459
            # "pidfile" was never created
 
2460
            pass
2665
2461
        del pidfilename
 
2462
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2666
2463
    
2667
2464
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2668
2465
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2733
2530
    
2734
2531
    def cleanup():
2735
2532
        "Cleanup function; run on exit"
2736
 
        if zeroconf:
2737
 
            service.cleanup()
 
2533
        service.cleanup()
2738
2534
        
2739
2535
        multiprocessing.active_children()
2740
 
        wnull.close()
2741
2536
        if not (tcp_server.clients or client_settings):
2742
2537
            return
2743
2538
        
2754
2549
                
2755
2550
                # A list of attributes that can not be pickled
2756
2551
                # + secret.
2757
 
                exclude = { "bus", "changedstate", "secret",
2758
 
                            "checker", "server_settings" }
 
2552
                exclude = set(("bus", "changedstate", "secret",
 
2553
                               "checker"))
2759
2554
                for name, typ in (inspect.getmembers
2760
2555
                                  (dbus.service.Object)):
2761
2556
                    exclude.add(name)
2784
2579
                except NameError:
2785
2580
                    pass
2786
2581
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2787
 
                logger.warning("Could not save persistent state: {}"
 
2582
                logger.warning("Could not save persistent state: {0}"
2788
2583
                               .format(os.strerror(e.errno)))
2789
2584
            else:
2790
2585
                logger.warning("Could not save persistent state:",
2791
2586
                               exc_info=e)
2792
 
                raise
 
2587
                raise e
2793
2588
        
2794
2589
        # Delete all clients, and settings from config
2795
2590
        while tcp_server.clients:
2819
2614
    tcp_server.server_activate()
2820
2615
    
2821
2616
    # Find out what port we got
2822
 
    if zeroconf:
2823
 
        service.port = tcp_server.socket.getsockname()[1]
 
2617
    service.port = tcp_server.socket.getsockname()[1]
2824
2618
    if use_ipv6:
2825
2619
        logger.info("Now listening on address %r, port %d,"
2826
2620
                    " flowinfo %d, scope_id %d",
2832
2626
    #service.interface = tcp_server.socket.getsockname()[3]
2833
2627
    
2834
2628
    try:
2835
 
        if zeroconf:
2836
 
            # From the Avahi example code
2837
 
            try:
2838
 
                service.activate()
2839
 
            except dbus.exceptions.DBusException as error:
2840
 
                logger.critical("D-Bus Exception", exc_info=error)
2841
 
                cleanup()
2842
 
                sys.exit(1)
2843
 
            # End of Avahi example code
 
2629
        # From the Avahi example code
 
2630
        try:
 
2631
            service.activate()
 
2632
        except dbus.exceptions.DBusException as error:
 
2633
            logger.critical("D-Bus Exception", exc_info=error)
 
2634
            cleanup()
 
2635
            sys.exit(1)
 
2636
        # End of Avahi example code
2844
2637
        
2845
2638
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2846
2639
                             lambda *args, **kwargs: