/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: 2014-07-14 21:41:08 UTC
  • Revision ID: teddy@recompile.se-20140714214108-awg7u6gaiy7d40dz
mandos-monitor: New "verbose" mode to see less important log messages.

* mandos-monitor (MandosClientWidget.__init__): Log client creation.
  (MandosClientWidget.checker_completed): Log a successful checker.
  (MandosClientWidget.checker_started): Log starting of a checker.
  (UserInterface.__init__): New optional "log_level" argument.
  (UserInterface.log_message, UserInterface.log_message_raw): Take
                                                              optional
                                                              "level"
                                                              arg.
  (UserInterface.toggle_log_display): Log visibility change.
  (UserInterface.change_log_display): Log wrap mode change.
  (UserInterface.process_input): Show new "v" key in help message and
                                 process "v" key if pressed.
* mandos-monitor.xml (KEYS): Document new "v" key.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008-2014 Teddy Hogeborn
 
15
# Copyright © 2008-2014 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
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
 
37
from future_builtins import *
 
38
 
37
39
import SocketServer as socketserver
38
40
import socket
39
41
import argparse
66
68
import binascii
67
69
import tempfile
68
70
import itertools
 
71
import collections
69
72
 
70
73
import dbus
71
74
import dbus.service
76
79
import ctypes.util
77
80
import xml.dom.minidom
78
81
import inspect
79
 
import GnuPGInterface
80
82
 
81
83
try:
82
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
88
    except ImportError:
87
89
        SO_BINDTODEVICE = None
88
90
 
89
 
version = "1.5.3"
 
91
version = "1.6.6"
90
92
stored_state_file = "clients.pickle"
91
93
 
92
94
logger = logging.getLogger()
93
 
syslogger = (logging.handlers.SysLogHandler
94
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
 
              address = str("/dev/log")))
 
95
syslogger = None
96
96
 
97
97
try:
98
98
    if_nametoindex = (ctypes.cdll.LoadLibrary
114
114
def initlogger(debug, level=logging.WARNING):
115
115
    """init logger and add loglevel"""
116
116
    
 
117
    global syslogger
 
118
    syslogger = (logging.handlers.SysLogHandler
 
119
                 (facility =
 
120
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
121
                  address = str("/dev/log")))
117
122
    syslogger.setFormatter(logging.Formatter
118
123
                           ('Mandos [%(process)d]: %(levelname)s:'
119
124
                            ' %(message)s'))
137
142
class PGPEngine(object):
138
143
    """A simple class for OpenPGP symmetric encryption & decryption"""
139
144
    def __init__(self):
140
 
        self.gnupg = GnuPGInterface.GnuPG()
141
145
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
142
 
        self.gnupg = GnuPGInterface.GnuPG()
143
 
        self.gnupg.options.meta_interactive = False
144
 
        self.gnupg.options.homedir = self.tempdir
145
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
146
 
                                              '--quiet',
147
 
                                              '--no-use-agent'])
 
146
        self.gnupgargs = ['--batch',
 
147
                          '--home', self.tempdir,
 
148
                          '--force-mdc',
 
149
                          '--quiet',
 
150
                          '--no-use-agent']
148
151
    
149
152
    def __enter__(self):
150
153
        return self
151
154
    
152
 
    def __exit__ (self, exc_type, exc_value, traceback):
 
155
    def __exit__(self, exc_type, exc_value, traceback):
153
156
        self._cleanup()
154
157
        return False
155
158
    
172
175
    def password_encode(self, password):
173
176
        # Passphrase can not be empty and can not contain newlines or
174
177
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        return b"mandos" + binascii.hexlify(password)
 
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
176
185
    
177
186
    def encrypt(self, data, password):
178
 
        self.gnupg.passphrase = self.password_encode(password)
179
 
        with open(os.devnull, "w") as devnull:
180
 
            try:
181
 
                proc = self.gnupg.run(['--symmetric'],
182
 
                                      create_fhs=['stdin', 'stdout'],
183
 
                                      attach_fhs={'stderr': devnull})
184
 
                with contextlib.closing(proc.handles['stdin']) as f:
185
 
                    f.write(data)
186
 
                with contextlib.closing(proc.handles['stdout']) as f:
187
 
                    ciphertext = f.read()
188
 
                proc.wait()
189
 
            except IOError as e:
190
 
                raise PGPError(e)
191
 
        self.gnupg.passphrase = None
 
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)
192
202
        return ciphertext
193
203
    
194
204
    def decrypt(self, data, password):
195
 
        self.gnupg.passphrase = self.password_encode(password)
196
 
        with open(os.devnull, "w") as devnull:
197
 
            try:
198
 
                proc = self.gnupg.run(['--decrypt'],
199
 
                                      create_fhs=['stdin', 'stdout'],
200
 
                                      attach_fhs={'stderr': devnull})
201
 
                with contextlib.closing(proc.handles['stdin']) as f:
202
 
                    f.write(data)
203
 
                with contextlib.closing(proc.handles['stdout']) as f:
204
 
                    decrypted_plaintext = f.read()
205
 
                proc.wait()
206
 
            except IOError as e:
207
 
                raise PGPError(e)
208
 
        self.gnupg.passphrase = None
 
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)
209
221
        return decrypted_plaintext
210
222
 
211
223
 
231
243
               Used to optionally bind to the specified interface.
232
244
    name: string; Example: 'Mandos'
233
245
    type: string; Example: '_mandos._tcp'.
234
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
246
     See <https://www.iana.org/assignments/service-names-port-numbers>
235
247
    port: integer; what port to announce
236
248
    TXT: list of strings; TXT record for the service
237
249
    domain: string; Domain to publish on, default to .local if empty.
377
389
                                 self.server_state_changed)
378
390
        self.server_state_changed(self.server.GetState())
379
391
 
 
392
 
380
393
class AvahiServiceToSyslog(AvahiService):
381
394
    def rename(self):
382
395
        """Add the new name to the syslog messages"""
387
400
                                .format(self.name)))
388
401
        return ret
389
402
 
 
403
 
390
404
def timedelta_to_milliseconds(td):
391
405
    "Convert a datetime.timedelta() to milliseconds"
392
406
    return ((td.days * 24 * 60 * 60 * 1000)
393
407
            + (td.seconds * 1000)
394
408
            + (td.microseconds // 1000))
395
409
 
 
410
 
396
411
class Client(object):
397
412
    """A representation of a client host served by this server.
398
413
    
434
449
    runtime_expansions: Allowed attributes for runtime expansion.
435
450
    expires:    datetime.datetime(); time (UTC) when a client will be
436
451
                disabled, or None
 
452
    server_settings: The server_settings dict from main()
437
453
    """
438
454
    
439
455
    runtime_expansions = ("approval_delay", "approval_duration",
440
 
                          "created", "enabled", "fingerprint",
441
 
                          "host", "interval", "last_checked_ok",
 
456
                          "created", "enabled", "expires",
 
457
                          "fingerprint", "host", "interval",
 
458
                          "last_approval_request", "last_checked_ok",
442
459
                          "last_enabled", "name", "timeout")
443
 
    client_defaults = { "timeout": "5m",
444
 
                        "extended_timeout": "15m",
445
 
                        "interval": "2m",
 
460
    client_defaults = { "timeout": "PT5M",
 
461
                        "extended_timeout": "PT15M",
 
462
                        "interval": "PT2M",
446
463
                        "checker": "fping -q -- %%(host)s",
447
464
                        "host": "",
448
 
                        "approval_delay": "0s",
449
 
                        "approval_duration": "1s",
 
465
                        "approval_delay": "PT0S",
 
466
                        "approval_duration": "PT1S",
450
467
                        "approved_by_default": "True",
451
468
                        "enabled": "True",
452
469
                        }
513
530
        
514
531
        return settings
515
532
    
516
 
    def __init__(self, settings, name = None):
 
533
    def __init__(self, settings, name = None, server_settings=None):
517
534
        self.name = name
 
535
        if server_settings is None:
 
536
            server_settings = {}
 
537
        self.server_settings = server_settings
518
538
        # adding all client settings
519
539
        for setting, value in settings.iteritems():
520
540
            setattr(self, setting, value)
570
590
        if getattr(self, "enabled", False):
571
591
            # Already enabled
572
592
            return
573
 
        self.send_changedstate()
574
593
        self.expires = datetime.datetime.utcnow() + self.timeout
575
594
        self.enabled = True
576
595
        self.last_enabled = datetime.datetime.utcnow()
577
596
        self.init_checker()
 
597
        self.send_changedstate()
578
598
    
579
599
    def disable(self, quiet=True):
580
600
        """Disable this client."""
581
601
        if not getattr(self, "enabled", False):
582
602
            return False
583
603
        if not quiet:
584
 
            self.send_changedstate()
585
 
        if not quiet:
586
604
            logger.info("Disabling client %s", self.name)
587
 
        if getattr(self, "disable_initiator_tag", False):
 
605
        if getattr(self, "disable_initiator_tag", None) is not None:
588
606
            gobject.source_remove(self.disable_initiator_tag)
589
607
            self.disable_initiator_tag = None
590
608
        self.expires = None
591
 
        if getattr(self, "checker_initiator_tag", False):
 
609
        if getattr(self, "checker_initiator_tag", None) is not None:
592
610
            gobject.source_remove(self.checker_initiator_tag)
593
611
            self.checker_initiator_tag = None
594
612
        self.stop_checker()
595
613
        self.enabled = False
 
614
        if not quiet:
 
615
            self.send_changedstate()
596
616
        # Do not run this again if called by a gobject.timeout_add
597
617
        return False
598
618
    
602
622
    def init_checker(self):
603
623
        # Schedule a new checker to be started an 'interval' from now,
604
624
        # and every interval from then on.
 
625
        if self.checker_initiator_tag is not None:
 
626
            gobject.source_remove(self.checker_initiator_tag)
605
627
        self.checker_initiator_tag = (gobject.timeout_add
606
628
                                      (self.interval_milliseconds(),
607
629
                                       self.start_checker))
608
630
        # Schedule a disable() when 'timeout' has passed
 
631
        if self.disable_initiator_tag is not None:
 
632
            gobject.source_remove(self.disable_initiator_tag)
609
633
        self.disable_initiator_tag = (gobject.timeout_add
610
634
                                   (self.timeout_milliseconds(),
611
635
                                    self.disable))
642
666
            timeout = self.timeout
643
667
        if self.disable_initiator_tag is not None:
644
668
            gobject.source_remove(self.disable_initiator_tag)
 
669
            self.disable_initiator_tag = None
645
670
        if getattr(self, "enabled", False):
646
671
            self.disable_initiator_tag = (gobject.timeout_add
647
672
                                          (timedelta_to_milliseconds
657
682
        If a checker already exists, leave it running and do
658
683
        nothing."""
659
684
        # The reason for not killing a running checker is that if we
660
 
        # did that, then if a checker (for some reason) started
661
 
        # running slowly and taking more than 'interval' time, the
662
 
        # client would inevitably timeout, since no checker would get
663
 
        # a chance to run to completion.  If we instead leave running
 
685
        # did that, and if a checker (for some reason) started running
 
686
        # slowly and taking more than 'interval' time, then the client
 
687
        # would inevitably timeout, since no checker would get a
 
688
        # chance to run to completion.  If we instead leave running
664
689
        # checkers alone, the checker would have to take more time
665
690
        # than 'timeout' for the client to be disabled, which is as it
666
691
        # should be.
668
693
        # If a checker exists, make sure it is not a zombie
669
694
        try:
670
695
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
671
 
        except (AttributeError, OSError) as error:
672
 
            if (isinstance(error, OSError)
673
 
                and error.errno != errno.ECHILD):
674
 
                raise error
 
696
        except AttributeError:
 
697
            pass
 
698
        except OSError as error:
 
699
            if error.errno != errno.ECHILD:
 
700
                raise
675
701
        else:
676
702
            if pid:
677
703
                logger.warning("Checker was a zombie")
680
706
                                      self.current_checker_command)
681
707
        # Start a new checker if needed
682
708
        if self.checker is None:
 
709
            # 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)
683
714
            try:
684
 
                # In case checker_command has exactly one % operator
685
 
                command = self.checker_command % self.host
686
 
            except TypeError:
687
 
                # Escape attributes for the shell
688
 
                escaped_attrs = dict(
689
 
                    (attr,
690
 
                     re.escape(unicode(str(getattr(self, attr, "")),
691
 
                                       errors=
692
 
                                       'replace')))
693
 
                    for attr in
694
 
                    self.runtime_expansions)
695
 
                
696
 
                try:
697
 
                    command = self.checker_command % escaped_attrs
698
 
                except TypeError as error:
699
 
                    logger.error('Could not format string "%s"',
700
 
                                 self.checker_command, exc_info=error)
701
 
                    return True # Try again later
 
715
                command = self.checker_command % escaped_attrs
 
716
            except TypeError as error:
 
717
                logger.error('Could not format string "%s"',
 
718
                             self.checker_command, exc_info=error)
 
719
                return True # Try again later
702
720
            self.current_checker_command = command
703
721
            try:
704
722
                logger.info("Starting checker %r for %s",
707
725
                # in normal mode, that is already done by daemon(),
708
726
                # and in debug mode we don't want to.  (Stdin is
709
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 })
710
736
                self.checker = subprocess.Popen(command,
711
737
                                                close_fds=True,
712
 
                                                shell=True, cwd="/")
713
 
                self.checker_callback_tag = (gobject.child_watch_add
714
 
                                             (self.checker.pid,
715
 
                                              self.checker_callback,
716
 
                                              data=command))
717
 
                # The checker may have completed before the gobject
718
 
                # watch was added.  Check for this.
719
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
720
 
                if pid:
721
 
                    gobject.source_remove(self.checker_callback_tag)
722
 
                    self.checker_callback(pid, status, command)
 
738
                                                shell=True, cwd="/",
 
739
                                                **popen_args)
723
740
            except OSError as error:
724
741
                logger.error("Failed to start subprocess",
725
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)
726
762
        # Re-run this periodically if run by gobject.timeout_add
727
763
        return True
728
764
    
901
937
            # The byte_arrays option is not supported yet on
902
938
            # signatures other than "ay".
903
939
            if prop._dbus_signature != "ay":
904
 
                raise ValueError
 
940
                raise ValueError("Byte arrays not supported for non-"
 
941
                                 "'ay' signature {0!r}"
 
942
                                 .format(prop._dbus_signature))
905
943
            value = dbus.ByteArray(b''.join(chr(byte)
906
944
                                            for byte in value))
907
945
        prop(value)
979
1017
                            tag.appendChild(ann_tag)
980
1018
                # Add interface annotation tags
981
1019
                for annotation, value in dict(
982
 
                    itertools.chain(
983
 
                        *(annotations().iteritems()
984
 
                          for name, annotations in
985
 
                          self._get_all_dbus_things("interface")
986
 
                          if name == if_tag.getAttribute("name")
987
 
                          ))).iteritems():
 
1020
                    itertools.chain.from_iterable(
 
1021
                        annotations().iteritems()
 
1022
                        for name, annotations in
 
1023
                        self._get_all_dbus_things("interface")
 
1024
                        if name == if_tag.getAttribute("name")
 
1025
                        )).iteritems():
988
1026
                    ann_tag = document.createElement("annotation")
989
1027
                    ann_tag.setAttribute("name", annotation)
990
1028
                    ann_tag.setAttribute("value", value)
1013
1051
        return xmlstring
1014
1052
 
1015
1053
 
1016
 
def datetime_to_dbus (dt, variant_level=0):
 
1054
def datetime_to_dbus(dt, variant_level=0):
1017
1055
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1018
1056
    if dt is None:
1019
1057
        return dbus.String("", variant_level = variant_level)
1021
1059
                       variant_level=variant_level)
1022
1060
 
1023
1061
 
1024
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1025
 
                                  .__metaclass__):
1026
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
1027
 
    will add additional D-Bus attributes matching a certain pattern.
 
1062
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1063
    """A class decorator; applied to a subclass of
 
1064
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1065
    interface names according to the "alt_interface_names" mapping.
 
1066
    Usage:
 
1067
    
 
1068
    @alternate_dbus_interfaces({"org.example.Interface":
 
1069
                                    "net.example.AlternateInterface"})
 
1070
    class SampleDBusObject(dbus.service.Object):
 
1071
        @dbus.service.method("org.example.Interface")
 
1072
        def SampleDBusMethod():
 
1073
            pass
 
1074
    
 
1075
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1076
    reachable via two interfaces: "org.example.Interface" and
 
1077
    "net.example.AlternateInterface", the latter of which will have
 
1078
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1079
    "true", unless "deprecate" is passed with a False value.
 
1080
    
 
1081
    This works for methods and signals, and also for D-Bus properties
 
1082
    (from DBusObjectWithProperties) and interfaces (from the
 
1083
    dbus_interface_annotations decorator).
1028
1084
    """
1029
 
    def __new__(mcs, name, bases, attr):
1030
 
        # Go through all the base classes which could have D-Bus
1031
 
        # methods, signals, or properties in them
1032
 
        old_interface_names = []
1033
 
        for base in (b for b in bases
1034
 
                     if issubclass(b, dbus.service.Object)):
1035
 
            # Go though all attributes of the base class
1036
 
            for attrname, attribute in inspect.getmembers(base):
 
1085
    def wrapper(cls):
 
1086
        for orig_interface_name, alt_interface_name in (
 
1087
            alt_interface_names.iteritems()):
 
1088
            attr = {}
 
1089
            interface_names = set()
 
1090
            # Go though all attributes of the class
 
1091
            for attrname, attribute in inspect.getmembers(cls):
1037
1092
                # Ignore non-D-Bus attributes, and D-Bus attributes
1038
1093
                # with the wrong interface name
1039
1094
                if (not hasattr(attribute, "_dbus_interface")
1040
1095
                    or not attribute._dbus_interface
1041
 
                    .startswith("se.recompile.Mandos")):
 
1096
                    .startswith(orig_interface_name)):
1042
1097
                    continue
1043
1098
                # Create an alternate D-Bus interface name based on
1044
1099
                # the current name
1045
1100
                alt_interface = (attribute._dbus_interface
1046
 
                                 .replace("se.recompile.Mandos",
1047
 
                                          "se.bsnet.fukt.Mandos"))
1048
 
                if alt_interface != attribute._dbus_interface:
1049
 
                    old_interface_names.append(alt_interface)
 
1101
                                 .replace(orig_interface_name,
 
1102
                                          alt_interface_name))
 
1103
                interface_names.add(alt_interface)
1050
1104
                # Is this a D-Bus signal?
1051
1105
                if getattr(attribute, "_dbus_is_signal", False):
1052
 
                    # Extract the original non-method function by
1053
 
                    # black magic
 
1106
                    # Extract the original non-method undecorated
 
1107
                    # function by black magic
1054
1108
                    nonmethod_func = (dict(
1055
1109
                            zip(attribute.func_code.co_freevars,
1056
1110
                                attribute.__closure__))["func"]
1074
1128
                    except AttributeError:
1075
1129
                        pass
1076
1130
                    # Define a creator of a function to call both the
1077
 
                    # old and new functions, so both the old and new
1078
 
                    # signals gets sent when the function is called
 
1131
                    # original and alternate functions, so both the
 
1132
                    # original and alternate signals gets sent when
 
1133
                    # the function is called
1079
1134
                    def fixscope(func1, func2):
1080
1135
                        """This function is a scope container to pass
1081
1136
                        func1 and func2 to the "call_both" function
1088
1143
                        return call_both
1089
1144
                    # Create the "call_both" function and add it to
1090
1145
                    # the class
1091
 
                    attr[attrname] = fixscope(attribute,
1092
 
                                              new_function)
 
1146
                    attr[attrname] = fixscope(attribute, new_function)
1093
1147
                # Is this a D-Bus method?
1094
1148
                elif getattr(attribute, "_dbus_is_method", False):
1095
1149
                    # Create a new, but exactly alike, function
1151
1205
                                        attribute.func_name,
1152
1206
                                        attribute.func_defaults,
1153
1207
                                        attribute.func_closure)))
1154
 
        # Deprecate all old interfaces
1155
 
        iname="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1156
 
        for old_interface_name in old_interface_names:
1157
 
            @dbus_interface_annotations(old_interface_name)
1158
 
            def func(self):
1159
 
                return { "org.freedesktop.DBus.Deprecated": "true" }
1160
 
            # Find an unused name
1161
 
            for aname in (iname.format(i) for i in itertools.count()):
1162
 
                if aname not in attr:
1163
 
                    attr[aname] = func
1164
 
                    break
1165
 
        return type.__new__(mcs, name, bases, attr)
1166
 
 
1167
 
 
 
1208
            if deprecate:
 
1209
                # Deprecate all alternate interfaces
 
1210
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1211
                for interface_name in interface_names:
 
1212
                    @dbus_interface_annotations(interface_name)
 
1213
                    def func(self):
 
1214
                        return { "org.freedesktop.DBus.Deprecated":
 
1215
                                     "true" }
 
1216
                    # Find an unused name
 
1217
                    for aname in (iname.format(i)
 
1218
                                  for i in itertools.count()):
 
1219
                        if aname not in attr:
 
1220
                            attr[aname] = func
 
1221
                            break
 
1222
            if interface_names:
 
1223
                # Replace the class with a new subclass of it with
 
1224
                # methods, signals, etc. as created above.
 
1225
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1226
                           (cls,), attr)
 
1227
        return cls
 
1228
    return wrapper
 
1229
 
 
1230
 
 
1231
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1232
                                "se.bsnet.fukt.Mandos"})
1168
1233
class ClientDBus(Client, DBusObjectWithProperties):
1169
1234
    """A Client class using D-Bus
1170
1235
    
1288
1353
                                       *args, **kwargs)
1289
1354
    
1290
1355
    def start_checker(self, *args, **kwargs):
1291
 
        old_checker = self.checker
1292
 
        if self.checker is not None:
1293
 
            old_checker_pid = self.checker.pid
1294
 
        else:
1295
 
            old_checker_pid = None
 
1356
        old_checker_pid = getattr(self.checker, "pid", None)
1296
1357
        r = Client.start_checker(self, *args, **kwargs)
1297
1358
        # Only if new checker process was started
1298
1359
        if (self.checker is not None
1306
1367
        return False
1307
1368
    
1308
1369
    def approve(self, value=True):
1309
 
        self.send_changedstate()
1310
1370
        self.approved = value
1311
1371
        gobject.timeout_add(timedelta_to_milliseconds
1312
1372
                            (self.approval_duration),
1313
1373
                            self._reset_approved)
 
1374
        self.send_changedstate()
1314
1375
    
1315
1376
    ## D-Bus methods, signals & properties
1316
1377
    _interface = "se.recompile.Mandos.Client"
1500
1561
    def Timeout_dbus_property(self, value=None):
1501
1562
        if value is None:       # get
1502
1563
            return dbus.UInt64(self.timeout_milliseconds())
 
1564
        old_timeout = self.timeout
1503
1565
        self.timeout = datetime.timedelta(0, 0, 0, value)
1504
 
        # Reschedule timeout
 
1566
        # Reschedule disabling
1505
1567
        if self.enabled:
1506
1568
            now = datetime.datetime.utcnow()
1507
 
            time_to_die = timedelta_to_milliseconds(
1508
 
                (self.last_checked_ok + self.timeout) - now)
1509
 
            if time_to_die <= 0:
 
1569
            self.expires += self.timeout - old_timeout
 
1570
            if self.expires <= now:
1510
1571
                # The timeout has passed
1511
1572
                self.disable()
1512
1573
            else:
1513
 
                self.expires = (now +
1514
 
                                datetime.timedelta(milliseconds =
1515
 
                                                   time_to_die))
1516
1574
                if (getattr(self, "disable_initiator_tag", None)
1517
1575
                    is None):
1518
1576
                    return
1519
1577
                gobject.source_remove(self.disable_initiator_tag)
1520
 
                self.disable_initiator_tag = (gobject.timeout_add
1521
 
                                              (time_to_die,
1522
 
                                               self.disable))
 
1578
                self.disable_initiator_tag = (
 
1579
                    gobject.timeout_add(
 
1580
                        timedelta_to_milliseconds(self.expires - now),
 
1581
                        self.disable))
1523
1582
    
1524
1583
    # ExtendedTimeout - property
1525
1584
    @dbus_service_property(_interface, signature="t",
1604
1663
        self._pipe.send(('setattr', name, value))
1605
1664
 
1606
1665
 
1607
 
class ClientDBusTransitional(ClientDBus):
1608
 
    __metaclass__ = AlternateDBusNamesMetaclass
1609
 
 
1610
 
 
1611
1666
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
1667
    """A class to handle client connections.
1613
1668
    
1649
1704
            logger.debug("Protocol version: %r", line)
1650
1705
            try:
1651
1706
                if int(line.strip().split()[0]) > 1:
1652
 
                    raise RuntimeError
 
1707
                    raise RuntimeError(line)
1653
1708
            except (ValueError, IndexError, RuntimeError) as error:
1654
1709
                logger.error("Unknown protocol version: %s", error)
1655
1710
                return
1717
1772
                    #wait until timeout or approved
1718
1773
                    time = datetime.datetime.now()
1719
1774
                    client.changedstate.acquire()
1720
 
                    (client.changedstate.wait
1721
 
                     (float(client.timedelta_to_milliseconds(delay)
1722
 
                            / 1000)))
 
1775
                    client.changedstate.wait(
 
1776
                        float(timedelta_to_milliseconds(delay)
 
1777
                              / 1000))
1723
1778
                    client.changedstate.release()
1724
1779
                    time2 = datetime.datetime.now()
1725
1780
                    if (time2 - time) >= delay:
1841
1896
    def process_request(self, request, address):
1842
1897
        """Start a new process to process the request."""
1843
1898
        proc = multiprocessing.Process(target = self.sub_process_main,
1844
 
                                       args = (request,
1845
 
                                               address))
 
1899
                                       args = (request, address))
1846
1900
        proc.start()
1847
1901
        return proc
1848
1902
 
1863
1917
    
1864
1918
    def add_pipe(self, parent_pipe, proc):
1865
1919
        """Dummy function; override as necessary"""
1866
 
        raise NotImplementedError
 
1920
        raise NotImplementedError()
1867
1921
 
1868
1922
 
1869
1923
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1876
1930
        use_ipv6:       Boolean; to use IPv6 or not
1877
1931
    """
1878
1932
    def __init__(self, server_address, RequestHandlerClass,
1879
 
                 interface=None, use_ipv6=True):
 
1933
                 interface=None, use_ipv6=True, socketfd=None):
 
1934
        """If socketfd is set, use that file descriptor instead of
 
1935
        creating a new one with socket.socket().
 
1936
        """
1880
1937
        self.interface = interface
1881
1938
        if use_ipv6:
1882
1939
            self.address_family = socket.AF_INET6
 
1940
        if socketfd is not None:
 
1941
            # Save the file descriptor
 
1942
            self.socketfd = socketfd
 
1943
            # Save the original socket.socket() function
 
1944
            self.socket_socket = socket.socket
 
1945
            # To implement --socket, we monkey patch socket.socket.
 
1946
            # 
 
1947
            # (When socketserver.TCPServer is a new-style class, we
 
1948
            # could make self.socket into a property instead of monkey
 
1949
            # patching socket.socket.)
 
1950
            # 
 
1951
            # Create a one-time-only replacement for socket.socket()
 
1952
            @functools.wraps(socket.socket)
 
1953
            def socket_wrapper(*args, **kwargs):
 
1954
                # Restore original function so subsequent calls are
 
1955
                # not affected.
 
1956
                socket.socket = self.socket_socket
 
1957
                del self.socket_socket
 
1958
                # This time only, return a new socket object from the
 
1959
                # saved file descriptor.
 
1960
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1961
            # Replace socket.socket() function with wrapper
 
1962
            socket.socket = socket_wrapper
 
1963
        # The socketserver.TCPServer.__init__ will call
 
1964
        # socket.socket(), which might be our replacement,
 
1965
        # socket_wrapper(), if socketfd was set.
1883
1966
        socketserver.TCPServer.__init__(self, server_address,
1884
1967
                                        RequestHandlerClass)
 
1968
    
1885
1969
    def server_bind(self):
1886
1970
        """This overrides the normal server_bind() function
1887
1971
        to bind to an interface if one was specified, and also NOT to
1895
1979
                try:
1896
1980
                    self.socket.setsockopt(socket.SOL_SOCKET,
1897
1981
                                           SO_BINDTODEVICE,
1898
 
                                           str(self.interface
1899
 
                                               + '\0'))
 
1982
                                           str(self.interface + '\0'))
1900
1983
                except socket.error as error:
1901
 
                    if error[0] == errno.EPERM:
1902
 
                        logger.error("No permission to"
1903
 
                                     " bind to interface %s",
1904
 
                                     self.interface)
1905
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1984
                    if error.errno == errno.EPERM:
 
1985
                        logger.error("No permission to bind to"
 
1986
                                     " interface %s", self.interface)
 
1987
                    elif error.errno == errno.ENOPROTOOPT:
1906
1988
                        logger.error("SO_BINDTODEVICE not available;"
1907
1989
                                     " cannot bind to interface %s",
1908
1990
                                     self.interface)
 
1991
                    elif error.errno == errno.ENODEV:
 
1992
                        logger.error("Interface %s does not exist,"
 
1993
                                     " cannot bind", self.interface)
1909
1994
                    else:
1910
1995
                        raise
1911
1996
        # Only bind(2) the socket if we really need to.
1914
1999
                if self.address_family == socket.AF_INET6:
1915
2000
                    any_address = "::" # in6addr_any
1916
2001
                else:
1917
 
                    any_address = socket.INADDR_ANY
 
2002
                    any_address = "0.0.0.0" # INADDR_ANY
1918
2003
                self.server_address = (any_address,
1919
2004
                                       self.server_address[1])
1920
2005
            elif not self.server_address[1]:
1941
2026
    """
1942
2027
    def __init__(self, server_address, RequestHandlerClass,
1943
2028
                 interface=None, use_ipv6=True, clients=None,
1944
 
                 gnutls_priority=None, use_dbus=True):
 
2029
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1945
2030
        self.enabled = False
1946
2031
        self.clients = clients
1947
2032
        if self.clients is None:
1951
2036
        IPv6_TCPServer.__init__(self, server_address,
1952
2037
                                RequestHandlerClass,
1953
2038
                                interface = interface,
1954
 
                                use_ipv6 = use_ipv6)
 
2039
                                use_ipv6 = use_ipv6,
 
2040
                                socketfd = socketfd)
1955
2041
    def server_activate(self):
1956
2042
        if self.enabled:
1957
2043
            return socketserver.TCPServer.server_activate(self)
1970
2056
    
1971
2057
    def handle_ipc(self, source, condition, parent_pipe=None,
1972
2058
                   proc = None, client_object=None):
1973
 
        condition_names = {
1974
 
            gobject.IO_IN: "IN",   # There is data to read.
1975
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1976
 
                                    # blocking).
1977
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1978
 
            gobject.IO_ERR: "ERR", # Error condition.
1979
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1980
 
                                    # broken, usually for pipes and
1981
 
                                    # sockets).
1982
 
            }
1983
 
        conditions_string = ' | '.join(name
1984
 
                                       for cond, name in
1985
 
                                       condition_names.iteritems()
1986
 
                                       if cond & condition)
1987
2059
        # error, or the other end of multiprocessing.Pipe has closed
1988
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2060
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1989
2061
            # Wait for other process to exit
1990
2062
            proc.join()
1991
2063
            return False
2049
2121
        return True
2050
2122
 
2051
2123
 
 
2124
def rfc3339_duration_to_delta(duration):
 
2125
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2126
    
 
2127
    >>> rfc3339_duration_to_delta("P7D")
 
2128
    datetime.timedelta(7)
 
2129
    >>> rfc3339_duration_to_delta("PT60S")
 
2130
    datetime.timedelta(0, 60)
 
2131
    >>> rfc3339_duration_to_delta("PT60M")
 
2132
    datetime.timedelta(0, 3600)
 
2133
    >>> rfc3339_duration_to_delta("PT24H")
 
2134
    datetime.timedelta(1)
 
2135
    >>> rfc3339_duration_to_delta("P1W")
 
2136
    datetime.timedelta(7)
 
2137
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2138
    datetime.timedelta(0, 330)
 
2139
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2140
    datetime.timedelta(1, 200)
 
2141
    """
 
2142
    
 
2143
    # Parsing an RFC 3339 duration with regular expressions is not
 
2144
    # possible - there would have to be multiple places for the same
 
2145
    # values, like seconds.  The current code, while more esoteric, is
 
2146
    # cleaner without depending on a parsing library.  If Python had a
 
2147
    # built-in library for parsing we would use it, but we'd like to
 
2148
    # avoid excessive use of external libraries.
 
2149
    
 
2150
    # 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
 
2160
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2161
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2162
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2163
    token_second = Token(re.compile(r"(\d+)S"),
 
2164
                         datetime.timedelta(seconds=1),
 
2165
                         frozenset((token_end,)))
 
2166
    token_minute = Token(re.compile(r"(\d+)M"),
 
2167
                         datetime.timedelta(minutes=1),
 
2168
                         frozenset((token_second, token_end)))
 
2169
    token_hour = Token(re.compile(r"(\d+)H"),
 
2170
                       datetime.timedelta(hours=1),
 
2171
                       frozenset((token_minute, token_end)))
 
2172
    token_time = Token(re.compile(r"T"),
 
2173
                       None,
 
2174
                       frozenset((token_hour, token_minute,
 
2175
                                  token_second)))
 
2176
    token_day = Token(re.compile(r"(\d+)D"),
 
2177
                      datetime.timedelta(days=1),
 
2178
                      frozenset((token_time, token_end)))
 
2179
    token_month = Token(re.compile(r"(\d+)M"),
 
2180
                        datetime.timedelta(weeks=4),
 
2181
                        frozenset((token_day, token_end)))
 
2182
    token_year = Token(re.compile(r"(\d+)Y"),
 
2183
                       datetime.timedelta(weeks=52),
 
2184
                       frozenset((token_month, token_end)))
 
2185
    token_week = Token(re.compile(r"(\d+)W"),
 
2186
                       datetime.timedelta(weeks=1),
 
2187
                       frozenset((token_end,)))
 
2188
    token_duration = Token(re.compile(r"P"), None,
 
2189
                           frozenset((token_year, token_month,
 
2190
                                      token_day, token_time,
 
2191
                                      token_week))),
 
2192
    # Define starting values
 
2193
    value = datetime.timedelta() # Value so far
 
2194
    found_token = None
 
2195
    followers = frozenset(token_duration,) # Following valid tokens
 
2196
    s = duration                # String left to parse
 
2197
    # Loop until end token is found
 
2198
    while found_token is not token_end:
 
2199
        # Search for any currently valid tokens
 
2200
        for token in followers:
 
2201
            match = token.regexp.match(s)
 
2202
            if match is not None:
 
2203
                # Token found
 
2204
                if token.value is not None:
 
2205
                    # Value found, parse digits
 
2206
                    factor = int(match.group(1), 10)
 
2207
                    # Add to value so far
 
2208
                    value += factor * token.value
 
2209
                # Strip token from string
 
2210
                s = token.regexp.sub("", s, 1)
 
2211
                # Go to found token
 
2212
                found_token = token
 
2213
                # Set valid next tokens
 
2214
                followers = found_token.followers
 
2215
                break
 
2216
        else:
 
2217
            # No currently valid tokens were found
 
2218
            raise ValueError("Invalid RFC 3339 duration")
 
2219
    # End token found
 
2220
    return value
 
2221
 
 
2222
 
2052
2223
def string_to_delta(interval):
2053
2224
    """Parse a string and return a datetime.timedelta
2054
2225
    
2065
2236
    >>> string_to_delta('5m 30s')
2066
2237
    datetime.timedelta(0, 330)
2067
2238
    """
 
2239
    
 
2240
    try:
 
2241
        return rfc3339_duration_to_delta(interval)
 
2242
    except ValueError:
 
2243
        pass
 
2244
    
2068
2245
    timevalue = datetime.timedelta(0)
2069
2246
    for s in interval.split():
2070
2247
        try:
2083
2260
            else:
2084
2261
                raise ValueError("Unknown suffix {0!r}"
2085
2262
                                 .format(suffix))
2086
 
        except (ValueError, IndexError) as e:
 
2263
        except IndexError as e:
2087
2264
            raise ValueError(*(e.args))
2088
2265
        timevalue += delta
2089
2266
    return timevalue
2133
2310
                        help="Run self-test")
2134
2311
    parser.add_argument("--debug", action="store_true",
2135
2312
                        help="Debug mode; run in foreground and log"
2136
 
                        " to terminal")
 
2313
                        " to terminal", default=None)
2137
2314
    parser.add_argument("--debuglevel", metavar="LEVEL",
2138
2315
                        help="Debug level for stdout output")
2139
2316
    parser.add_argument("--priority", help="GnuTLS"
2146
2323
                        " files")
2147
2324
    parser.add_argument("--no-dbus", action="store_false",
2148
2325
                        dest="use_dbus", help="Do not provide D-Bus"
2149
 
                        " system bus interface")
 
2326
                        " system bus interface", default=None)
2150
2327
    parser.add_argument("--no-ipv6", action="store_false",
2151
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2328
                        dest="use_ipv6", help="Do not use IPv6",
 
2329
                        default=None)
2152
2330
    parser.add_argument("--no-restore", action="store_false",
2153
2331
                        dest="restore", help="Do not restore stored"
2154
 
                        " state")
 
2332
                        " state", default=None)
 
2333
    parser.add_argument("--socket", type=int,
 
2334
                        help="Specify a file descriptor to a network"
 
2335
                        " socket to use instead of creating one")
2155
2336
    parser.add_argument("--statedir", metavar="DIR",
2156
2337
                        help="Directory to save/restore state in")
 
2338
    parser.add_argument("--foreground", action="store_true",
 
2339
                        help="Run in foreground", default=None)
 
2340
    parser.add_argument("--no-zeroconf", action="store_false",
 
2341
                        dest="zeroconf", help="Do not use Zeroconf",
 
2342
                        default=None)
2157
2343
    
2158
2344
    options = parser.parse_args()
2159
2345
    
2160
2346
    if options.check:
2161
2347
        import doctest
2162
 
        doctest.testmod()
2163
 
        sys.exit()
 
2348
        fail_count, test_count = doctest.testmod()
 
2349
        sys.exit(os.EX_OK if fail_count == 0 else 1)
2164
2350
    
2165
2351
    # Default values for config file for server-global settings
2166
2352
    server_defaults = { "interface": "",
2168
2354
                        "port": "",
2169
2355
                        "debug": "False",
2170
2356
                        "priority":
2171
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2357
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2172
2358
                        "servicename": "Mandos",
2173
2359
                        "use_dbus": "True",
2174
2360
                        "use_ipv6": "True",
2175
2361
                        "debuglevel": "",
2176
2362
                        "restore": "True",
2177
 
                        "statedir": "/var/lib/mandos"
 
2363
                        "socket": "",
 
2364
                        "statedir": "/var/lib/mandos",
 
2365
                        "foreground": "False",
 
2366
                        "zeroconf": "True",
2178
2367
                        }
2179
2368
    
2180
2369
    # Parse config file for server-global settings
2185
2374
    # Convert the SafeConfigParser object to a dict
2186
2375
    server_settings = server_config.defaults()
2187
2376
    # Use the appropriate methods on the non-string config options
2188
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2377
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2189
2378
        server_settings[option] = server_config.getboolean("DEFAULT",
2190
2379
                                                           option)
2191
2380
    if server_settings["port"]:
2192
2381
        server_settings["port"] = server_config.getint("DEFAULT",
2193
2382
                                                       "port")
 
2383
    if server_settings["socket"]:
 
2384
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2385
                                                         "socket")
 
2386
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2387
        # over with an opened os.devnull.  But we don't want this to
 
2388
        # happen with a supplied network socket.
 
2389
        if 0 <= server_settings["socket"] <= 2:
 
2390
            server_settings["socket"] = os.dup(server_settings
 
2391
                                               ["socket"])
2194
2392
    del server_config
2195
2393
    
2196
2394
    # Override the settings from the config file with command line
2198
2396
    for option in ("interface", "address", "port", "debug",
2199
2397
                   "priority", "servicename", "configdir",
2200
2398
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2201
 
                   "statedir"):
 
2399
                   "statedir", "socket", "foreground", "zeroconf"):
2202
2400
        value = getattr(options, option)
2203
2401
        if value is not None:
2204
2402
            server_settings[option] = value
2207
2405
    for option in server_settings.keys():
2208
2406
        if type(server_settings[option]) is str:
2209
2407
            server_settings[option] = unicode(server_settings[option])
 
2408
    # Force all boolean options to be boolean
 
2409
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2410
                   "foreground", "zeroconf"):
 
2411
        server_settings[option] = bool(server_settings[option])
 
2412
    # Debug implies foreground
 
2413
    if server_settings["debug"]:
 
2414
        server_settings["foreground"] = True
2210
2415
    # Now we have our good server settings in "server_settings"
2211
2416
    
2212
2417
    ##################################################################
2213
2418
    
 
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")
 
2424
    
2214
2425
    # For convenience
2215
2426
    debug = server_settings["debug"]
2216
2427
    debuglevel = server_settings["debuglevel"]
2218
2429
    use_ipv6 = server_settings["use_ipv6"]
2219
2430
    stored_state_path = os.path.join(server_settings["statedir"],
2220
2431
                                     stored_state_file)
 
2432
    foreground = server_settings["foreground"]
 
2433
    zeroconf = server_settings["zeroconf"]
2221
2434
    
2222
2435
    if debug:
2223
2436
        initlogger(debug, logging.DEBUG)
2244
2457
    global mandos_dbus_service
2245
2458
    mandos_dbus_service = None
2246
2459
    
 
2460
    socketfd = None
 
2461
    if server_settings["socket"] != "":
 
2462
        socketfd = server_settings["socket"]
2247
2463
    tcp_server = MandosServer((server_settings["address"],
2248
2464
                               server_settings["port"]),
2249
2465
                              ClientHandler,
2252
2468
                              use_ipv6=use_ipv6,
2253
2469
                              gnutls_priority=
2254
2470
                              server_settings["priority"],
2255
 
                              use_dbus=use_dbus)
2256
 
    if not debug:
2257
 
        pidfilename = "/var/run/mandos.pid"
 
2471
                              use_dbus=use_dbus,
 
2472
                              socketfd=socketfd)
 
2473
    if not foreground:
 
2474
        pidfilename = "/run/mandos.pid"
 
2475
        if not os.path.isdir("/run/."):
 
2476
            pidfilename = "/var/run/mandos.pid"
 
2477
        pidfile = None
2258
2478
        try:
2259
2479
            pidfile = open(pidfilename, "w")
2260
2480
        except IOError as e:
2275
2495
        os.setgid(gid)
2276
2496
        os.setuid(uid)
2277
2497
    except OSError as error:
2278
 
        if error[0] != errno.EPERM:
2279
 
            raise error
 
2498
        if error.errno != errno.EPERM:
 
2499
            raise
2280
2500
    
2281
2501
    if debug:
2282
2502
        # Enable all possible GnuTLS debugging
2299
2519
            os.close(null)
2300
2520
    
2301
2521
    # Need to fork before connecting to D-Bus
2302
 
    if not debug:
 
2522
    if not foreground:
2303
2523
        # Close all input and output, do double fork, etc.
2304
2524
        daemon()
2305
2525
    
 
2526
    # multiprocessing will use threads, so before we use gobject we
 
2527
    # need to inform gobject that threads will be used.
2306
2528
    gobject.threads_init()
2307
2529
    
2308
2530
    global main_loop
2323
2545
            use_dbus = False
2324
2546
            server_settings["use_dbus"] = False
2325
2547
            tcp_server.use_dbus = False
2326
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2327
 
    service = AvahiServiceToSyslog(name =
2328
 
                                   server_settings["servicename"],
2329
 
                                   servicetype = "_mandos._tcp",
2330
 
                                   protocol = protocol, bus = bus)
2331
 
    if server_settings["interface"]:
2332
 
        service.interface = (if_nametoindex
2333
 
                             (str(server_settings["interface"])))
 
2548
    if zeroconf:
 
2549
        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)
 
2554
        if server_settings["interface"]:
 
2555
            service.interface = (if_nametoindex
 
2556
                                 (str(server_settings["interface"])))
2334
2557
    
2335
2558
    global multiprocessing_manager
2336
2559
    multiprocessing_manager = multiprocessing.Manager()
2337
2560
    
2338
2561
    client_class = Client
2339
2562
    if use_dbus:
2340
 
        client_class = functools.partial(ClientDBusTransitional,
2341
 
                                         bus = bus)
 
2563
        client_class = functools.partial(ClientDBus, bus = bus)
2342
2564
    
2343
2565
    client_settings = Client.config_parser(client_config)
2344
2566
    old_client_settings = {}
2345
2567
    clients_data = {}
2346
2568
    
 
2569
    # This is used to redirect stdout and stderr for checker processes
 
2570
    global wnull
 
2571
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2572
    # Only used if server is running in foreground but not in debug
 
2573
    # mode
 
2574
    if debug or not foreground:
 
2575
        wnull.close()
 
2576
    
2347
2577
    # Get client data and settings from last running state.
2348
2578
    if server_settings["restore"]:
2349
2579
        try:
2365
2595
    
2366
2596
    with PGPEngine() as pgp:
2367
2597
        for client_name, client in clients_data.iteritems():
 
2598
            # Skip removed clients
 
2599
            if client_name not in client_settings:
 
2600
                continue
 
2601
            
2368
2602
            # Decide which value to use after restoring saved state.
2369
2603
            # We have three different values: Old config file,
2370
2604
            # new config file, and saved state.
2432
2666
    # Create all client objects
2433
2667
    for client_name, client in clients_data.iteritems():
2434
2668
        tcp_server.clients[client_name] = client_class(
2435
 
            name = client_name, settings = client)
 
2669
            name = client_name, settings = client,
 
2670
            server_settings = server_settings)
2436
2671
    
2437
2672
    if not tcp_server.clients:
2438
2673
        logger.warning("No clients defined")
2439
2674
    
2440
 
    if not debug:
2441
 
        try:
2442
 
            with pidfile:
2443
 
                pid = os.getpid()
2444
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2445
 
            del pidfile
2446
 
        except IOError:
2447
 
            logger.error("Could not write to file %r with PID %d",
2448
 
                         pidfilename, pid)
2449
 
        except NameError:
2450
 
            # "pidfile" was never created
2451
 
            pass
 
2675
    if not foreground:
 
2676
        if pidfile is not None:
 
2677
            try:
 
2678
                with pidfile:
 
2679
                    pid = os.getpid()
 
2680
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2681
            except IOError:
 
2682
                logger.error("Could not write to file %r with PID %d",
 
2683
                             pidfilename, pid)
 
2684
        del pidfile
2452
2685
        del pidfilename
2453
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2454
2686
    
2455
2687
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2456
2688
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2457
2689
    
2458
2690
    if use_dbus:
 
2691
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2692
                                        "se.bsnet.fukt.Mandos"})
2459
2693
        class MandosDBusService(DBusObjectWithProperties):
2460
2694
            """A D-Bus proxy object"""
2461
2695
            def __init__(self):
2515
2749
            
2516
2750
            del _interface
2517
2751
        
2518
 
        class MandosDBusServiceTransitional(MandosDBusService):
2519
 
            __metaclass__ = AlternateDBusNamesMetaclass
2520
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2752
        mandos_dbus_service = MandosDBusService()
2521
2753
    
2522
2754
    def cleanup():
2523
2755
        "Cleanup function; run on exit"
2524
 
        service.cleanup()
 
2756
        if zeroconf:
 
2757
            service.cleanup()
2525
2758
        
2526
2759
        multiprocessing.active_children()
 
2760
        wnull.close()
2527
2761
        if not (tcp_server.clients or client_settings):
2528
2762
            return
2529
2763
        
2541
2775
                # A list of attributes that can not be pickled
2542
2776
                # + secret.
2543
2777
                exclude = set(("bus", "changedstate", "secret",
2544
 
                               "checker"))
 
2778
                               "checker", "server_settings"))
2545
2779
                for name, typ in (inspect.getmembers
2546
2780
                                  (dbus.service.Object)):
2547
2781
                    exclude.add(name)
2556
2790
                del client_settings[client.name]["secret"]
2557
2791
        
2558
2792
        try:
2559
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2560
 
                                                prefix="clients-",
2561
 
                                                dir=os.path.dirname
2562
 
                                                (stored_state_path))
2563
 
            with os.fdopen(tempfd, "wb") as stored_state:
 
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:
2564
2797
                pickle.dump((clients, client_settings), stored_state)
 
2798
                tempname=stored_state.name
2565
2799
            os.rename(tempname, stored_state_path)
2566
2800
        except (IOError, OSError) as e:
2567
2801
            if not debug:
2575
2809
            else:
2576
2810
                logger.warning("Could not save persistent state:",
2577
2811
                               exc_info=e)
2578
 
                raise e
 
2812
                raise
2579
2813
        
2580
2814
        # Delete all clients, and settings from config
2581
2815
        while tcp_server.clients:
2605
2839
    tcp_server.server_activate()
2606
2840
    
2607
2841
    # Find out what port we got
2608
 
    service.port = tcp_server.socket.getsockname()[1]
 
2842
    if zeroconf:
 
2843
        service.port = tcp_server.socket.getsockname()[1]
2609
2844
    if use_ipv6:
2610
2845
        logger.info("Now listening on address %r, port %d,"
2611
2846
                    " flowinfo %d, scope_id %d",
2617
2852
    #service.interface = tcp_server.socket.getsockname()[3]
2618
2853
    
2619
2854
    try:
2620
 
        # From the Avahi example code
2621
 
        try:
2622
 
            service.activate()
2623
 
        except dbus.exceptions.DBusException as error:
2624
 
            logger.critical("D-Bus Exception", exc_info=error)
2625
 
            cleanup()
2626
 
            sys.exit(1)
2627
 
        # End of Avahi example code
 
2855
        if zeroconf:
 
2856
            # From the Avahi example code
 
2857
            try:
 
2858
                service.activate()
 
2859
            except dbus.exceptions.DBusException as error:
 
2860
                logger.critical("D-Bus Exception", exc_info=error)
 
2861
                cleanup()
 
2862
                sys.exit(1)
 
2863
            # End of Avahi example code
2628
2864
        
2629
2865
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2630
2866
                             lambda *args, **kwargs: