/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: 2013-10-26 19:05:21 UTC
  • Revision ID: teddy@recompile.se-20131026190521-giagilisbyciox2h
Fall back to /var/run for pidfile if /run is not a directory.

This is for old (possibly non-Debian) systems which have not migrated
from /var/run to /run yet.

* init.d-mandos (PIDFILE): Fall back to /var/run/mandos.pid if /run is
                           not a directory.
* mandos (pidfilename): - '' -
* mandos.xml (FILES): Document fallback to /var/run/mandos.pid if /run
                      is not a directory.

Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>

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-2013 Teddy Hogeborn
 
15
# Copyright © 2008-2013 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.2"
90
92
stored_state_file = "clients.pickle"
91
93
 
92
94
logger = logging.getLogger()
137
139
class PGPEngine(object):
138
140
    """A simple class for OpenPGP symmetric encryption & decryption"""
139
141
    def __init__(self):
140
 
        self.gnupg = GnuPGInterface.GnuPG()
141
142
        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'])
 
143
        self.gnupgargs = ['--batch',
 
144
                          '--home', self.tempdir,
 
145
                          '--force-mdc',
 
146
                          '--quiet',
 
147
                          '--no-use-agent']
148
148
    
149
149
    def __enter__(self):
150
150
        return self
151
151
    
152
 
    def __exit__ (self, exc_type, exc_value, traceback):
 
152
    def __exit__(self, exc_type, exc_value, traceback):
153
153
        self._cleanup()
154
154
        return False
155
155
    
172
172
    def password_encode(self, password):
173
173
        # Passphrase can not be empty and can not contain newlines or
174
174
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        return b"mandos" + binascii.hexlify(password)
 
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
176
182
    
177
183
    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
 
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)
192
199
        return ciphertext
193
200
    
194
201
    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
 
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)
209
218
        return decrypted_plaintext
210
219
 
211
220
 
231
240
               Used to optionally bind to the specified interface.
232
241
    name: string; Example: 'Mandos'
233
242
    type: string; Example: '_mandos._tcp'.
234
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
243
     See <https://www.iana.org/assignments/service-names-port-numbers>
235
244
    port: integer; what port to announce
236
245
    TXT: list of strings; TXT record for the service
237
246
    domain: string; Domain to publish on, default to .local if empty.
377
386
                                 self.server_state_changed)
378
387
        self.server_state_changed(self.server.GetState())
379
388
 
 
389
 
380
390
class AvahiServiceToSyslog(AvahiService):
381
391
    def rename(self):
382
392
        """Add the new name to the syslog messages"""
387
397
                                .format(self.name)))
388
398
        return ret
389
399
 
 
400
 
390
401
def timedelta_to_milliseconds(td):
391
402
    "Convert a datetime.timedelta() to milliseconds"
392
403
    return ((td.days * 24 * 60 * 60 * 1000)
393
404
            + (td.seconds * 1000)
394
405
            + (td.microseconds // 1000))
395
406
 
 
407
 
396
408
class Client(object):
397
409
    """A representation of a client host served by this server.
398
410
    
434
446
    runtime_expansions: Allowed attributes for runtime expansion.
435
447
    expires:    datetime.datetime(); time (UTC) when a client will be
436
448
                disabled, or None
 
449
    server_settings: The server_settings dict from main()
437
450
    """
438
451
    
439
452
    runtime_expansions = ("approval_delay", "approval_duration",
440
 
                          "created", "enabled", "fingerprint",
441
 
                          "host", "interval", "last_checked_ok",
 
453
                          "created", "enabled", "expires",
 
454
                          "fingerprint", "host", "interval",
 
455
                          "last_approval_request", "last_checked_ok",
442
456
                          "last_enabled", "name", "timeout")
443
 
    client_defaults = { "timeout": "5m",
444
 
                        "extended_timeout": "15m",
445
 
                        "interval": "2m",
 
457
    client_defaults = { "timeout": "PT5M",
 
458
                        "extended_timeout": "PT15M",
 
459
                        "interval": "PT2M",
446
460
                        "checker": "fping -q -- %%(host)s",
447
461
                        "host": "",
448
 
                        "approval_delay": "0s",
449
 
                        "approval_duration": "1s",
 
462
                        "approval_delay": "PT0S",
 
463
                        "approval_duration": "PT1S",
450
464
                        "approved_by_default": "True",
451
465
                        "enabled": "True",
452
466
                        }
513
527
        
514
528
        return settings
515
529
    
516
 
    def __init__(self, settings, name = None):
 
530
    def __init__(self, settings, name = None, server_settings=None):
517
531
        self.name = name
 
532
        if server_settings is None:
 
533
            server_settings = {}
 
534
        self.server_settings = server_settings
518
535
        # adding all client settings
519
536
        for setting, value in settings.iteritems():
520
537
            setattr(self, setting, value)
570
587
        if getattr(self, "enabled", False):
571
588
            # Already enabled
572
589
            return
573
 
        self.send_changedstate()
574
590
        self.expires = datetime.datetime.utcnow() + self.timeout
575
591
        self.enabled = True
576
592
        self.last_enabled = datetime.datetime.utcnow()
577
593
        self.init_checker()
 
594
        self.send_changedstate()
578
595
    
579
596
    def disable(self, quiet=True):
580
597
        """Disable this client."""
581
598
        if not getattr(self, "enabled", False):
582
599
            return False
583
600
        if not quiet:
584
 
            self.send_changedstate()
585
 
        if not quiet:
586
601
            logger.info("Disabling client %s", self.name)
587
 
        if getattr(self, "disable_initiator_tag", False):
 
602
        if getattr(self, "disable_initiator_tag", None) is not None:
588
603
            gobject.source_remove(self.disable_initiator_tag)
589
604
            self.disable_initiator_tag = None
590
605
        self.expires = None
591
 
        if getattr(self, "checker_initiator_tag", False):
 
606
        if getattr(self, "checker_initiator_tag", None) is not None:
592
607
            gobject.source_remove(self.checker_initiator_tag)
593
608
            self.checker_initiator_tag = None
594
609
        self.stop_checker()
595
610
        self.enabled = False
 
611
        if not quiet:
 
612
            self.send_changedstate()
596
613
        # Do not run this again if called by a gobject.timeout_add
597
614
        return False
598
615
    
602
619
    def init_checker(self):
603
620
        # Schedule a new checker to be started an 'interval' from now,
604
621
        # and every interval from then on.
 
622
        if self.checker_initiator_tag is not None:
 
623
            gobject.source_remove(self.checker_initiator_tag)
605
624
        self.checker_initiator_tag = (gobject.timeout_add
606
625
                                      (self.interval_milliseconds(),
607
626
                                       self.start_checker))
608
627
        # Schedule a disable() when 'timeout' has passed
 
628
        if self.disable_initiator_tag is not None:
 
629
            gobject.source_remove(self.disable_initiator_tag)
609
630
        self.disable_initiator_tag = (gobject.timeout_add
610
631
                                   (self.timeout_milliseconds(),
611
632
                                    self.disable))
642
663
            timeout = self.timeout
643
664
        if self.disable_initiator_tag is not None:
644
665
            gobject.source_remove(self.disable_initiator_tag)
 
666
            self.disable_initiator_tag = None
645
667
        if getattr(self, "enabled", False):
646
668
            self.disable_initiator_tag = (gobject.timeout_add
647
669
                                          (timedelta_to_milliseconds
680
702
                                      self.current_checker_command)
681
703
        # Start a new checker if needed
682
704
        if self.checker is None:
 
705
            # Escape attributes for the shell
 
706
            escaped_attrs = dict(
 
707
                (attr, re.escape(unicode(getattr(self, attr))))
 
708
                for attr in
 
709
                self.runtime_expansions)
683
710
            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
 
711
                command = self.checker_command % escaped_attrs
 
712
            except TypeError as error:
 
713
                logger.error('Could not format string "%s"',
 
714
                             self.checker_command, exc_info=error)
 
715
                return True # Try again later
702
716
            self.current_checker_command = command
703
717
            try:
704
718
                logger.info("Starting checker %r for %s",
707
721
                # in normal mode, that is already done by daemon(),
708
722
                # and in debug mode we don't want to.  (Stdin is
709
723
                # always replaced by /dev/null.)
 
724
                # The exception is when not debugging but nevertheless
 
725
                # running in the foreground; use the previously
 
726
                # created wnull.
 
727
                popen_args = {}
 
728
                if (not self.server_settings["debug"]
 
729
                    and self.server_settings["foreground"]):
 
730
                    popen_args.update({"stdout": wnull,
 
731
                                       "stderr": wnull })
710
732
                self.checker = subprocess.Popen(command,
711
733
                                                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)
 
734
                                                shell=True, cwd="/",
 
735
                                                **popen_args)
723
736
            except OSError as error:
724
737
                logger.error("Failed to start subprocess",
725
738
                             exc_info=error)
 
739
                return True
 
740
            self.checker_callback_tag = (gobject.child_watch_add
 
741
                                         (self.checker.pid,
 
742
                                          self.checker_callback,
 
743
                                          data=command))
 
744
            # The checker may have completed before the gobject
 
745
            # watch was added.  Check for this.
 
746
            try:
 
747
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
748
            except OSError as error:
 
749
                if error.errno == errno.ECHILD:
 
750
                    # This should never happen
 
751
                    logger.error("Child process vanished",
 
752
                                 exc_info=error)
 
753
                    return True
 
754
                raise
 
755
            if pid:
 
756
                gobject.source_remove(self.checker_callback_tag)
 
757
                self.checker_callback(pid, status, command)
726
758
        # Re-run this periodically if run by gobject.timeout_add
727
759
        return True
728
760
    
1013
1045
        return xmlstring
1014
1046
 
1015
1047
 
1016
 
def datetime_to_dbus (dt, variant_level=0):
 
1048
def datetime_to_dbus(dt, variant_level=0):
1017
1049
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1018
1050
    if dt is None:
1019
1051
        return dbus.String("", variant_level = variant_level)
1027
1059
    interface names according to the "alt_interface_names" mapping.
1028
1060
    Usage:
1029
1061
    
1030
 
    @alternate_dbus_names({"org.example.Interface":
1031
 
                               "net.example.AlternateInterface"})
 
1062
    @alternate_dbus_interfaces({"org.example.Interface":
 
1063
                                    "net.example.AlternateInterface"})
1032
1064
    class SampleDBusObject(dbus.service.Object):
1033
1065
        @dbus.service.method("org.example.Interface")
1034
1066
        def SampleDBusMethod():
1065
1097
                interface_names.add(alt_interface)
1066
1098
                # Is this a D-Bus signal?
1067
1099
                if getattr(attribute, "_dbus_is_signal", False):
1068
 
                    # Extract the original non-method function by
1069
 
                    # black magic
 
1100
                    # Extract the original non-method undecorated
 
1101
                    # function by black magic
1070
1102
                    nonmethod_func = (dict(
1071
1103
                            zip(attribute.func_code.co_freevars,
1072
1104
                                attribute.__closure__))["func"]
1333
1365
        return False
1334
1366
    
1335
1367
    def approve(self, value=True):
1336
 
        self.send_changedstate()
1337
1368
        self.approved = value
1338
1369
        gobject.timeout_add(timedelta_to_milliseconds
1339
1370
                            (self.approval_duration),
1340
1371
                            self._reset_approved)
 
1372
        self.send_changedstate()
1341
1373
    
1342
1374
    ## D-Bus methods, signals & properties
1343
1375
    _interface = "se.recompile.Mandos.Client"
1527
1559
    def Timeout_dbus_property(self, value=None):
1528
1560
        if value is None:       # get
1529
1561
            return dbus.UInt64(self.timeout_milliseconds())
 
1562
        old_timeout = self.timeout
1530
1563
        self.timeout = datetime.timedelta(0, 0, 0, value)
1531
 
        # Reschedule timeout
 
1564
        # Reschedule disabling
1532
1565
        if self.enabled:
1533
1566
            now = datetime.datetime.utcnow()
1534
 
            time_to_die = timedelta_to_milliseconds(
1535
 
                (self.last_checked_ok + self.timeout) - now)
1536
 
            if time_to_die <= 0:
 
1567
            self.expires += self.timeout - old_timeout
 
1568
            if self.expires <= now:
1537
1569
                # The timeout has passed
1538
1570
                self.disable()
1539
1571
            else:
1540
 
                self.expires = (now +
1541
 
                                datetime.timedelta(milliseconds =
1542
 
                                                   time_to_die))
1543
1572
                if (getattr(self, "disable_initiator_tag", None)
1544
1573
                    is None):
1545
1574
                    return
1546
1575
                gobject.source_remove(self.disable_initiator_tag)
1547
 
                self.disable_initiator_tag = (gobject.timeout_add
1548
 
                                              (time_to_die,
1549
 
                                               self.disable))
 
1576
                self.disable_initiator_tag = (
 
1577
                    gobject.timeout_add(
 
1578
                        timedelta_to_milliseconds(self.expires - now),
 
1579
                        self.disable))
1550
1580
    
1551
1581
    # ExtendedTimeout - property
1552
1582
    @dbus_service_property(_interface, signature="t",
1740
1770
                    #wait until timeout or approved
1741
1771
                    time = datetime.datetime.now()
1742
1772
                    client.changedstate.acquire()
1743
 
                    (client.changedstate.wait
1744
 
                     (float(client.timedelta_to_milliseconds(delay)
1745
 
                            / 1000)))
 
1773
                    client.changedstate.wait(
 
1774
                        float(timedelta_to_milliseconds(delay)
 
1775
                              / 1000))
1746
1776
                    client.changedstate.release()
1747
1777
                    time2 = datetime.datetime.now()
1748
1778
                    if (time2 - time) >= delay:
1864
1894
    def process_request(self, request, address):
1865
1895
        """Start a new process to process the request."""
1866
1896
        proc = multiprocessing.Process(target = self.sub_process_main,
1867
 
                                       args = (request,
1868
 
                                               address))
 
1897
                                       args = (request, address))
1869
1898
        proc.start()
1870
1899
        return proc
1871
1900
 
1899
1928
        use_ipv6:       Boolean; to use IPv6 or not
1900
1929
    """
1901
1930
    def __init__(self, server_address, RequestHandlerClass,
1902
 
                 interface=None, use_ipv6=True):
 
1931
                 interface=None, use_ipv6=True, socketfd=None):
 
1932
        """If socketfd is set, use that file descriptor instead of
 
1933
        creating a new one with socket.socket().
 
1934
        """
1903
1935
        self.interface = interface
1904
1936
        if use_ipv6:
1905
1937
            self.address_family = socket.AF_INET6
 
1938
        if socketfd is not None:
 
1939
            # Save the file descriptor
 
1940
            self.socketfd = socketfd
 
1941
            # Save the original socket.socket() function
 
1942
            self.socket_socket = socket.socket
 
1943
            # To implement --socket, we monkey patch socket.socket.
 
1944
            # 
 
1945
            # (When socketserver.TCPServer is a new-style class, we
 
1946
            # could make self.socket into a property instead of monkey
 
1947
            # patching socket.socket.)
 
1948
            # 
 
1949
            # Create a one-time-only replacement for socket.socket()
 
1950
            @functools.wraps(socket.socket)
 
1951
            def socket_wrapper(*args, **kwargs):
 
1952
                # Restore original function so subsequent calls are
 
1953
                # not affected.
 
1954
                socket.socket = self.socket_socket
 
1955
                del self.socket_socket
 
1956
                # This time only, return a new socket object from the
 
1957
                # saved file descriptor.
 
1958
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1959
            # Replace socket.socket() function with wrapper
 
1960
            socket.socket = socket_wrapper
 
1961
        # The socketserver.TCPServer.__init__ will call
 
1962
        # socket.socket(), which might be our replacement,
 
1963
        # socket_wrapper(), if socketfd was set.
1906
1964
        socketserver.TCPServer.__init__(self, server_address,
1907
1965
                                        RequestHandlerClass)
 
1966
    
1908
1967
    def server_bind(self):
1909
1968
        """This overrides the normal server_bind() function
1910
1969
        to bind to an interface if one was specified, and also NOT to
1918
1977
                try:
1919
1978
                    self.socket.setsockopt(socket.SOL_SOCKET,
1920
1979
                                           SO_BINDTODEVICE,
1921
 
                                           str(self.interface
1922
 
                                               + '\0'))
 
1980
                                           str(self.interface + '\0'))
1923
1981
                except socket.error as error:
1924
 
                    if error[0] == errno.EPERM:
1925
 
                        logger.error("No permission to"
1926
 
                                     " bind to interface %s",
1927
 
                                     self.interface)
1928
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1982
                    if error.errno == errno.EPERM:
 
1983
                        logger.error("No permission to bind to"
 
1984
                                     " interface %s", self.interface)
 
1985
                    elif error.errno == errno.ENOPROTOOPT:
1929
1986
                        logger.error("SO_BINDTODEVICE not available;"
1930
1987
                                     " cannot bind to interface %s",
1931
1988
                                     self.interface)
 
1989
                    elif error.errno == errno.ENODEV:
 
1990
                        logger.error("Interface %s does not exist,"
 
1991
                                     " cannot bind", self.interface)
1932
1992
                    else:
1933
1993
                        raise
1934
1994
        # Only bind(2) the socket if we really need to.
1937
1997
                if self.address_family == socket.AF_INET6:
1938
1998
                    any_address = "::" # in6addr_any
1939
1999
                else:
1940
 
                    any_address = socket.INADDR_ANY
 
2000
                    any_address = "0.0.0.0" # INADDR_ANY
1941
2001
                self.server_address = (any_address,
1942
2002
                                       self.server_address[1])
1943
2003
            elif not self.server_address[1]:
1964
2024
    """
1965
2025
    def __init__(self, server_address, RequestHandlerClass,
1966
2026
                 interface=None, use_ipv6=True, clients=None,
1967
 
                 gnutls_priority=None, use_dbus=True):
 
2027
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1968
2028
        self.enabled = False
1969
2029
        self.clients = clients
1970
2030
        if self.clients is None:
1974
2034
        IPv6_TCPServer.__init__(self, server_address,
1975
2035
                                RequestHandlerClass,
1976
2036
                                interface = interface,
1977
 
                                use_ipv6 = use_ipv6)
 
2037
                                use_ipv6 = use_ipv6,
 
2038
                                socketfd = socketfd)
1978
2039
    def server_activate(self):
1979
2040
        if self.enabled:
1980
2041
            return socketserver.TCPServer.server_activate(self)
2058
2119
        return True
2059
2120
 
2060
2121
 
 
2122
def rfc3339_duration_to_delta(duration):
 
2123
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2124
    
 
2125
    >>> rfc3339_duration_to_delta("P7D")
 
2126
    datetime.timedelta(7)
 
2127
    >>> rfc3339_duration_to_delta("PT60S")
 
2128
    datetime.timedelta(0, 60)
 
2129
    >>> rfc3339_duration_to_delta("PT60M")
 
2130
    datetime.timedelta(0, 3600)
 
2131
    >>> rfc3339_duration_to_delta("PT24H")
 
2132
    datetime.timedelta(1)
 
2133
    >>> rfc3339_duration_to_delta("P1W")
 
2134
    datetime.timedelta(7)
 
2135
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2136
    datetime.timedelta(0, 330)
 
2137
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2138
    datetime.timedelta(1, 200)
 
2139
    """
 
2140
    
 
2141
    # Parsing an RFC 3339 duration with regular expressions is not
 
2142
    # possible - there would have to be multiple places for the same
 
2143
    # values, like seconds.  The current code, while more esoteric, is
 
2144
    # cleaner without depending on a parsing library.  If Python had a
 
2145
    # built-in library for parsing we would use it, but we'd like to
 
2146
    # avoid excessive use of external libraries.
 
2147
    
 
2148
    # New type for defining tokens, syntax, and semantics all-in-one
 
2149
    Token = collections.namedtuple("Token",
 
2150
                                   ("regexp", # To match token; if
 
2151
                                              # "value" is not None,
 
2152
                                              # must have a "group"
 
2153
                                              # containing digits
 
2154
                                    "value",  # datetime.timedelta or
 
2155
                                              # None
 
2156
                                    "followers")) # Tokens valid after
 
2157
                                                  # this token
 
2158
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2159
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2160
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2161
    token_second = Token(re.compile(r"(\d+)S"),
 
2162
                         datetime.timedelta(seconds=1),
 
2163
                         frozenset((token_end,)))
 
2164
    token_minute = Token(re.compile(r"(\d+)M"),
 
2165
                         datetime.timedelta(minutes=1),
 
2166
                         frozenset((token_second, token_end)))
 
2167
    token_hour = Token(re.compile(r"(\d+)H"),
 
2168
                       datetime.timedelta(hours=1),
 
2169
                       frozenset((token_minute, token_end)))
 
2170
    token_time = Token(re.compile(r"T"),
 
2171
                       None,
 
2172
                       frozenset((token_hour, token_minute,
 
2173
                                  token_second)))
 
2174
    token_day = Token(re.compile(r"(\d+)D"),
 
2175
                      datetime.timedelta(days=1),
 
2176
                      frozenset((token_time, token_end)))
 
2177
    token_month = Token(re.compile(r"(\d+)M"),
 
2178
                        datetime.timedelta(weeks=4),
 
2179
                        frozenset((token_day, token_end)))
 
2180
    token_year = Token(re.compile(r"(\d+)Y"),
 
2181
                       datetime.timedelta(weeks=52),
 
2182
                       frozenset((token_month, token_end)))
 
2183
    token_week = Token(re.compile(r"(\d+)W"),
 
2184
                       datetime.timedelta(weeks=1),
 
2185
                       frozenset((token_end,)))
 
2186
    token_duration = Token(re.compile(r"P"), None,
 
2187
                           frozenset((token_year, token_month,
 
2188
                                      token_day, token_time,
 
2189
                                      token_week))),
 
2190
    # Define starting values
 
2191
    value = datetime.timedelta() # Value so far
 
2192
    found_token = None
 
2193
    followers = frozenset(token_duration,) # Following valid tokens
 
2194
    s = duration                # String left to parse
 
2195
    # Loop until end token is found
 
2196
    while found_token is not token_end:
 
2197
        # Search for any currently valid tokens
 
2198
        for token in followers:
 
2199
            match = token.regexp.match(s)
 
2200
            if match is not None:
 
2201
                # Token found
 
2202
                if token.value is not None:
 
2203
                    # Value found, parse digits
 
2204
                    factor = int(match.group(1), 10)
 
2205
                    # Add to value so far
 
2206
                    value += factor * token.value
 
2207
                # Strip token from string
 
2208
                s = token.regexp.sub("", s, 1)
 
2209
                # Go to found token
 
2210
                found_token = token
 
2211
                # Set valid next tokens
 
2212
                followers = found_token.followers
 
2213
                break
 
2214
        else:
 
2215
            # No currently valid tokens were found
 
2216
            raise ValueError("Invalid RFC 3339 duration")
 
2217
    # End token found
 
2218
    return value
 
2219
 
 
2220
 
2061
2221
def string_to_delta(interval):
2062
2222
    """Parse a string and return a datetime.timedelta
2063
2223
    
2074
2234
    >>> string_to_delta('5m 30s')
2075
2235
    datetime.timedelta(0, 330)
2076
2236
    """
 
2237
    
 
2238
    try:
 
2239
        return rfc3339_duration_to_delta(interval)
 
2240
    except ValueError:
 
2241
        pass
 
2242
    
2077
2243
    timevalue = datetime.timedelta(0)
2078
2244
    for s in interval.split():
2079
2245
        try:
2142
2308
                        help="Run self-test")
2143
2309
    parser.add_argument("--debug", action="store_true",
2144
2310
                        help="Debug mode; run in foreground and log"
2145
 
                        " to terminal")
 
2311
                        " to terminal", default=None)
2146
2312
    parser.add_argument("--debuglevel", metavar="LEVEL",
2147
2313
                        help="Debug level for stdout output")
2148
2314
    parser.add_argument("--priority", help="GnuTLS"
2155
2321
                        " files")
2156
2322
    parser.add_argument("--no-dbus", action="store_false",
2157
2323
                        dest="use_dbus", help="Do not provide D-Bus"
2158
 
                        " system bus interface")
 
2324
                        " system bus interface", default=None)
2159
2325
    parser.add_argument("--no-ipv6", action="store_false",
2160
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2326
                        dest="use_ipv6", help="Do not use IPv6",
 
2327
                        default=None)
2161
2328
    parser.add_argument("--no-restore", action="store_false",
2162
2329
                        dest="restore", help="Do not restore stored"
2163
 
                        " state")
 
2330
                        " state", default=None)
 
2331
    parser.add_argument("--socket", type=int,
 
2332
                        help="Specify a file descriptor to a network"
 
2333
                        " socket to use instead of creating one")
2164
2334
    parser.add_argument("--statedir", metavar="DIR",
2165
2335
                        help="Directory to save/restore state in")
 
2336
    parser.add_argument("--foreground", action="store_true",
 
2337
                        help="Run in foreground", default=None)
2166
2338
    
2167
2339
    options = parser.parse_args()
2168
2340
    
2177
2349
                        "port": "",
2178
2350
                        "debug": "False",
2179
2351
                        "priority":
2180
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2352
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2181
2353
                        "servicename": "Mandos",
2182
2354
                        "use_dbus": "True",
2183
2355
                        "use_ipv6": "True",
2184
2356
                        "debuglevel": "",
2185
2357
                        "restore": "True",
2186
 
                        "statedir": "/var/lib/mandos"
 
2358
                        "socket": "",
 
2359
                        "statedir": "/var/lib/mandos",
 
2360
                        "foreground": "False",
2187
2361
                        }
2188
2362
    
2189
2363
    # Parse config file for server-global settings
2194
2368
    # Convert the SafeConfigParser object to a dict
2195
2369
    server_settings = server_config.defaults()
2196
2370
    # Use the appropriate methods on the non-string config options
2197
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2371
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2198
2372
        server_settings[option] = server_config.getboolean("DEFAULT",
2199
2373
                                                           option)
2200
2374
    if server_settings["port"]:
2201
2375
        server_settings["port"] = server_config.getint("DEFAULT",
2202
2376
                                                       "port")
 
2377
    if server_settings["socket"]:
 
2378
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2379
                                                         "socket")
 
2380
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2381
        # over with an opened os.devnull.  But we don't want this to
 
2382
        # happen with a supplied network socket.
 
2383
        if 0 <= server_settings["socket"] <= 2:
 
2384
            server_settings["socket"] = os.dup(server_settings
 
2385
                                               ["socket"])
2203
2386
    del server_config
2204
2387
    
2205
2388
    # Override the settings from the config file with command line
2207
2390
    for option in ("interface", "address", "port", "debug",
2208
2391
                   "priority", "servicename", "configdir",
2209
2392
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2210
 
                   "statedir"):
 
2393
                   "statedir", "socket", "foreground"):
2211
2394
        value = getattr(options, option)
2212
2395
        if value is not None:
2213
2396
            server_settings[option] = value
2216
2399
    for option in server_settings.keys():
2217
2400
        if type(server_settings[option]) is str:
2218
2401
            server_settings[option] = unicode(server_settings[option])
 
2402
    # Force all boolean options to be boolean
 
2403
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2404
                   "foreground"):
 
2405
        server_settings[option] = bool(server_settings[option])
 
2406
    # Debug implies foreground
 
2407
    if server_settings["debug"]:
 
2408
        server_settings["foreground"] = True
2219
2409
    # Now we have our good server settings in "server_settings"
2220
2410
    
2221
2411
    ##################################################################
2227
2417
    use_ipv6 = server_settings["use_ipv6"]
2228
2418
    stored_state_path = os.path.join(server_settings["statedir"],
2229
2419
                                     stored_state_file)
 
2420
    foreground = server_settings["foreground"]
2230
2421
    
2231
2422
    if debug:
2232
2423
        initlogger(debug, logging.DEBUG)
2261
2452
                              use_ipv6=use_ipv6,
2262
2453
                              gnutls_priority=
2263
2454
                              server_settings["priority"],
2264
 
                              use_dbus=use_dbus)
2265
 
    if not debug:
2266
 
        pidfilename = "/var/run/mandos.pid"
 
2455
                              use_dbus=use_dbus,
 
2456
                              socketfd=(server_settings["socket"]
 
2457
                                        or None))
 
2458
    if not foreground:
 
2459
        pidfilename = "/run/mandos.pid"
 
2460
        if not os.path.isdir("/run/."):
 
2461
            pidfilename = "/var/run/mandos.pid"
 
2462
        pidfile = None
2267
2463
        try:
2268
2464
            pidfile = open(pidfilename, "w")
2269
2465
        except IOError as e:
2284
2480
        os.setgid(gid)
2285
2481
        os.setuid(uid)
2286
2482
    except OSError as error:
2287
 
        if error[0] != errno.EPERM:
 
2483
        if error.errno != errno.EPERM:
2288
2484
            raise error
2289
2485
    
2290
2486
    if debug:
2308
2504
            os.close(null)
2309
2505
    
2310
2506
    # Need to fork before connecting to D-Bus
2311
 
    if not debug:
 
2507
    if not foreground:
2312
2508
        # Close all input and output, do double fork, etc.
2313
2509
        daemon()
2314
2510
    
 
2511
    # multiprocessing will use threads, so before we use gobject we
 
2512
    # need to inform gobject that threads will be used.
2315
2513
    gobject.threads_init()
2316
2514
    
2317
2515
    global main_loop
2352
2550
    old_client_settings = {}
2353
2551
    clients_data = {}
2354
2552
    
 
2553
    # This is used to redirect stdout and stderr for checker processes
 
2554
    global wnull
 
2555
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2556
    # Only used if server is running in foreground but not in debug
 
2557
    # mode
 
2558
    if debug or not foreground:
 
2559
        wnull.close()
 
2560
    
2355
2561
    # Get client data and settings from last running state.
2356
2562
    if server_settings["restore"]:
2357
2563
        try:
2373
2579
    
2374
2580
    with PGPEngine() as pgp:
2375
2581
        for client_name, client in clients_data.iteritems():
 
2582
            # Skip removed clients
 
2583
            if client_name not in client_settings:
 
2584
                continue
 
2585
            
2376
2586
            # Decide which value to use after restoring saved state.
2377
2587
            # We have three different values: Old config file,
2378
2588
            # new config file, and saved state.
2440
2650
    # Create all client objects
2441
2651
    for client_name, client in clients_data.iteritems():
2442
2652
        tcp_server.clients[client_name] = client_class(
2443
 
            name = client_name, settings = client)
 
2653
            name = client_name, settings = client,
 
2654
            server_settings = server_settings)
2444
2655
    
2445
2656
    if not tcp_server.clients:
2446
2657
        logger.warning("No clients defined")
2447
2658
    
2448
 
    if not debug:
2449
 
        try:
2450
 
            with pidfile:
2451
 
                pid = os.getpid()
2452
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2453
 
            del pidfile
2454
 
        except IOError:
2455
 
            logger.error("Could not write to file %r with PID %d",
2456
 
                         pidfilename, pid)
2457
 
        except NameError:
2458
 
            # "pidfile" was never created
2459
 
            pass
 
2659
    if not foreground:
 
2660
        if pidfile is not None:
 
2661
            try:
 
2662
                with pidfile:
 
2663
                    pid = os.getpid()
 
2664
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2665
            except IOError:
 
2666
                logger.error("Could not write to file %r with PID %d",
 
2667
                             pidfilename, pid)
 
2668
        del pidfile
2460
2669
        del pidfilename
2461
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2462
2670
    
2463
2671
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2464
2672
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2532
2740
        service.cleanup()
2533
2741
        
2534
2742
        multiprocessing.active_children()
 
2743
        wnull.close()
2535
2744
        if not (tcp_server.clients or client_settings):
2536
2745
            return
2537
2746
        
2549
2758
                # A list of attributes that can not be pickled
2550
2759
                # + secret.
2551
2760
                exclude = set(("bus", "changedstate", "secret",
2552
 
                               "checker"))
 
2761
                               "checker", "server_settings"))
2553
2762
                for name, typ in (inspect.getmembers
2554
2763
                                  (dbus.service.Object)):
2555
2764
                    exclude.add(name)
2564
2773
                del client_settings[client.name]["secret"]
2565
2774
        
2566
2775
        try:
2567
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2568
 
                                                prefix="clients-",
2569
 
                                                dir=os.path.dirname
2570
 
                                                (stored_state_path))
2571
 
            with os.fdopen(tempfd, "wb") as stored_state:
 
2776
            with (tempfile.NamedTemporaryFile
 
2777
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2778
                   dir=os.path.dirname(stored_state_path),
 
2779
                   delete=False)) as stored_state:
2572
2780
                pickle.dump((clients, client_settings), stored_state)
 
2781
                tempname=stored_state.name
2573
2782
            os.rename(tempname, stored_state_path)
2574
2783
        except (IOError, OSError) as e:
2575
2784
            if not debug: