/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

  • Committer: Teddy Hogeborn
  • Date: 2013-10-28 20:08:32 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 307.
  • Revision ID: teddy@recompile.se-20131028200832-80d1k8c5e8mugpkx
Syntax fix; use "raise" better in Mandos server.

* mandos: Syntax fix; use "raise" better in Mandos server; Always
          raise instances, not classes, skip argument when re-raising,
          etc.

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
 
212
 
 
213
221
class AvahiError(Exception):
214
222
    def __init__(self, value, *args, **kwargs):
215
223
        self.value = value
232
240
               Used to optionally bind to the specified interface.
233
241
    name: string; Example: 'Mandos'
234
242
    type: string; Example: '_mandos._tcp'.
235
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
243
     See <https://www.iana.org/assignments/service-names-port-numbers>
236
244
    port: integer; what port to announce
237
245
    TXT: list of strings; TXT record for the service
238
246
    domain: string; Domain to publish on, default to .local if empty.
244
252
    server: D-Bus Server
245
253
    bus: dbus.SystemBus()
246
254
    """
 
255
    
247
256
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
248
257
                 servicetype = None, port = None, TXT = None,
249
258
                 domain = "", host = "", max_renames = 32768,
262
271
        self.server = None
263
272
        self.bus = bus
264
273
        self.entry_group_state_changed_match = None
 
274
    
265
275
    def rename(self):
266
276
        """Derived from the Avahi example code"""
267
277
        if self.rename_count >= self.max_renames:
281
291
            self.cleanup()
282
292
            os._exit(1)
283
293
        self.rename_count += 1
 
294
    
284
295
    def remove(self):
285
296
        """Derived from the Avahi example code"""
286
297
        if self.entry_group_state_changed_match is not None:
288
299
            self.entry_group_state_changed_match = None
289
300
        if self.group is not None:
290
301
            self.group.Reset()
 
302
    
291
303
    def add(self):
292
304
        """Derived from the Avahi example code"""
293
305
        self.remove()
310
322
            dbus.UInt16(self.port),
311
323
            avahi.string_array_to_txt_array(self.TXT))
312
324
        self.group.Commit()
 
325
    
313
326
    def entry_group_state_changed(self, state, error):
314
327
        """Derived from the Avahi example code"""
315
328
        logger.debug("Avahi entry group state change: %i", state)
324
337
                            unicode(error))
325
338
            raise AvahiGroupError("State changed: {0!s}"
326
339
                                  .format(error))
 
340
    
327
341
    def cleanup(self):
328
342
        """Derived from the Avahi example code"""
329
343
        if self.group is not None:
334
348
                pass
335
349
            self.group = None
336
350
        self.remove()
 
351
    
337
352
    def server_state_changed(self, state, error=None):
338
353
        """Derived from the Avahi example code"""
339
354
        logger.debug("Avahi server state change: %i", state)
358
373
                logger.debug("Unknown state: %r", state)
359
374
            else:
360
375
                logger.debug("Unknown state: %r: %r", state, error)
 
376
    
361
377
    def activate(self):
362
378
        """Derived from the Avahi example code"""
363
379
        if self.server is None:
370
386
                                 self.server_state_changed)
371
387
        self.server_state_changed(self.server.GetState())
372
388
 
 
389
 
373
390
class AvahiServiceToSyslog(AvahiService):
374
391
    def rename(self):
375
392
        """Add the new name to the syslog messages"""
380
397
                                .format(self.name)))
381
398
        return ret
382
399
 
 
400
 
383
401
def timedelta_to_milliseconds(td):
384
402
    "Convert a datetime.timedelta() to milliseconds"
385
403
    return ((td.days * 24 * 60 * 60 * 1000)
386
404
            + (td.seconds * 1000)
387
405
            + (td.microseconds // 1000))
388
 
        
 
406
 
 
407
 
389
408
class Client(object):
390
409
    """A representation of a client host served by this server.
391
410
    
427
446
    runtime_expansions: Allowed attributes for runtime expansion.
428
447
    expires:    datetime.datetime(); time (UTC) when a client will be
429
448
                disabled, or None
 
449
    server_settings: The server_settings dict from main()
430
450
    """
431
451
    
432
452
    runtime_expansions = ("approval_delay", "approval_duration",
433
 
                          "created", "enabled", "fingerprint",
434
 
                          "host", "interval", "last_checked_ok",
 
453
                          "created", "enabled", "expires",
 
454
                          "fingerprint", "host", "interval",
 
455
                          "last_approval_request", "last_checked_ok",
435
456
                          "last_enabled", "name", "timeout")
436
 
    client_defaults = { "timeout": "5m",
437
 
                        "extended_timeout": "15m",
438
 
                        "interval": "2m",
 
457
    client_defaults = { "timeout": "PT5M",
 
458
                        "extended_timeout": "PT15M",
 
459
                        "interval": "PT2M",
439
460
                        "checker": "fping -q -- %%(host)s",
440
461
                        "host": "",
441
 
                        "approval_delay": "0s",
442
 
                        "approval_duration": "1s",
 
462
                        "approval_delay": "PT0S",
 
463
                        "approval_duration": "PT1S",
443
464
                        "approved_by_default": "True",
444
465
                        "enabled": "True",
445
466
                        }
458
479
    
459
480
    def approval_delay_milliseconds(self):
460
481
        return timedelta_to_milliseconds(self.approval_delay)
461
 
 
 
482
    
462
483
    @staticmethod
463
484
    def config_parser(config):
464
485
        """Construct a new dict of client settings of this form:
505
526
            client["last_checker_status"] = -2
506
527
        
507
528
        return settings
508
 
        
509
 
        
510
 
    def __init__(self, settings, name = None):
511
 
        """Note: the 'checker' key in 'config' sets the
512
 
        'checker_command' attribute and *not* the 'checker'
513
 
        attribute."""
 
529
    
 
530
    def __init__(self, settings, name = None, server_settings=None):
514
531
        self.name = name
 
532
        if server_settings is None:
 
533
            server_settings = {}
 
534
        self.server_settings = server_settings
515
535
        # adding all client settings
516
536
        for setting, value in settings.iteritems():
517
537
            setattr(self, setting, value)
525
545
        else:
526
546
            self.last_enabled = None
527
547
            self.expires = None
528
 
       
 
548
        
529
549
        logger.debug("Creating client %r", self.name)
530
550
        # Uppercase and remove spaces from fingerprint for later
531
551
        # comparison purposes with return value from the fingerprint()
533
553
        logger.debug("  Fingerprint: %s", self.fingerprint)
534
554
        self.created = settings.get("created",
535
555
                                    datetime.datetime.utcnow())
536
 
 
 
556
        
537
557
        # attributes specific for this server instance
538
558
        self.checker = None
539
559
        self.checker_initiator_tag = None
567
587
        if getattr(self, "enabled", False):
568
588
            # Already enabled
569
589
            return
570
 
        self.send_changedstate()
571
590
        self.expires = datetime.datetime.utcnow() + self.timeout
572
591
        self.enabled = True
573
592
        self.last_enabled = datetime.datetime.utcnow()
574
593
        self.init_checker()
 
594
        self.send_changedstate()
575
595
    
576
596
    def disable(self, quiet=True):
577
597
        """Disable this client."""
578
598
        if not getattr(self, "enabled", False):
579
599
            return False
580
600
        if not quiet:
581
 
            self.send_changedstate()
582
 
        if not quiet:
583
601
            logger.info("Disabling client %s", self.name)
584
 
        if getattr(self, "disable_initiator_tag", False):
 
602
        if getattr(self, "disable_initiator_tag", None) is not None:
585
603
            gobject.source_remove(self.disable_initiator_tag)
586
604
            self.disable_initiator_tag = None
587
605
        self.expires = None
588
 
        if getattr(self, "checker_initiator_tag", False):
 
606
        if getattr(self, "checker_initiator_tag", None) is not None:
589
607
            gobject.source_remove(self.checker_initiator_tag)
590
608
            self.checker_initiator_tag = None
591
609
        self.stop_checker()
592
610
        self.enabled = False
 
611
        if not quiet:
 
612
            self.send_changedstate()
593
613
        # Do not run this again if called by a gobject.timeout_add
594
614
        return False
595
615
    
599
619
    def init_checker(self):
600
620
        # Schedule a new checker to be started an 'interval' from now,
601
621
        # and every interval from then on.
 
622
        if self.checker_initiator_tag is not None:
 
623
            gobject.source_remove(self.checker_initiator_tag)
602
624
        self.checker_initiator_tag = (gobject.timeout_add
603
625
                                      (self.interval_milliseconds(),
604
626
                                       self.start_checker))
605
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)
606
630
        self.disable_initiator_tag = (gobject.timeout_add
607
631
                                   (self.timeout_milliseconds(),
608
632
                                    self.disable))
639
663
            timeout = self.timeout
640
664
        if self.disable_initiator_tag is not None:
641
665
            gobject.source_remove(self.disable_initiator_tag)
 
666
            self.disable_initiator_tag = None
642
667
        if getattr(self, "enabled", False):
643
668
            self.disable_initiator_tag = (gobject.timeout_add
644
669
                                          (timedelta_to_milliseconds
654
679
        If a checker already exists, leave it running and do
655
680
        nothing."""
656
681
        # The reason for not killing a running checker is that if we
657
 
        # did that, then if a checker (for some reason) started
658
 
        # running slowly and taking more than 'interval' time, the
659
 
        # client would inevitably timeout, since no checker would get
660
 
        # a chance to run to completion.  If we instead leave running
 
682
        # did that, and if a checker (for some reason) started running
 
683
        # slowly and taking more than 'interval' time, then the client
 
684
        # would inevitably timeout, since no checker would get a
 
685
        # chance to run to completion.  If we instead leave running
661
686
        # checkers alone, the checker would have to take more time
662
687
        # than 'timeout' for the client to be disabled, which is as it
663
688
        # should be.
665
690
        # If a checker exists, make sure it is not a zombie
666
691
        try:
667
692
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
668
 
        except (AttributeError, OSError) as error:
669
 
            if (isinstance(error, OSError)
670
 
                and error.errno != errno.ECHILD):
671
 
                raise error
 
693
        except AttributeError:
 
694
            pass
 
695
        except OSError as error:
 
696
            if error.errno != errno.ECHILD:
 
697
                raise
672
698
        else:
673
699
            if pid:
674
700
                logger.warning("Checker was a zombie")
677
703
                                      self.current_checker_command)
678
704
        # Start a new checker if needed
679
705
        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)
680
711
            try:
681
 
                # In case checker_command has exactly one % operator
682
 
                command = self.checker_command % self.host
683
 
            except TypeError:
684
 
                # Escape attributes for the shell
685
 
                escaped_attrs = dict(
686
 
                    (attr,
687
 
                     re.escape(unicode(str(getattr(self, attr, "")),
688
 
                                       errors=
689
 
                                       'replace')))
690
 
                    for attr in
691
 
                    self.runtime_expansions)
692
 
                
693
 
                try:
694
 
                    command = self.checker_command % escaped_attrs
695
 
                except TypeError as error:
696
 
                    logger.error('Could not format string "%s"',
697
 
                                 self.checker_command, exc_info=error)
698
 
                    return True # Try again later
 
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
699
717
            self.current_checker_command = command
700
718
            try:
701
719
                logger.info("Starting checker %r for %s",
704
722
                # in normal mode, that is already done by daemon(),
705
723
                # and in debug mode we don't want to.  (Stdin is
706
724
                # 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 })
707
733
                self.checker = subprocess.Popen(command,
708
734
                                                close_fds=True,
709
 
                                                shell=True, cwd="/")
710
 
                self.checker_callback_tag = (gobject.child_watch_add
711
 
                                             (self.checker.pid,
712
 
                                              self.checker_callback,
713
 
                                              data=command))
714
 
                # The checker may have completed before the gobject
715
 
                # watch was added.  Check for this.
716
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
717
 
                if pid:
718
 
                    gobject.source_remove(self.checker_callback_tag)
719
 
                    self.checker_callback(pid, status, command)
 
735
                                                shell=True, cwd="/",
 
736
                                                **popen_args)
720
737
            except OSError as error:
721
738
                logger.error("Failed to start subprocess",
722
739
                             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)
723
759
        # Re-run this periodically if run by gobject.timeout_add
724
760
        return True
725
761
    
773
809
 
774
810
 
775
811
def dbus_interface_annotations(dbus_interface):
776
 
    """Decorator for marking functions returning interface annotations.
 
812
    """Decorator for marking functions returning interface annotations
777
813
    
778
814
    Usage:
779
815
    
976
1012
                            tag.appendChild(ann_tag)
977
1013
                # Add interface annotation tags
978
1014
                for annotation, value in dict(
979
 
                    itertools.chain(
980
 
                        *(annotations().iteritems()
981
 
                          for name, annotations in
982
 
                          self._get_all_dbus_things("interface")
983
 
                          if name == if_tag.getAttribute("name")
984
 
                          ))).iteritems():
 
1015
                    itertools.chain.from_iterable(
 
1016
                        annotations().iteritems()
 
1017
                        for name, annotations in
 
1018
                        self._get_all_dbus_things("interface")
 
1019
                        if name == if_tag.getAttribute("name")
 
1020
                        )).iteritems():
985
1021
                    ann_tag = document.createElement("annotation")
986
1022
                    ann_tag.setAttribute("name", annotation)
987
1023
                    ann_tag.setAttribute("value", value)
1010
1046
        return xmlstring
1011
1047
 
1012
1048
 
1013
 
def datetime_to_dbus (dt, variant_level=0):
 
1049
def datetime_to_dbus(dt, variant_level=0):
1014
1050
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1015
1051
    if dt is None:
1016
1052
        return dbus.String("", variant_level = variant_level)
1018
1054
                       variant_level=variant_level)
1019
1055
 
1020
1056
 
1021
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1022
 
                                  .__metaclass__):
1023
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
1024
 
    will add additional D-Bus attributes matching a certain pattern.
 
1057
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1058
    """A class decorator; applied to a subclass of
 
1059
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1060
    interface names according to the "alt_interface_names" mapping.
 
1061
    Usage:
 
1062
    
 
1063
    @alternate_dbus_interfaces({"org.example.Interface":
 
1064
                                    "net.example.AlternateInterface"})
 
1065
    class SampleDBusObject(dbus.service.Object):
 
1066
        @dbus.service.method("org.example.Interface")
 
1067
        def SampleDBusMethod():
 
1068
            pass
 
1069
    
 
1070
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1071
    reachable via two interfaces: "org.example.Interface" and
 
1072
    "net.example.AlternateInterface", the latter of which will have
 
1073
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1074
    "true", unless "deprecate" is passed with a False value.
 
1075
    
 
1076
    This works for methods and signals, and also for D-Bus properties
 
1077
    (from DBusObjectWithProperties) and interfaces (from the
 
1078
    dbus_interface_annotations decorator).
1025
1079
    """
1026
 
    def __new__(mcs, name, bases, attr):
1027
 
        # Go through all the base classes which could have D-Bus
1028
 
        # methods, signals, or properties in them
1029
 
        old_interface_names = []
1030
 
        for base in (b for b in bases
1031
 
                     if issubclass(b, dbus.service.Object)):
1032
 
            # Go though all attributes of the base class
1033
 
            for attrname, attribute in inspect.getmembers(base):
 
1080
    def wrapper(cls):
 
1081
        for orig_interface_name, alt_interface_name in (
 
1082
            alt_interface_names.iteritems()):
 
1083
            attr = {}
 
1084
            interface_names = set()
 
1085
            # Go though all attributes of the class
 
1086
            for attrname, attribute in inspect.getmembers(cls):
1034
1087
                # Ignore non-D-Bus attributes, and D-Bus attributes
1035
1088
                # with the wrong interface name
1036
1089
                if (not hasattr(attribute, "_dbus_interface")
1037
1090
                    or not attribute._dbus_interface
1038
 
                    .startswith("se.recompile.Mandos")):
 
1091
                    .startswith(orig_interface_name)):
1039
1092
                    continue
1040
1093
                # Create an alternate D-Bus interface name based on
1041
1094
                # the current name
1042
1095
                alt_interface = (attribute._dbus_interface
1043
 
                                 .replace("se.recompile.Mandos",
1044
 
                                          "se.bsnet.fukt.Mandos"))
1045
 
                if alt_interface != attribute._dbus_interface:
1046
 
                    old_interface_names.append(alt_interface)
 
1096
                                 .replace(orig_interface_name,
 
1097
                                          alt_interface_name))
 
1098
                interface_names.add(alt_interface)
1047
1099
                # Is this a D-Bus signal?
1048
1100
                if getattr(attribute, "_dbus_is_signal", False):
1049
 
                    # Extract the original non-method function by
1050
 
                    # black magic
 
1101
                    # Extract the original non-method undecorated
 
1102
                    # function by black magic
1051
1103
                    nonmethod_func = (dict(
1052
1104
                            zip(attribute.func_code.co_freevars,
1053
1105
                                attribute.__closure__))["func"]
1071
1123
                    except AttributeError:
1072
1124
                        pass
1073
1125
                    # Define a creator of a function to call both the
1074
 
                    # old and new functions, so both the old and new
1075
 
                    # signals gets sent when the function is called
 
1126
                    # original and alternate functions, so both the
 
1127
                    # original and alternate signals gets sent when
 
1128
                    # the function is called
1076
1129
                    def fixscope(func1, func2):
1077
1130
                        """This function is a scope container to pass
1078
1131
                        func1 and func2 to the "call_both" function
1085
1138
                        return call_both
1086
1139
                    # Create the "call_both" function and add it to
1087
1140
                    # the class
1088
 
                    attr[attrname] = fixscope(attribute,
1089
 
                                              new_function)
 
1141
                    attr[attrname] = fixscope(attribute, new_function)
1090
1142
                # Is this a D-Bus method?
1091
1143
                elif getattr(attribute, "_dbus_is_method", False):
1092
1144
                    # Create a new, but exactly alike, function
1148
1200
                                        attribute.func_name,
1149
1201
                                        attribute.func_defaults,
1150
1202
                                        attribute.func_closure)))
1151
 
        # Deprecate all old interfaces
1152
 
        basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
 
        for old_interface_name in old_interface_names:
1154
 
            @dbus_interface_annotations(old_interface_name)
1155
 
            def func(self):
1156
 
                return { "org.freedesktop.DBus.Deprecated": "true" }
1157
 
            # Find an unused name
1158
 
            for aname in (basename.format(i) for i in
1159
 
                          itertools.count()):
1160
 
                if aname not in attr:
1161
 
                    attr[aname] = func
1162
 
                    break
1163
 
        return type.__new__(mcs, name, bases, attr)
1164
 
 
1165
 
 
 
1203
            if deprecate:
 
1204
                # Deprecate all alternate interfaces
 
1205
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1206
                for interface_name in interface_names:
 
1207
                    @dbus_interface_annotations(interface_name)
 
1208
                    def func(self):
 
1209
                        return { "org.freedesktop.DBus.Deprecated":
 
1210
                                     "true" }
 
1211
                    # Find an unused name
 
1212
                    for aname in (iname.format(i)
 
1213
                                  for i in itertools.count()):
 
1214
                        if aname not in attr:
 
1215
                            attr[aname] = func
 
1216
                            break
 
1217
            if interface_names:
 
1218
                # Replace the class with a new subclass of it with
 
1219
                # methods, signals, etc. as created above.
 
1220
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1221
                           (cls,), attr)
 
1222
        return cls
 
1223
    return wrapper
 
1224
 
 
1225
 
 
1226
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1227
                                "se.bsnet.fukt.Mandos"})
1166
1228
class ClientDBus(Client, DBusObjectWithProperties):
1167
1229
    """A Client class using D-Bus
1168
1230
    
1188
1250
                                 ("/clients/" + client_object_name))
1189
1251
        DBusObjectWithProperties.__init__(self, self.bus,
1190
1252
                                          self.dbus_object_path)
1191
 
        
 
1253
    
1192
1254
    def notifychangeproperty(transform_func,
1193
1255
                             dbus_name, type_func=lambda x: x,
1194
1256
                             variant_level=1):
1217
1279
        
1218
1280
        return property(lambda self: getattr(self, attrname), setter)
1219
1281
    
1220
 
    
1221
1282
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1222
1283
    approvals_pending = notifychangeproperty(dbus.Boolean,
1223
1284
                                             "ApprovalPending",
1305
1366
        return False
1306
1367
    
1307
1368
    def approve(self, value=True):
1308
 
        self.send_changedstate()
1309
1369
        self.approved = value
1310
1370
        gobject.timeout_add(timedelta_to_milliseconds
1311
1371
                            (self.approval_duration),
1312
1372
                            self._reset_approved)
1313
 
    
 
1373
        self.send_changedstate()
1314
1374
    
1315
1375
    ## D-Bus methods, signals & properties
1316
1376
    _interface = "se.recompile.Mandos.Client"
1500
1560
    def Timeout_dbus_property(self, value=None):
1501
1561
        if value is None:       # get
1502
1562
            return dbus.UInt64(self.timeout_milliseconds())
 
1563
        old_timeout = self.timeout
1503
1564
        self.timeout = datetime.timedelta(0, 0, 0, value)
1504
 
        # Reschedule timeout
 
1565
        # Reschedule disabling
1505
1566
        if self.enabled:
1506
1567
            now = datetime.datetime.utcnow()
1507
 
            time_to_die = timedelta_to_milliseconds(
1508
 
                (self.last_checked_ok + self.timeout) - now)
1509
 
            if time_to_die <= 0:
 
1568
            self.expires += self.timeout - old_timeout
 
1569
            if self.expires <= now:
1510
1570
                # The timeout has passed
1511
1571
                self.disable()
1512
1572
            else:
1513
 
                self.expires = (now +
1514
 
                                datetime.timedelta(milliseconds =
1515
 
                                                   time_to_die))
1516
1573
                if (getattr(self, "disable_initiator_tag", None)
1517
1574
                    is None):
1518
1575
                    return
1519
1576
                gobject.source_remove(self.disable_initiator_tag)
1520
 
                self.disable_initiator_tag = (gobject.timeout_add
1521
 
                                              (time_to_die,
1522
 
                                               self.disable))
 
1577
                self.disable_initiator_tag = (
 
1578
                    gobject.timeout_add(
 
1579
                        timedelta_to_milliseconds(self.expires - now),
 
1580
                        self.disable))
1523
1581
    
1524
1582
    # ExtendedTimeout - property
1525
1583
    @dbus_service_property(_interface, signature="t",
1604
1662
        self._pipe.send(('setattr', name, value))
1605
1663
 
1606
1664
 
1607
 
class ClientDBusTransitional(ClientDBus):
1608
 
    __metaclass__ = AlternateDBusNamesMetaclass
1609
 
 
1610
 
 
1611
1665
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
1666
    """A class to handle client connections.
1613
1667
    
1649
1703
            logger.debug("Protocol version: %r", line)
1650
1704
            try:
1651
1705
                if int(line.strip().split()[0]) > 1:
1652
 
                    raise RuntimeError
 
1706
                    raise RuntimeError(line)
1653
1707
            except (ValueError, IndexError, RuntimeError) as error:
1654
1708
                logger.error("Unknown protocol version: %s", error)
1655
1709
                return
1717
1771
                    #wait until timeout or approved
1718
1772
                    time = datetime.datetime.now()
1719
1773
                    client.changedstate.acquire()
1720
 
                    (client.changedstate.wait
1721
 
                     (float(client.timedelta_to_milliseconds(delay)
1722
 
                            / 1000)))
 
1774
                    client.changedstate.wait(
 
1775
                        float(timedelta_to_milliseconds(delay)
 
1776
                              / 1000))
1723
1777
                    client.changedstate.release()
1724
1778
                    time2 = datetime.datetime.now()
1725
1779
                    if (time2 - time) >= delay:
1741
1795
                    try:
1742
1796
                        sent = session.send(client.secret[sent_size:])
1743
1797
                    except gnutls.errors.GNUTLSError as error:
1744
 
                        logger.warning("gnutls send failed")
 
1798
                        logger.warning("gnutls send failed",
 
1799
                                       exc_info=error)
1745
1800
                        return
1746
1801
                    logger.debug("Sent: %d, remaining: %d",
1747
1802
                                 sent, len(client.secret)
1761
1816
                try:
1762
1817
                    session.bye()
1763
1818
                except gnutls.errors.GNUTLSError as error:
1764
 
                    logger.warning("GnuTLS bye failed")
 
1819
                    logger.warning("GnuTLS bye failed",
 
1820
                                   exc_info=error)
1765
1821
    
1766
1822
    @staticmethod
1767
1823
    def peer_certificate(session):
1839
1895
    def process_request(self, request, address):
1840
1896
        """Start a new process to process the request."""
1841
1897
        proc = multiprocessing.Process(target = self.sub_process_main,
1842
 
                                       args = (request,
1843
 
                                               address))
 
1898
                                       args = (request, address))
1844
1899
        proc.start()
1845
1900
        return proc
1846
1901
 
1861
1916
    
1862
1917
    def add_pipe(self, parent_pipe, proc):
1863
1918
        """Dummy function; override as necessary"""
1864
 
        raise NotImplementedError
 
1919
        raise NotImplementedError()
1865
1920
 
1866
1921
 
1867
1922
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1874
1929
        use_ipv6:       Boolean; to use IPv6 or not
1875
1930
    """
1876
1931
    def __init__(self, server_address, RequestHandlerClass,
1877
 
                 interface=None, use_ipv6=True):
 
1932
                 interface=None, use_ipv6=True, socketfd=None):
 
1933
        """If socketfd is set, use that file descriptor instead of
 
1934
        creating a new one with socket.socket().
 
1935
        """
1878
1936
        self.interface = interface
1879
1937
        if use_ipv6:
1880
1938
            self.address_family = socket.AF_INET6
 
1939
        if socketfd is not None:
 
1940
            # Save the file descriptor
 
1941
            self.socketfd = socketfd
 
1942
            # Save the original socket.socket() function
 
1943
            self.socket_socket = socket.socket
 
1944
            # To implement --socket, we monkey patch socket.socket.
 
1945
            # 
 
1946
            # (When socketserver.TCPServer is a new-style class, we
 
1947
            # could make self.socket into a property instead of monkey
 
1948
            # patching socket.socket.)
 
1949
            # 
 
1950
            # Create a one-time-only replacement for socket.socket()
 
1951
            @functools.wraps(socket.socket)
 
1952
            def socket_wrapper(*args, **kwargs):
 
1953
                # Restore original function so subsequent calls are
 
1954
                # not affected.
 
1955
                socket.socket = self.socket_socket
 
1956
                del self.socket_socket
 
1957
                # This time only, return a new socket object from the
 
1958
                # saved file descriptor.
 
1959
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1960
            # Replace socket.socket() function with wrapper
 
1961
            socket.socket = socket_wrapper
 
1962
        # The socketserver.TCPServer.__init__ will call
 
1963
        # socket.socket(), which might be our replacement,
 
1964
        # socket_wrapper(), if socketfd was set.
1881
1965
        socketserver.TCPServer.__init__(self, server_address,
1882
1966
                                        RequestHandlerClass)
 
1967
    
1883
1968
    def server_bind(self):
1884
1969
        """This overrides the normal server_bind() function
1885
1970
        to bind to an interface if one was specified, and also NOT to
1893
1978
                try:
1894
1979
                    self.socket.setsockopt(socket.SOL_SOCKET,
1895
1980
                                           SO_BINDTODEVICE,
1896
 
                                           str(self.interface
1897
 
                                               + '\0'))
 
1981
                                           str(self.interface + '\0'))
1898
1982
                except socket.error as error:
1899
 
                    if error[0] == errno.EPERM:
1900
 
                        logger.error("No permission to"
1901
 
                                     " bind to interface %s",
1902
 
                                     self.interface)
1903
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1983
                    if error.errno == errno.EPERM:
 
1984
                        logger.error("No permission to bind to"
 
1985
                                     " interface %s", self.interface)
 
1986
                    elif error.errno == errno.ENOPROTOOPT:
1904
1987
                        logger.error("SO_BINDTODEVICE not available;"
1905
1988
                                     " cannot bind to interface %s",
1906
1989
                                     self.interface)
 
1990
                    elif error.errno == errno.ENODEV:
 
1991
                        logger.error("Interface %s does not exist,"
 
1992
                                     " cannot bind", self.interface)
1907
1993
                    else:
1908
1994
                        raise
1909
1995
        # Only bind(2) the socket if we really need to.
1912
1998
                if self.address_family == socket.AF_INET6:
1913
1999
                    any_address = "::" # in6addr_any
1914
2000
                else:
1915
 
                    any_address = socket.INADDR_ANY
 
2001
                    any_address = "0.0.0.0" # INADDR_ANY
1916
2002
                self.server_address = (any_address,
1917
2003
                                       self.server_address[1])
1918
2004
            elif not self.server_address[1]:
1939
2025
    """
1940
2026
    def __init__(self, server_address, RequestHandlerClass,
1941
2027
                 interface=None, use_ipv6=True, clients=None,
1942
 
                 gnutls_priority=None, use_dbus=True):
 
2028
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1943
2029
        self.enabled = False
1944
2030
        self.clients = clients
1945
2031
        if self.clients is None:
1949
2035
        IPv6_TCPServer.__init__(self, server_address,
1950
2036
                                RequestHandlerClass,
1951
2037
                                interface = interface,
1952
 
                                use_ipv6 = use_ipv6)
 
2038
                                use_ipv6 = use_ipv6,
 
2039
                                socketfd = socketfd)
1953
2040
    def server_activate(self):
1954
2041
        if self.enabled:
1955
2042
            return socketserver.TCPServer.server_activate(self)
1968
2055
    
1969
2056
    def handle_ipc(self, source, condition, parent_pipe=None,
1970
2057
                   proc = None, client_object=None):
1971
 
        condition_names = {
1972
 
            gobject.IO_IN: "IN",   # There is data to read.
1973
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1974
 
                                    # blocking).
1975
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1976
 
            gobject.IO_ERR: "ERR", # Error condition.
1977
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1978
 
                                    # broken, usually for pipes and
1979
 
                                    # sockets).
1980
 
            }
1981
 
        conditions_string = ' | '.join(name
1982
 
                                       for cond, name in
1983
 
                                       condition_names.iteritems()
1984
 
                                       if cond & condition)
1985
2058
        # error, or the other end of multiprocessing.Pipe has closed
1986
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2059
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1987
2060
            # Wait for other process to exit
1988
2061
            proc.join()
1989
2062
            return False
2047
2120
        return True
2048
2121
 
2049
2122
 
 
2123
def rfc3339_duration_to_delta(duration):
 
2124
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2125
    
 
2126
    >>> rfc3339_duration_to_delta("P7D")
 
2127
    datetime.timedelta(7)
 
2128
    >>> rfc3339_duration_to_delta("PT60S")
 
2129
    datetime.timedelta(0, 60)
 
2130
    >>> rfc3339_duration_to_delta("PT60M")
 
2131
    datetime.timedelta(0, 3600)
 
2132
    >>> rfc3339_duration_to_delta("PT24H")
 
2133
    datetime.timedelta(1)
 
2134
    >>> rfc3339_duration_to_delta("P1W")
 
2135
    datetime.timedelta(7)
 
2136
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2137
    datetime.timedelta(0, 330)
 
2138
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2139
    datetime.timedelta(1, 200)
 
2140
    """
 
2141
    
 
2142
    # Parsing an RFC 3339 duration with regular expressions is not
 
2143
    # possible - there would have to be multiple places for the same
 
2144
    # values, like seconds.  The current code, while more esoteric, is
 
2145
    # cleaner without depending on a parsing library.  If Python had a
 
2146
    # built-in library for parsing we would use it, but we'd like to
 
2147
    # avoid excessive use of external libraries.
 
2148
    
 
2149
    # New type for defining tokens, syntax, and semantics all-in-one
 
2150
    Token = collections.namedtuple("Token",
 
2151
                                   ("regexp", # To match token; if
 
2152
                                              # "value" is not None,
 
2153
                                              # must have a "group"
 
2154
                                              # containing digits
 
2155
                                    "value",  # datetime.timedelta or
 
2156
                                              # None
 
2157
                                    "followers")) # Tokens valid after
 
2158
                                                  # this token
 
2159
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2160
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2161
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2162
    token_second = Token(re.compile(r"(\d+)S"),
 
2163
                         datetime.timedelta(seconds=1),
 
2164
                         frozenset((token_end,)))
 
2165
    token_minute = Token(re.compile(r"(\d+)M"),
 
2166
                         datetime.timedelta(minutes=1),
 
2167
                         frozenset((token_second, token_end)))
 
2168
    token_hour = Token(re.compile(r"(\d+)H"),
 
2169
                       datetime.timedelta(hours=1),
 
2170
                       frozenset((token_minute, token_end)))
 
2171
    token_time = Token(re.compile(r"T"),
 
2172
                       None,
 
2173
                       frozenset((token_hour, token_minute,
 
2174
                                  token_second)))
 
2175
    token_day = Token(re.compile(r"(\d+)D"),
 
2176
                      datetime.timedelta(days=1),
 
2177
                      frozenset((token_time, token_end)))
 
2178
    token_month = Token(re.compile(r"(\d+)M"),
 
2179
                        datetime.timedelta(weeks=4),
 
2180
                        frozenset((token_day, token_end)))
 
2181
    token_year = Token(re.compile(r"(\d+)Y"),
 
2182
                       datetime.timedelta(weeks=52),
 
2183
                       frozenset((token_month, token_end)))
 
2184
    token_week = Token(re.compile(r"(\d+)W"),
 
2185
                       datetime.timedelta(weeks=1),
 
2186
                       frozenset((token_end,)))
 
2187
    token_duration = Token(re.compile(r"P"), None,
 
2188
                           frozenset((token_year, token_month,
 
2189
                                      token_day, token_time,
 
2190
                                      token_week))),
 
2191
    # Define starting values
 
2192
    value = datetime.timedelta() # Value so far
 
2193
    found_token = None
 
2194
    followers = frozenset(token_duration,) # Following valid tokens
 
2195
    s = duration                # String left to parse
 
2196
    # Loop until end token is found
 
2197
    while found_token is not token_end:
 
2198
        # Search for any currently valid tokens
 
2199
        for token in followers:
 
2200
            match = token.regexp.match(s)
 
2201
            if match is not None:
 
2202
                # Token found
 
2203
                if token.value is not None:
 
2204
                    # Value found, parse digits
 
2205
                    factor = int(match.group(1), 10)
 
2206
                    # Add to value so far
 
2207
                    value += factor * token.value
 
2208
                # Strip token from string
 
2209
                s = token.regexp.sub("", s, 1)
 
2210
                # Go to found token
 
2211
                found_token = token
 
2212
                # Set valid next tokens
 
2213
                followers = found_token.followers
 
2214
                break
 
2215
        else:
 
2216
            # No currently valid tokens were found
 
2217
            raise ValueError("Invalid RFC 3339 duration")
 
2218
    # End token found
 
2219
    return value
 
2220
 
 
2221
 
2050
2222
def string_to_delta(interval):
2051
2223
    """Parse a string and return a datetime.timedelta
2052
2224
    
2063
2235
    >>> string_to_delta('5m 30s')
2064
2236
    datetime.timedelta(0, 330)
2065
2237
    """
 
2238
    
 
2239
    try:
 
2240
        return rfc3339_duration_to_delta(interval)
 
2241
    except ValueError:
 
2242
        pass
 
2243
    
2066
2244
    timevalue = datetime.timedelta(0)
2067
2245
    for s in interval.split():
2068
2246
        try:
2081
2259
            else:
2082
2260
                raise ValueError("Unknown suffix {0!r}"
2083
2261
                                 .format(suffix))
2084
 
        except (ValueError, IndexError) as e:
 
2262
        except IndexError as e:
2085
2263
            raise ValueError(*(e.args))
2086
2264
        timevalue += delta
2087
2265
    return timevalue
2131
2309
                        help="Run self-test")
2132
2310
    parser.add_argument("--debug", action="store_true",
2133
2311
                        help="Debug mode; run in foreground and log"
2134
 
                        " to terminal")
 
2312
                        " to terminal", default=None)
2135
2313
    parser.add_argument("--debuglevel", metavar="LEVEL",
2136
2314
                        help="Debug level for stdout output")
2137
2315
    parser.add_argument("--priority", help="GnuTLS"
2144
2322
                        " files")
2145
2323
    parser.add_argument("--no-dbus", action="store_false",
2146
2324
                        dest="use_dbus", help="Do not provide D-Bus"
2147
 
                        " system bus interface")
 
2325
                        " system bus interface", default=None)
2148
2326
    parser.add_argument("--no-ipv6", action="store_false",
2149
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2327
                        dest="use_ipv6", help="Do not use IPv6",
 
2328
                        default=None)
2150
2329
    parser.add_argument("--no-restore", action="store_false",
2151
2330
                        dest="restore", help="Do not restore stored"
2152
 
                        " state")
 
2331
                        " state", default=None)
 
2332
    parser.add_argument("--socket", type=int,
 
2333
                        help="Specify a file descriptor to a network"
 
2334
                        " socket to use instead of creating one")
2153
2335
    parser.add_argument("--statedir", metavar="DIR",
2154
2336
                        help="Directory to save/restore state in")
 
2337
    parser.add_argument("--foreground", action="store_true",
 
2338
                        help="Run in foreground", default=None)
2155
2339
    
2156
2340
    options = parser.parse_args()
2157
2341
    
2166
2350
                        "port": "",
2167
2351
                        "debug": "False",
2168
2352
                        "priority":
2169
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2353
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2170
2354
                        "servicename": "Mandos",
2171
2355
                        "use_dbus": "True",
2172
2356
                        "use_ipv6": "True",
2173
2357
                        "debuglevel": "",
2174
2358
                        "restore": "True",
2175
 
                        "statedir": "/var/lib/mandos"
 
2359
                        "socket": "",
 
2360
                        "statedir": "/var/lib/mandos",
 
2361
                        "foreground": "False",
2176
2362
                        }
2177
2363
    
2178
2364
    # Parse config file for server-global settings
2183
2369
    # Convert the SafeConfigParser object to a dict
2184
2370
    server_settings = server_config.defaults()
2185
2371
    # Use the appropriate methods on the non-string config options
2186
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2372
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2187
2373
        server_settings[option] = server_config.getboolean("DEFAULT",
2188
2374
                                                           option)
2189
2375
    if server_settings["port"]:
2190
2376
        server_settings["port"] = server_config.getint("DEFAULT",
2191
2377
                                                       "port")
 
2378
    if server_settings["socket"]:
 
2379
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2380
                                                         "socket")
 
2381
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2382
        # over with an opened os.devnull.  But we don't want this to
 
2383
        # happen with a supplied network socket.
 
2384
        if 0 <= server_settings["socket"] <= 2:
 
2385
            server_settings["socket"] = os.dup(server_settings
 
2386
                                               ["socket"])
2192
2387
    del server_config
2193
2388
    
2194
2389
    # Override the settings from the config file with command line
2196
2391
    for option in ("interface", "address", "port", "debug",
2197
2392
                   "priority", "servicename", "configdir",
2198
2393
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2199
 
                   "statedir"):
 
2394
                   "statedir", "socket", "foreground"):
2200
2395
        value = getattr(options, option)
2201
2396
        if value is not None:
2202
2397
            server_settings[option] = value
2205
2400
    for option in server_settings.keys():
2206
2401
        if type(server_settings[option]) is str:
2207
2402
            server_settings[option] = unicode(server_settings[option])
 
2403
    # Force all boolean options to be boolean
 
2404
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2405
                   "foreground"):
 
2406
        server_settings[option] = bool(server_settings[option])
 
2407
    # Debug implies foreground
 
2408
    if server_settings["debug"]:
 
2409
        server_settings["foreground"] = True
2208
2410
    # Now we have our good server settings in "server_settings"
2209
2411
    
2210
2412
    ##################################################################
2216
2418
    use_ipv6 = server_settings["use_ipv6"]
2217
2419
    stored_state_path = os.path.join(server_settings["statedir"],
2218
2420
                                     stored_state_file)
 
2421
    foreground = server_settings["foreground"]
2219
2422
    
2220
2423
    if debug:
2221
2424
        initlogger(debug, logging.DEBUG)
2250
2453
                              use_ipv6=use_ipv6,
2251
2454
                              gnutls_priority=
2252
2455
                              server_settings["priority"],
2253
 
                              use_dbus=use_dbus)
2254
 
    if not debug:
2255
 
        pidfilename = "/var/run/mandos.pid"
 
2456
                              use_dbus=use_dbus,
 
2457
                              socketfd=(server_settings["socket"]
 
2458
                                        or None))
 
2459
    if not foreground:
 
2460
        pidfilename = "/run/mandos.pid"
 
2461
        if not os.path.isdir("/run/."):
 
2462
            pidfilename = "/var/run/mandos.pid"
 
2463
        pidfile = None
2256
2464
        try:
2257
2465
            pidfile = open(pidfilename, "w")
2258
 
        except IOError:
2259
 
            logger.error("Could not open file %r", pidfilename)
 
2466
        except IOError as e:
 
2467
            logger.error("Could not open file %r", pidfilename,
 
2468
                         exc_info=e)
2260
2469
    
2261
2470
    for name in ("_mandos", "mandos", "nobody"):
2262
2471
        try:
2272
2481
        os.setgid(gid)
2273
2482
        os.setuid(uid)
2274
2483
    except OSError as error:
2275
 
        if error[0] != errno.EPERM:
2276
 
            raise error
 
2484
        if error.errno != errno.EPERM:
 
2485
            raise
2277
2486
    
2278
2487
    if debug:
2279
2488
        # Enable all possible GnuTLS debugging
2296
2505
            os.close(null)
2297
2506
    
2298
2507
    # Need to fork before connecting to D-Bus
2299
 
    if not debug:
 
2508
    if not foreground:
2300
2509
        # Close all input and output, do double fork, etc.
2301
2510
        daemon()
2302
2511
    
 
2512
    # multiprocessing will use threads, so before we use gobject we
 
2513
    # need to inform gobject that threads will be used.
2303
2514
    gobject.threads_init()
2304
2515
    
2305
2516
    global main_loop
2316
2527
                            ("se.bsnet.fukt.Mandos", bus,
2317
2528
                             do_not_queue=True))
2318
2529
        except dbus.exceptions.NameExistsException as e:
2319
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2530
            logger.error("Disabling D-Bus:", exc_info=e)
2320
2531
            use_dbus = False
2321
2532
            server_settings["use_dbus"] = False
2322
2533
            tcp_server.use_dbus = False
2334
2545
    
2335
2546
    client_class = Client
2336
2547
    if use_dbus:
2337
 
        client_class = functools.partial(ClientDBusTransitional,
2338
 
                                         bus = bus)
 
2548
        client_class = functools.partial(ClientDBus, bus = bus)
2339
2549
    
2340
2550
    client_settings = Client.config_parser(client_config)
2341
2551
    old_client_settings = {}
2342
2552
    clients_data = {}
2343
2553
    
 
2554
    # This is used to redirect stdout and stderr for checker processes
 
2555
    global wnull
 
2556
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2557
    # Only used if server is running in foreground but not in debug
 
2558
    # mode
 
2559
    if debug or not foreground:
 
2560
        wnull.close()
 
2561
    
2344
2562
    # Get client data and settings from last running state.
2345
2563
    if server_settings["restore"]:
2346
2564
        try:
2349
2567
                                                     (stored_state))
2350
2568
            os.remove(stored_state_path)
2351
2569
        except IOError as e:
2352
 
            logger.warning("Could not load persistent state: {0}"
2353
 
                           .format(e))
2354
 
            if e.errno != errno.ENOENT:
 
2570
            if e.errno == errno.ENOENT:
 
2571
                logger.warning("Could not load persistent state: {0}"
 
2572
                                .format(os.strerror(e.errno)))
 
2573
            else:
 
2574
                logger.critical("Could not load persistent state:",
 
2575
                                exc_info=e)
2355
2576
                raise
2356
2577
        except EOFError as e:
2357
2578
            logger.warning("Could not load persistent state: "
2358
 
                           "EOFError: {0}".format(e))
 
2579
                           "EOFError:", exc_info=e)
2359
2580
    
2360
2581
    with PGPEngine() as pgp:
2361
2582
        for client_name, client in clients_data.iteritems():
 
2583
            # Skip removed clients
 
2584
            if client_name not in client_settings:
 
2585
                continue
 
2586
            
2362
2587
            # Decide which value to use after restoring saved state.
2363
2588
            # We have three different values: Old config file,
2364
2589
            # new config file, and saved state.
2414
2639
                             .format(client_name))
2415
2640
                client["secret"] = (
2416
2641
                    client_settings[client_name]["secret"])
2417
 
 
2418
2642
    
2419
2643
    # Add/remove clients based on new changes made to config
2420
2644
    for client_name in (set(old_client_settings)
2423
2647
    for client_name in (set(client_settings)
2424
2648
                        - set(old_client_settings)):
2425
2649
        clients_data[client_name] = client_settings[client_name]
2426
 
 
 
2650
    
2427
2651
    # Create all client objects
2428
2652
    for client_name, client in clients_data.iteritems():
2429
2653
        tcp_server.clients[client_name] = client_class(
2430
 
            name = client_name, settings = client)
 
2654
            name = client_name, settings = client,
 
2655
            server_settings = server_settings)
2431
2656
    
2432
2657
    if not tcp_server.clients:
2433
2658
        logger.warning("No clients defined")
2434
 
        
2435
 
    if not debug:
2436
 
        try:
2437
 
            with pidfile:
2438
 
                pid = os.getpid()
2439
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2440
 
            del pidfile
2441
 
        except IOError:
2442
 
            logger.error("Could not write to file %r with PID %d",
2443
 
                         pidfilename, pid)
2444
 
        except NameError:
2445
 
            # "pidfile" was never created
2446
 
            pass
 
2659
    
 
2660
    if not foreground:
 
2661
        if pidfile is not None:
 
2662
            try:
 
2663
                with pidfile:
 
2664
                    pid = os.getpid()
 
2665
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2666
            except IOError:
 
2667
                logger.error("Could not write to file %r with PID %d",
 
2668
                             pidfilename, pid)
 
2669
        del pidfile
2447
2670
        del pidfilename
2448
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2449
2671
    
2450
2672
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2451
2673
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2452
2674
    
2453
2675
    if use_dbus:
 
2676
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2677
                                        "se.bsnet.fukt.Mandos"})
2454
2678
        class MandosDBusService(DBusObjectWithProperties):
2455
2679
            """A D-Bus proxy object"""
2456
2680
            def __init__(self):
2510
2734
            
2511
2735
            del _interface
2512
2736
        
2513
 
        class MandosDBusServiceTransitional(MandosDBusService):
2514
 
            __metaclass__ = AlternateDBusNamesMetaclass
2515
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2737
        mandos_dbus_service = MandosDBusService()
2516
2738
    
2517
2739
    def cleanup():
2518
2740
        "Cleanup function; run on exit"
2519
2741
        service.cleanup()
2520
2742
        
2521
2743
        multiprocessing.active_children()
 
2744
        wnull.close()
2522
2745
        if not (tcp_server.clients or client_settings):
2523
2746
            return
2524
2747
        
2536
2759
                # A list of attributes that can not be pickled
2537
2760
                # + secret.
2538
2761
                exclude = set(("bus", "changedstate", "secret",
2539
 
                               "checker"))
 
2762
                               "checker", "server_settings"))
2540
2763
                for name, typ in (inspect.getmembers
2541
2764
                                  (dbus.service.Object)):
2542
2765
                    exclude.add(name)
2551
2774
                del client_settings[client.name]["secret"]
2552
2775
        
2553
2776
        try:
2554
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2555
 
                                                prefix="clients-",
2556
 
                                                dir=os.path.dirname
2557
 
                                                (stored_state_path))
2558
 
            with os.fdopen(tempfd, "wb") as stored_state:
 
2777
            with (tempfile.NamedTemporaryFile
 
2778
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2779
                   dir=os.path.dirname(stored_state_path),
 
2780
                   delete=False)) as stored_state:
2559
2781
                pickle.dump((clients, client_settings), stored_state)
 
2782
                tempname=stored_state.name
2560
2783
            os.rename(tempname, stored_state_path)
2561
2784
        except (IOError, OSError) as e:
2562
 
            logger.warning("Could not save persistent state: {0}"
2563
 
                           .format(e))
2564
2785
            if not debug:
2565
2786
                try:
2566
2787
                    os.remove(tempname)
2567
2788
                except NameError:
2568
2789
                    pass
2569
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2570
 
                                   errno.EEXIST)):
2571
 
                raise e
 
2790
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2791
                logger.warning("Could not save persistent state: {0}"
 
2792
                               .format(os.strerror(e.errno)))
 
2793
            else:
 
2794
                logger.warning("Could not save persistent state:",
 
2795
                               exc_info=e)
 
2796
                raise
2572
2797
        
2573
2798
        # Delete all clients, and settings from config
2574
2799
        while tcp_server.clients: