/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-20 15:25:09 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 305.
  • Revision ID: teddy@recompile.se-20131020152509-zkhuy2yse76w10hg
* Makefile (CFLAGS, LDFLAGS): Keep default flags from environment.
  (purge-server): PID file changed to "/run/mandos.pid".
* debian/compat: Changed to "9".
* debian/control (Standards-Version): Updated to "3.9.4".
  (DM-Upload-Allowed): Removed.
  (mandos/Depends): Add "initscripts (>= 2.88dsf-13.3)" to be able to
                    use the "/run" directory (for mandos.pid).
* debian/copyright (Copyright): Update year.
* init.d-mandos (PIDFILE): Changed to "/run/mandos.pid".
* mandos: Update copyright year.
  (pidfilename): Changed to "/run/mandos.pid".
* mandos-clients.conf.xml (OPTIONS/approval_delay): Bug fix: default
                                                    is "PT0S" - using
                                                    the new RFC 3339
                                                    duration syntax.
* mandos-keygen: Update copyright year.
* mandos-monitor: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
  (FILES): PID file changed to "/run/mandos.pid".
* plugin-runner.c: Update copyright year.
* plugins.d/mandos-client.c: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/plymouth.c: - '' -

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.1"
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
    
175
175
        return b"mandos" + binascii.hexlify(password)
176
176
    
177
177
    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
 
178
        passphrase = self.password_encode(password)
 
179
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
180
                                         ) as passfile:
 
181
            passfile.write(passphrase)
 
182
            passfile.flush()
 
183
            proc = subprocess.Popen(['gpg', '--symmetric',
 
184
                                     '--passphrase-file',
 
185
                                     passfile.name]
 
186
                                    + self.gnupgargs,
 
187
                                    stdin = subprocess.PIPE,
 
188
                                    stdout = subprocess.PIPE,
 
189
                                    stderr = subprocess.PIPE)
 
190
            ciphertext, err = proc.communicate(input = data)
 
191
        if proc.returncode != 0:
 
192
            raise PGPError(err)
192
193
        return ciphertext
193
194
    
194
195
    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
 
196
        passphrase = self.password_encode(password)
 
197
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
198
                                         ) as passfile:
 
199
            passfile.write(passphrase)
 
200
            passfile.flush()
 
201
            proc = subprocess.Popen(['gpg', '--decrypt',
 
202
                                     '--passphrase-file',
 
203
                                     passfile.name]
 
204
                                    + self.gnupgargs,
 
205
                                    stdin = subprocess.PIPE,
 
206
                                    stdout = subprocess.PIPE,
 
207
                                    stderr = subprocess.PIPE)
 
208
            decrypted_plaintext, err = proc.communicate(input
 
209
                                                        = data)
 
210
        if proc.returncode != 0:
 
211
            raise PGPError(err)
209
212
        return decrypted_plaintext
210
213
 
211
214
 
212
 
 
213
215
class AvahiError(Exception):
214
216
    def __init__(self, value, *args, **kwargs):
215
217
        self.value = value
232
234
               Used to optionally bind to the specified interface.
233
235
    name: string; Example: 'Mandos'
234
236
    type: string; Example: '_mandos._tcp'.
235
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
237
     See <https://www.iana.org/assignments/service-names-port-numbers>
236
238
    port: integer; what port to announce
237
239
    TXT: list of strings; TXT record for the service
238
240
    domain: string; Domain to publish on, default to .local if empty.
244
246
    server: D-Bus Server
245
247
    bus: dbus.SystemBus()
246
248
    """
 
249
    
247
250
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
248
251
                 servicetype = None, port = None, TXT = None,
249
252
                 domain = "", host = "", max_renames = 32768,
262
265
        self.server = None
263
266
        self.bus = bus
264
267
        self.entry_group_state_changed_match = None
 
268
    
265
269
    def rename(self):
266
270
        """Derived from the Avahi example code"""
267
271
        if self.rename_count >= self.max_renames:
277
281
        try:
278
282
            self.add()
279
283
        except dbus.exceptions.DBusException as error:
280
 
            logger.critical("DBusException: %s", error)
 
284
            logger.critical("D-Bus Exception", exc_info=error)
281
285
            self.cleanup()
282
286
            os._exit(1)
283
287
        self.rename_count += 1
 
288
    
284
289
    def remove(self):
285
290
        """Derived from the Avahi example code"""
286
291
        if self.entry_group_state_changed_match is not None:
288
293
            self.entry_group_state_changed_match = None
289
294
        if self.group is not None:
290
295
            self.group.Reset()
 
296
    
291
297
    def add(self):
292
298
        """Derived from the Avahi example code"""
293
299
        self.remove()
310
316
            dbus.UInt16(self.port),
311
317
            avahi.string_array_to_txt_array(self.TXT))
312
318
        self.group.Commit()
 
319
    
313
320
    def entry_group_state_changed(self, state, error):
314
321
        """Derived from the Avahi example code"""
315
322
        logger.debug("Avahi entry group state change: %i", state)
322
329
        elif state == avahi.ENTRY_GROUP_FAILURE:
323
330
            logger.critical("Avahi: Error in group state changed %s",
324
331
                            unicode(error))
325
 
            raise AvahiGroupError("State changed: %s"
326
 
                                  % unicode(error))
 
332
            raise AvahiGroupError("State changed: {0!s}"
 
333
                                  .format(error))
 
334
    
327
335
    def cleanup(self):
328
336
        """Derived from the Avahi example code"""
329
337
        if self.group is not None:
334
342
                pass
335
343
            self.group = None
336
344
        self.remove()
 
345
    
337
346
    def server_state_changed(self, state, error=None):
338
347
        """Derived from the Avahi example code"""
339
348
        logger.debug("Avahi server state change: %i", state)
358
367
                logger.debug("Unknown state: %r", state)
359
368
            else:
360
369
                logger.debug("Unknown state: %r: %r", state, error)
 
370
    
361
371
    def activate(self):
362
372
        """Derived from the Avahi example code"""
363
373
        if self.server is None:
370
380
                                 self.server_state_changed)
371
381
        self.server_state_changed(self.server.GetState())
372
382
 
 
383
 
373
384
class AvahiServiceToSyslog(AvahiService):
374
385
    def rename(self):
375
386
        """Add the new name to the syslog messages"""
376
387
        ret = AvahiService.rename(self)
377
388
        syslogger.setFormatter(logging.Formatter
378
 
                               ('Mandos (%s) [%%(process)d]:'
379
 
                                ' %%(levelname)s: %%(message)s'
380
 
                                % self.name))
 
389
                               ('Mandos ({0}) [%(process)d]:'
 
390
                                ' %(levelname)s: %(message)s'
 
391
                                .format(self.name)))
381
392
        return ret
382
393
 
 
394
 
383
395
def timedelta_to_milliseconds(td):
384
396
    "Convert a datetime.timedelta() to milliseconds"
385
397
    return ((td.days * 24 * 60 * 60 * 1000)
386
398
            + (td.seconds * 1000)
387
399
            + (td.microseconds // 1000))
388
 
        
 
400
 
 
401
 
389
402
class Client(object):
390
403
    """A representation of a client host served by this server.
391
404
    
427
440
    runtime_expansions: Allowed attributes for runtime expansion.
428
441
    expires:    datetime.datetime(); time (UTC) when a client will be
429
442
                disabled, or None
 
443
    server_settings: The server_settings dict from main()
430
444
    """
431
445
    
432
446
    runtime_expansions = ("approval_delay", "approval_duration",
433
 
                          "created", "enabled", "fingerprint",
434
 
                          "host", "interval", "last_checked_ok",
 
447
                          "created", "enabled", "expires",
 
448
                          "fingerprint", "host", "interval",
 
449
                          "last_approval_request", "last_checked_ok",
435
450
                          "last_enabled", "name", "timeout")
436
 
    client_defaults = { "timeout": "5m",
437
 
                        "extended_timeout": "15m",
438
 
                        "interval": "2m",
 
451
    client_defaults = { "timeout": "PT5M",
 
452
                        "extended_timeout": "PT15M",
 
453
                        "interval": "PT2M",
439
454
                        "checker": "fping -q -- %%(host)s",
440
455
                        "host": "",
441
 
                        "approval_delay": "0s",
442
 
                        "approval_duration": "1s",
 
456
                        "approval_delay": "PT0S",
 
457
                        "approval_duration": "PT1S",
443
458
                        "approved_by_default": "True",
444
459
                        "enabled": "True",
445
460
                        }
458
473
    
459
474
    def approval_delay_milliseconds(self):
460
475
        return timedelta_to_milliseconds(self.approval_delay)
461
 
 
 
476
    
462
477
    @staticmethod
463
478
    def config_parser(config):
464
479
        """Construct a new dict of client settings of this form:
489
504
                          "rb") as secfile:
490
505
                    client["secret"] = secfile.read()
491
506
            else:
492
 
                raise TypeError("No secret or secfile for section %s"
493
 
                                % section)
 
507
                raise TypeError("No secret or secfile for section {0}"
 
508
                                .format(section))
494
509
            client["timeout"] = string_to_delta(section["timeout"])
495
510
            client["extended_timeout"] = string_to_delta(
496
511
                section["extended_timeout"])
505
520
            client["last_checker_status"] = -2
506
521
        
507
522
        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."""
 
523
    
 
524
    def __init__(self, settings, name = None, server_settings=None):
514
525
        self.name = name
 
526
        if server_settings is None:
 
527
            server_settings = {}
 
528
        self.server_settings = server_settings
515
529
        # adding all client settings
516
530
        for setting, value in settings.iteritems():
517
531
            setattr(self, setting, value)
525
539
        else:
526
540
            self.last_enabled = None
527
541
            self.expires = None
528
 
       
 
542
        
529
543
        logger.debug("Creating client %r", self.name)
530
544
        # Uppercase and remove spaces from fingerprint for later
531
545
        # comparison purposes with return value from the fingerprint()
533
547
        logger.debug("  Fingerprint: %s", self.fingerprint)
534
548
        self.created = settings.get("created",
535
549
                                    datetime.datetime.utcnow())
536
 
 
 
550
        
537
551
        # attributes specific for this server instance
538
552
        self.checker = None
539
553
        self.checker_initiator_tag = None
567
581
        if getattr(self, "enabled", False):
568
582
            # Already enabled
569
583
            return
570
 
        self.send_changedstate()
571
584
        self.expires = datetime.datetime.utcnow() + self.timeout
572
585
        self.enabled = True
573
586
        self.last_enabled = datetime.datetime.utcnow()
574
587
        self.init_checker()
 
588
        self.send_changedstate()
575
589
    
576
590
    def disable(self, quiet=True):
577
591
        """Disable this client."""
578
592
        if not getattr(self, "enabled", False):
579
593
            return False
580
594
        if not quiet:
581
 
            self.send_changedstate()
582
 
        if not quiet:
583
595
            logger.info("Disabling client %s", self.name)
584
 
        if getattr(self, "disable_initiator_tag", False):
 
596
        if getattr(self, "disable_initiator_tag", None) is not None:
585
597
            gobject.source_remove(self.disable_initiator_tag)
586
598
            self.disable_initiator_tag = None
587
599
        self.expires = None
588
 
        if getattr(self, "checker_initiator_tag", False):
 
600
        if getattr(self, "checker_initiator_tag", None) is not None:
589
601
            gobject.source_remove(self.checker_initiator_tag)
590
602
            self.checker_initiator_tag = None
591
603
        self.stop_checker()
592
604
        self.enabled = False
 
605
        if not quiet:
 
606
            self.send_changedstate()
593
607
        # Do not run this again if called by a gobject.timeout_add
594
608
        return False
595
609
    
599
613
    def init_checker(self):
600
614
        # Schedule a new checker to be started an 'interval' from now,
601
615
        # and every interval from then on.
 
616
        if self.checker_initiator_tag is not None:
 
617
            gobject.source_remove(self.checker_initiator_tag)
602
618
        self.checker_initiator_tag = (gobject.timeout_add
603
619
                                      (self.interval_milliseconds(),
604
620
                                       self.start_checker))
605
621
        # Schedule a disable() when 'timeout' has passed
 
622
        if self.disable_initiator_tag is not None:
 
623
            gobject.source_remove(self.disable_initiator_tag)
606
624
        self.disable_initiator_tag = (gobject.timeout_add
607
625
                                   (self.timeout_milliseconds(),
608
626
                                    self.disable))
639
657
            timeout = self.timeout
640
658
        if self.disable_initiator_tag is not None:
641
659
            gobject.source_remove(self.disable_initiator_tag)
 
660
            self.disable_initiator_tag = None
642
661
        if getattr(self, "enabled", False):
643
662
            self.disable_initiator_tag = (gobject.timeout_add
644
663
                                          (timedelta_to_milliseconds
654
673
        If a checker already exists, leave it running and do
655
674
        nothing."""
656
675
        # 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
 
676
        # did that, and if a checker (for some reason) started running
 
677
        # slowly and taking more than 'interval' time, then the client
 
678
        # would inevitably timeout, since no checker would get a
 
679
        # chance to run to completion.  If we instead leave running
661
680
        # checkers alone, the checker would have to take more time
662
681
        # than 'timeout' for the client to be disabled, which is as it
663
682
        # should be.
677
696
                                      self.current_checker_command)
678
697
        # Start a new checker if needed
679
698
        if self.checker is None:
 
699
            # Escape attributes for the shell
 
700
            escaped_attrs = dict(
 
701
                (attr, re.escape(unicode(getattr(self, attr))))
 
702
                for attr in
 
703
                self.runtime_expansions)
680
704
            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
 
                                 ' %s', self.checker_command, error)
698
 
                    return True # Try again later
 
705
                command = self.checker_command % escaped_attrs
 
706
            except TypeError as error:
 
707
                logger.error('Could not format string "%s"',
 
708
                             self.checker_command, exc_info=error)
 
709
                return True # Try again later
699
710
            self.current_checker_command = command
700
711
            try:
701
712
                logger.info("Starting checker %r for %s",
704
715
                # in normal mode, that is already done by daemon(),
705
716
                # and in debug mode we don't want to.  (Stdin is
706
717
                # always replaced by /dev/null.)
 
718
                # The exception is when not debugging but nevertheless
 
719
                # running in the foreground; use the previously
 
720
                # created wnull.
 
721
                popen_args = {}
 
722
                if (not self.server_settings["debug"]
 
723
                    and self.server_settings["foreground"]):
 
724
                    popen_args.update({"stdout": wnull,
 
725
                                       "stderr": wnull })
707
726
                self.checker = subprocess.Popen(command,
708
727
                                                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.
 
728
                                                shell=True, cwd="/",
 
729
                                                **popen_args)
 
730
            except OSError as error:
 
731
                logger.error("Failed to start subprocess",
 
732
                             exc_info=error)
 
733
                return True
 
734
            self.checker_callback_tag = (gobject.child_watch_add
 
735
                                         (self.checker.pid,
 
736
                                          self.checker_callback,
 
737
                                          data=command))
 
738
            # The checker may have completed before the gobject
 
739
            # watch was added.  Check for this.
 
740
            try:
716
741
                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)
720
742
            except OSError as error:
721
 
                logger.error("Failed to start subprocess: %s",
722
 
                             error)
 
743
                if error.errno == errno.ECHILD:
 
744
                    # This should never happen
 
745
                    logger.error("Child process vanished",
 
746
                                 exc_info=error)
 
747
                    return True
 
748
                raise
 
749
            if pid:
 
750
                gobject.source_remove(self.checker_callback_tag)
 
751
                self.checker_callback(pid, status, command)
723
752
        # Re-run this periodically if run by gobject.timeout_add
724
753
        return True
725
754
    
732
761
            return
733
762
        logger.debug("Stopping checker for %(name)s", vars(self))
734
763
        try:
735
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
764
            self.checker.terminate()
736
765
            #time.sleep(0.5)
737
766
            #if self.checker.poll() is None:
738
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
767
            #    self.checker.kill()
739
768
        except OSError as error:
740
769
            if error.errno != errno.ESRCH: # No such process
741
770
                raise
758
787
    # "Set" method, so we fail early here:
759
788
    if byte_arrays and signature != "ay":
760
789
        raise ValueError("Byte arrays not supported for non-'ay'"
761
 
                         " signature %r" % signature)
 
790
                         " signature {0!r}".format(signature))
762
791
    def decorator(func):
763
792
        func._dbus_is_property = True
764
793
        func._dbus_interface = dbus_interface
773
802
 
774
803
 
775
804
def dbus_interface_annotations(dbus_interface):
776
 
    """Decorator for marking functions returning interface annotations.
 
805
    """Decorator for marking functions returning interface annotations
777
806
    
778
807
    Usage:
779
808
    
791
820
    return decorator
792
821
 
793
822
 
 
823
def dbus_annotations(annotations):
 
824
    """Decorator to annotate D-Bus methods, signals or properties
 
825
    Usage:
 
826
    
 
827
    @dbus_service_property("org.example.Interface", signature="b",
 
828
                           access="r")
 
829
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
830
                        "org.freedesktop.DBus.Property."
 
831
                        "EmitsChangedSignal": "false"})
 
832
    def Property_dbus_property(self):
 
833
        return dbus.Boolean(False)
 
834
    """
 
835
    def decorator(func):
 
836
        func._dbus_annotations = annotations
 
837
        return func
 
838
    return decorator
 
839
 
 
840
 
794
841
class DBusPropertyException(dbus.exceptions.DBusException):
795
842
    """A base class for D-Bus property-related exceptions
796
843
    """
831
878
    def _get_all_dbus_things(self, thing):
832
879
        """Returns a generator of (name, attribute) pairs
833
880
        """
834
 
        return ((athing.__get__(self)._dbus_name,
 
881
        return ((getattr(athing.__get__(self), "_dbus_name",
 
882
                         name),
835
883
                 athing.__get__(self))
836
884
                for cls in self.__class__.__mro__
837
885
                for name, athing in
936
984
                            if prop._dbus_interface
937
985
                            == if_tag.getAttribute("name")):
938
986
                    if_tag.appendChild(tag)
 
987
                # Add annotation tags
 
988
                for typ in ("method", "signal", "property"):
 
989
                    for tag in if_tag.getElementsByTagName(typ):
 
990
                        annots = dict()
 
991
                        for name, prop in (self.
 
992
                                           _get_all_dbus_things(typ)):
 
993
                            if (name == tag.getAttribute("name")
 
994
                                and prop._dbus_interface
 
995
                                == if_tag.getAttribute("name")):
 
996
                                annots.update(getattr
 
997
                                              (prop,
 
998
                                               "_dbus_annotations",
 
999
                                               {}))
 
1000
                        for name, value in annots.iteritems():
 
1001
                            ann_tag = document.createElement(
 
1002
                                "annotation")
 
1003
                            ann_tag.setAttribute("name", name)
 
1004
                            ann_tag.setAttribute("value", value)
 
1005
                            tag.appendChild(ann_tag)
939
1006
                # Add interface annotation tags
940
1007
                for annotation, value in dict(
941
 
                    itertools.chain(
942
 
                        *(annotations().iteritems()
943
 
                          for name, annotations in
944
 
                          self._get_all_dbus_things("interface")
945
 
                          if name == if_tag.getAttribute("name")
946
 
                          ))).iteritems():
947
 
                    attr_tag = document.createElement("annotation")
948
 
                    attr_tag.setAttribute("name", annotation)
949
 
                    attr_tag.setAttribute("value", value)
950
 
                    if_tag.appendChild(attr_tag)
 
1008
                    itertools.chain.from_iterable(
 
1009
                        annotations().iteritems()
 
1010
                        for name, annotations in
 
1011
                        self._get_all_dbus_things("interface")
 
1012
                        if name == if_tag.getAttribute("name")
 
1013
                        )).iteritems():
 
1014
                    ann_tag = document.createElement("annotation")
 
1015
                    ann_tag.setAttribute("name", annotation)
 
1016
                    ann_tag.setAttribute("value", value)
 
1017
                    if_tag.appendChild(ann_tag)
951
1018
                # Add the names to the return values for the
952
1019
                # "org.freedesktop.DBus.Properties" methods
953
1020
                if (if_tag.getAttribute("name")
968
1035
        except (AttributeError, xml.dom.DOMException,
969
1036
                xml.parsers.expat.ExpatError) as error:
970
1037
            logger.error("Failed to override Introspection method",
971
 
                         error)
 
1038
                         exc_info=error)
972
1039
        return xmlstring
973
1040
 
974
1041
 
975
 
def datetime_to_dbus (dt, variant_level=0):
 
1042
def datetime_to_dbus(dt, variant_level=0):
976
1043
    """Convert a UTC datetime.datetime() to a D-Bus type."""
977
1044
    if dt is None:
978
1045
        return dbus.String("", variant_level = variant_level)
980
1047
                       variant_level=variant_level)
981
1048
 
982
1049
 
983
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
984
 
                                  .__metaclass__):
985
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
986
 
    will add additional D-Bus attributes matching a certain pattern.
 
1050
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1051
    """A class decorator; applied to a subclass of
 
1052
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1053
    interface names according to the "alt_interface_names" mapping.
 
1054
    Usage:
 
1055
    
 
1056
    @alternate_dbus_interfaces({"org.example.Interface":
 
1057
                                    "net.example.AlternateInterface"})
 
1058
    class SampleDBusObject(dbus.service.Object):
 
1059
        @dbus.service.method("org.example.Interface")
 
1060
        def SampleDBusMethod():
 
1061
            pass
 
1062
    
 
1063
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1064
    reachable via two interfaces: "org.example.Interface" and
 
1065
    "net.example.AlternateInterface", the latter of which will have
 
1066
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1067
    "true", unless "deprecate" is passed with a False value.
 
1068
    
 
1069
    This works for methods and signals, and also for D-Bus properties
 
1070
    (from DBusObjectWithProperties) and interfaces (from the
 
1071
    dbus_interface_annotations decorator).
987
1072
    """
988
 
    def __new__(mcs, name, bases, attr):
989
 
        # Go through all the base classes which could have D-Bus
990
 
        # methods, signals, or properties in them
991
 
        old_interface_names = []
992
 
        for base in (b for b in bases
993
 
                     if issubclass(b, dbus.service.Object)):
994
 
            # Go though all attributes of the base class
995
 
            for attrname, attribute in inspect.getmembers(base):
 
1073
    def wrapper(cls):
 
1074
        for orig_interface_name, alt_interface_name in (
 
1075
            alt_interface_names.iteritems()):
 
1076
            attr = {}
 
1077
            interface_names = set()
 
1078
            # Go though all attributes of the class
 
1079
            for attrname, attribute in inspect.getmembers(cls):
996
1080
                # Ignore non-D-Bus attributes, and D-Bus attributes
997
1081
                # with the wrong interface name
998
1082
                if (not hasattr(attribute, "_dbus_interface")
999
1083
                    or not attribute._dbus_interface
1000
 
                    .startswith("se.recompile.Mandos")):
 
1084
                    .startswith(orig_interface_name)):
1001
1085
                    continue
1002
1086
                # Create an alternate D-Bus interface name based on
1003
1087
                # the current name
1004
1088
                alt_interface = (attribute._dbus_interface
1005
 
                                 .replace("se.recompile.Mandos",
1006
 
                                          "se.bsnet.fukt.Mandos"))
1007
 
                if alt_interface != attribute._dbus_interface:
1008
 
                    old_interface_names.append(alt_interface)
 
1089
                                 .replace(orig_interface_name,
 
1090
                                          alt_interface_name))
 
1091
                interface_names.add(alt_interface)
1009
1092
                # Is this a D-Bus signal?
1010
1093
                if getattr(attribute, "_dbus_is_signal", False):
1011
 
                    # Extract the original non-method function by
1012
 
                    # black magic
 
1094
                    # Extract the original non-method undecorated
 
1095
                    # function by black magic
1013
1096
                    nonmethod_func = (dict(
1014
1097
                            zip(attribute.func_code.co_freevars,
1015
1098
                                attribute.__closure__))["func"]
1026
1109
                                nonmethod_func.func_name,
1027
1110
                                nonmethod_func.func_defaults,
1028
1111
                                nonmethod_func.func_closure)))
 
1112
                    # Copy annotations, if any
 
1113
                    try:
 
1114
                        new_function._dbus_annotations = (
 
1115
                            dict(attribute._dbus_annotations))
 
1116
                    except AttributeError:
 
1117
                        pass
1029
1118
                    # Define a creator of a function to call both the
1030
 
                    # old and new functions, so both the old and new
1031
 
                    # signals gets sent when the function is called
 
1119
                    # original and alternate functions, so both the
 
1120
                    # original and alternate signals gets sent when
 
1121
                    # the function is called
1032
1122
                    def fixscope(func1, func2):
1033
1123
                        """This function is a scope container to pass
1034
1124
                        func1 and func2 to the "call_both" function
1041
1131
                        return call_both
1042
1132
                    # Create the "call_both" function and add it to
1043
1133
                    # the class
1044
 
                    attr[attrname] = fixscope(attribute,
1045
 
                                              new_function)
 
1134
                    attr[attrname] = fixscope(attribute, new_function)
1046
1135
                # Is this a D-Bus method?
1047
1136
                elif getattr(attribute, "_dbus_is_method", False):
1048
1137
                    # Create a new, but exactly alike, function
1059
1148
                                        attribute.func_name,
1060
1149
                                        attribute.func_defaults,
1061
1150
                                        attribute.func_closure)))
 
1151
                    # Copy annotations, if any
 
1152
                    try:
 
1153
                        attr[attrname]._dbus_annotations = (
 
1154
                            dict(attribute._dbus_annotations))
 
1155
                    except AttributeError:
 
1156
                        pass
1062
1157
                # Is this a D-Bus property?
1063
1158
                elif getattr(attribute, "_dbus_is_property", False):
1064
1159
                    # Create a new, but exactly alike, function
1078
1173
                                        attribute.func_name,
1079
1174
                                        attribute.func_defaults,
1080
1175
                                        attribute.func_closure)))
 
1176
                    # Copy annotations, if any
 
1177
                    try:
 
1178
                        attr[attrname]._dbus_annotations = (
 
1179
                            dict(attribute._dbus_annotations))
 
1180
                    except AttributeError:
 
1181
                        pass
1081
1182
                # Is this a D-Bus interface?
1082
1183
                elif getattr(attribute, "_dbus_is_interface", False):
1083
1184
                    # Create a new, but exactly alike, function
1092
1193
                                        attribute.func_name,
1093
1194
                                        attribute.func_defaults,
1094
1195
                                        attribute.func_closure)))
1095
 
        # Deprecate all old interfaces
1096
 
        basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1097
 
        for old_interface_name in old_interface_names:
1098
 
            @dbus_interface_annotations(old_interface_name)
1099
 
            def func(self):
1100
 
                return { "org.freedesktop.DBus.Deprecated": "true" }
1101
 
            # Find an unused name
1102
 
            for aname in (basename.format(i) for i in
1103
 
                          itertools.count()):
1104
 
                if aname not in attr:
1105
 
                    attr[aname] = func
1106
 
                    break
1107
 
        return type.__new__(mcs, name, bases, attr)
1108
 
 
1109
 
 
 
1196
            if deprecate:
 
1197
                # Deprecate all alternate interfaces
 
1198
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1199
                for interface_name in interface_names:
 
1200
                    @dbus_interface_annotations(interface_name)
 
1201
                    def func(self):
 
1202
                        return { "org.freedesktop.DBus.Deprecated":
 
1203
                                     "true" }
 
1204
                    # Find an unused name
 
1205
                    for aname in (iname.format(i)
 
1206
                                  for i in itertools.count()):
 
1207
                        if aname not in attr:
 
1208
                            attr[aname] = func
 
1209
                            break
 
1210
            if interface_names:
 
1211
                # Replace the class with a new subclass of it with
 
1212
                # methods, signals, etc. as created above.
 
1213
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1214
                           (cls,), attr)
 
1215
        return cls
 
1216
    return wrapper
 
1217
 
 
1218
 
 
1219
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1220
                                "se.bsnet.fukt.Mandos"})
1110
1221
class ClientDBus(Client, DBusObjectWithProperties):
1111
1222
    """A Client class using D-Bus
1112
1223
    
1132
1243
                                 ("/clients/" + client_object_name))
1133
1244
        DBusObjectWithProperties.__init__(self, self.bus,
1134
1245
                                          self.dbus_object_path)
1135
 
        
 
1246
    
1136
1247
    def notifychangeproperty(transform_func,
1137
1248
                             dbus_name, type_func=lambda x: x,
1138
1249
                             variant_level=1):
1161
1272
        
1162
1273
        return property(lambda self: getattr(self, attrname), setter)
1163
1274
    
1164
 
    
1165
1275
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1166
1276
    approvals_pending = notifychangeproperty(dbus.Boolean,
1167
1277
                                             "ApprovalPending",
1249
1359
        return False
1250
1360
    
1251
1361
    def approve(self, value=True):
1252
 
        self.send_changedstate()
1253
1362
        self.approved = value
1254
1363
        gobject.timeout_add(timedelta_to_milliseconds
1255
1364
                            (self.approval_duration),
1256
1365
                            self._reset_approved)
1257
 
    
 
1366
        self.send_changedstate()
1258
1367
    
1259
1368
    ## D-Bus methods, signals & properties
1260
1369
    _interface = "se.recompile.Mandos.Client"
1444
1553
    def Timeout_dbus_property(self, value=None):
1445
1554
        if value is None:       # get
1446
1555
            return dbus.UInt64(self.timeout_milliseconds())
 
1556
        old_timeout = self.timeout
1447
1557
        self.timeout = datetime.timedelta(0, 0, 0, value)
1448
 
        # Reschedule timeout
 
1558
        # Reschedule disabling
1449
1559
        if self.enabled:
1450
1560
            now = datetime.datetime.utcnow()
1451
 
            time_to_die = timedelta_to_milliseconds(
1452
 
                (self.last_checked_ok + self.timeout) - now)
1453
 
            if time_to_die <= 0:
 
1561
            self.expires += self.timeout - old_timeout
 
1562
            if self.expires <= now:
1454
1563
                # The timeout has passed
1455
1564
                self.disable()
1456
1565
            else:
1457
 
                self.expires = (now +
1458
 
                                datetime.timedelta(milliseconds =
1459
 
                                                   time_to_die))
1460
1566
                if (getattr(self, "disable_initiator_tag", None)
1461
1567
                    is None):
1462
1568
                    return
1463
1569
                gobject.source_remove(self.disable_initiator_tag)
1464
 
                self.disable_initiator_tag = (gobject.timeout_add
1465
 
                                              (time_to_die,
1466
 
                                               self.disable))
 
1570
                self.disable_initiator_tag = (
 
1571
                    gobject.timeout_add(
 
1572
                        timedelta_to_milliseconds(self.expires - now),
 
1573
                        self.disable))
1467
1574
    
1468
1575
    # ExtendedTimeout - property
1469
1576
    @dbus_service_property(_interface, signature="t",
1548
1655
        self._pipe.send(('setattr', name, value))
1549
1656
 
1550
1657
 
1551
 
class ClientDBusTransitional(ClientDBus):
1552
 
    __metaclass__ = AlternateDBusNamesMetaclass
1553
 
 
1554
 
 
1555
1658
class ClientHandler(socketserver.BaseRequestHandler, object):
1556
1659
    """A class to handle client connections.
1557
1660
    
1661
1764
                    #wait until timeout or approved
1662
1765
                    time = datetime.datetime.now()
1663
1766
                    client.changedstate.acquire()
1664
 
                    (client.changedstate.wait
1665
 
                     (float(client.timedelta_to_milliseconds(delay)
1666
 
                            / 1000)))
 
1767
                    client.changedstate.wait(
 
1768
                        float(timedelta_to_milliseconds(delay)
 
1769
                              / 1000))
1667
1770
                    client.changedstate.release()
1668
1771
                    time2 = datetime.datetime.now()
1669
1772
                    if (time2 - time) >= delay:
1685
1788
                    try:
1686
1789
                        sent = session.send(client.secret[sent_size:])
1687
1790
                    except gnutls.errors.GNUTLSError as error:
1688
 
                        logger.warning("gnutls send failed")
 
1791
                        logger.warning("gnutls send failed",
 
1792
                                       exc_info=error)
1689
1793
                        return
1690
1794
                    logger.debug("Sent: %d, remaining: %d",
1691
1795
                                 sent, len(client.secret)
1705
1809
                try:
1706
1810
                    session.bye()
1707
1811
                except gnutls.errors.GNUTLSError as error:
1708
 
                    logger.warning("GnuTLS bye failed")
 
1812
                    logger.warning("GnuTLS bye failed",
 
1813
                                   exc_info=error)
1709
1814
    
1710
1815
    @staticmethod
1711
1816
    def peer_certificate(session):
1783
1888
    def process_request(self, request, address):
1784
1889
        """Start a new process to process the request."""
1785
1890
        proc = multiprocessing.Process(target = self.sub_process_main,
1786
 
                                       args = (request,
1787
 
                                               address))
 
1891
                                       args = (request, address))
1788
1892
        proc.start()
1789
1893
        return proc
1790
1894
 
1818
1922
        use_ipv6:       Boolean; to use IPv6 or not
1819
1923
    """
1820
1924
    def __init__(self, server_address, RequestHandlerClass,
1821
 
                 interface=None, use_ipv6=True):
 
1925
                 interface=None, use_ipv6=True, socketfd=None):
 
1926
        """If socketfd is set, use that file descriptor instead of
 
1927
        creating a new one with socket.socket().
 
1928
        """
1822
1929
        self.interface = interface
1823
1930
        if use_ipv6:
1824
1931
            self.address_family = socket.AF_INET6
 
1932
        if socketfd is not None:
 
1933
            # Save the file descriptor
 
1934
            self.socketfd = socketfd
 
1935
            # Save the original socket.socket() function
 
1936
            self.socket_socket = socket.socket
 
1937
            # To implement --socket, we monkey patch socket.socket.
 
1938
            # 
 
1939
            # (When socketserver.TCPServer is a new-style class, we
 
1940
            # could make self.socket into a property instead of monkey
 
1941
            # patching socket.socket.)
 
1942
            # 
 
1943
            # Create a one-time-only replacement for socket.socket()
 
1944
            @functools.wraps(socket.socket)
 
1945
            def socket_wrapper(*args, **kwargs):
 
1946
                # Restore original function so subsequent calls are
 
1947
                # not affected.
 
1948
                socket.socket = self.socket_socket
 
1949
                del self.socket_socket
 
1950
                # This time only, return a new socket object from the
 
1951
                # saved file descriptor.
 
1952
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
1953
            # Replace socket.socket() function with wrapper
 
1954
            socket.socket = socket_wrapper
 
1955
        # The socketserver.TCPServer.__init__ will call
 
1956
        # socket.socket(), which might be our replacement,
 
1957
        # socket_wrapper(), if socketfd was set.
1825
1958
        socketserver.TCPServer.__init__(self, server_address,
1826
1959
                                        RequestHandlerClass)
 
1960
    
1827
1961
    def server_bind(self):
1828
1962
        """This overrides the normal server_bind() function
1829
1963
        to bind to an interface if one was specified, and also NOT to
1837
1971
                try:
1838
1972
                    self.socket.setsockopt(socket.SOL_SOCKET,
1839
1973
                                           SO_BINDTODEVICE,
1840
 
                                           str(self.interface
1841
 
                                               + '\0'))
 
1974
                                           str(self.interface + '\0'))
1842
1975
                except socket.error as error:
1843
 
                    if error[0] == errno.EPERM:
1844
 
                        logger.error("No permission to"
1845
 
                                     " bind to interface %s",
1846
 
                                     self.interface)
1847
 
                    elif error[0] == errno.ENOPROTOOPT:
 
1976
                    if error.errno == errno.EPERM:
 
1977
                        logger.error("No permission to bind to"
 
1978
                                     " interface %s", self.interface)
 
1979
                    elif error.errno == errno.ENOPROTOOPT:
1848
1980
                        logger.error("SO_BINDTODEVICE not available;"
1849
1981
                                     " cannot bind to interface %s",
1850
1982
                                     self.interface)
 
1983
                    elif error.errno == errno.ENODEV:
 
1984
                        logger.error("Interface %s does not exist,"
 
1985
                                     " cannot bind", self.interface)
1851
1986
                    else:
1852
1987
                        raise
1853
1988
        # Only bind(2) the socket if we really need to.
1856
1991
                if self.address_family == socket.AF_INET6:
1857
1992
                    any_address = "::" # in6addr_any
1858
1993
                else:
1859
 
                    any_address = socket.INADDR_ANY
 
1994
                    any_address = "0.0.0.0" # INADDR_ANY
1860
1995
                self.server_address = (any_address,
1861
1996
                                       self.server_address[1])
1862
1997
            elif not self.server_address[1]:
1883
2018
    """
1884
2019
    def __init__(self, server_address, RequestHandlerClass,
1885
2020
                 interface=None, use_ipv6=True, clients=None,
1886
 
                 gnutls_priority=None, use_dbus=True):
 
2021
                 gnutls_priority=None, use_dbus=True, socketfd=None):
1887
2022
        self.enabled = False
1888
2023
        self.clients = clients
1889
2024
        if self.clients is None:
1893
2028
        IPv6_TCPServer.__init__(self, server_address,
1894
2029
                                RequestHandlerClass,
1895
2030
                                interface = interface,
1896
 
                                use_ipv6 = use_ipv6)
 
2031
                                use_ipv6 = use_ipv6,
 
2032
                                socketfd = socketfd)
1897
2033
    def server_activate(self):
1898
2034
        if self.enabled:
1899
2035
            return socketserver.TCPServer.server_activate(self)
1912
2048
    
1913
2049
    def handle_ipc(self, source, condition, parent_pipe=None,
1914
2050
                   proc = None, client_object=None):
1915
 
        condition_names = {
1916
 
            gobject.IO_IN: "IN",   # There is data to read.
1917
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1918
 
                                    # blocking).
1919
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1920
 
            gobject.IO_ERR: "ERR", # Error condition.
1921
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1922
 
                                    # broken, usually for pipes and
1923
 
                                    # sockets).
1924
 
            }
1925
 
        conditions_string = ' | '.join(name
1926
 
                                       for cond, name in
1927
 
                                       condition_names.iteritems()
1928
 
                                       if cond & condition)
1929
2051
        # error, or the other end of multiprocessing.Pipe has closed
1930
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2052
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1931
2053
            # Wait for other process to exit
1932
2054
            proc.join()
1933
2055
            return False
1991
2113
        return True
1992
2114
 
1993
2115
 
 
2116
def rfc3339_duration_to_delta(duration):
 
2117
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2118
    
 
2119
    >>> rfc3339_duration_to_delta("P7D")
 
2120
    datetime.timedelta(7)
 
2121
    >>> rfc3339_duration_to_delta("PT60S")
 
2122
    datetime.timedelta(0, 60)
 
2123
    >>> rfc3339_duration_to_delta("PT60M")
 
2124
    datetime.timedelta(0, 3600)
 
2125
    >>> rfc3339_duration_to_delta("PT24H")
 
2126
    datetime.timedelta(1)
 
2127
    >>> rfc3339_duration_to_delta("P1W")
 
2128
    datetime.timedelta(7)
 
2129
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2130
    datetime.timedelta(0, 330)
 
2131
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2132
    datetime.timedelta(1, 200)
 
2133
    """
 
2134
    
 
2135
    # Parsing an RFC 3339 duration with regular expressions is not
 
2136
    # possible - there would have to be multiple places for the same
 
2137
    # values, like seconds.  The current code, while more esoteric, is
 
2138
    # cleaner without depending on a parsing library.  If Python had a
 
2139
    # built-in library for parsing we would use it, but we'd like to
 
2140
    # avoid excessive use of external libraries.
 
2141
    
 
2142
    # New type for defining tokens, syntax, and semantics all-in-one
 
2143
    Token = collections.namedtuple("Token",
 
2144
                                   ("regexp", # To match token; if
 
2145
                                              # "value" is not None,
 
2146
                                              # must have a "group"
 
2147
                                              # containing digits
 
2148
                                    "value",  # datetime.timedelta or
 
2149
                                              # None
 
2150
                                    "followers")) # Tokens valid after
 
2151
                                                  # this token
 
2152
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2153
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2154
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2155
    token_second = Token(re.compile(r"(\d+)S"),
 
2156
                         datetime.timedelta(seconds=1),
 
2157
                         frozenset((token_end,)))
 
2158
    token_minute = Token(re.compile(r"(\d+)M"),
 
2159
                         datetime.timedelta(minutes=1),
 
2160
                         frozenset((token_second, token_end)))
 
2161
    token_hour = Token(re.compile(r"(\d+)H"),
 
2162
                       datetime.timedelta(hours=1),
 
2163
                       frozenset((token_minute, token_end)))
 
2164
    token_time = Token(re.compile(r"T"),
 
2165
                       None,
 
2166
                       frozenset((token_hour, token_minute,
 
2167
                                  token_second)))
 
2168
    token_day = Token(re.compile(r"(\d+)D"),
 
2169
                      datetime.timedelta(days=1),
 
2170
                      frozenset((token_time, token_end)))
 
2171
    token_month = Token(re.compile(r"(\d+)M"),
 
2172
                        datetime.timedelta(weeks=4),
 
2173
                        frozenset((token_day, token_end)))
 
2174
    token_year = Token(re.compile(r"(\d+)Y"),
 
2175
                       datetime.timedelta(weeks=52),
 
2176
                       frozenset((token_month, token_end)))
 
2177
    token_week = Token(re.compile(r"(\d+)W"),
 
2178
                       datetime.timedelta(weeks=1),
 
2179
                       frozenset((token_end,)))
 
2180
    token_duration = Token(re.compile(r"P"), None,
 
2181
                           frozenset((token_year, token_month,
 
2182
                                      token_day, token_time,
 
2183
                                      token_week))),
 
2184
    # Define starting values
 
2185
    value = datetime.timedelta() # Value so far
 
2186
    found_token = None
 
2187
    followers = frozenset(token_duration,) # Following valid tokens
 
2188
    s = duration                # String left to parse
 
2189
    # Loop until end token is found
 
2190
    while found_token is not token_end:
 
2191
        # Search for any currently valid tokens
 
2192
        for token in followers:
 
2193
            match = token.regexp.match(s)
 
2194
            if match is not None:
 
2195
                # Token found
 
2196
                if token.value is not None:
 
2197
                    # Value found, parse digits
 
2198
                    factor = int(match.group(1), 10)
 
2199
                    # Add to value so far
 
2200
                    value += factor * token.value
 
2201
                # Strip token from string
 
2202
                s = token.regexp.sub("", s, 1)
 
2203
                # Go to found token
 
2204
                found_token = token
 
2205
                # Set valid next tokens
 
2206
                followers = found_token.followers
 
2207
                break
 
2208
        else:
 
2209
            # No currently valid tokens were found
 
2210
            raise ValueError("Invalid RFC 3339 duration")
 
2211
    # End token found
 
2212
    return value
 
2213
 
 
2214
 
1994
2215
def string_to_delta(interval):
1995
2216
    """Parse a string and return a datetime.timedelta
1996
2217
    
2007
2228
    >>> string_to_delta('5m 30s')
2008
2229
    datetime.timedelta(0, 330)
2009
2230
    """
 
2231
    
 
2232
    try:
 
2233
        return rfc3339_duration_to_delta(interval)
 
2234
    except ValueError:
 
2235
        pass
 
2236
    
2010
2237
    timevalue = datetime.timedelta(0)
2011
2238
    for s in interval.split():
2012
2239
        try:
2023
2250
            elif suffix == "w":
2024
2251
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2025
2252
            else:
2026
 
                raise ValueError("Unknown suffix %r" % suffix)
 
2253
                raise ValueError("Unknown suffix {0!r}"
 
2254
                                 .format(suffix))
2027
2255
        except (ValueError, IndexError) as e:
2028
2256
            raise ValueError(*(e.args))
2029
2257
        timevalue += delta
2046
2274
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2047
2275
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2048
2276
            raise OSError(errno.ENODEV,
2049
 
                          "%s not a character device"
2050
 
                          % os.devnull)
 
2277
                          "{0} not a character device"
 
2278
                          .format(os.devnull))
2051
2279
        os.dup2(null, sys.stdin.fileno())
2052
2280
        os.dup2(null, sys.stdout.fileno())
2053
2281
        os.dup2(null, sys.stderr.fileno())
2062
2290
    
2063
2291
    parser = argparse.ArgumentParser()
2064
2292
    parser.add_argument("-v", "--version", action="version",
2065
 
                        version = "%%(prog)s %s" % version,
 
2293
                        version = "%(prog)s {0}".format(version),
2066
2294
                        help="show version number and exit")
2067
2295
    parser.add_argument("-i", "--interface", metavar="IF",
2068
2296
                        help="Bind to interface IF")
2074
2302
                        help="Run self-test")
2075
2303
    parser.add_argument("--debug", action="store_true",
2076
2304
                        help="Debug mode; run in foreground and log"
2077
 
                        " to terminal")
 
2305
                        " to terminal", default=None)
2078
2306
    parser.add_argument("--debuglevel", metavar="LEVEL",
2079
2307
                        help="Debug level for stdout output")
2080
2308
    parser.add_argument("--priority", help="GnuTLS"
2087
2315
                        " files")
2088
2316
    parser.add_argument("--no-dbus", action="store_false",
2089
2317
                        dest="use_dbus", help="Do not provide D-Bus"
2090
 
                        " system bus interface")
 
2318
                        " system bus interface", default=None)
2091
2319
    parser.add_argument("--no-ipv6", action="store_false",
2092
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2320
                        dest="use_ipv6", help="Do not use IPv6",
 
2321
                        default=None)
2093
2322
    parser.add_argument("--no-restore", action="store_false",
2094
2323
                        dest="restore", help="Do not restore stored"
2095
 
                        " state")
 
2324
                        " state", default=None)
 
2325
    parser.add_argument("--socket", type=int,
 
2326
                        help="Specify a file descriptor to a network"
 
2327
                        " socket to use instead of creating one")
2096
2328
    parser.add_argument("--statedir", metavar="DIR",
2097
2329
                        help="Directory to save/restore state in")
 
2330
    parser.add_argument("--foreground", action="store_true",
 
2331
                        help="Run in foreground", default=None)
2098
2332
    
2099
2333
    options = parser.parse_args()
2100
2334
    
2109
2343
                        "port": "",
2110
2344
                        "debug": "False",
2111
2345
                        "priority":
2112
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2346
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
2113
2347
                        "servicename": "Mandos",
2114
2348
                        "use_dbus": "True",
2115
2349
                        "use_ipv6": "True",
2116
2350
                        "debuglevel": "",
2117
2351
                        "restore": "True",
2118
 
                        "statedir": "/var/lib/mandos"
 
2352
                        "socket": "",
 
2353
                        "statedir": "/var/lib/mandos",
 
2354
                        "foreground": "False",
2119
2355
                        }
2120
2356
    
2121
2357
    # Parse config file for server-global settings
2126
2362
    # Convert the SafeConfigParser object to a dict
2127
2363
    server_settings = server_config.defaults()
2128
2364
    # Use the appropriate methods on the non-string config options
2129
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2365
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2130
2366
        server_settings[option] = server_config.getboolean("DEFAULT",
2131
2367
                                                           option)
2132
2368
    if server_settings["port"]:
2133
2369
        server_settings["port"] = server_config.getint("DEFAULT",
2134
2370
                                                       "port")
 
2371
    if server_settings["socket"]:
 
2372
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2373
                                                         "socket")
 
2374
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2375
        # over with an opened os.devnull.  But we don't want this to
 
2376
        # happen with a supplied network socket.
 
2377
        if 0 <= server_settings["socket"] <= 2:
 
2378
            server_settings["socket"] = os.dup(server_settings
 
2379
                                               ["socket"])
2135
2380
    del server_config
2136
2381
    
2137
2382
    # Override the settings from the config file with command line
2139
2384
    for option in ("interface", "address", "port", "debug",
2140
2385
                   "priority", "servicename", "configdir",
2141
2386
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2142
 
                   "statedir"):
 
2387
                   "statedir", "socket", "foreground"):
2143
2388
        value = getattr(options, option)
2144
2389
        if value is not None:
2145
2390
            server_settings[option] = value
2148
2393
    for option in server_settings.keys():
2149
2394
        if type(server_settings[option]) is str:
2150
2395
            server_settings[option] = unicode(server_settings[option])
 
2396
    # Force all boolean options to be boolean
 
2397
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2398
                   "foreground"):
 
2399
        server_settings[option] = bool(server_settings[option])
 
2400
    # Debug implies foreground
 
2401
    if server_settings["debug"]:
 
2402
        server_settings["foreground"] = True
2151
2403
    # Now we have our good server settings in "server_settings"
2152
2404
    
2153
2405
    ##################################################################
2159
2411
    use_ipv6 = server_settings["use_ipv6"]
2160
2412
    stored_state_path = os.path.join(server_settings["statedir"],
2161
2413
                                     stored_state_file)
 
2414
    foreground = server_settings["foreground"]
2162
2415
    
2163
2416
    if debug:
2164
2417
        initlogger(debug, logging.DEBUG)
2171
2424
    
2172
2425
    if server_settings["servicename"] != "Mandos":
2173
2426
        syslogger.setFormatter(logging.Formatter
2174
 
                               ('Mandos (%s) [%%(process)d]:'
2175
 
                                ' %%(levelname)s: %%(message)s'
2176
 
                                % server_settings["servicename"]))
 
2427
                               ('Mandos ({0}) [%(process)d]:'
 
2428
                                ' %(levelname)s: %(message)s'
 
2429
                                .format(server_settings
 
2430
                                        ["servicename"])))
2177
2431
    
2178
2432
    # Parse config file with clients
2179
2433
    client_config = configparser.SafeConfigParser(Client
2192
2446
                              use_ipv6=use_ipv6,
2193
2447
                              gnutls_priority=
2194
2448
                              server_settings["priority"],
2195
 
                              use_dbus=use_dbus)
2196
 
    if not debug:
2197
 
        pidfilename = "/var/run/mandos.pid"
 
2449
                              use_dbus=use_dbus,
 
2450
                              socketfd=(server_settings["socket"]
 
2451
                                        or None))
 
2452
    if not foreground:
 
2453
        pidfilename = "/run/mandos.pid"
 
2454
        pidfile = None
2198
2455
        try:
2199
2456
            pidfile = open(pidfilename, "w")
2200
 
        except IOError:
2201
 
            logger.error("Could not open file %r", pidfilename)
 
2457
        except IOError as e:
 
2458
            logger.error("Could not open file %r", pidfilename,
 
2459
                         exc_info=e)
2202
2460
    
2203
 
    try:
2204
 
        uid = pwd.getpwnam("_mandos").pw_uid
2205
 
        gid = pwd.getpwnam("_mandos").pw_gid
2206
 
    except KeyError:
 
2461
    for name in ("_mandos", "mandos", "nobody"):
2207
2462
        try:
2208
 
            uid = pwd.getpwnam("mandos").pw_uid
2209
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2463
            uid = pwd.getpwnam(name).pw_uid
 
2464
            gid = pwd.getpwnam(name).pw_gid
 
2465
            break
2210
2466
        except KeyError:
2211
 
            try:
2212
 
                uid = pwd.getpwnam("nobody").pw_uid
2213
 
                gid = pwd.getpwnam("nobody").pw_gid
2214
 
            except KeyError:
2215
 
                uid = 65534
2216
 
                gid = 65534
 
2467
            continue
 
2468
    else:
 
2469
        uid = 65534
 
2470
        gid = 65534
2217
2471
    try:
2218
2472
        os.setgid(gid)
2219
2473
        os.setuid(uid)
2220
2474
    except OSError as error:
2221
 
        if error[0] != errno.EPERM:
 
2475
        if error.errno != errno.EPERM:
2222
2476
            raise error
2223
2477
    
2224
2478
    if debug:
2242
2496
            os.close(null)
2243
2497
    
2244
2498
    # Need to fork before connecting to D-Bus
2245
 
    if not debug:
 
2499
    if not foreground:
2246
2500
        # Close all input and output, do double fork, etc.
2247
2501
        daemon()
2248
2502
    
 
2503
    # multiprocessing will use threads, so before we use gobject we
 
2504
    # need to inform gobject that threads will be used.
2249
2505
    gobject.threads_init()
2250
2506
    
2251
2507
    global main_loop
2262
2518
                            ("se.bsnet.fukt.Mandos", bus,
2263
2519
                             do_not_queue=True))
2264
2520
        except dbus.exceptions.NameExistsException as e:
2265
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2521
            logger.error("Disabling D-Bus:", exc_info=e)
2266
2522
            use_dbus = False
2267
2523
            server_settings["use_dbus"] = False
2268
2524
            tcp_server.use_dbus = False
2280
2536
    
2281
2537
    client_class = Client
2282
2538
    if use_dbus:
2283
 
        client_class = functools.partial(ClientDBusTransitional,
2284
 
                                         bus = bus)
 
2539
        client_class = functools.partial(ClientDBus, bus = bus)
2285
2540
    
2286
2541
    client_settings = Client.config_parser(client_config)
2287
2542
    old_client_settings = {}
2288
2543
    clients_data = {}
2289
2544
    
 
2545
    # This is used to redirect stdout and stderr for checker processes
 
2546
    global wnull
 
2547
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2548
    # Only used if server is running in foreground but not in debug
 
2549
    # mode
 
2550
    if debug or not foreground:
 
2551
        wnull.close()
 
2552
    
2290
2553
    # Get client data and settings from last running state.
2291
2554
    if server_settings["restore"]:
2292
2555
        try:
2295
2558
                                                     (stored_state))
2296
2559
            os.remove(stored_state_path)
2297
2560
        except IOError as e:
2298
 
            logger.warning("Could not load persistent state: {0}"
2299
 
                           .format(e))
2300
 
            if e.errno != errno.ENOENT:
 
2561
            if e.errno == errno.ENOENT:
 
2562
                logger.warning("Could not load persistent state: {0}"
 
2563
                                .format(os.strerror(e.errno)))
 
2564
            else:
 
2565
                logger.critical("Could not load persistent state:",
 
2566
                                exc_info=e)
2301
2567
                raise
2302
2568
        except EOFError as e:
2303
2569
            logger.warning("Could not load persistent state: "
2304
 
                           "EOFError: {0}".format(e))
 
2570
                           "EOFError:", exc_info=e)
2305
2571
    
2306
2572
    with PGPEngine() as pgp:
2307
2573
        for client_name, client in clients_data.iteritems():
 
2574
            # Skip removed clients
 
2575
            if client_name not in client_settings:
 
2576
                continue
 
2577
            
2308
2578
            # Decide which value to use after restoring saved state.
2309
2579
            # We have three different values: Old config file,
2310
2580
            # new config file, and saved state.
2360
2630
                             .format(client_name))
2361
2631
                client["secret"] = (
2362
2632
                    client_settings[client_name]["secret"])
2363
 
 
2364
2633
    
2365
2634
    # Add/remove clients based on new changes made to config
2366
2635
    for client_name in (set(old_client_settings)
2369
2638
    for client_name in (set(client_settings)
2370
2639
                        - set(old_client_settings)):
2371
2640
        clients_data[client_name] = client_settings[client_name]
2372
 
 
 
2641
    
2373
2642
    # Create all client objects
2374
2643
    for client_name, client in clients_data.iteritems():
2375
2644
        tcp_server.clients[client_name] = client_class(
2376
 
            name = client_name, settings = client)
 
2645
            name = client_name, settings = client,
 
2646
            server_settings = server_settings)
2377
2647
    
2378
2648
    if not tcp_server.clients:
2379
2649
        logger.warning("No clients defined")
2380
 
        
2381
 
    if not debug:
2382
 
        try:
2383
 
            with pidfile:
2384
 
                pid = os.getpid()
2385
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2386
 
            del pidfile
2387
 
        except IOError:
2388
 
            logger.error("Could not write to file %r with PID %d",
2389
 
                         pidfilename, pid)
2390
 
        except NameError:
2391
 
            # "pidfile" was never created
2392
 
            pass
 
2650
    
 
2651
    if not foreground:
 
2652
        if pidfile is not None:
 
2653
            try:
 
2654
                with pidfile:
 
2655
                    pid = os.getpid()
 
2656
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2657
            except IOError:
 
2658
                logger.error("Could not write to file %r with PID %d",
 
2659
                             pidfilename, pid)
 
2660
        del pidfile
2393
2661
        del pidfilename
2394
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2395
2662
    
2396
2663
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2397
2664
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2398
2665
    
2399
2666
    if use_dbus:
 
2667
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2668
                                        "se.bsnet.fukt.Mandos"})
2400
2669
        class MandosDBusService(DBusObjectWithProperties):
2401
2670
            """A D-Bus proxy object"""
2402
2671
            def __init__(self):
2456
2725
            
2457
2726
            del _interface
2458
2727
        
2459
 
        class MandosDBusServiceTransitional(MandosDBusService):
2460
 
            __metaclass__ = AlternateDBusNamesMetaclass
2461
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2728
        mandos_dbus_service = MandosDBusService()
2462
2729
    
2463
2730
    def cleanup():
2464
2731
        "Cleanup function; run on exit"
2465
2732
        service.cleanup()
2466
2733
        
2467
2734
        multiprocessing.active_children()
 
2735
        wnull.close()
2468
2736
        if not (tcp_server.clients or client_settings):
2469
2737
            return
2470
2738
        
2482
2750
                # A list of attributes that can not be pickled
2483
2751
                # + secret.
2484
2752
                exclude = set(("bus", "changedstate", "secret",
2485
 
                               "checker"))
 
2753
                               "checker", "server_settings"))
2486
2754
                for name, typ in (inspect.getmembers
2487
2755
                                  (dbus.service.Object)):
2488
2756
                    exclude.add(name)
2497
2765
                del client_settings[client.name]["secret"]
2498
2766
        
2499
2767
        try:
2500
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2501
 
                                                prefix="clients-",
2502
 
                                                dir=os.path.dirname
2503
 
                                                (stored_state_path))
2504
 
            with os.fdopen(tempfd, "wb") as stored_state:
 
2768
            with (tempfile.NamedTemporaryFile
 
2769
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2770
                   dir=os.path.dirname(stored_state_path),
 
2771
                   delete=False)) as stored_state:
2505
2772
                pickle.dump((clients, client_settings), stored_state)
 
2773
                tempname=stored_state.name
2506
2774
            os.rename(tempname, stored_state_path)
2507
2775
        except (IOError, OSError) as e:
2508
 
            logger.warning("Could not save persistent state: {0}"
2509
 
                           .format(e))
2510
2776
            if not debug:
2511
2777
                try:
2512
2778
                    os.remove(tempname)
2513
2779
                except NameError:
2514
2780
                    pass
2515
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2516
 
                                   errno.EEXIST)):
 
2781
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2782
                logger.warning("Could not save persistent state: {0}"
 
2783
                               .format(os.strerror(e.errno)))
 
2784
            else:
 
2785
                logger.warning("Could not save persistent state:",
 
2786
                               exc_info=e)
2517
2787
                raise e
2518
2788
        
2519
2789
        # Delete all clients, and settings from config
2547
2817
    service.port = tcp_server.socket.getsockname()[1]
2548
2818
    if use_ipv6:
2549
2819
        logger.info("Now listening on address %r, port %d,"
2550
 
                    " flowinfo %d, scope_id %d"
2551
 
                    % tcp_server.socket.getsockname())
 
2820
                    " flowinfo %d, scope_id %d",
 
2821
                    *tcp_server.socket.getsockname())
2552
2822
    else:                       # IPv4
2553
 
        logger.info("Now listening on address %r, port %d"
2554
 
                    % tcp_server.socket.getsockname())
 
2823
        logger.info("Now listening on address %r, port %d",
 
2824
                    *tcp_server.socket.getsockname())
2555
2825
    
2556
2826
    #service.interface = tcp_server.socket.getsockname()[3]
2557
2827
    
2560
2830
        try:
2561
2831
            service.activate()
2562
2832
        except dbus.exceptions.DBusException as error:
2563
 
            logger.critical("DBusException: %s", error)
 
2833
            logger.critical("D-Bus Exception", exc_info=error)
2564
2834
            cleanup()
2565
2835
            sys.exit(1)
2566
2836
        # End of Avahi example code
2573
2843
        logger.debug("Starting main loop")
2574
2844
        main_loop.run()
2575
2845
    except AvahiError as error:
2576
 
        logger.critical("AvahiError: %s", error)
 
2846
        logger.critical("Avahi Error", exc_info=error)
2577
2847
        cleanup()
2578
2848
        sys.exit(1)
2579
2849
    except KeyboardInterrupt: