/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

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-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.3"
 
91
version = "1.5.3"
92
92
stored_state_file = "clients.pickle"
93
93
 
94
94
logger = logging.getLogger()
139
139
class PGPEngine(object):
140
140
    """A simple class for OpenPGP symmetric encryption & decryption"""
141
141
    def __init__(self):
 
142
        self.gnupg = GnuPGInterface.GnuPG()
142
143
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
143
 
        self.gnupgargs = ['--batch',
144
 
                          '--home', self.tempdir,
145
 
                          '--force-mdc',
146
 
                          '--quiet',
147
 
                          '--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'])
148
150
    
149
151
    def __enter__(self):
150
152
        return self
151
153
    
152
 
    def __exit__(self, exc_type, exc_value, traceback):
 
154
    def __exit__ (self, exc_type, exc_value, traceback):
153
155
        self._cleanup()
154
156
        return False
155
157
    
172
174
    def password_encode(self, password):
173
175
        # Passphrase can not be empty and can not contain newlines or
174
176
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        encoded = b"mandos" + binascii.hexlify(password)
176
 
        if len(encoded) > 2048:
177
 
            # GnuPG can't handle long passwords, so encode differently
178
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
179
 
                       .replace(b"\n", b"\\n")
180
 
                       .replace(b"\0", b"\\x00"))
181
 
        return encoded
 
177
        return b"mandos" + binascii.hexlify(password)
182
178
    
183
179
    def encrypt(self, data, password):
184
 
        passphrase = self.password_encode(password)
185
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
186
 
                                         ) as passfile:
187
 
            passfile.write(passphrase)
188
 
            passfile.flush()
189
 
            proc = subprocess.Popen(['gpg', '--symmetric',
190
 
                                     '--passphrase-file',
191
 
                                     passfile.name]
192
 
                                    + self.gnupgargs,
193
 
                                    stdin = subprocess.PIPE,
194
 
                                    stdout = subprocess.PIPE,
195
 
                                    stderr = subprocess.PIPE)
196
 
            ciphertext, err = proc.communicate(input = data)
197
 
        if proc.returncode != 0:
198
 
            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
199
194
        return ciphertext
200
195
    
201
196
    def decrypt(self, data, password):
202
 
        passphrase = self.password_encode(password)
203
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
204
 
                                         ) as passfile:
205
 
            passfile.write(passphrase)
206
 
            passfile.flush()
207
 
            proc = subprocess.Popen(['gpg', '--decrypt',
208
 
                                     '--passphrase-file',
209
 
                                     passfile.name]
210
 
                                    + self.gnupgargs,
211
 
                                    stdin = subprocess.PIPE,
212
 
                                    stdout = subprocess.PIPE,
213
 
                                    stderr = subprocess.PIPE)
214
 
            decrypted_plaintext, err = proc.communicate(input
215
 
                                                        = data)
216
 
        if proc.returncode != 0:
217
 
            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
218
211
        return decrypted_plaintext
219
212
 
220
213
 
240
233
               Used to optionally bind to the specified interface.
241
234
    name: string; Example: 'Mandos'
242
235
    type: string; Example: '_mandos._tcp'.
243
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
236
                  See <http://www.dns-sd.org/ServiceTypes.html>
244
237
    port: integer; what port to announce
245
238
    TXT: list of strings; TXT record for the service
246
239
    domain: string; Domain to publish on, default to .local if empty.
386
379
                                 self.server_state_changed)
387
380
        self.server_state_changed(self.server.GetState())
388
381
 
389
 
 
390
382
class AvahiServiceToSyslog(AvahiService):
391
383
    def rename(self):
392
384
        """Add the new name to the syslog messages"""
397
389
                                .format(self.name)))
398
390
        return ret
399
391
 
400
 
 
401
392
def timedelta_to_milliseconds(td):
402
393
    "Convert a datetime.timedelta() to milliseconds"
403
394
    return ((td.days * 24 * 60 * 60 * 1000)
404
395
            + (td.seconds * 1000)
405
396
            + (td.microseconds // 1000))
406
397
 
407
 
 
408
398
class Client(object):
409
399
    """A representation of a client host served by this server.
410
400
    
446
436
    runtime_expansions: Allowed attributes for runtime expansion.
447
437
    expires:    datetime.datetime(); time (UTC) when a client will be
448
438
                disabled, or None
449
 
    server_settings: The server_settings dict from main()
450
439
    """
451
440
    
452
441
    runtime_expansions = ("approval_delay", "approval_duration",
453
 
                          "created", "enabled", "expires",
454
 
                          "fingerprint", "host", "interval",
455
 
                          "last_approval_request", "last_checked_ok",
 
442
                          "created", "enabled", "fingerprint",
 
443
                          "host", "interval", "last_checked_ok",
456
444
                          "last_enabled", "name", "timeout")
457
 
    client_defaults = { "timeout": "PT5M",
458
 
                        "extended_timeout": "PT15M",
459
 
                        "interval": "PT2M",
 
445
    client_defaults = { "timeout": "5m",
 
446
                        "extended_timeout": "15m",
 
447
                        "interval": "2m",
460
448
                        "checker": "fping -q -- %%(host)s",
461
449
                        "host": "",
462
 
                        "approval_delay": "PT0S",
463
 
                        "approval_duration": "PT1S",
 
450
                        "approval_delay": "0s",
 
451
                        "approval_duration": "1s",
464
452
                        "approved_by_default": "True",
465
453
                        "enabled": "True",
466
454
                        }
527
515
        
528
516
        return settings
529
517
    
530
 
    def __init__(self, settings, name = None, server_settings=None):
 
518
    def __init__(self, settings, name = None):
531
519
        self.name = name
532
 
        if server_settings is None:
533
 
            server_settings = {}
534
 
        self.server_settings = server_settings
535
520
        # adding all client settings
536
521
        for setting, value in settings.iteritems():
537
522
            setattr(self, setting, value)
587
572
        if getattr(self, "enabled", False):
588
573
            # Already enabled
589
574
            return
 
575
        self.send_changedstate()
590
576
        self.expires = datetime.datetime.utcnow() + self.timeout
591
577
        self.enabled = True
592
578
        self.last_enabled = datetime.datetime.utcnow()
593
579
        self.init_checker()
594
 
        self.send_changedstate()
595
580
    
596
581
    def disable(self, quiet=True):
597
582
        """Disable this client."""
598
583
        if not getattr(self, "enabled", False):
599
584
            return False
600
585
        if not quiet:
 
586
            self.send_changedstate()
 
587
        if not quiet:
601
588
            logger.info("Disabling client %s", self.name)
602
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
589
        if getattr(self, "disable_initiator_tag", False):
603
590
            gobject.source_remove(self.disable_initiator_tag)
604
591
            self.disable_initiator_tag = None
605
592
        self.expires = None
606
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
593
        if getattr(self, "checker_initiator_tag", False):
607
594
            gobject.source_remove(self.checker_initiator_tag)
608
595
            self.checker_initiator_tag = None
609
596
        self.stop_checker()
610
597
        self.enabled = False
611
 
        if not quiet:
612
 
            self.send_changedstate()
613
598
        # Do not run this again if called by a gobject.timeout_add
614
599
        return False
615
600
    
619
604
    def init_checker(self):
620
605
        # Schedule a new checker to be started an 'interval' from now,
621
606
        # and every interval from then on.
622
 
        if self.checker_initiator_tag is not None:
623
 
            gobject.source_remove(self.checker_initiator_tag)
624
607
        self.checker_initiator_tag = (gobject.timeout_add
625
608
                                      (self.interval_milliseconds(),
626
609
                                       self.start_checker))
627
610
        # Schedule a disable() when 'timeout' has passed
628
 
        if self.disable_initiator_tag is not None:
629
 
            gobject.source_remove(self.disable_initiator_tag)
630
611
        self.disable_initiator_tag = (gobject.timeout_add
631
612
                                   (self.timeout_milliseconds(),
632
613
                                    self.disable))
663
644
            timeout = self.timeout
664
645
        if self.disable_initiator_tag is not None:
665
646
            gobject.source_remove(self.disable_initiator_tag)
666
 
            self.disable_initiator_tag = None
667
647
        if getattr(self, "enabled", False):
668
648
            self.disable_initiator_tag = (gobject.timeout_add
669
649
                                          (timedelta_to_milliseconds
690
670
        # If a checker exists, make sure it is not a zombie
691
671
        try:
692
672
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
 
        except AttributeError:
694
 
            pass
695
 
        except OSError as error:
696
 
            if error.errno != errno.ECHILD:
697
 
                raise
 
673
        except (AttributeError, OSError) as error:
 
674
            if (isinstance(error, OSError)
 
675
                and error.errno != errno.ECHILD):
 
676
                raise error
698
677
        else:
699
678
            if pid:
700
679
                logger.warning("Checker was a zombie")
703
682
                                      self.current_checker_command)
704
683
        # Start a new checker if needed
705
684
        if self.checker is None:
706
 
            # Escape attributes for the shell
707
 
            escaped_attrs = dict(
708
 
                (attr, re.escape(unicode(getattr(self, attr))))
709
 
                for attr in
710
 
                self.runtime_expansions)
711
685
            try:
712
 
                command = self.checker_command % escaped_attrs
713
 
            except TypeError as error:
714
 
                logger.error('Could not format string "%s"',
715
 
                             self.checker_command, exc_info=error)
716
 
                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
717
704
            self.current_checker_command = command
718
705
            try:
719
706
                logger.info("Starting checker %r for %s",
722
709
                # in normal mode, that is already done by daemon(),
723
710
                # and in debug mode we don't want to.  (Stdin is
724
711
                # always replaced by /dev/null.)
725
 
                # The exception is when not debugging but nevertheless
726
 
                # running in the foreground; use the previously
727
 
                # created wnull.
728
 
                popen_args = {}
729
 
                if (not self.server_settings["debug"]
730
 
                    and self.server_settings["foreground"]):
731
 
                    popen_args.update({"stdout": wnull,
732
 
                                       "stderr": wnull })
733
712
                self.checker = subprocess.Popen(command,
734
713
                                                close_fds=True,
735
 
                                                shell=True, cwd="/",
736
 
                                                **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)
737
725
            except OSError as error:
738
726
                logger.error("Failed to start subprocess",
739
727
                             exc_info=error)
740
 
                return True
741
 
            self.checker_callback_tag = (gobject.child_watch_add
742
 
                                         (self.checker.pid,
743
 
                                          self.checker_callback,
744
 
                                          data=command))
745
 
            # The checker may have completed before the gobject
746
 
            # watch was added.  Check for this.
747
 
            try:
748
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
749
 
            except OSError as error:
750
 
                if error.errno == errno.ECHILD:
751
 
                    # This should never happen
752
 
                    logger.error("Child process vanished",
753
 
                                 exc_info=error)
754
 
                    return True
755
 
                raise
756
 
            if pid:
757
 
                gobject.source_remove(self.checker_callback_tag)
758
 
                self.checker_callback(pid, status, command)
759
728
        # Re-run this periodically if run by gobject.timeout_add
760
729
        return True
761
730
    
934
903
            # The byte_arrays option is not supported yet on
935
904
            # signatures other than "ay".
936
905
            if prop._dbus_signature != "ay":
937
 
                raise ValueError("Byte arrays not supported for non-"
938
 
                                 "'ay' signature {0!r}"
939
 
                                 .format(prop._dbus_signature))
 
906
                raise ValueError
940
907
            value = dbus.ByteArray(b''.join(chr(byte)
941
908
                                            for byte in value))
942
909
        prop(value)
1048
1015
        return xmlstring
1049
1016
 
1050
1017
 
1051
 
def datetime_to_dbus(dt, variant_level=0):
 
1018
def datetime_to_dbus (dt, variant_level=0):
1052
1019
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1053
1020
    if dt is None:
1054
1021
        return dbus.String("", variant_level = variant_level)
1062
1029
    interface names according to the "alt_interface_names" mapping.
1063
1030
    Usage:
1064
1031
    
1065
 
    @alternate_dbus_interfaces({"org.example.Interface":
1066
 
                                    "net.example.AlternateInterface"})
 
1032
    @alternate_dbus_names({"org.example.Interface":
 
1033
                               "net.example.AlternateInterface"})
1067
1034
    class SampleDBusObject(dbus.service.Object):
1068
1035
        @dbus.service.method("org.example.Interface")
1069
1036
        def SampleDBusMethod():
1100
1067
                interface_names.add(alt_interface)
1101
1068
                # Is this a D-Bus signal?
1102
1069
                if getattr(attribute, "_dbus_is_signal", False):
1103
 
                    # Extract the original non-method undecorated
1104
 
                    # function by black magic
 
1070
                    # Extract the original non-method function by
 
1071
                    # black magic
1105
1072
                    nonmethod_func = (dict(
1106
1073
                            zip(attribute.func_code.co_freevars,
1107
1074
                                attribute.__closure__))["func"]
1368
1335
        return False
1369
1336
    
1370
1337
    def approve(self, value=True):
 
1338
        self.send_changedstate()
1371
1339
        self.approved = value
1372
1340
        gobject.timeout_add(timedelta_to_milliseconds
1373
1341
                            (self.approval_duration),
1374
1342
                            self._reset_approved)
1375
 
        self.send_changedstate()
1376
1343
    
1377
1344
    ## D-Bus methods, signals & properties
1378
1345
    _interface = "se.recompile.Mandos.Client"
1562
1529
    def Timeout_dbus_property(self, value=None):
1563
1530
        if value is None:       # get
1564
1531
            return dbus.UInt64(self.timeout_milliseconds())
1565
 
        old_timeout = self.timeout
1566
1532
        self.timeout = datetime.timedelta(0, 0, 0, value)
1567
 
        # Reschedule disabling
 
1533
        # Reschedule timeout
1568
1534
        if self.enabled:
1569
1535
            now = datetime.datetime.utcnow()
1570
 
            self.expires += self.timeout - old_timeout
1571
 
            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:
1572
1539
                # The timeout has passed
1573
1540
                self.disable()
1574
1541
            else:
 
1542
                self.expires = (now +
 
1543
                                datetime.timedelta(milliseconds =
 
1544
                                                   time_to_die))
1575
1545
                if (getattr(self, "disable_initiator_tag", None)
1576
1546
                    is None):
1577
1547
                    return
1578
1548
                gobject.source_remove(self.disable_initiator_tag)
1579
 
                self.disable_initiator_tag = (
1580
 
                    gobject.timeout_add(
1581
 
                        timedelta_to_milliseconds(self.expires - now),
1582
 
                        self.disable))
 
1549
                self.disable_initiator_tag = (gobject.timeout_add
 
1550
                                              (time_to_die,
 
1551
                                               self.disable))
1583
1552
    
1584
1553
    # ExtendedTimeout - property
1585
1554
    @dbus_service_property(_interface, signature="t",
1705
1674
            logger.debug("Protocol version: %r", line)
1706
1675
            try:
1707
1676
                if int(line.strip().split()[0]) > 1:
1708
 
                    raise RuntimeError(line)
 
1677
                    raise RuntimeError
1709
1678
            except (ValueError, IndexError, RuntimeError) as error:
1710
1679
                logger.error("Unknown protocol version: %s", error)
1711
1680
                return
1773
1742
                    #wait until timeout or approved
1774
1743
                    time = datetime.datetime.now()
1775
1744
                    client.changedstate.acquire()
1776
 
                    client.changedstate.wait(
1777
 
                        float(timedelta_to_milliseconds(delay)
1778
 
                              / 1000))
 
1745
                    (client.changedstate.wait
 
1746
                     (float(client.timedelta_to_milliseconds(delay)
 
1747
                            / 1000)))
1779
1748
                    client.changedstate.release()
1780
1749
                    time2 = datetime.datetime.now()
1781
1750
                    if (time2 - time) >= delay:
1918
1887
    
1919
1888
    def add_pipe(self, parent_pipe, proc):
1920
1889
        """Dummy function; override as necessary"""
1921
 
        raise NotImplementedError()
 
1890
        raise NotImplementedError
1922
1891
 
1923
1892
 
1924
1893
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1931
1900
        use_ipv6:       Boolean; to use IPv6 or not
1932
1901
    """
1933
1902
    def __init__(self, server_address, RequestHandlerClass,
1934
 
                 interface=None, use_ipv6=True, socketfd=None):
1935
 
        """If socketfd is set, use that file descriptor instead of
1936
 
        creating a new one with socket.socket().
1937
 
        """
 
1903
                 interface=None, use_ipv6=True):
1938
1904
        self.interface = interface
1939
1905
        if use_ipv6:
1940
1906
            self.address_family = socket.AF_INET6
1941
 
        if socketfd is not None:
1942
 
            # Save the file descriptor
1943
 
            self.socketfd = socketfd
1944
 
            # Save the original socket.socket() function
1945
 
            self.socket_socket = socket.socket
1946
 
            # To implement --socket, we monkey patch socket.socket.
1947
 
            # 
1948
 
            # (When socketserver.TCPServer is a new-style class, we
1949
 
            # could make self.socket into a property instead of monkey
1950
 
            # patching socket.socket.)
1951
 
            # 
1952
 
            # Create a one-time-only replacement for socket.socket()
1953
 
            @functools.wraps(socket.socket)
1954
 
            def socket_wrapper(*args, **kwargs):
1955
 
                # Restore original function so subsequent calls are
1956
 
                # not affected.
1957
 
                socket.socket = self.socket_socket
1958
 
                del self.socket_socket
1959
 
                # This time only, return a new socket object from the
1960
 
                # saved file descriptor.
1961
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1962
 
            # Replace socket.socket() function with wrapper
1963
 
            socket.socket = socket_wrapper
1964
 
        # The socketserver.TCPServer.__init__ will call
1965
 
        # socket.socket(), which might be our replacement,
1966
 
        # socket_wrapper(), if socketfd was set.
1967
1907
        socketserver.TCPServer.__init__(self, server_address,
1968
1908
                                        RequestHandlerClass)
1969
 
    
1970
1909
    def server_bind(self):
1971
1910
        """This overrides the normal server_bind() function
1972
1911
        to bind to an interface if one was specified, and also NOT to
1980
1919
                try:
1981
1920
                    self.socket.setsockopt(socket.SOL_SOCKET,
1982
1921
                                           SO_BINDTODEVICE,
1983
 
                                           str(self.interface + '\0'))
 
1922
                                           str(self.interface
 
1923
                                               + '\0'))
1984
1924
                except socket.error as error:
1985
 
                    if error.errno == errno.EPERM:
1986
 
                        logger.error("No permission to bind to"
1987
 
                                     " interface %s", self.interface)
1988
 
                    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:
1989
1930
                        logger.error("SO_BINDTODEVICE not available;"
1990
1931
                                     " cannot bind to interface %s",
1991
1932
                                     self.interface)
1992
 
                    elif error.errno == errno.ENODEV:
1993
 
                        logger.error("Interface %s does not exist,"
1994
 
                                     " cannot bind", self.interface)
1995
1933
                    else:
1996
1934
                        raise
1997
1935
        # Only bind(2) the socket if we really need to.
2000
1938
                if self.address_family == socket.AF_INET6:
2001
1939
                    any_address = "::" # in6addr_any
2002
1940
                else:
2003
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1941
                    any_address = socket.INADDR_ANY
2004
1942
                self.server_address = (any_address,
2005
1943
                                       self.server_address[1])
2006
1944
            elif not self.server_address[1]:
2027
1965
    """
2028
1966
    def __init__(self, server_address, RequestHandlerClass,
2029
1967
                 interface=None, use_ipv6=True, clients=None,
2030
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1968
                 gnutls_priority=None, use_dbus=True):
2031
1969
        self.enabled = False
2032
1970
        self.clients = clients
2033
1971
        if self.clients is None:
2037
1975
        IPv6_TCPServer.__init__(self, server_address,
2038
1976
                                RequestHandlerClass,
2039
1977
                                interface = interface,
2040
 
                                use_ipv6 = use_ipv6,
2041
 
                                socketfd = socketfd)
 
1978
                                use_ipv6 = use_ipv6)
2042
1979
    def server_activate(self):
2043
1980
        if self.enabled:
2044
1981
            return socketserver.TCPServer.server_activate(self)
2122
2059
        return True
2123
2060
 
2124
2061
 
2125
 
def rfc3339_duration_to_delta(duration):
2126
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2127
 
    
2128
 
    >>> rfc3339_duration_to_delta("P7D")
2129
 
    datetime.timedelta(7)
2130
 
    >>> rfc3339_duration_to_delta("PT60S")
2131
 
    datetime.timedelta(0, 60)
2132
 
    >>> rfc3339_duration_to_delta("PT60M")
2133
 
    datetime.timedelta(0, 3600)
2134
 
    >>> rfc3339_duration_to_delta("PT24H")
2135
 
    datetime.timedelta(1)
2136
 
    >>> rfc3339_duration_to_delta("P1W")
2137
 
    datetime.timedelta(7)
2138
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2139
 
    datetime.timedelta(0, 330)
2140
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2141
 
    datetime.timedelta(1, 200)
2142
 
    """
2143
 
    
2144
 
    # Parsing an RFC 3339 duration with regular expressions is not
2145
 
    # possible - there would have to be multiple places for the same
2146
 
    # values, like seconds.  The current code, while more esoteric, is
2147
 
    # cleaner without depending on a parsing library.  If Python had a
2148
 
    # built-in library for parsing we would use it, but we'd like to
2149
 
    # avoid excessive use of external libraries.
2150
 
    
2151
 
    # New type for defining tokens, syntax, and semantics all-in-one
2152
 
    Token = collections.namedtuple("Token",
2153
 
                                   ("regexp", # To match token; if
2154
 
                                              # "value" is not None,
2155
 
                                              # must have a "group"
2156
 
                                              # containing digits
2157
 
                                    "value",  # datetime.timedelta or
2158
 
                                              # None
2159
 
                                    "followers")) # Tokens valid after
2160
 
                                                  # this token
2161
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2162
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2163
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2164
 
    token_second = Token(re.compile(r"(\d+)S"),
2165
 
                         datetime.timedelta(seconds=1),
2166
 
                         frozenset((token_end,)))
2167
 
    token_minute = Token(re.compile(r"(\d+)M"),
2168
 
                         datetime.timedelta(minutes=1),
2169
 
                         frozenset((token_second, token_end)))
2170
 
    token_hour = Token(re.compile(r"(\d+)H"),
2171
 
                       datetime.timedelta(hours=1),
2172
 
                       frozenset((token_minute, token_end)))
2173
 
    token_time = Token(re.compile(r"T"),
2174
 
                       None,
2175
 
                       frozenset((token_hour, token_minute,
2176
 
                                  token_second)))
2177
 
    token_day = Token(re.compile(r"(\d+)D"),
2178
 
                      datetime.timedelta(days=1),
2179
 
                      frozenset((token_time, token_end)))
2180
 
    token_month = Token(re.compile(r"(\d+)M"),
2181
 
                        datetime.timedelta(weeks=4),
2182
 
                        frozenset((token_day, token_end)))
2183
 
    token_year = Token(re.compile(r"(\d+)Y"),
2184
 
                       datetime.timedelta(weeks=52),
2185
 
                       frozenset((token_month, token_end)))
2186
 
    token_week = Token(re.compile(r"(\d+)W"),
2187
 
                       datetime.timedelta(weeks=1),
2188
 
                       frozenset((token_end,)))
2189
 
    token_duration = Token(re.compile(r"P"), None,
2190
 
                           frozenset((token_year, token_month,
2191
 
                                      token_day, token_time,
2192
 
                                      token_week))),
2193
 
    # Define starting values
2194
 
    value = datetime.timedelta() # Value so far
2195
 
    found_token = None
2196
 
    followers = frozenset(token_duration,) # Following valid tokens
2197
 
    s = duration                # String left to parse
2198
 
    # Loop until end token is found
2199
 
    while found_token is not token_end:
2200
 
        # Search for any currently valid tokens
2201
 
        for token in followers:
2202
 
            match = token.regexp.match(s)
2203
 
            if match is not None:
2204
 
                # Token found
2205
 
                if token.value is not None:
2206
 
                    # Value found, parse digits
2207
 
                    factor = int(match.group(1), 10)
2208
 
                    # Add to value so far
2209
 
                    value += factor * token.value
2210
 
                # Strip token from string
2211
 
                s = token.regexp.sub("", s, 1)
2212
 
                # Go to found token
2213
 
                found_token = token
2214
 
                # Set valid next tokens
2215
 
                followers = found_token.followers
2216
 
                break
2217
 
        else:
2218
 
            # No currently valid tokens were found
2219
 
            raise ValueError("Invalid RFC 3339 duration")
2220
 
    # End token found
2221
 
    return value
2222
 
 
2223
 
 
2224
2062
def string_to_delta(interval):
2225
2063
    """Parse a string and return a datetime.timedelta
2226
2064
    
2237
2075
    >>> string_to_delta('5m 30s')
2238
2076
    datetime.timedelta(0, 330)
2239
2077
    """
2240
 
    
2241
 
    try:
2242
 
        return rfc3339_duration_to_delta(interval)
2243
 
    except ValueError:
2244
 
        pass
2245
 
    
2246
2078
    timevalue = datetime.timedelta(0)
2247
2079
    for s in interval.split():
2248
2080
        try:
2261
2093
            else:
2262
2094
                raise ValueError("Unknown suffix {0!r}"
2263
2095
                                 .format(suffix))
2264
 
        except IndexError as e:
 
2096
        except (ValueError, IndexError) as e:
2265
2097
            raise ValueError(*(e.args))
2266
2098
        timevalue += delta
2267
2099
    return timevalue
2311
2143
                        help="Run self-test")
2312
2144
    parser.add_argument("--debug", action="store_true",
2313
2145
                        help="Debug mode; run in foreground and log"
2314
 
                        " to terminal", default=None)
 
2146
                        " to terminal")
2315
2147
    parser.add_argument("--debuglevel", metavar="LEVEL",
2316
2148
                        help="Debug level for stdout output")
2317
2149
    parser.add_argument("--priority", help="GnuTLS"
2324
2156
                        " files")
2325
2157
    parser.add_argument("--no-dbus", action="store_false",
2326
2158
                        dest="use_dbus", help="Do not provide D-Bus"
2327
 
                        " system bus interface", default=None)
 
2159
                        " system bus interface")
2328
2160
    parser.add_argument("--no-ipv6", action="store_false",
2329
 
                        dest="use_ipv6", help="Do not use IPv6",
2330
 
                        default=None)
 
2161
                        dest="use_ipv6", help="Do not use IPv6")
2331
2162
    parser.add_argument("--no-restore", action="store_false",
2332
2163
                        dest="restore", help="Do not restore stored"
2333
 
                        " state", default=None)
2334
 
    parser.add_argument("--socket", type=int,
2335
 
                        help="Specify a file descriptor to a network"
2336
 
                        " socket to use instead of creating one")
 
2164
                        " state")
2337
2165
    parser.add_argument("--statedir", metavar="DIR",
2338
2166
                        help="Directory to save/restore state in")
2339
 
    parser.add_argument("--foreground", action="store_true",
2340
 
                        help="Run in foreground", default=None)
2341
2167
    
2342
2168
    options = parser.parse_args()
2343
2169
    
2352
2178
                        "port": "",
2353
2179
                        "debug": "False",
2354
2180
                        "priority":
2355
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2181
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2356
2182
                        "servicename": "Mandos",
2357
2183
                        "use_dbus": "True",
2358
2184
                        "use_ipv6": "True",
2359
2185
                        "debuglevel": "",
2360
2186
                        "restore": "True",
2361
 
                        "socket": "",
2362
 
                        "statedir": "/var/lib/mandos",
2363
 
                        "foreground": "False",
 
2187
                        "statedir": "/var/lib/mandos"
2364
2188
                        }
2365
2189
    
2366
2190
    # Parse config file for server-global settings
2371
2195
    # Convert the SafeConfigParser object to a dict
2372
2196
    server_settings = server_config.defaults()
2373
2197
    # Use the appropriate methods on the non-string config options
2374
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2198
    for option in ("debug", "use_dbus", "use_ipv6"):
2375
2199
        server_settings[option] = server_config.getboolean("DEFAULT",
2376
2200
                                                           option)
2377
2201
    if server_settings["port"]:
2378
2202
        server_settings["port"] = server_config.getint("DEFAULT",
2379
2203
                                                       "port")
2380
 
    if server_settings["socket"]:
2381
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2382
 
                                                         "socket")
2383
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2384
 
        # over with an opened os.devnull.  But we don't want this to
2385
 
        # happen with a supplied network socket.
2386
 
        if 0 <= server_settings["socket"] <= 2:
2387
 
            server_settings["socket"] = os.dup(server_settings
2388
 
                                               ["socket"])
2389
2204
    del server_config
2390
2205
    
2391
2206
    # Override the settings from the config file with command line
2393
2208
    for option in ("interface", "address", "port", "debug",
2394
2209
                   "priority", "servicename", "configdir",
2395
2210
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2396
 
                   "statedir", "socket", "foreground"):
 
2211
                   "statedir"):
2397
2212
        value = getattr(options, option)
2398
2213
        if value is not None:
2399
2214
            server_settings[option] = value
2402
2217
    for option in server_settings.keys():
2403
2218
        if type(server_settings[option]) is str:
2404
2219
            server_settings[option] = unicode(server_settings[option])
2405
 
    # Force all boolean options to be boolean
2406
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2407
 
                   "foreground"):
2408
 
        server_settings[option] = bool(server_settings[option])
2409
 
    # Debug implies foreground
2410
 
    if server_settings["debug"]:
2411
 
        server_settings["foreground"] = True
2412
2220
    # Now we have our good server settings in "server_settings"
2413
2221
    
2414
2222
    ##################################################################
2420
2228
    use_ipv6 = server_settings["use_ipv6"]
2421
2229
    stored_state_path = os.path.join(server_settings["statedir"],
2422
2230
                                     stored_state_file)
2423
 
    foreground = server_settings["foreground"]
2424
2231
    
2425
2232
    if debug:
2426
2233
        initlogger(debug, logging.DEBUG)
2455
2262
                              use_ipv6=use_ipv6,
2456
2263
                              gnutls_priority=
2457
2264
                              server_settings["priority"],
2458
 
                              use_dbus=use_dbus,
2459
 
                              socketfd=(server_settings["socket"]
2460
 
                                        or None))
2461
 
    if not foreground:
2462
 
        pidfilename = "/run/mandos.pid"
2463
 
        if not os.path.isdir("/run/."):
2464
 
            pidfilename = "/var/run/mandos.pid"
2465
 
        pidfile = None
 
2265
                              use_dbus=use_dbus)
 
2266
    if not debug:
 
2267
        pidfilename = "/var/run/mandos.pid"
2466
2268
        try:
2467
2269
            pidfile = open(pidfilename, "w")
2468
2270
        except IOError as e:
2483
2285
        os.setgid(gid)
2484
2286
        os.setuid(uid)
2485
2287
    except OSError as error:
2486
 
        if error.errno != errno.EPERM:
2487
 
            raise
 
2288
        if error[0] != errno.EPERM:
 
2289
            raise error
2488
2290
    
2489
2291
    if debug:
2490
2292
        # Enable all possible GnuTLS debugging
2507
2309
            os.close(null)
2508
2310
    
2509
2311
    # Need to fork before connecting to D-Bus
2510
 
    if not foreground:
 
2312
    if not debug:
2511
2313
        # Close all input and output, do double fork, etc.
2512
2314
        daemon()
2513
2315
    
2514
 
    # multiprocessing will use threads, so before we use gobject we
2515
 
    # need to inform gobject that threads will be used.
2516
2316
    gobject.threads_init()
2517
2317
    
2518
2318
    global main_loop
2553
2353
    old_client_settings = {}
2554
2354
    clients_data = {}
2555
2355
    
2556
 
    # This is used to redirect stdout and stderr for checker processes
2557
 
    global wnull
2558
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2559
 
    # Only used if server is running in foreground but not in debug
2560
 
    # mode
2561
 
    if debug or not foreground:
2562
 
        wnull.close()
2563
 
    
2564
2356
    # Get client data and settings from last running state.
2565
2357
    if server_settings["restore"]:
2566
2358
        try:
2582
2374
    
2583
2375
    with PGPEngine() as pgp:
2584
2376
        for client_name, client in clients_data.iteritems():
2585
 
            # Skip removed clients
2586
 
            if client_name not in client_settings:
2587
 
                continue
2588
 
            
2589
2377
            # Decide which value to use after restoring saved state.
2590
2378
            # We have three different values: Old config file,
2591
2379
            # new config file, and saved state.
2653
2441
    # Create all client objects
2654
2442
    for client_name, client in clients_data.iteritems():
2655
2443
        tcp_server.clients[client_name] = client_class(
2656
 
            name = client_name, settings = client,
2657
 
            server_settings = server_settings)
 
2444
            name = client_name, settings = client)
2658
2445
    
2659
2446
    if not tcp_server.clients:
2660
2447
        logger.warning("No clients defined")
2661
2448
    
2662
 
    if not foreground:
2663
 
        if pidfile is not None:
2664
 
            try:
2665
 
                with pidfile:
2666
 
                    pid = os.getpid()
2667
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2668
 
            except IOError:
2669
 
                logger.error("Could not write to file %r with PID %d",
2670
 
                             pidfilename, pid)
2671
 
        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
2672
2461
        del pidfilename
 
2462
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2673
2463
    
2674
2464
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2675
2465
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2743
2533
        service.cleanup()
2744
2534
        
2745
2535
        multiprocessing.active_children()
2746
 
        wnull.close()
2747
2536
        if not (tcp_server.clients or client_settings):
2748
2537
            return
2749
2538
        
2761
2550
                # A list of attributes that can not be pickled
2762
2551
                # + secret.
2763
2552
                exclude = set(("bus", "changedstate", "secret",
2764
 
                               "checker", "server_settings"))
 
2553
                               "checker"))
2765
2554
                for name, typ in (inspect.getmembers
2766
2555
                                  (dbus.service.Object)):
2767
2556
                    exclude.add(name)
2795
2584
            else:
2796
2585
                logger.warning("Could not save persistent state:",
2797
2586
                               exc_info=e)
2798
 
                raise
 
2587
                raise e
2799
2588
        
2800
2589
        # Delete all clients, and settings from config
2801
2590
        while tcp_server.clients: