/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

Merge from Teddy

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-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 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
 
 
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
67
65
import types
68
66
import binascii
69
67
import tempfile
70
 
import itertools
71
68
 
72
69
import dbus
73
70
import dbus.service
88
85
    except ImportError:
89
86
        SO_BINDTODEVICE = None
90
87
 
91
 
version = "1.5.5"
 
88
version = "1.4.1"
92
89
stored_state_file = "clients.pickle"
93
90
 
94
91
logger = logging.getLogger()
113
110
        return interface_index
114
111
 
115
112
 
116
 
def initlogger(debug, level=logging.WARNING):
 
113
def initlogger(level=logging.WARNING):
117
114
    """init logger and add loglevel"""
118
115
    
119
116
    syslogger.setFormatter(logging.Formatter
121
118
                            ' %(message)s'))
122
119
    logger.addHandler(syslogger)
123
120
    
124
 
    if debug:
125
 
        console = logging.StreamHandler()
126
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
127
 
                                               ' [%(process)d]:'
128
 
                                               ' %(levelname)s:'
129
 
                                               ' %(message)s'))
130
 
        logger.addHandler(console)
 
121
    console = logging.StreamHandler()
 
122
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
123
                                           ' [%(process)d]:'
 
124
                                           ' %(levelname)s:'
 
125
                                           ' %(message)s'))
 
126
    logger.addHandler(console)
131
127
    logger.setLevel(level)
132
128
 
133
129
 
145
141
        self.gnupg.options.meta_interactive = False
146
142
        self.gnupg.options.homedir = self.tempdir
147
143
        self.gnupg.options.extra_args.extend(['--force-mdc',
148
 
                                              '--quiet',
149
 
                                              '--no-use-agent'])
 
144
                                              '--quiet'])
150
145
    
151
146
    def __enter__(self):
152
147
        return self
153
148
    
154
 
    def __exit__(self, exc_type, exc_value, traceback):
 
149
    def __exit__ (self, exc_type, exc_value, traceback):
155
150
        self._cleanup()
156
151
        return False
157
152
    
178
173
    
179
174
    def encrypt(self, data, password):
180
175
        self.gnupg.passphrase = self.password_encode(password)
181
 
        with open(os.devnull, "w") as devnull:
 
176
        with open(os.devnull) as devnull:
182
177
            try:
183
178
                proc = self.gnupg.run(['--symmetric'],
184
179
                                      create_fhs=['stdin', 'stdout'],
195
190
    
196
191
    def decrypt(self, data, password):
197
192
        self.gnupg.passphrase = self.password_encode(password)
198
 
        with open(os.devnull, "w") as devnull:
 
193
        with open(os.devnull) as devnull:
199
194
            try:
200
195
                proc = self.gnupg.run(['--decrypt'],
201
196
                                      create_fhs=['stdin', 'stdout'],
202
197
                                      attach_fhs={'stderr': devnull})
203
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
198
                with contextlib.closing(proc.handles['stdin'] ) as f:
204
199
                    f.write(data)
205
200
                with contextlib.closing(proc.handles['stdout']) as f:
206
201
                    decrypted_plaintext = f.read()
211
206
        return decrypted_plaintext
212
207
 
213
208
 
 
209
 
214
210
class AvahiError(Exception):
215
211
    def __init__(self, value, *args, **kwargs):
216
212
        self.value = value
245
241
    server: D-Bus Server
246
242
    bus: dbus.SystemBus()
247
243
    """
248
 
    
249
244
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
250
245
                 servicetype = None, port = None, TXT = None,
251
246
                 domain = "", host = "", max_renames = 32768,
264
259
        self.server = None
265
260
        self.bus = bus
266
261
        self.entry_group_state_changed_match = None
267
 
    
268
262
    def rename(self):
269
263
        """Derived from the Avahi example code"""
270
264
        if self.rename_count >= self.max_renames:
280
274
        try:
281
275
            self.add()
282
276
        except dbus.exceptions.DBusException as error:
283
 
            logger.critical("D-Bus Exception", exc_info=error)
 
277
            logger.critical("DBusException: %s", error)
284
278
            self.cleanup()
285
279
            os._exit(1)
286
280
        self.rename_count += 1
287
 
    
288
281
    def remove(self):
289
282
        """Derived from the Avahi example code"""
290
283
        if self.entry_group_state_changed_match is not None:
292
285
            self.entry_group_state_changed_match = None
293
286
        if self.group is not None:
294
287
            self.group.Reset()
295
 
    
296
288
    def add(self):
297
289
        """Derived from the Avahi example code"""
298
290
        self.remove()
315
307
            dbus.UInt16(self.port),
316
308
            avahi.string_array_to_txt_array(self.TXT))
317
309
        self.group.Commit()
318
 
    
319
310
    def entry_group_state_changed(self, state, error):
320
311
        """Derived from the Avahi example code"""
321
312
        logger.debug("Avahi entry group state change: %i", state)
328
319
        elif state == avahi.ENTRY_GROUP_FAILURE:
329
320
            logger.critical("Avahi: Error in group state changed %s",
330
321
                            unicode(error))
331
 
            raise AvahiGroupError("State changed: {0!s}"
332
 
                                  .format(error))
333
 
    
 
322
            raise AvahiGroupError("State changed: %s"
 
323
                                  % unicode(error))
334
324
    def cleanup(self):
335
325
        """Derived from the Avahi example code"""
336
326
        if self.group is not None:
341
331
                pass
342
332
            self.group = None
343
333
        self.remove()
344
 
    
345
334
    def server_state_changed(self, state, error=None):
346
335
        """Derived from the Avahi example code"""
347
336
        logger.debug("Avahi server state change: %i", state)
366
355
                logger.debug("Unknown state: %r", state)
367
356
            else:
368
357
                logger.debug("Unknown state: %r: %r", state, error)
369
 
    
370
358
    def activate(self):
371
359
        """Derived from the Avahi example code"""
372
360
        if self.server is None:
379
367
                                 self.server_state_changed)
380
368
        self.server_state_changed(self.server.GetState())
381
369
 
382
 
 
383
370
class AvahiServiceToSyslog(AvahiService):
384
371
    def rename(self):
385
372
        """Add the new name to the syslog messages"""
386
373
        ret = AvahiService.rename(self)
387
374
        syslogger.setFormatter(logging.Formatter
388
 
                               ('Mandos ({0}) [%(process)d]:'
389
 
                                ' %(levelname)s: %(message)s'
390
 
                                .format(self.name)))
 
375
                               ('Mandos (%s) [%%(process)d]:'
 
376
                                ' %%(levelname)s: %%(message)s'
 
377
                                % self.name))
391
378
        return ret
392
379
 
393
 
 
394
380
def timedelta_to_milliseconds(td):
395
381
    "Convert a datetime.timedelta() to milliseconds"
396
382
    return ((td.days * 24 * 60 * 60 * 1000)
397
383
            + (td.seconds * 1000)
398
384
            + (td.microseconds // 1000))
399
 
 
400
 
 
 
385
        
401
386
class Client(object):
402
387
    """A representation of a client host served by this server.
403
388
    
428
413
    last_checked_ok: datetime.datetime(); (UTC) or None
429
414
    last_checker_status: integer between 0 and 255 reflecting exit
430
415
                         status of last checker. -1 reflects crashed
431
 
                         checker, -2 means no checker completed yet.
 
416
                         checker, or None.
432
417
    last_enabled: datetime.datetime(); (UTC) or None
433
418
    name:       string; from the config file, used in log messages and
434
419
                        D-Bus identifiers
435
420
    secret:     bytestring; sent verbatim (over TLS) to client
436
421
    timeout:    datetime.timedelta(); How long from last_checked_ok
437
422
                                      until this client is disabled
438
 
    extended_timeout:   extra long timeout when secret has been sent
 
423
    extended_timeout:   extra long timeout when password has been sent
439
424
    runtime_expansions: Allowed attributes for runtime expansion.
440
425
    expires:    datetime.datetime(); time (UTC) when a client will be
441
426
                disabled, or None
442
427
    """
443
428
    
444
429
    runtime_expansions = ("approval_delay", "approval_duration",
445
 
                          "created", "enabled", "expires",
446
 
                          "fingerprint", "host", "interval",
447
 
                          "last_approval_request", "last_checked_ok",
 
430
                          "created", "enabled", "fingerprint",
 
431
                          "host", "interval", "last_checked_ok",
448
432
                          "last_enabled", "name", "timeout")
449
433
    client_defaults = { "timeout": "5m",
450
434
                        "extended_timeout": "15m",
471
455
    
472
456
    def approval_delay_milliseconds(self):
473
457
        return timedelta_to_milliseconds(self.approval_delay)
474
 
    
 
458
 
475
459
    @staticmethod
476
460
    def config_parser(config):
477
 
        """Construct a new dict of client settings of this form:
 
461
        """ Construct a new dict of client settings of this form:
478
462
        { client_name: {setting_name: value, ...}, ...}
479
 
        with exceptions for any special settings as defined above.
480
 
        NOTE: Must be a pure function. Must return the same result
481
 
        value given the same arguments.
482
 
        """
 
463
        with exceptions for any special settings as defined above"""
483
464
        settings = {}
484
465
        for client_name in config.sections():
485
466
            section = dict(config.items(client_name))
489
470
            # Reformat values from string types to Python types
490
471
            client["approved_by_default"] = config.getboolean(
491
472
                client_name, "approved_by_default")
492
 
            client["enabled"] = config.getboolean(client_name,
493
 
                                                  "enabled")
 
473
            client["enabled"] = config.getboolean(client_name, "enabled")
494
474
            
495
475
            client["fingerprint"] = (section["fingerprint"].upper()
496
476
                                     .replace(" ", ""))
502
482
                          "rb") as secfile:
503
483
                    client["secret"] = secfile.read()
504
484
            else:
505
 
                raise TypeError("No secret or secfile for section {0}"
506
 
                                .format(section))
 
485
                raise TypeError("No secret or secfile for section %s"
 
486
                                % section)
507
487
            client["timeout"] = string_to_delta(section["timeout"])
508
488
            client["extended_timeout"] = string_to_delta(
509
489
                section["extended_timeout"])
515
495
            client["checker_command"] = section["checker"]
516
496
            client["last_approval_request"] = None
517
497
            client["last_checked_ok"] = None
518
 
            client["last_checker_status"] = -2
519
 
        
 
498
            client["last_checker_status"] = None
 
499
            if client["enabled"]:
 
500
                client["last_enabled"] = datetime.datetime.utcnow()
 
501
                client["expires"] = (datetime.datetime.utcnow()
 
502
                                     + client["timeout"])
 
503
            else:
 
504
                client["last_enabled"] = None
 
505
                client["expires"] = None
 
506
 
520
507
        return settings
521
 
    
 
508
        
 
509
        
522
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
514
        self.name = name
524
515
        # adding all client settings
525
516
        for setting, value in settings.iteritems():
526
517
            setattr(self, setting, value)
527
518
        
528
 
        if self.enabled:
529
 
            if not hasattr(self, "last_enabled"):
530
 
                self.last_enabled = datetime.datetime.utcnow()
531
 
            if not hasattr(self, "expires"):
532
 
                self.expires = (datetime.datetime.utcnow()
533
 
                                + self.timeout)
534
 
        else:
535
 
            self.last_enabled = None
536
 
            self.expires = None
537
 
        
538
519
        logger.debug("Creating client %r", self.name)
539
520
        # Uppercase and remove spaces from fingerprint for later
540
521
        # comparison purposes with return value from the fingerprint()
541
522
        # function
542
523
        logger.debug("  Fingerprint: %s", self.fingerprint)
543
 
        self.created = settings.get("created",
544
 
                                    datetime.datetime.utcnow())
545
 
        
 
524
        self.created = settings.get("created", datetime.datetime.utcnow())
 
525
 
546
526
        # attributes specific for this server instance
547
527
        self.checker = None
548
528
        self.checker_initiator_tag = None
576
556
        if getattr(self, "enabled", False):
577
557
            # Already enabled
578
558
            return
 
559
        self.send_changedstate()
579
560
        self.expires = datetime.datetime.utcnow() + self.timeout
580
561
        self.enabled = True
581
562
        self.last_enabled = datetime.datetime.utcnow()
582
563
        self.init_checker()
583
 
        self.send_changedstate()
584
564
    
585
565
    def disable(self, quiet=True):
586
566
        """Disable this client."""
587
567
        if not getattr(self, "enabled", False):
588
568
            return False
589
569
        if not quiet:
 
570
            self.send_changedstate()
 
571
        if not quiet:
590
572
            logger.info("Disabling client %s", self.name)
591
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
573
        if getattr(self, "disable_initiator_tag", False):
592
574
            gobject.source_remove(self.disable_initiator_tag)
593
575
            self.disable_initiator_tag = None
594
576
        self.expires = None
595
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
577
        if getattr(self, "checker_initiator_tag", False):
596
578
            gobject.source_remove(self.checker_initiator_tag)
597
579
            self.checker_initiator_tag = None
598
580
        self.stop_checker()
599
581
        self.enabled = False
600
 
        if not quiet:
601
 
            self.send_changedstate()
602
582
        # Do not run this again if called by a gobject.timeout_add
603
583
        return False
604
584
    
608
588
    def init_checker(self):
609
589
        # Schedule a new checker to be started an 'interval' from now,
610
590
        # and every interval from then on.
611
 
        if self.checker_initiator_tag is not None:
612
 
            gobject.source_remove(self.checker_initiator_tag)
613
591
        self.checker_initiator_tag = (gobject.timeout_add
614
592
                                      (self.interval_milliseconds(),
615
593
                                       self.start_checker))
616
594
        # Schedule a disable() when 'timeout' has passed
617
 
        if self.disable_initiator_tag is not None:
618
 
            gobject.source_remove(self.disable_initiator_tag)
619
595
        self.disable_initiator_tag = (gobject.timeout_add
620
596
                                   (self.timeout_milliseconds(),
621
597
                                    self.disable))
640
616
            logger.warning("Checker for %(name)s crashed?",
641
617
                           vars(self))
642
618
    
643
 
    def checked_ok(self):
644
 
        """Assert that the client has been seen, alive and well."""
645
 
        self.last_checked_ok = datetime.datetime.utcnow()
646
 
        self.last_checker_status = 0
647
 
        self.bump_timeout()
648
 
    
649
 
    def bump_timeout(self, timeout=None):
650
 
        """Bump up the timeout for this client."""
 
619
    def checked_ok(self, timeout=None):
 
620
        """Bump up the timeout for this client.
 
621
        
 
622
        This should only be called when the client has been seen,
 
623
        alive and well.
 
624
        """
651
625
        if timeout is None:
652
626
            timeout = self.timeout
 
627
        self.last_checked_ok = datetime.datetime.utcnow()
653
628
        if self.disable_initiator_tag is not None:
654
629
            gobject.source_remove(self.disable_initiator_tag)
655
 
            self.disable_initiator_tag = None
656
630
        if getattr(self, "enabled", False):
657
631
            self.disable_initiator_tag = (gobject.timeout_add
658
632
                                          (timedelta_to_milliseconds
668
642
        If a checker already exists, leave it running and do
669
643
        nothing."""
670
644
        # The reason for not killing a running checker is that if we
671
 
        # did that, and if a checker (for some reason) started running
672
 
        # slowly and taking more than 'interval' time, then the client
673
 
        # would inevitably timeout, since no checker would get a
674
 
        # chance to run to completion.  If we instead leave running
 
645
        # did that, then if a checker (for some reason) started
 
646
        # running slowly and taking more than 'interval' time, the
 
647
        # client would inevitably timeout, since no checker would get
 
648
        # a chance to run to completion.  If we instead leave running
675
649
        # checkers alone, the checker would have to take more time
676
650
        # than 'timeout' for the client to be disabled, which is as it
677
651
        # should be.
691
665
                                      self.current_checker_command)
692
666
        # Start a new checker if needed
693
667
        if self.checker is None:
694
 
            # Escape attributes for the shell
695
 
            escaped_attrs = dict(
696
 
                (attr, re.escape(unicode(getattr(self, attr))))
697
 
                for attr in
698
 
                self.runtime_expansions)
699
668
            try:
700
 
                command = self.checker_command % escaped_attrs
701
 
            except TypeError as error:
702
 
                logger.error('Could not format string "%s"',
703
 
                             self.checker_command, exc_info=error)
704
 
                return True # Try again later
 
669
                # In case checker_command has exactly one % operator
 
670
                command = self.checker_command % self.host
 
671
            except TypeError:
 
672
                # Escape attributes for the shell
 
673
                escaped_attrs = dict(
 
674
                    (attr,
 
675
                     re.escape(unicode(str(getattr(self, attr, "")),
 
676
                                       errors=
 
677
                                       'replace')))
 
678
                    for attr in
 
679
                    self.runtime_expansions)
 
680
                
 
681
                try:
 
682
                    command = self.checker_command % escaped_attrs
 
683
                except TypeError as error:
 
684
                    logger.error('Could not format string "%s":'
 
685
                                 ' %s', self.checker_command, error)
 
686
                    return True # Try again later
705
687
            self.current_checker_command = command
706
688
            try:
707
689
                logger.info("Starting checker %r for %s",
713
695
                self.checker = subprocess.Popen(command,
714
696
                                                close_fds=True,
715
697
                                                shell=True, cwd="/")
 
698
                self.checker_callback_tag = (gobject.child_watch_add
 
699
                                             (self.checker.pid,
 
700
                                              self.checker_callback,
 
701
                                              data=command))
 
702
                # The checker may have completed before the gobject
 
703
                # watch was added.  Check for this.
 
704
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
705
                if pid:
 
706
                    gobject.source_remove(self.checker_callback_tag)
 
707
                    self.checker_callback(pid, status, command)
716
708
            except OSError as error:
717
 
                logger.error("Failed to start subprocess",
718
 
                             exc_info=error)
719
 
            self.checker_callback_tag = (gobject.child_watch_add
720
 
                                         (self.checker.pid,
721
 
                                          self.checker_callback,
722
 
                                          data=command))
723
 
            # The checker may have completed before the gobject
724
 
            # watch was added.  Check for this.
725
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
726
 
            if pid:
727
 
                gobject.source_remove(self.checker_callback_tag)
728
 
                self.checker_callback(pid, status, command)
 
709
                logger.error("Failed to start subprocess: %s",
 
710
                             error)
729
711
        # Re-run this periodically if run by gobject.timeout_add
730
712
        return True
731
713
    
738
720
            return
739
721
        logger.debug("Stopping checker for %(name)s", vars(self))
740
722
        try:
741
 
            self.checker.terminate()
 
723
            os.kill(self.checker.pid, signal.SIGTERM)
742
724
            #time.sleep(0.5)
743
725
            #if self.checker.poll() is None:
744
 
            #    self.checker.kill()
 
726
            #    os.kill(self.checker.pid, signal.SIGKILL)
745
727
        except OSError as error:
746
728
            if error.errno != errno.ESRCH: # No such process
747
729
                raise
764
746
    # "Set" method, so we fail early here:
765
747
    if byte_arrays and signature != "ay":
766
748
        raise ValueError("Byte arrays not supported for non-'ay'"
767
 
                         " signature {0!r}".format(signature))
 
749
                         " signature %r" % signature)
768
750
    def decorator(func):
769
751
        func._dbus_is_property = True
770
752
        func._dbus_interface = dbus_interface
778
760
    return decorator
779
761
 
780
762
 
781
 
def dbus_interface_annotations(dbus_interface):
782
 
    """Decorator for marking functions returning interface annotations
783
 
    
784
 
    Usage:
785
 
    
786
 
    @dbus_interface_annotations("org.example.Interface")
787
 
    def _foo(self):  # Function name does not matter
788
 
        return {"org.freedesktop.DBus.Deprecated": "true",
789
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
790
 
                    "false"}
791
 
    """
792
 
    def decorator(func):
793
 
        func._dbus_is_interface = True
794
 
        func._dbus_interface = dbus_interface
795
 
        func._dbus_name = dbus_interface
796
 
        return func
797
 
    return decorator
798
 
 
799
 
 
800
 
def dbus_annotations(annotations):
801
 
    """Decorator to annotate D-Bus methods, signals or properties
802
 
    Usage:
803
 
    
804
 
    @dbus_service_property("org.example.Interface", signature="b",
805
 
                           access="r")
806
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
807
 
                        "org.freedesktop.DBus.Property."
808
 
                        "EmitsChangedSignal": "false"})
809
 
    def Property_dbus_property(self):
810
 
        return dbus.Boolean(False)
811
 
    """
812
 
    def decorator(func):
813
 
        func._dbus_annotations = annotations
814
 
        return func
815
 
    return decorator
816
 
 
817
 
 
818
763
class DBusPropertyException(dbus.exceptions.DBusException):
819
764
    """A base class for D-Bus property-related exceptions
820
765
    """
843
788
    """
844
789
    
845
790
    @staticmethod
846
 
    def _is_dbus_thing(thing):
847
 
        """Returns a function testing if an attribute is a D-Bus thing
848
 
        
849
 
        If called like _is_dbus_thing("method") it returns a function
850
 
        suitable for use as predicate to inspect.getmembers().
851
 
        """
852
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
853
 
                                   False)
 
791
    def _is_dbus_property(obj):
 
792
        return getattr(obj, "_dbus_is_property", False)
854
793
    
855
 
    def _get_all_dbus_things(self, thing):
 
794
    def _get_all_dbus_properties(self):
856
795
        """Returns a generator of (name, attribute) pairs
857
796
        """
858
 
        return ((getattr(athing.__get__(self), "_dbus_name",
859
 
                         name),
860
 
                 athing.__get__(self))
 
797
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
861
798
                for cls in self.__class__.__mro__
862
 
                for name, athing in
863
 
                inspect.getmembers(cls,
864
 
                                   self._is_dbus_thing(thing)))
 
799
                for name, prop in
 
800
                inspect.getmembers(cls, self._is_dbus_property))
865
801
    
866
802
    def _get_dbus_property(self, interface_name, property_name):
867
803
        """Returns a bound method if one exists which is a D-Bus
869
805
        """
870
806
        for cls in  self.__class__.__mro__:
871
807
            for name, value in (inspect.getmembers
872
 
                                (cls,
873
 
                                 self._is_dbus_thing("property"))):
 
808
                                (cls, self._is_dbus_property)):
874
809
                if (value._dbus_name == property_name
875
810
                    and value._dbus_interface == interface_name):
876
811
                    return value.__get__(self)
905
840
            # signatures other than "ay".
906
841
            if prop._dbus_signature != "ay":
907
842
                raise ValueError
908
 
            value = dbus.ByteArray(b''.join(chr(byte)
909
 
                                            for byte in value))
 
843
            value = dbus.ByteArray(''.join(unichr(byte)
 
844
                                           for byte in value))
910
845
        prop(value)
911
846
    
912
847
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
918
853
        Note: Will not include properties with access="write".
919
854
        """
920
855
        properties = {}
921
 
        for name, prop in self._get_all_dbus_things("property"):
 
856
        for name, prop in self._get_all_dbus_properties():
922
857
            if (interface_name
923
858
                and interface_name != prop._dbus_interface):
924
859
                # Interface non-empty but did not match
939
874
                         path_keyword='object_path',
940
875
                         connection_keyword='connection')
941
876
    def Introspect(self, object_path, connection):
942
 
        """Overloading of standard D-Bus method.
943
 
        
944
 
        Inserts property tags and interface annotation tags.
 
877
        """Standard D-Bus method, overloaded to insert property tags.
945
878
        """
946
879
        xmlstring = dbus.service.Object.Introspect(self, object_path,
947
880
                                                   connection)
954
887
                e.setAttribute("access", prop._dbus_access)
955
888
                return e
956
889
            for if_tag in document.getElementsByTagName("interface"):
957
 
                # Add property tags
958
890
                for tag in (make_tag(document, name, prop)
959
891
                            for name, prop
960
 
                            in self._get_all_dbus_things("property")
 
892
                            in self._get_all_dbus_properties()
961
893
                            if prop._dbus_interface
962
894
                            == if_tag.getAttribute("name")):
963
895
                    if_tag.appendChild(tag)
964
 
                # Add annotation tags
965
 
                for typ in ("method", "signal", "property"):
966
 
                    for tag in if_tag.getElementsByTagName(typ):
967
 
                        annots = dict()
968
 
                        for name, prop in (self.
969
 
                                           _get_all_dbus_things(typ)):
970
 
                            if (name == tag.getAttribute("name")
971
 
                                and prop._dbus_interface
972
 
                                == if_tag.getAttribute("name")):
973
 
                                annots.update(getattr
974
 
                                              (prop,
975
 
                                               "_dbus_annotations",
976
 
                                               {}))
977
 
                        for name, value in annots.iteritems():
978
 
                            ann_tag = document.createElement(
979
 
                                "annotation")
980
 
                            ann_tag.setAttribute("name", name)
981
 
                            ann_tag.setAttribute("value", value)
982
 
                            tag.appendChild(ann_tag)
983
 
                # Add interface annotation tags
984
 
                for annotation, value in dict(
985
 
                    itertools.chain.from_iterable(
986
 
                        annotations().iteritems()
987
 
                        for name, annotations in
988
 
                        self._get_all_dbus_things("interface")
989
 
                        if name == if_tag.getAttribute("name")
990
 
                        )).iteritems():
991
 
                    ann_tag = document.createElement("annotation")
992
 
                    ann_tag.setAttribute("name", annotation)
993
 
                    ann_tag.setAttribute("value", value)
994
 
                    if_tag.appendChild(ann_tag)
995
896
                # Add the names to the return values for the
996
897
                # "org.freedesktop.DBus.Properties" methods
997
898
                if (if_tag.getAttribute("name")
1012
913
        except (AttributeError, xml.dom.DOMException,
1013
914
                xml.parsers.expat.ExpatError) as error:
1014
915
            logger.error("Failed to override Introspection method",
1015
 
                         exc_info=error)
 
916
                         error)
1016
917
        return xmlstring
1017
918
 
1018
919
 
1019
 
def datetime_to_dbus(dt, variant_level=0):
 
920
def datetime_to_dbus (dt, variant_level=0):
1020
921
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1021
922
    if dt is None:
1022
923
        return dbus.String("", variant_level = variant_level)
1024
925
                       variant_level=variant_level)
1025
926
 
1026
927
 
1027
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1028
 
    """A class decorator; applied to a subclass of
1029
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1030
 
    interface names according to the "alt_interface_names" mapping.
1031
 
    Usage:
1032
 
    
1033
 
    @alternate_dbus_interfaces({"org.example.Interface":
1034
 
                                    "net.example.AlternateInterface"})
1035
 
    class SampleDBusObject(dbus.service.Object):
1036
 
        @dbus.service.method("org.example.Interface")
1037
 
        def SampleDBusMethod():
1038
 
            pass
1039
 
    
1040
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1041
 
    reachable via two interfaces: "org.example.Interface" and
1042
 
    "net.example.AlternateInterface", the latter of which will have
1043
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1044
 
    "true", unless "deprecate" is passed with a False value.
1045
 
    
1046
 
    This works for methods and signals, and also for D-Bus properties
1047
 
    (from DBusObjectWithProperties) and interfaces (from the
1048
 
    dbus_interface_annotations decorator).
 
928
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
929
                                  .__metaclass__):
 
930
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
931
    will add additional D-Bus attributes matching a certain pattern.
1049
932
    """
1050
 
    def wrapper(cls):
1051
 
        for orig_interface_name, alt_interface_name in (
1052
 
            alt_interface_names.iteritems()):
1053
 
            attr = {}
1054
 
            interface_names = set()
1055
 
            # Go though all attributes of the class
1056
 
            for attrname, attribute in inspect.getmembers(cls):
 
933
    def __new__(mcs, name, bases, attr):
 
934
        # Go through all the base classes which could have D-Bus
 
935
        # methods, signals, or properties in them
 
936
        for base in (b for b in bases
 
937
                     if issubclass(b, dbus.service.Object)):
 
938
            # Go though all attributes of the base class
 
939
            for attrname, attribute in inspect.getmembers(base):
1057
940
                # Ignore non-D-Bus attributes, and D-Bus attributes
1058
941
                # with the wrong interface name
1059
942
                if (not hasattr(attribute, "_dbus_interface")
1060
943
                    or not attribute._dbus_interface
1061
 
                    .startswith(orig_interface_name)):
 
944
                    .startswith("se.recompile.Mandos")):
1062
945
                    continue
1063
946
                # Create an alternate D-Bus interface name based on
1064
947
                # the current name
1065
948
                alt_interface = (attribute._dbus_interface
1066
 
                                 .replace(orig_interface_name,
1067
 
                                          alt_interface_name))
1068
 
                interface_names.add(alt_interface)
 
949
                                 .replace("se.recompile.Mandos",
 
950
                                          "se.bsnet.fukt.Mandos"))
1069
951
                # Is this a D-Bus signal?
1070
952
                if getattr(attribute, "_dbus_is_signal", False):
1071
953
                    # Extract the original non-method function by
1086
968
                                nonmethod_func.func_name,
1087
969
                                nonmethod_func.func_defaults,
1088
970
                                nonmethod_func.func_closure)))
1089
 
                    # Copy annotations, if any
1090
 
                    try:
1091
 
                        new_function._dbus_annotations = (
1092
 
                            dict(attribute._dbus_annotations))
1093
 
                    except AttributeError:
1094
 
                        pass
1095
971
                    # Define a creator of a function to call both the
1096
 
                    # original and alternate functions, so both the
1097
 
                    # original and alternate signals gets sent when
1098
 
                    # the function is called
 
972
                    # old and new functions, so both the old and new
 
973
                    # signals gets sent when the function is called
1099
974
                    def fixscope(func1, func2):
1100
975
                        """This function is a scope container to pass
1101
976
                        func1 and func2 to the "call_both" function
1108
983
                        return call_both
1109
984
                    # Create the "call_both" function and add it to
1110
985
                    # the class
1111
 
                    attr[attrname] = fixscope(attribute, new_function)
 
986
                    attr[attrname] = fixscope(attribute,
 
987
                                              new_function)
1112
988
                # Is this a D-Bus method?
1113
989
                elif getattr(attribute, "_dbus_is_method", False):
1114
990
                    # Create a new, but exactly alike, function
1125
1001
                                        attribute.func_name,
1126
1002
                                        attribute.func_defaults,
1127
1003
                                        attribute.func_closure)))
1128
 
                    # Copy annotations, if any
1129
 
                    try:
1130
 
                        attr[attrname]._dbus_annotations = (
1131
 
                            dict(attribute._dbus_annotations))
1132
 
                    except AttributeError:
1133
 
                        pass
1134
1004
                # Is this a D-Bus property?
1135
1005
                elif getattr(attribute, "_dbus_is_property", False):
1136
1006
                    # Create a new, but exactly alike, function
1150
1020
                                        attribute.func_name,
1151
1021
                                        attribute.func_defaults,
1152
1022
                                        attribute.func_closure)))
1153
 
                    # Copy annotations, if any
1154
 
                    try:
1155
 
                        attr[attrname]._dbus_annotations = (
1156
 
                            dict(attribute._dbus_annotations))
1157
 
                    except AttributeError:
1158
 
                        pass
1159
 
                # Is this a D-Bus interface?
1160
 
                elif getattr(attribute, "_dbus_is_interface", False):
1161
 
                    # Create a new, but exactly alike, function
1162
 
                    # object.  Decorate it to be a new D-Bus interface
1163
 
                    # with the alternate D-Bus interface name.  Add it
1164
 
                    # to the class.
1165
 
                    attr[attrname] = (dbus_interface_annotations
1166
 
                                      (alt_interface)
1167
 
                                      (types.FunctionType
1168
 
                                       (attribute.func_code,
1169
 
                                        attribute.func_globals,
1170
 
                                        attribute.func_name,
1171
 
                                        attribute.func_defaults,
1172
 
                                        attribute.func_closure)))
1173
 
            if deprecate:
1174
 
                # Deprecate all alternate interfaces
1175
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1176
 
                for interface_name in interface_names:
1177
 
                    @dbus_interface_annotations(interface_name)
1178
 
                    def func(self):
1179
 
                        return { "org.freedesktop.DBus.Deprecated":
1180
 
                                     "true" }
1181
 
                    # Find an unused name
1182
 
                    for aname in (iname.format(i)
1183
 
                                  for i in itertools.count()):
1184
 
                        if aname not in attr:
1185
 
                            attr[aname] = func
1186
 
                            break
1187
 
            if interface_names:
1188
 
                # Replace the class with a new subclass of it with
1189
 
                # methods, signals, etc. as created above.
1190
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1191
 
                           (cls,), attr)
1192
 
        return cls
1193
 
    return wrapper
1194
 
 
1195
 
 
1196
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1197
 
                                "se.bsnet.fukt.Mandos"})
 
1023
        return type.__new__(mcs, name, bases, attr)
 
1024
 
 
1025
 
1198
1026
class ClientDBus(Client, DBusObjectWithProperties):
1199
1027
    """A Client class using D-Bus
1200
1028
    
1211
1039
    def __init__(self, bus = None, *args, **kwargs):
1212
1040
        self.bus = bus
1213
1041
        Client.__init__(self, *args, **kwargs)
 
1042
        self._approvals_pending = 0
 
1043
        
 
1044
        self._approvals_pending = 0
1214
1045
        # Only now, when this client is initialized, can it show up on
1215
1046
        # the D-Bus
1216
1047
        client_object_name = unicode(self.name).translate(
1220
1051
                                 ("/clients/" + client_object_name))
1221
1052
        DBusObjectWithProperties.__init__(self, self.bus,
1222
1053
                                          self.dbus_object_path)
1223
 
    
 
1054
        
1224
1055
    def notifychangeproperty(transform_func,
1225
1056
                             dbus_name, type_func=lambda x: x,
1226
1057
                             variant_level=1):
1249
1080
        
1250
1081
        return property(lambda self: getattr(self, attrname), setter)
1251
1082
    
 
1083
    
1252
1084
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1253
1085
    approvals_pending = notifychangeproperty(dbus.Boolean,
1254
1086
                                             "ApprovalPending",
1261
1093
                                       checker is not None)
1262
1094
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1263
1095
                                           "LastCheckedOK")
1264
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1265
 
                                               "LastCheckerStatus")
1266
1096
    last_approval_request = notifychangeproperty(
1267
1097
        datetime_to_dbus, "LastApprovalRequest")
1268
1098
    approved_by_default = notifychangeproperty(dbus.Boolean,
1336
1166
        return False
1337
1167
    
1338
1168
    def approve(self, value=True):
 
1169
        self.send_changedstate()
1339
1170
        self.approved = value
1340
1171
        gobject.timeout_add(timedelta_to_milliseconds
1341
1172
                            (self.approval_duration),
1342
1173
                            self._reset_approved)
1343
 
        self.send_changedstate()
 
1174
    
1344
1175
    
1345
1176
    ## D-Bus methods, signals & properties
1346
1177
    _interface = "se.recompile.Mandos.Client"
1347
1178
    
1348
 
    ## Interfaces
1349
 
    
1350
 
    @dbus_interface_annotations(_interface)
1351
 
    def _foo(self):
1352
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1353
 
                     "false"}
1354
 
    
1355
1179
    ## Signals
1356
1180
    
1357
1181
    # CheckerCompleted - signal
1393
1217
        "D-Bus signal"
1394
1218
        return self.need_approval()
1395
1219
    
 
1220
    # NeRwequest - signal
 
1221
    @dbus.service.signal(_interface, signature="s")
 
1222
    def NewRequest(self, ip):
 
1223
        """D-Bus signal
 
1224
        Is sent after a client request a password.
 
1225
        """
 
1226
        pass
 
1227
    
1396
1228
    ## Methods
1397
1229
    
1398
1230
    # Approve - method
1508
1340
            return
1509
1341
        return datetime_to_dbus(self.last_checked_ok)
1510
1342
    
1511
 
    # LastCheckerStatus - property
1512
 
    @dbus_service_property(_interface, signature="n",
1513
 
                           access="read")
1514
 
    def LastCheckerStatus_dbus_property(self):
1515
 
        return dbus.Int16(self.last_checker_status)
1516
 
    
1517
1343
    # Expires - property
1518
1344
    @dbus_service_property(_interface, signature="s", access="read")
1519
1345
    def Expires_dbus_property(self):
1530
1356
    def Timeout_dbus_property(self, value=None):
1531
1357
        if value is None:       # get
1532
1358
            return dbus.UInt64(self.timeout_milliseconds())
1533
 
        old_timeout = self.timeout
1534
1359
        self.timeout = datetime.timedelta(0, 0, 0, value)
1535
 
        # Reschedule disabling
1536
 
        if self.enabled:
1537
 
            now = datetime.datetime.utcnow()
1538
 
            self.expires += self.timeout - old_timeout
1539
 
            if self.expires <= now:
1540
 
                # The timeout has passed
1541
 
                self.disable()
1542
 
            else:
1543
 
                if (getattr(self, "disable_initiator_tag", None)
1544
 
                    is None):
1545
 
                    return
1546
 
                gobject.source_remove(self.disable_initiator_tag)
1547
 
                self.disable_initiator_tag = (
1548
 
                    gobject.timeout_add(
1549
 
                        timedelta_to_milliseconds(self.expires - now),
1550
 
                        self.disable))
 
1360
        if getattr(self, "disable_initiator_tag", None) is None:
 
1361
            return
 
1362
        # Reschedule timeout
 
1363
        gobject.source_remove(self.disable_initiator_tag)
 
1364
        self.disable_initiator_tag = None
 
1365
        self.expires = None
 
1366
        time_to_die = timedelta_to_milliseconds((self
 
1367
                                                 .last_checked_ok
 
1368
                                                 + self.timeout)
 
1369
                                                - datetime.datetime
 
1370
                                                .utcnow())
 
1371
        if time_to_die <= 0:
 
1372
            # The timeout has passed
 
1373
            self.disable()
 
1374
        else:
 
1375
            self.expires = (datetime.datetime.utcnow()
 
1376
                            + datetime.timedelta(milliseconds =
 
1377
                                                 time_to_die))
 
1378
            self.disable_initiator_tag = (gobject.timeout_add
 
1379
                                          (time_to_die, self.disable))
1551
1380
    
1552
1381
    # ExtendedTimeout - property
1553
1382
    @dbus_service_property(_interface, signature="t",
1632
1461
        self._pipe.send(('setattr', name, value))
1633
1462
 
1634
1463
 
 
1464
class ClientDBusTransitional(ClientDBus):
 
1465
    __metaclass__ = AlternateDBusNamesMetaclass
 
1466
 
 
1467
 
1635
1468
class ClientHandler(socketserver.BaseRequestHandler, object):
1636
1469
    """A class to handle client connections.
1637
1470
    
1705
1538
                except KeyError:
1706
1539
                    return
1707
1540
                
 
1541
                if self.server.use_dbus:
 
1542
                    # Emit D-Bus signal
 
1543
                    client.NewRequest(str(self.client_address))
 
1544
                
1708
1545
                if client.approval_delay:
1709
1546
                    delay = client.approval_delay
1710
1547
                    client.approvals_pending += 1
1741
1578
                    #wait until timeout or approved
1742
1579
                    time = datetime.datetime.now()
1743
1580
                    client.changedstate.acquire()
1744
 
                    client.changedstate.wait(
1745
 
                        float(timedelta_to_milliseconds(delay)
1746
 
                              / 1000))
 
1581
                    (client.changedstate.wait
 
1582
                     (float(client.timedelta_to_milliseconds(delay)
 
1583
                            / 1000)))
1747
1584
                    client.changedstate.release()
1748
1585
                    time2 = datetime.datetime.now()
1749
1586
                    if (time2 - time) >= delay:
1765
1602
                    try:
1766
1603
                        sent = session.send(client.secret[sent_size:])
1767
1604
                    except gnutls.errors.GNUTLSError as error:
1768
 
                        logger.warning("gnutls send failed",
1769
 
                                       exc_info=error)
 
1605
                        logger.warning("gnutls send failed")
1770
1606
                        return
1771
1607
                    logger.debug("Sent: %d, remaining: %d",
1772
1608
                                 sent, len(client.secret)
1775
1611
                
1776
1612
                logger.info("Sending secret to %s", client.name)
1777
1613
                # bump the timeout using extended_timeout
1778
 
                client.bump_timeout(client.extended_timeout)
 
1614
                client.checked_ok(client.extended_timeout)
1779
1615
                if self.server.use_dbus:
1780
1616
                    # Emit D-Bus signal
1781
1617
                    client.GotSecret()
1786
1622
                try:
1787
1623
                    session.bye()
1788
1624
                except gnutls.errors.GNUTLSError as error:
1789
 
                    logger.warning("GnuTLS bye failed",
1790
 
                                   exc_info=error)
 
1625
                    logger.warning("GnuTLS bye failed")
1791
1626
    
1792
1627
    @staticmethod
1793
1628
    def peer_certificate(session):
1865
1700
    def process_request(self, request, address):
1866
1701
        """Start a new process to process the request."""
1867
1702
        proc = multiprocessing.Process(target = self.sub_process_main,
1868
 
                                       args = (request, address))
 
1703
                                       args = (request,
 
1704
                                               address))
1869
1705
        proc.start()
1870
1706
        return proc
1871
1707
 
1899
1735
        use_ipv6:       Boolean; to use IPv6 or not
1900
1736
    """
1901
1737
    def __init__(self, server_address, RequestHandlerClass,
1902
 
                 interface=None, use_ipv6=True, socketfd=None):
1903
 
        """If socketfd is set, use that file descriptor instead of
1904
 
        creating a new one with socket.socket().
1905
 
        """
 
1738
                 interface=None, use_ipv6=True):
1906
1739
        self.interface = interface
1907
1740
        if use_ipv6:
1908
1741
            self.address_family = socket.AF_INET6
1909
 
        if socketfd is not None:
1910
 
            # Save the file descriptor
1911
 
            self.socketfd = socketfd
1912
 
            # Save the original socket.socket() function
1913
 
            self.socket_socket = socket.socket
1914
 
            # To implement --socket, we monkey patch socket.socket.
1915
 
            # 
1916
 
            # (When socketserver.TCPServer is a new-style class, we
1917
 
            # could make self.socket into a property instead of monkey
1918
 
            # patching socket.socket.)
1919
 
            # 
1920
 
            # Create a one-time-only replacement for socket.socket()
1921
 
            @functools.wraps(socket.socket)
1922
 
            def socket_wrapper(*args, **kwargs):
1923
 
                # Restore original function so subsequent calls are
1924
 
                # not affected.
1925
 
                socket.socket = self.socket_socket
1926
 
                del self.socket_socket
1927
 
                # This time only, return a new socket object from the
1928
 
                # saved file descriptor.
1929
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1930
 
            # Replace socket.socket() function with wrapper
1931
 
            socket.socket = socket_wrapper
1932
 
        # The socketserver.TCPServer.__init__ will call
1933
 
        # socket.socket(), which might be our replacement,
1934
 
        # socket_wrapper(), if socketfd was set.
1935
1742
        socketserver.TCPServer.__init__(self, server_address,
1936
1743
                                        RequestHandlerClass)
1937
 
    
1938
1744
    def server_bind(self):
1939
1745
        """This overrides the normal server_bind() function
1940
1746
        to bind to an interface if one was specified, and also NOT to
1948
1754
                try:
1949
1755
                    self.socket.setsockopt(socket.SOL_SOCKET,
1950
1756
                                           SO_BINDTODEVICE,
1951
 
                                           str(self.interface + '\0'))
 
1757
                                           str(self.interface
 
1758
                                               + '\0'))
1952
1759
                except socket.error as error:
1953
 
                    if error.errno == errno.EPERM:
1954
 
                        logger.error("No permission to bind to"
1955
 
                                     " interface %s", self.interface)
1956
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1760
                    if error[0] == errno.EPERM:
 
1761
                        logger.error("No permission to"
 
1762
                                     " bind to interface %s",
 
1763
                                     self.interface)
 
1764
                    elif error[0] == errno.ENOPROTOOPT:
1957
1765
                        logger.error("SO_BINDTODEVICE not available;"
1958
1766
                                     " cannot bind to interface %s",
1959
1767
                                     self.interface)
1960
 
                    elif error.errno == errno.ENODEV:
1961
 
                        logger.error("Interface %s does not exist,"
1962
 
                                     " cannot bind", self.interface)
1963
1768
                    else:
1964
1769
                        raise
1965
1770
        # Only bind(2) the socket if we really need to.
1995
1800
    """
1996
1801
    def __init__(self, server_address, RequestHandlerClass,
1997
1802
                 interface=None, use_ipv6=True, clients=None,
1998
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1803
                 gnutls_priority=None, use_dbus=True):
1999
1804
        self.enabled = False
2000
1805
        self.clients = clients
2001
1806
        if self.clients is None:
2005
1810
        IPv6_TCPServer.__init__(self, server_address,
2006
1811
                                RequestHandlerClass,
2007
1812
                                interface = interface,
2008
 
                                use_ipv6 = use_ipv6,
2009
 
                                socketfd = socketfd)
 
1813
                                use_ipv6 = use_ipv6)
2010
1814
    def server_activate(self):
2011
1815
        if self.enabled:
2012
1816
            return socketserver.TCPServer.server_activate(self)
2025
1829
    
2026
1830
    def handle_ipc(self, source, condition, parent_pipe=None,
2027
1831
                   proc = None, client_object=None):
 
1832
        condition_names = {
 
1833
            gobject.IO_IN: "IN",   # There is data to read.
 
1834
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1835
                                    # blocking).
 
1836
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1837
            gobject.IO_ERR: "ERR", # Error condition.
 
1838
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1839
                                    # broken, usually for pipes and
 
1840
                                    # sockets).
 
1841
            }
 
1842
        conditions_string = ' | '.join(name
 
1843
                                       for cond, name in
 
1844
                                       condition_names.iteritems()
 
1845
                                       if cond & condition)
2028
1846
        # error, or the other end of multiprocessing.Pipe has closed
2029
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1847
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2030
1848
            # Wait for other process to exit
2031
1849
            proc.join()
2032
1850
            return False
2122
1940
            elif suffix == "w":
2123
1941
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2124
1942
            else:
2125
 
                raise ValueError("Unknown suffix {0!r}"
2126
 
                                 .format(suffix))
 
1943
                raise ValueError("Unknown suffix %r" % suffix)
2127
1944
        except (ValueError, IndexError) as e:
2128
1945
            raise ValueError(*(e.args))
2129
1946
        timevalue += delta
2143
1960
        sys.exit()
2144
1961
    if not noclose:
2145
1962
        # Close all standard open file descriptors
2146
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1963
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2147
1964
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2148
1965
            raise OSError(errno.ENODEV,
2149
 
                          "{0} not a character device"
2150
 
                          .format(os.devnull))
 
1966
                          "%s not a character device"
 
1967
                          % os.path.devnull)
2151
1968
        os.dup2(null, sys.stdin.fileno())
2152
1969
        os.dup2(null, sys.stdout.fileno())
2153
1970
        os.dup2(null, sys.stderr.fileno())
2162
1979
    
2163
1980
    parser = argparse.ArgumentParser()
2164
1981
    parser.add_argument("-v", "--version", action="version",
2165
 
                        version = "%(prog)s {0}".format(version),
 
1982
                        version = "%%(prog)s %s" % version,
2166
1983
                        help="show version number and exit")
2167
1984
    parser.add_argument("-i", "--interface", metavar="IF",
2168
1985
                        help="Bind to interface IF")
2193
2010
    parser.add_argument("--no-restore", action="store_false",
2194
2011
                        dest="restore", help="Do not restore stored"
2195
2012
                        " state")
2196
 
    parser.add_argument("--socket", type=int,
2197
 
                        help="Specify a file descriptor to a network"
2198
 
                        " socket to use instead of creating one")
2199
2013
    parser.add_argument("--statedir", metavar="DIR",
2200
2014
                        help="Directory to save/restore state in")
2201
 
    parser.add_argument("--foreground", action="store_true",
2202
 
                        help="Run in foreground")
2203
2015
    
2204
2016
    options = parser.parse_args()
2205
2017
    
2220
2032
                        "use_ipv6": "True",
2221
2033
                        "debuglevel": "",
2222
2034
                        "restore": "True",
2223
 
                        "socket": "",
2224
 
                        "statedir": "/var/lib/mandos",
2225
 
                        "foreground": "False",
 
2035
                        "statedir": "/var/lib/mandos"
2226
2036
                        }
2227
2037
    
2228
2038
    # Parse config file for server-global settings
2233
2043
    # Convert the SafeConfigParser object to a dict
2234
2044
    server_settings = server_config.defaults()
2235
2045
    # Use the appropriate methods on the non-string config options
2236
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2046
    for option in ("debug", "use_dbus", "use_ipv6"):
2237
2047
        server_settings[option] = server_config.getboolean("DEFAULT",
2238
2048
                                                           option)
2239
2049
    if server_settings["port"]:
2240
2050
        server_settings["port"] = server_config.getint("DEFAULT",
2241
2051
                                                       "port")
2242
 
    if server_settings["socket"]:
2243
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2244
 
                                                         "socket")
2245
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2246
 
        # over with an opened os.devnull.  But we don't want this to
2247
 
        # happen with a supplied network socket.
2248
 
        if 0 <= server_settings["socket"] <= 2:
2249
 
            server_settings["socket"] = os.dup(server_settings
2250
 
                                               ["socket"])
2251
2052
    del server_config
2252
2053
    
2253
2054
    # Override the settings from the config file with command line
2255
2056
    for option in ("interface", "address", "port", "debug",
2256
2057
                   "priority", "servicename", "configdir",
2257
2058
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2258
 
                   "statedir", "socket", "foreground"):
 
2059
                   "statedir"):
2259
2060
        value = getattr(options, option)
2260
2061
        if value is not None:
2261
2062
            server_settings[option] = value
2264
2065
    for option in server_settings.keys():
2265
2066
        if type(server_settings[option]) is str:
2266
2067
            server_settings[option] = unicode(server_settings[option])
2267
 
    # Debug implies foreground
2268
 
    if server_settings["debug"]:
2269
 
        server_settings["foreground"] = True
2270
2068
    # Now we have our good server settings in "server_settings"
2271
2069
    
2272
2070
    ##################################################################
2278
2076
    use_ipv6 = server_settings["use_ipv6"]
2279
2077
    stored_state_path = os.path.join(server_settings["statedir"],
2280
2078
                                     stored_state_file)
2281
 
    foreground = server_settings["foreground"]
2282
2079
    
2283
2080
    if debug:
2284
 
        initlogger(debug, logging.DEBUG)
 
2081
        initlogger(logging.DEBUG)
2285
2082
    else:
2286
2083
        if not debuglevel:
2287
 
            initlogger(debug)
 
2084
            initlogger()
2288
2085
        else:
2289
2086
            level = getattr(logging, debuglevel.upper())
2290
 
            initlogger(debug, level)
 
2087
            initlogger(level)
2291
2088
    
2292
2089
    if server_settings["servicename"] != "Mandos":
2293
2090
        syslogger.setFormatter(logging.Formatter
2294
 
                               ('Mandos ({0}) [%(process)d]:'
2295
 
                                ' %(levelname)s: %(message)s'
2296
 
                                .format(server_settings
2297
 
                                        ["servicename"])))
 
2091
                               ('Mandos (%s) [%%(process)d]:'
 
2092
                                ' %%(levelname)s: %%(message)s'
 
2093
                                % server_settings["servicename"]))
2298
2094
    
2299
2095
    # Parse config file with clients
2300
 
    client_config = configparser.SafeConfigParser(Client
2301
 
                                                  .client_defaults)
 
2096
    client_config = configparser.SafeConfigParser(Client.client_defaults)
2302
2097
    client_config.read(os.path.join(server_settings["configdir"],
2303
2098
                                    "clients.conf"))
2304
2099
    
2313
2108
                              use_ipv6=use_ipv6,
2314
2109
                              gnutls_priority=
2315
2110
                              server_settings["priority"],
2316
 
                              use_dbus=use_dbus,
2317
 
                              socketfd=(server_settings["socket"]
2318
 
                                        or None))
2319
 
    if not foreground:
 
2111
                              use_dbus=use_dbus)
 
2112
    if not debug:
2320
2113
        pidfilename = "/var/run/mandos.pid"
2321
 
        pidfile = None
2322
2114
        try:
2323
2115
            pidfile = open(pidfilename, "w")
2324
 
        except IOError as e:
2325
 
            logger.error("Could not open file %r", pidfilename,
2326
 
                         exc_info=e)
 
2116
        except IOError:
 
2117
            logger.error("Could not open file %r", pidfilename)
2327
2118
    
2328
 
    for name in ("_mandos", "mandos", "nobody"):
 
2119
    try:
 
2120
        uid = pwd.getpwnam("_mandos").pw_uid
 
2121
        gid = pwd.getpwnam("_mandos").pw_gid
 
2122
    except KeyError:
2329
2123
        try:
2330
 
            uid = pwd.getpwnam(name).pw_uid
2331
 
            gid = pwd.getpwnam(name).pw_gid
2332
 
            break
 
2124
            uid = pwd.getpwnam("mandos").pw_uid
 
2125
            gid = pwd.getpwnam("mandos").pw_gid
2333
2126
        except KeyError:
2334
 
            continue
2335
 
    else:
2336
 
        uid = 65534
2337
 
        gid = 65534
 
2127
            try:
 
2128
                uid = pwd.getpwnam("nobody").pw_uid
 
2129
                gid = pwd.getpwnam("nobody").pw_gid
 
2130
            except KeyError:
 
2131
                uid = 65534
 
2132
                gid = 65534
2338
2133
    try:
2339
2134
        os.setgid(gid)
2340
2135
        os.setuid(uid)
2341
2136
    except OSError as error:
2342
 
        if error.errno != errno.EPERM:
 
2137
        if error[0] != errno.EPERM:
2343
2138
            raise error
2344
2139
    
2345
2140
    if debug:
2357
2152
         .gnutls_global_set_log_function(debug_gnutls))
2358
2153
        
2359
2154
        # Redirect stdin so all checkers get /dev/null
2360
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2155
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2361
2156
        os.dup2(null, sys.stdin.fileno())
2362
2157
        if null > 2:
2363
2158
            os.close(null)
 
2159
    else:
 
2160
        # No console logging
 
2161
        logger.removeHandler(console)
2364
2162
    
2365
2163
    # Need to fork before connecting to D-Bus
2366
 
    if not foreground:
 
2164
    if not debug:
2367
2165
        # Close all input and output, do double fork, etc.
2368
2166
        daemon()
2369
2167
    
2370
 
    # multiprocessing will use threads, so before we use gobject we
2371
 
    # need to inform gobject that threads will be used.
2372
2168
    gobject.threads_init()
2373
2169
    
2374
2170
    global main_loop
2375
2171
    # From the Avahi example code
2376
 
    DBusGMainLoop(set_as_default=True)
 
2172
    DBusGMainLoop(set_as_default=True )
2377
2173
    main_loop = gobject.MainLoop()
2378
2174
    bus = dbus.SystemBus()
2379
2175
    # End of Avahi example code
2385
2181
                            ("se.bsnet.fukt.Mandos", bus,
2386
2182
                             do_not_queue=True))
2387
2183
        except dbus.exceptions.NameExistsException as e:
2388
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2184
            logger.error(unicode(e) + ", disabling D-Bus")
2389
2185
            use_dbus = False
2390
2186
            server_settings["use_dbus"] = False
2391
2187
            tcp_server.use_dbus = False
2403
2199
    
2404
2200
    client_class = Client
2405
2201
    if use_dbus:
2406
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2202
        client_class = functools.partial(ClientDBusTransitional,
 
2203
                                         bus = bus)
2407
2204
    
2408
2205
    client_settings = Client.config_parser(client_config)
2409
2206
    old_client_settings = {}
2417
2214
                                                     (stored_state))
2418
2215
            os.remove(stored_state_path)
2419
2216
        except IOError as e:
2420
 
            if e.errno == errno.ENOENT:
2421
 
                logger.warning("Could not load persistent state: {0}"
2422
 
                                .format(os.strerror(e.errno)))
2423
 
            else:
2424
 
                logger.critical("Could not load persistent state:",
2425
 
                                exc_info=e)
 
2217
            logger.warning("Could not load persistent state: {0}"
 
2218
                           .format(e))
 
2219
            if e.errno != errno.ENOENT:
2426
2220
                raise
2427
2221
        except EOFError as e:
2428
2222
            logger.warning("Could not load persistent state: "
2429
 
                           "EOFError:", exc_info=e)
 
2223
                           "EOFError: {0}".format(e))
2430
2224
    
2431
2225
    with PGPEngine() as pgp:
2432
2226
        for client_name, client in clients_data.iteritems():
2449
2243
            
2450
2244
            # Clients who has passed its expire date can still be
2451
2245
            # enabled if its last checker was successful.  Clients
2452
 
            # whose checker succeeded before we stored its state is
2453
 
            # assumed to have successfully run all checkers during
2454
 
            # downtime.
 
2246
            # whose checker failed before we stored its state is
 
2247
            # assumed to have failed all checkers during downtime.
2455
2248
            if client["enabled"]:
2456
2249
                if datetime.datetime.utcnow() >= client["expires"]:
2457
2250
                    if not client["last_checked_ok"]:
2458
2251
                        logger.warning(
2459
2252
                            "disabling client {0} - Client never "
2460
 
                            "performed a successful checker"
2461
 
                            .format(client_name))
 
2253
                            "performed a successfull checker"
 
2254
                            .format(client["name"]))
2462
2255
                        client["enabled"] = False
2463
2256
                    elif client["last_checker_status"] != 0:
2464
2257
                        logger.warning(
2465
2258
                            "disabling client {0} - Client "
2466
2259
                            "last checker failed with error code {1}"
2467
 
                            .format(client_name,
 
2260
                            .format(client["name"],
2468
2261
                                    client["last_checker_status"]))
2469
2262
                        client["enabled"] = False
2470
2263
                    else:
2471
2264
                        client["expires"] = (datetime.datetime
2472
2265
                                             .utcnow()
2473
2266
                                             + client["timeout"])
2474
 
                        logger.debug("Last checker succeeded,"
2475
 
                                     " keeping {0} enabled"
2476
 
                                     .format(client_name))
 
2267
                    
2477
2268
            try:
2478
2269
                client["secret"] = (
2479
2270
                    pgp.decrypt(client["encrypted_secret"],
2485
2276
                             .format(client_name))
2486
2277
                client["secret"] = (
2487
2278
                    client_settings[client_name]["secret"])
 
2279
 
2488
2280
    
2489
2281
    # Add/remove clients based on new changes made to config
2490
 
    for client_name in (set(old_client_settings)
2491
 
                        - set(client_settings)):
 
2282
    for client_name in set(old_client_settings) - set(client_settings):
2492
2283
        del clients_data[client_name]
2493
 
    for client_name in (set(client_settings)
2494
 
                        - set(old_client_settings)):
 
2284
    for client_name in set(client_settings) - set(old_client_settings):
2495
2285
        clients_data[client_name] = client_settings[client_name]
2496
 
    
2497
 
    # Create all client objects
 
2286
 
 
2287
    # Create clients all clients
2498
2288
    for client_name, client in clients_data.iteritems():
2499
2289
        tcp_server.clients[client_name] = client_class(
2500
2290
            name = client_name, settings = client)
2501
2291
    
2502
2292
    if not tcp_server.clients:
2503
2293
        logger.warning("No clients defined")
2504
 
    
2505
 
    if not foreground:
2506
 
        if pidfile is not None:
2507
 
            try:
2508
 
                with pidfile:
2509
 
                    pid = os.getpid()
2510
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2511
 
            except IOError:
2512
 
                logger.error("Could not write to file %r with PID %d",
2513
 
                             pidfilename, pid)
2514
 
        del pidfile
 
2294
        
 
2295
    if not debug:
 
2296
        try:
 
2297
            with pidfile:
 
2298
                pid = os.getpid()
 
2299
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2300
            del pidfile
 
2301
        except IOError:
 
2302
            logger.error("Could not write to file %r with PID %d",
 
2303
                         pidfilename, pid)
 
2304
        except NameError:
 
2305
            # "pidfile" was never created
 
2306
            pass
2515
2307
        del pidfilename
 
2308
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2516
2309
    
2517
2310
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2518
2311
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2519
2312
    
2520
2313
    if use_dbus:
2521
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2522
 
                                        "se.bsnet.fukt.Mandos"})
2523
 
        class MandosDBusService(DBusObjectWithProperties):
 
2314
        class MandosDBusService(dbus.service.Object):
2524
2315
            """A D-Bus proxy object"""
2525
2316
            def __init__(self):
2526
2317
                dbus.service.Object.__init__(self, bus, "/")
2527
2318
            _interface = "se.recompile.Mandos"
2528
2319
            
2529
 
            @dbus_interface_annotations(_interface)
2530
 
            def _foo(self):
2531
 
                return { "org.freedesktop.DBus.Property"
2532
 
                         ".EmitsChangedSignal":
2533
 
                             "false"}
2534
 
            
2535
2320
            @dbus.service.signal(_interface, signature="o")
2536
2321
            def ClientAdded(self, objpath):
2537
2322
                "D-Bus signal"
2579
2364
            
2580
2365
            del _interface
2581
2366
        
2582
 
        mandos_dbus_service = MandosDBusService()
 
2367
        class MandosDBusServiceTransitional(MandosDBusService):
 
2368
            __metaclass__ = AlternateDBusNamesMetaclass
 
2369
        mandos_dbus_service = MandosDBusServiceTransitional()
2583
2370
    
2584
2371
    def cleanup():
2585
2372
        "Cleanup function; run on exit"
2618
2405
                del client_settings[client.name]["secret"]
2619
2406
        
2620
2407
        try:
2621
 
            with (tempfile.NamedTemporaryFile
2622
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2623
 
                   dir=os.path.dirname(stored_state_path),
2624
 
                   delete=False)) as stored_state:
 
2408
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2409
                                                prefix="clients-",
 
2410
                                                dir=os.path.dirname
 
2411
                                                (stored_state_path))
 
2412
            with os.fdopen(tempfd, "wb") as stored_state:
2625
2413
                pickle.dump((clients, client_settings), stored_state)
2626
 
                tempname=stored_state.name
2627
2414
            os.rename(tempname, stored_state_path)
2628
2415
        except (IOError, OSError) as e:
2629
 
            if not debug:
2630
 
                try:
2631
 
                    os.remove(tempname)
2632
 
                except NameError:
2633
 
                    pass
2634
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2635
 
                logger.warning("Could not save persistent state: {0}"
2636
 
                               .format(os.strerror(e.errno)))
2637
 
            else:
2638
 
                logger.warning("Could not save persistent state:",
2639
 
                               exc_info=e)
2640
 
                raise e
 
2416
            logger.warning("Could not save persistent state: {0}"
 
2417
                           .format(e))
 
2418
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2419
                                   errno.EEXIST)):
 
2420
                raise
2641
2421
        
2642
2422
        # Delete all clients, and settings from config
2643
2423
        while tcp_server.clients:
2670
2450
    service.port = tcp_server.socket.getsockname()[1]
2671
2451
    if use_ipv6:
2672
2452
        logger.info("Now listening on address %r, port %d,"
2673
 
                    " flowinfo %d, scope_id %d",
2674
 
                    *tcp_server.socket.getsockname())
 
2453
                    " flowinfo %d, scope_id %d"
 
2454
                    % tcp_server.socket.getsockname())
2675
2455
    else:                       # IPv4
2676
 
        logger.info("Now listening on address %r, port %d",
2677
 
                    *tcp_server.socket.getsockname())
 
2456
        logger.info("Now listening on address %r, port %d"
 
2457
                    % tcp_server.socket.getsockname())
2678
2458
    
2679
2459
    #service.interface = tcp_server.socket.getsockname()[3]
2680
2460
    
2683
2463
        try:
2684
2464
            service.activate()
2685
2465
        except dbus.exceptions.DBusException as error:
2686
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2466
            logger.critical("DBusException: %s", error)
2687
2467
            cleanup()
2688
2468
            sys.exit(1)
2689
2469
        # End of Avahi example code
2696
2476
        logger.debug("Starting main loop")
2697
2477
        main_loop.run()
2698
2478
    except AvahiError as error:
2699
 
        logger.critical("Avahi Error", exc_info=error)
 
2479
        logger.critical("AvahiError: %s", error)
2700
2480
        cleanup()
2701
2481
        sys.exit(1)
2702
2482
    except KeyboardInterrupt: