/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2011-12-31 14:05:57 UTC
  • mto: This revision was merged to the branch mainline in revision 541.
  • Revision ID: teddy@recompile.se-20111231140557-5u4s7s2122gsw5uq
* network-hooks.s/bridge: Don't use interface names directly; search
                          for interface names using their address.
  (addrtoif): New function.
* network-hooks.s/bridge.conf (PORTS): Removed.
  (PORT_ADDRESSES): New.
* network-hooks.s/wireless: Don't use interface names directly; search
                            for interface names using their address.
  (addrtoif): New function.
* network-hooks.s/wireless.conf: Specify address.

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()
145
142
        self.gnupg.options.meta_interactive = False
146
143
        self.gnupg.options.homedir = self.tempdir
147
144
        self.gnupg.options.extra_args.extend(['--force-mdc',
148
 
                                              '--quiet',
149
 
                                              '--no-use-agent'])
 
145
                                              '--quiet'])
150
146
    
151
147
    def __enter__(self):
152
148
        return self
153
149
    
154
 
    def __exit__(self, exc_type, exc_value, traceback):
 
150
    def __exit__ (self, exc_type, exc_value, traceback):
155
151
        self._cleanup()
156
152
        return False
157
153
    
178
174
    
179
175
    def encrypt(self, data, password):
180
176
        self.gnupg.passphrase = self.password_encode(password)
181
 
        with open(os.devnull, "w") as devnull:
 
177
        with open(os.devnull) as devnull:
182
178
            try:
183
179
                proc = self.gnupg.run(['--symmetric'],
184
180
                                      create_fhs=['stdin', 'stdout'],
195
191
    
196
192
    def decrypt(self, data, password):
197
193
        self.gnupg.passphrase = self.password_encode(password)
198
 
        with open(os.devnull, "w") as devnull:
 
194
        with open(os.devnull) as devnull:
199
195
            try:
200
196
                proc = self.gnupg.run(['--decrypt'],
201
197
                                      create_fhs=['stdin', 'stdout'],
202
198
                                      attach_fhs={'stderr': devnull})
203
 
                with contextlib.closing(proc.handles['stdin']) as f:
 
199
                with contextlib.closing(proc.handles['stdin'] ) as f:
204
200
                    f.write(data)
205
201
                with contextlib.closing(proc.handles['stdout']) as f:
206
202
                    decrypted_plaintext = f.read()
211
207
        return decrypted_plaintext
212
208
 
213
209
 
 
210
 
214
211
class AvahiError(Exception):
215
212
    def __init__(self, value, *args, **kwargs):
216
213
        self.value = value
245
242
    server: D-Bus Server
246
243
    bus: dbus.SystemBus()
247
244
    """
248
 
    
249
245
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
250
246
                 servicetype = None, port = None, TXT = None,
251
247
                 domain = "", host = "", max_renames = 32768,
264
260
        self.server = None
265
261
        self.bus = bus
266
262
        self.entry_group_state_changed_match = None
267
 
    
268
263
    def rename(self):
269
264
        """Derived from the Avahi example code"""
270
265
        if self.rename_count >= self.max_renames:
280
275
        try:
281
276
            self.add()
282
277
        except dbus.exceptions.DBusException as error:
283
 
            logger.critical("D-Bus Exception", exc_info=error)
 
278
            logger.critical("DBusException: %s", error)
284
279
            self.cleanup()
285
280
            os._exit(1)
286
281
        self.rename_count += 1
287
 
    
288
282
    def remove(self):
289
283
        """Derived from the Avahi example code"""
290
284
        if self.entry_group_state_changed_match is not None:
292
286
            self.entry_group_state_changed_match = None
293
287
        if self.group is not None:
294
288
            self.group.Reset()
295
 
    
296
289
    def add(self):
297
290
        """Derived from the Avahi example code"""
298
291
        self.remove()
315
308
            dbus.UInt16(self.port),
316
309
            avahi.string_array_to_txt_array(self.TXT))
317
310
        self.group.Commit()
318
 
    
319
311
    def entry_group_state_changed(self, state, error):
320
312
        """Derived from the Avahi example code"""
321
313
        logger.debug("Avahi entry group state change: %i", state)
328
320
        elif state == avahi.ENTRY_GROUP_FAILURE:
329
321
            logger.critical("Avahi: Error in group state changed %s",
330
322
                            unicode(error))
331
 
            raise AvahiGroupError("State changed: {0!s}"
332
 
                                  .format(error))
333
 
    
 
323
            raise AvahiGroupError("State changed: %s"
 
324
                                  % unicode(error))
334
325
    def cleanup(self):
335
326
        """Derived from the Avahi example code"""
336
327
        if self.group is not None:
341
332
                pass
342
333
            self.group = None
343
334
        self.remove()
344
 
    
345
335
    def server_state_changed(self, state, error=None):
346
336
        """Derived from the Avahi example code"""
347
337
        logger.debug("Avahi server state change: %i", state)
366
356
                logger.debug("Unknown state: %r", state)
367
357
            else:
368
358
                logger.debug("Unknown state: %r: %r", state, error)
369
 
    
370
359
    def activate(self):
371
360
        """Derived from the Avahi example code"""
372
361
        if self.server is None:
379
368
                                 self.server_state_changed)
380
369
        self.server_state_changed(self.server.GetState())
381
370
 
382
 
 
383
371
class AvahiServiceToSyslog(AvahiService):
384
372
    def rename(self):
385
373
        """Add the new name to the syslog messages"""
386
374
        ret = AvahiService.rename(self)
387
375
        syslogger.setFormatter(logging.Formatter
388
 
                               ('Mandos ({0}) [%(process)d]:'
389
 
                                ' %(levelname)s: %(message)s'
390
 
                                .format(self.name)))
 
376
                               ('Mandos (%s) [%%(process)d]:'
 
377
                                ' %%(levelname)s: %%(message)s'
 
378
                                % self.name))
391
379
        return ret
392
380
 
393
 
 
394
381
def timedelta_to_milliseconds(td):
395
382
    "Convert a datetime.timedelta() to milliseconds"
396
383
    return ((td.days * 24 * 60 * 60 * 1000)
397
384
            + (td.seconds * 1000)
398
385
            + (td.microseconds // 1000))
399
 
 
400
 
 
 
386
        
401
387
class Client(object):
402
388
    """A representation of a client host served by this server.
403
389
    
428
414
    last_checked_ok: datetime.datetime(); (UTC) or None
429
415
    last_checker_status: integer between 0 and 255 reflecting exit
430
416
                         status of last checker. -1 reflects crashed
431
 
                         checker, -2 means no checker completed yet.
 
417
                         checker, or None.
432
418
    last_enabled: datetime.datetime(); (UTC) or None
433
419
    name:       string; from the config file, used in log messages and
434
420
                        D-Bus identifiers
435
421
    secret:     bytestring; sent verbatim (over TLS) to client
436
422
    timeout:    datetime.timedelta(); How long from last_checked_ok
437
423
                                      until this client is disabled
438
 
    extended_timeout:   extra long timeout when secret has been sent
 
424
    extended_timeout:   extra long timeout when password has been sent
439
425
    runtime_expansions: Allowed attributes for runtime expansion.
440
426
    expires:    datetime.datetime(); time (UTC) when a client will be
441
427
                disabled, or None
442
428
    """
443
429
    
444
430
    runtime_expansions = ("approval_delay", "approval_duration",
445
 
                          "created", "enabled", "expires",
446
 
                          "fingerprint", "host", "interval",
447
 
                          "last_approval_request", "last_checked_ok",
 
431
                          "created", "enabled", "fingerprint",
 
432
                          "host", "interval", "last_checked_ok",
448
433
                          "last_enabled", "name", "timeout")
449
434
    client_defaults = { "timeout": "5m",
450
435
                        "extended_timeout": "15m",
471
456
    
472
457
    def approval_delay_milliseconds(self):
473
458
        return timedelta_to_milliseconds(self.approval_delay)
474
 
    
 
459
 
475
460
    @staticmethod
476
461
    def config_parser(config):
477
 
        """Construct a new dict of client settings of this form:
 
462
        """ Construct a new dict of client settings of this form:
478
463
        { 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
 
        """
 
464
        with exceptions for any special settings as defined above"""
483
465
        settings = {}
484
466
        for client_name in config.sections():
485
467
            section = dict(config.items(client_name))
489
471
            # Reformat values from string types to Python types
490
472
            client["approved_by_default"] = config.getboolean(
491
473
                client_name, "approved_by_default")
492
 
            client["enabled"] = config.getboolean(client_name,
493
 
                                                  "enabled")
 
474
            client["enabled"] = config.getboolean(client_name, "enabled")
494
475
            
495
476
            client["fingerprint"] = (section["fingerprint"].upper()
496
477
                                     .replace(" ", ""))
502
483
                          "rb") as secfile:
503
484
                    client["secret"] = secfile.read()
504
485
            else:
505
 
                raise TypeError("No secret or secfile for section {0}"
506
 
                                .format(section))
 
486
                raise TypeError("No secret or secfile for section %s"
 
487
                                % section)
507
488
            client["timeout"] = string_to_delta(section["timeout"])
508
489
            client["extended_timeout"] = string_to_delta(
509
490
                section["extended_timeout"])
515
496
            client["checker_command"] = section["checker"]
516
497
            client["last_approval_request"] = None
517
498
            client["last_checked_ok"] = None
518
 
            client["last_checker_status"] = -2
519
 
        
 
499
            client["last_checker_status"] = None
 
500
            if client["enabled"]:
 
501
                client["last_enabled"] = datetime.datetime.utcnow()
 
502
                client["expires"] = (datetime.datetime.utcnow()
 
503
                                     + client["timeout"])
 
504
            else:
 
505
                client["last_enabled"] = None
 
506
                client["expires"] = None
 
507
 
520
508
        return settings
521
 
    
 
509
        
 
510
        
522
511
    def __init__(self, settings, name = None):
 
512
        """Note: the 'checker' key in 'config' sets the
 
513
        'checker_command' attribute and *not* the 'checker'
 
514
        attribute."""
523
515
        self.name = name
524
516
        # adding all client settings
525
517
        for setting, value in settings.iteritems():
526
518
            setattr(self, setting, value)
527
519
        
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
520
        logger.debug("Creating client %r", self.name)
539
521
        # Uppercase and remove spaces from fingerprint for later
540
522
        # comparison purposes with return value from the fingerprint()
541
523
        # function
542
524
        logger.debug("  Fingerprint: %s", self.fingerprint)
543
 
        self.created = settings.get("created",
544
 
                                    datetime.datetime.utcnow())
545
 
        
 
525
        self.created = settings.get("created", datetime.datetime.utcnow())
 
526
 
546
527
        # attributes specific for this server instance
547
528
        self.checker = None
548
529
        self.checker_initiator_tag = None
576
557
        if getattr(self, "enabled", False):
577
558
            # Already enabled
578
559
            return
 
560
        self.send_changedstate()
579
561
        self.expires = datetime.datetime.utcnow() + self.timeout
580
562
        self.enabled = True
581
563
        self.last_enabled = datetime.datetime.utcnow()
582
564
        self.init_checker()
583
 
        self.send_changedstate()
584
565
    
585
566
    def disable(self, quiet=True):
586
567
        """Disable this client."""
587
568
        if not getattr(self, "enabled", False):
588
569
            return False
589
570
        if not quiet:
 
571
            self.send_changedstate()
 
572
        if not quiet:
590
573
            logger.info("Disabling client %s", self.name)
591
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
574
        if getattr(self, "disable_initiator_tag", False):
592
575
            gobject.source_remove(self.disable_initiator_tag)
593
576
            self.disable_initiator_tag = None
594
577
        self.expires = None
595
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
578
        if getattr(self, "checker_initiator_tag", False):
596
579
            gobject.source_remove(self.checker_initiator_tag)
597
580
            self.checker_initiator_tag = None
598
581
        self.stop_checker()
599
582
        self.enabled = False
600
 
        if not quiet:
601
 
            self.send_changedstate()
602
583
        # Do not run this again if called by a gobject.timeout_add
603
584
        return False
604
585
    
608
589
    def init_checker(self):
609
590
        # Schedule a new checker to be started an 'interval' from now,
610
591
        # and every interval from then on.
611
 
        if self.checker_initiator_tag is not None:
612
 
            gobject.source_remove(self.checker_initiator_tag)
613
592
        self.checker_initiator_tag = (gobject.timeout_add
614
593
                                      (self.interval_milliseconds(),
615
594
                                       self.start_checker))
616
595
        # 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
596
        self.disable_initiator_tag = (gobject.timeout_add
620
597
                                   (self.timeout_milliseconds(),
621
598
                                    self.disable))
640
617
            logger.warning("Checker for %(name)s crashed?",
641
618
                           vars(self))
642
619
    
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."""
 
620
    def checked_ok(self, timeout=None):
 
621
        """Bump up the timeout for this client.
 
622
        
 
623
        This should only be called when the client has been seen,
 
624
        alive and well.
 
625
        """
651
626
        if timeout is None:
652
627
            timeout = self.timeout
 
628
        self.last_checked_ok = datetime.datetime.utcnow()
653
629
        if self.disable_initiator_tag is not None:
654
630
            gobject.source_remove(self.disable_initiator_tag)
655
 
            self.disable_initiator_tag = None
656
631
        if getattr(self, "enabled", False):
657
632
            self.disable_initiator_tag = (gobject.timeout_add
658
633
                                          (timedelta_to_milliseconds
668
643
        If a checker already exists, leave it running and do
669
644
        nothing."""
670
645
        # 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
 
646
        # did that, then if a checker (for some reason) started
 
647
        # running slowly and taking more than 'interval' time, the
 
648
        # client would inevitably timeout, since no checker would get
 
649
        # a chance to run to completion.  If we instead leave running
675
650
        # checkers alone, the checker would have to take more time
676
651
        # than 'timeout' for the client to be disabled, which is as it
677
652
        # should be.
691
666
                                      self.current_checker_command)
692
667
        # Start a new checker if needed
693
668
        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
669
            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
 
670
                # In case checker_command has exactly one % operator
 
671
                command = self.checker_command % self.host
 
672
            except TypeError:
 
673
                # Escape attributes for the shell
 
674
                escaped_attrs = dict(
 
675
                    (attr,
 
676
                     re.escape(unicode(str(getattr(self, attr, "")),
 
677
                                       errors=
 
678
                                       'replace')))
 
679
                    for attr in
 
680
                    self.runtime_expansions)
 
681
                
 
682
                try:
 
683
                    command = self.checker_command % escaped_attrs
 
684
                except TypeError as error:
 
685
                    logger.error('Could not format string "%s":'
 
686
                                 ' %s', self.checker_command, error)
 
687
                    return True # Try again later
705
688
            self.current_checker_command = command
706
689
            try:
707
690
                logger.info("Starting checker %r for %s",
713
696
                self.checker = subprocess.Popen(command,
714
697
                                                close_fds=True,
715
698
                                                shell=True, cwd="/")
 
699
                self.checker_callback_tag = (gobject.child_watch_add
 
700
                                             (self.checker.pid,
 
701
                                              self.checker_callback,
 
702
                                              data=command))
 
703
                # The checker may have completed before the gobject
 
704
                # watch was added.  Check for this.
 
705
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
706
                if pid:
 
707
                    gobject.source_remove(self.checker_callback_tag)
 
708
                    self.checker_callback(pid, status, command)
716
709
            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)
 
710
                logger.error("Failed to start subprocess: %s",
 
711
                             error)
729
712
        # Re-run this periodically if run by gobject.timeout_add
730
713
        return True
731
714
    
738
721
            return
739
722
        logger.debug("Stopping checker for %(name)s", vars(self))
740
723
        try:
741
 
            self.checker.terminate()
 
724
            os.kill(self.checker.pid, signal.SIGTERM)
742
725
            #time.sleep(0.5)
743
726
            #if self.checker.poll() is None:
744
 
            #    self.checker.kill()
 
727
            #    os.kill(self.checker.pid, signal.SIGKILL)
745
728
        except OSError as error:
746
729
            if error.errno != errno.ESRCH: # No such process
747
730
                raise
764
747
    # "Set" method, so we fail early here:
765
748
    if byte_arrays and signature != "ay":
766
749
        raise ValueError("Byte arrays not supported for non-'ay'"
767
 
                         " signature {0!r}".format(signature))
 
750
                         " signature %r" % signature)
768
751
    def decorator(func):
769
752
        func._dbus_is_property = True
770
753
        func._dbus_interface = dbus_interface
778
761
    return decorator
779
762
 
780
763
 
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
764
class DBusPropertyException(dbus.exceptions.DBusException):
819
765
    """A base class for D-Bus property-related exceptions
820
766
    """
843
789
    """
844
790
    
845
791
    @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)
 
792
    def _is_dbus_property(obj):
 
793
        return getattr(obj, "_dbus_is_property", False)
854
794
    
855
 
    def _get_all_dbus_things(self, thing):
 
795
    def _get_all_dbus_properties(self):
856
796
        """Returns a generator of (name, attribute) pairs
857
797
        """
858
 
        return ((getattr(athing.__get__(self), "_dbus_name",
859
 
                         name),
860
 
                 athing.__get__(self))
 
798
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
861
799
                for cls in self.__class__.__mro__
862
 
                for name, athing in
863
 
                inspect.getmembers(cls,
864
 
                                   self._is_dbus_thing(thing)))
 
800
                for name, prop in
 
801
                inspect.getmembers(cls, self._is_dbus_property))
865
802
    
866
803
    def _get_dbus_property(self, interface_name, property_name):
867
804
        """Returns a bound method if one exists which is a D-Bus
869
806
        """
870
807
        for cls in  self.__class__.__mro__:
871
808
            for name, value in (inspect.getmembers
872
 
                                (cls,
873
 
                                 self._is_dbus_thing("property"))):
 
809
                                (cls, self._is_dbus_property)):
874
810
                if (value._dbus_name == property_name
875
811
                    and value._dbus_interface == interface_name):
876
812
                    return value.__get__(self)
905
841
            # signatures other than "ay".
906
842
            if prop._dbus_signature != "ay":
907
843
                raise ValueError
908
 
            value = dbus.ByteArray(b''.join(chr(byte)
909
 
                                            for byte in value))
 
844
            value = dbus.ByteArray(''.join(unichr(byte)
 
845
                                           for byte in value))
910
846
        prop(value)
911
847
    
912
848
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
918
854
        Note: Will not include properties with access="write".
919
855
        """
920
856
        properties = {}
921
 
        for name, prop in self._get_all_dbus_things("property"):
 
857
        for name, prop in self._get_all_dbus_properties():
922
858
            if (interface_name
923
859
                and interface_name != prop._dbus_interface):
924
860
                # Interface non-empty but did not match
939
875
                         path_keyword='object_path',
940
876
                         connection_keyword='connection')
941
877
    def Introspect(self, object_path, connection):
942
 
        """Overloading of standard D-Bus method.
943
 
        
944
 
        Inserts property tags and interface annotation tags.
 
878
        """Standard D-Bus method, overloaded to insert property tags.
945
879
        """
946
880
        xmlstring = dbus.service.Object.Introspect(self, object_path,
947
881
                                                   connection)
954
888
                e.setAttribute("access", prop._dbus_access)
955
889
                return e
956
890
            for if_tag in document.getElementsByTagName("interface"):
957
 
                # Add property tags
958
891
                for tag in (make_tag(document, name, prop)
959
892
                            for name, prop
960
 
                            in self._get_all_dbus_things("property")
 
893
                            in self._get_all_dbus_properties()
961
894
                            if prop._dbus_interface
962
895
                            == if_tag.getAttribute("name")):
963
896
                    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
897
                # Add the names to the return values for the
996
898
                # "org.freedesktop.DBus.Properties" methods
997
899
                if (if_tag.getAttribute("name")
1012
914
        except (AttributeError, xml.dom.DOMException,
1013
915
                xml.parsers.expat.ExpatError) as error:
1014
916
            logger.error("Failed to override Introspection method",
1015
 
                         exc_info=error)
 
917
                         error)
1016
918
        return xmlstring
1017
919
 
1018
920
 
1019
 
def datetime_to_dbus(dt, variant_level=0):
 
921
def datetime_to_dbus (dt, variant_level=0):
1020
922
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1021
923
    if dt is None:
1022
924
        return dbus.String("", variant_level = variant_level)
1024
926
                       variant_level=variant_level)
1025
927
 
1026
928
 
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).
 
929
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
930
                                  .__metaclass__):
 
931
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
932
    will add additional D-Bus attributes matching a certain pattern.
1049
933
    """
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):
 
934
    def __new__(mcs, name, bases, attr):
 
935
        # Go through all the base classes which could have D-Bus
 
936
        # methods, signals, or properties in them
 
937
        for base in (b for b in bases
 
938
                     if issubclass(b, dbus.service.Object)):
 
939
            # Go though all attributes of the base class
 
940
            for attrname, attribute in inspect.getmembers(base):
1057
941
                # Ignore non-D-Bus attributes, and D-Bus attributes
1058
942
                # with the wrong interface name
1059
943
                if (not hasattr(attribute, "_dbus_interface")
1060
944
                    or not attribute._dbus_interface
1061
 
                    .startswith(orig_interface_name)):
 
945
                    .startswith("se.recompile.Mandos")):
1062
946
                    continue
1063
947
                # Create an alternate D-Bus interface name based on
1064
948
                # the current name
1065
949
                alt_interface = (attribute._dbus_interface
1066
 
                                 .replace(orig_interface_name,
1067
 
                                          alt_interface_name))
1068
 
                interface_names.add(alt_interface)
 
950
                                 .replace("se.recompile.Mandos",
 
951
                                          "se.bsnet.fukt.Mandos"))
1069
952
                # Is this a D-Bus signal?
1070
953
                if getattr(attribute, "_dbus_is_signal", False):
1071
954
                    # Extract the original non-method function by
1086
969
                                nonmethod_func.func_name,
1087
970
                                nonmethod_func.func_defaults,
1088
971
                                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
972
                    # 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
 
973
                    # old and new functions, so both the old and new
 
974
                    # signals gets sent when the function is called
1099
975
                    def fixscope(func1, func2):
1100
976
                        """This function is a scope container to pass
1101
977
                        func1 and func2 to the "call_both" function
1108
984
                        return call_both
1109
985
                    # Create the "call_both" function and add it to
1110
986
                    # the class
1111
 
                    attr[attrname] = fixscope(attribute, new_function)
 
987
                    attr[attrname] = fixscope(attribute,
 
988
                                              new_function)
1112
989
                # Is this a D-Bus method?
1113
990
                elif getattr(attribute, "_dbus_is_method", False):
1114
991
                    # Create a new, but exactly alike, function
1125
1002
                                        attribute.func_name,
1126
1003
                                        attribute.func_defaults,
1127
1004
                                        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
1005
                # Is this a D-Bus property?
1135
1006
                elif getattr(attribute, "_dbus_is_property", False):
1136
1007
                    # Create a new, but exactly alike, function
1150
1021
                                        attribute.func_name,
1151
1022
                                        attribute.func_defaults,
1152
1023
                                        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"})
 
1024
        return type.__new__(mcs, name, bases, attr)
 
1025
 
 
1026
 
1198
1027
class ClientDBus(Client, DBusObjectWithProperties):
1199
1028
    """A Client class using D-Bus
1200
1029
    
1211
1040
    def __init__(self, bus = None, *args, **kwargs):
1212
1041
        self.bus = bus
1213
1042
        Client.__init__(self, *args, **kwargs)
 
1043
        self._approvals_pending = 0
 
1044
        
 
1045
        self._approvals_pending = 0
1214
1046
        # Only now, when this client is initialized, can it show up on
1215
1047
        # the D-Bus
1216
1048
        client_object_name = unicode(self.name).translate(
1220
1052
                                 ("/clients/" + client_object_name))
1221
1053
        DBusObjectWithProperties.__init__(self, self.bus,
1222
1054
                                          self.dbus_object_path)
1223
 
    
 
1055
        
1224
1056
    def notifychangeproperty(transform_func,
1225
1057
                             dbus_name, type_func=lambda x: x,
1226
1058
                             variant_level=1):
1249
1081
        
1250
1082
        return property(lambda self: getattr(self, attrname), setter)
1251
1083
    
 
1084
    
1252
1085
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1253
1086
    approvals_pending = notifychangeproperty(dbus.Boolean,
1254
1087
                                             "ApprovalPending",
1261
1094
                                       checker is not None)
1262
1095
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1263
1096
                                           "LastCheckedOK")
1264
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1265
 
                                               "LastCheckerStatus")
1266
1097
    last_approval_request = notifychangeproperty(
1267
1098
        datetime_to_dbus, "LastApprovalRequest")
1268
1099
    approved_by_default = notifychangeproperty(dbus.Boolean,
1336
1167
        return False
1337
1168
    
1338
1169
    def approve(self, value=True):
 
1170
        self.send_changedstate()
1339
1171
        self.approved = value
1340
1172
        gobject.timeout_add(timedelta_to_milliseconds
1341
1173
                            (self.approval_duration),
1342
1174
                            self._reset_approved)
1343
 
        self.send_changedstate()
 
1175
    
1344
1176
    
1345
1177
    ## D-Bus methods, signals & properties
1346
1178
    _interface = "se.recompile.Mandos.Client"
1347
1179
    
1348
 
    ## Interfaces
1349
 
    
1350
 
    @dbus_interface_annotations(_interface)
1351
 
    def _foo(self):
1352
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1353
 
                     "false"}
1354
 
    
1355
1180
    ## Signals
1356
1181
    
1357
1182
    # CheckerCompleted - signal
1393
1218
        "D-Bus signal"
1394
1219
        return self.need_approval()
1395
1220
    
 
1221
    # NeRwequest - signal
 
1222
    @dbus.service.signal(_interface, signature="s")
 
1223
    def NewRequest(self, ip):
 
1224
        """D-Bus signal
 
1225
        Is sent after a client request a password.
 
1226
        """
 
1227
        pass
 
1228
    
1396
1229
    ## Methods
1397
1230
    
1398
1231
    # Approve - method
1508
1341
            return
1509
1342
        return datetime_to_dbus(self.last_checked_ok)
1510
1343
    
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
1344
    # Expires - property
1518
1345
    @dbus_service_property(_interface, signature="s", access="read")
1519
1346
    def Expires_dbus_property(self):
1530
1357
    def Timeout_dbus_property(self, value=None):
1531
1358
        if value is None:       # get
1532
1359
            return dbus.UInt64(self.timeout_milliseconds())
1533
 
        old_timeout = self.timeout
1534
1360
        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))
 
1361
        if getattr(self, "disable_initiator_tag", None) is None:
 
1362
            return
 
1363
        # Reschedule timeout
 
1364
        gobject.source_remove(self.disable_initiator_tag)
 
1365
        self.disable_initiator_tag = None
 
1366
        self.expires = None
 
1367
        time_to_die = timedelta_to_milliseconds((self
 
1368
                                                 .last_checked_ok
 
1369
                                                 + self.timeout)
 
1370
                                                - datetime.datetime
 
1371
                                                .utcnow())
 
1372
        if time_to_die <= 0:
 
1373
            # The timeout has passed
 
1374
            self.disable()
 
1375
        else:
 
1376
            self.expires = (datetime.datetime.utcnow()
 
1377
                            + datetime.timedelta(milliseconds =
 
1378
                                                 time_to_die))
 
1379
            self.disable_initiator_tag = (gobject.timeout_add
 
1380
                                          (time_to_die, self.disable))
1551
1381
    
1552
1382
    # ExtendedTimeout - property
1553
1383
    @dbus_service_property(_interface, signature="t",
1632
1462
        self._pipe.send(('setattr', name, value))
1633
1463
 
1634
1464
 
 
1465
class ClientDBusTransitional(ClientDBus):
 
1466
    __metaclass__ = AlternateDBusNamesMetaclass
 
1467
 
 
1468
 
1635
1469
class ClientHandler(socketserver.BaseRequestHandler, object):
1636
1470
    """A class to handle client connections.
1637
1471
    
1705
1539
                except KeyError:
1706
1540
                    return
1707
1541
                
 
1542
                if self.server.use_dbus:
 
1543
                    # Emit D-Bus signal
 
1544
                    client.NewRequest(str(self.client_address))
 
1545
                
1708
1546
                if client.approval_delay:
1709
1547
                    delay = client.approval_delay
1710
1548
                    client.approvals_pending += 1
1741
1579
                    #wait until timeout or approved
1742
1580
                    time = datetime.datetime.now()
1743
1581
                    client.changedstate.acquire()
1744
 
                    client.changedstate.wait(
1745
 
                        float(timedelta_to_milliseconds(delay)
1746
 
                              / 1000))
 
1582
                    (client.changedstate.wait
 
1583
                     (float(client.timedelta_to_milliseconds(delay)
 
1584
                            / 1000)))
1747
1585
                    client.changedstate.release()
1748
1586
                    time2 = datetime.datetime.now()
1749
1587
                    if (time2 - time) >= delay:
1765
1603
                    try:
1766
1604
                        sent = session.send(client.secret[sent_size:])
1767
1605
                    except gnutls.errors.GNUTLSError as error:
1768
 
                        logger.warning("gnutls send failed",
1769
 
                                       exc_info=error)
 
1606
                        logger.warning("gnutls send failed")
1770
1607
                        return
1771
1608
                    logger.debug("Sent: %d, remaining: %d",
1772
1609
                                 sent, len(client.secret)
1775
1612
                
1776
1613
                logger.info("Sending secret to %s", client.name)
1777
1614
                # bump the timeout using extended_timeout
1778
 
                client.bump_timeout(client.extended_timeout)
 
1615
                client.checked_ok(client.extended_timeout)
1779
1616
                if self.server.use_dbus:
1780
1617
                    # Emit D-Bus signal
1781
1618
                    client.GotSecret()
1786
1623
                try:
1787
1624
                    session.bye()
1788
1625
                except gnutls.errors.GNUTLSError as error:
1789
 
                    logger.warning("GnuTLS bye failed",
1790
 
                                   exc_info=error)
 
1626
                    logger.warning("GnuTLS bye failed")
1791
1627
    
1792
1628
    @staticmethod
1793
1629
    def peer_certificate(session):
1865
1701
    def process_request(self, request, address):
1866
1702
        """Start a new process to process the request."""
1867
1703
        proc = multiprocessing.Process(target = self.sub_process_main,
1868
 
                                       args = (request, address))
 
1704
                                       args = (request,
 
1705
                                               address))
1869
1706
        proc.start()
1870
1707
        return proc
1871
1708
 
1899
1736
        use_ipv6:       Boolean; to use IPv6 or not
1900
1737
    """
1901
1738
    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
 
        """
 
1739
                 interface=None, use_ipv6=True):
1906
1740
        self.interface = interface
1907
1741
        if use_ipv6:
1908
1742
            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
1743
        socketserver.TCPServer.__init__(self, server_address,
1936
1744
                                        RequestHandlerClass)
1937
 
    
1938
1745
    def server_bind(self):
1939
1746
        """This overrides the normal server_bind() function
1940
1747
        to bind to an interface if one was specified, and also NOT to
1951
1758
                                           str(self.interface
1952
1759
                                               + '\0'))
1953
1760
                except socket.error as error:
1954
 
                    if error.errno == errno.EPERM:
 
1761
                    if error[0] == errno.EPERM:
1955
1762
                        logger.error("No permission to"
1956
1763
                                     " bind to interface %s",
1957
1764
                                     self.interface)
1958
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1765
                    elif error[0] == errno.ENOPROTOOPT:
1959
1766
                        logger.error("SO_BINDTODEVICE not available;"
1960
1767
                                     " cannot bind to interface %s",
1961
1768
                                     self.interface)
1962
 
                    elif error.errno == errno.ENODEV:
1963
 
                        logger.error("Interface %s does not"
1964
 
                                     " exist, cannot bind",
1965
 
                                     self.interface)
1966
1769
                    else:
1967
1770
                        raise
1968
1771
        # Only bind(2) the socket if we really need to.
1998
1801
    """
1999
1802
    def __init__(self, server_address, RequestHandlerClass,
2000
1803
                 interface=None, use_ipv6=True, clients=None,
2001
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1804
                 gnutls_priority=None, use_dbus=True):
2002
1805
        self.enabled = False
2003
1806
        self.clients = clients
2004
1807
        if self.clients is None:
2008
1811
        IPv6_TCPServer.__init__(self, server_address,
2009
1812
                                RequestHandlerClass,
2010
1813
                                interface = interface,
2011
 
                                use_ipv6 = use_ipv6,
2012
 
                                socketfd = socketfd)
 
1814
                                use_ipv6 = use_ipv6)
2013
1815
    def server_activate(self):
2014
1816
        if self.enabled:
2015
1817
            return socketserver.TCPServer.server_activate(self)
2028
1830
    
2029
1831
    def handle_ipc(self, source, condition, parent_pipe=None,
2030
1832
                   proc = None, client_object=None):
 
1833
        condition_names = {
 
1834
            gobject.IO_IN: "IN",   # There is data to read.
 
1835
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1836
                                    # blocking).
 
1837
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1838
            gobject.IO_ERR: "ERR", # Error condition.
 
1839
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1840
                                    # broken, usually for pipes and
 
1841
                                    # sockets).
 
1842
            }
 
1843
        conditions_string = ' | '.join(name
 
1844
                                       for cond, name in
 
1845
                                       condition_names.iteritems()
 
1846
                                       if cond & condition)
2031
1847
        # error, or the other end of multiprocessing.Pipe has closed
2032
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1848
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2033
1849
            # Wait for other process to exit
2034
1850
            proc.join()
2035
1851
            return False
2125
1941
            elif suffix == "w":
2126
1942
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2127
1943
            else:
2128
 
                raise ValueError("Unknown suffix {0!r}"
2129
 
                                 .format(suffix))
 
1944
                raise ValueError("Unknown suffix %r" % suffix)
2130
1945
        except (ValueError, IndexError) as e:
2131
1946
            raise ValueError(*(e.args))
2132
1947
        timevalue += delta
2146
1961
        sys.exit()
2147
1962
    if not noclose:
2148
1963
        # Close all standard open file descriptors
2149
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1964
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2150
1965
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2151
1966
            raise OSError(errno.ENODEV,
2152
 
                          "{0} not a character device"
2153
 
                          .format(os.devnull))
 
1967
                          "%s not a character device"
 
1968
                          % os.path.devnull)
2154
1969
        os.dup2(null, sys.stdin.fileno())
2155
1970
        os.dup2(null, sys.stdout.fileno())
2156
1971
        os.dup2(null, sys.stderr.fileno())
2165
1980
    
2166
1981
    parser = argparse.ArgumentParser()
2167
1982
    parser.add_argument("-v", "--version", action="version",
2168
 
                        version = "%(prog)s {0}".format(version),
 
1983
                        version = "%%(prog)s %s" % version,
2169
1984
                        help="show version number and exit")
2170
1985
    parser.add_argument("-i", "--interface", metavar="IF",
2171
1986
                        help="Bind to interface IF")
2196
2011
    parser.add_argument("--no-restore", action="store_false",
2197
2012
                        dest="restore", help="Do not restore stored"
2198
2013
                        " state")
2199
 
    parser.add_argument("--socket", type=int,
2200
 
                        help="Specify a file descriptor to a network"
2201
 
                        " socket to use instead of creating one")
2202
2014
    parser.add_argument("--statedir", metavar="DIR",
2203
2015
                        help="Directory to save/restore state in")
2204
2016
    
2221
2033
                        "use_ipv6": "True",
2222
2034
                        "debuglevel": "",
2223
2035
                        "restore": "True",
2224
 
                        "socket": "",
2225
2036
                        "statedir": "/var/lib/mandos"
2226
2037
                        }
2227
2038
    
2239
2050
    if server_settings["port"]:
2240
2051
        server_settings["port"] = server_config.getint("DEFAULT",
2241
2052
                                                       "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
2053
    del server_config
2252
2054
    
2253
2055
    # Override the settings from the config file with command line
2255
2057
    for option in ("interface", "address", "port", "debug",
2256
2058
                   "priority", "servicename", "configdir",
2257
2059
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2258
 
                   "statedir", "socket"):
 
2060
                   "statedir"):
2259
2061
        value = getattr(options, option)
2260
2062
        if value is not None:
2261
2063
            server_settings[option] = value
2287
2089
    
2288
2090
    if server_settings["servicename"] != "Mandos":
2289
2091
        syslogger.setFormatter(logging.Formatter
2290
 
                               ('Mandos ({0}) [%(process)d]:'
2291
 
                                ' %(levelname)s: %(message)s'
2292
 
                                .format(server_settings
2293
 
                                        ["servicename"])))
 
2092
                               ('Mandos (%s) [%%(process)d]:'
 
2093
                                ' %%(levelname)s: %%(message)s'
 
2094
                                % server_settings["servicename"]))
2294
2095
    
2295
2096
    # Parse config file with clients
2296
 
    client_config = configparser.SafeConfigParser(Client
2297
 
                                                  .client_defaults)
 
2097
    client_config = configparser.SafeConfigParser(Client.client_defaults)
2298
2098
    client_config.read(os.path.join(server_settings["configdir"],
2299
2099
                                    "clients.conf"))
2300
2100
    
2309
2109
                              use_ipv6=use_ipv6,
2310
2110
                              gnutls_priority=
2311
2111
                              server_settings["priority"],
2312
 
                              use_dbus=use_dbus,
2313
 
                              socketfd=(server_settings["socket"]
2314
 
                                        or None))
 
2112
                              use_dbus=use_dbus)
2315
2113
    if not debug:
2316
2114
        pidfilename = "/var/run/mandos.pid"
2317
2115
        try:
2318
2116
            pidfile = open(pidfilename, "w")
2319
 
        except IOError as e:
2320
 
            logger.error("Could not open file %r", pidfilename,
2321
 
                         exc_info=e)
 
2117
        except IOError:
 
2118
            logger.error("Could not open file %r", pidfilename)
2322
2119
    
2323
 
    for name in ("_mandos", "mandos", "nobody"):
 
2120
    try:
 
2121
        uid = pwd.getpwnam("_mandos").pw_uid
 
2122
        gid = pwd.getpwnam("_mandos").pw_gid
 
2123
    except KeyError:
2324
2124
        try:
2325
 
            uid = pwd.getpwnam(name).pw_uid
2326
 
            gid = pwd.getpwnam(name).pw_gid
2327
 
            break
 
2125
            uid = pwd.getpwnam("mandos").pw_uid
 
2126
            gid = pwd.getpwnam("mandos").pw_gid
2328
2127
        except KeyError:
2329
 
            continue
2330
 
    else:
2331
 
        uid = 65534
2332
 
        gid = 65534
 
2128
            try:
 
2129
                uid = pwd.getpwnam("nobody").pw_uid
 
2130
                gid = pwd.getpwnam("nobody").pw_gid
 
2131
            except KeyError:
 
2132
                uid = 65534
 
2133
                gid = 65534
2333
2134
    try:
2334
2135
        os.setgid(gid)
2335
2136
        os.setuid(uid)
2336
2137
    except OSError as error:
2337
 
        if error.errno != errno.EPERM:
 
2138
        if error[0] != errno.EPERM:
2338
2139
            raise error
2339
2140
    
2340
2141
    if debug:
2352
2153
         .gnutls_global_set_log_function(debug_gnutls))
2353
2154
        
2354
2155
        # Redirect stdin so all checkers get /dev/null
2355
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2156
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2356
2157
        os.dup2(null, sys.stdin.fileno())
2357
2158
        if null > 2:
2358
2159
            os.close(null)
2362
2163
        # Close all input and output, do double fork, etc.
2363
2164
        daemon()
2364
2165
    
2365
 
    # multiprocessing will use threads, so before we use gobject we
2366
 
    # need to inform gobject that threads will be used.
2367
2166
    gobject.threads_init()
2368
2167
    
2369
2168
    global main_loop
2370
2169
    # From the Avahi example code
2371
 
    DBusGMainLoop(set_as_default=True)
 
2170
    DBusGMainLoop(set_as_default=True )
2372
2171
    main_loop = gobject.MainLoop()
2373
2172
    bus = dbus.SystemBus()
2374
2173
    # End of Avahi example code
2380
2179
                            ("se.bsnet.fukt.Mandos", bus,
2381
2180
                             do_not_queue=True))
2382
2181
        except dbus.exceptions.NameExistsException as e:
2383
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2182
            logger.error(unicode(e) + ", disabling D-Bus")
2384
2183
            use_dbus = False
2385
2184
            server_settings["use_dbus"] = False
2386
2185
            tcp_server.use_dbus = False
2398
2197
    
2399
2198
    client_class = Client
2400
2199
    if use_dbus:
2401
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2200
        client_class = functools.partial(ClientDBusTransitional,
 
2201
                                         bus = bus)
2402
2202
    
2403
2203
    client_settings = Client.config_parser(client_config)
2404
2204
    old_client_settings = {}
2412
2212
                                                     (stored_state))
2413
2213
            os.remove(stored_state_path)
2414
2214
        except IOError as e:
2415
 
            if e.errno == errno.ENOENT:
2416
 
                logger.warning("Could not load persistent state: {0}"
2417
 
                                .format(os.strerror(e.errno)))
2418
 
            else:
2419
 
                logger.critical("Could not load persistent state:",
2420
 
                                exc_info=e)
 
2215
            logger.warning("Could not load persistent state: {0}"
 
2216
                           .format(e))
 
2217
            if e.errno != errno.ENOENT:
2421
2218
                raise
2422
2219
        except EOFError as e:
2423
2220
            logger.warning("Could not load persistent state: "
2424
 
                           "EOFError:", exc_info=e)
 
2221
                           "EOFError: {0}".format(e))
2425
2222
    
2426
2223
    with PGPEngine() as pgp:
2427
2224
        for client_name, client in clients_data.iteritems():
2444
2241
            
2445
2242
            # Clients who has passed its expire date can still be
2446
2243
            # enabled if its last checker was successful.  Clients
2447
 
            # whose checker succeeded before we stored its state is
2448
 
            # assumed to have successfully run all checkers during
2449
 
            # downtime.
 
2244
            # whose checker failed before we stored its state is
 
2245
            # assumed to have failed all checkers during downtime.
2450
2246
            if client["enabled"]:
2451
2247
                if datetime.datetime.utcnow() >= client["expires"]:
2452
2248
                    if not client["last_checked_ok"]:
2453
2249
                        logger.warning(
2454
2250
                            "disabling client {0} - Client never "
2455
 
                            "performed a successful checker"
2456
 
                            .format(client_name))
 
2251
                            "performed a successfull checker"
 
2252
                            .format(client["name"]))
2457
2253
                        client["enabled"] = False
2458
2254
                    elif client["last_checker_status"] != 0:
2459
2255
                        logger.warning(
2460
2256
                            "disabling client {0} - Client "
2461
2257
                            "last checker failed with error code {1}"
2462
 
                            .format(client_name,
 
2258
                            .format(client["name"],
2463
2259
                                    client["last_checker_status"]))
2464
2260
                        client["enabled"] = False
2465
2261
                    else:
2466
2262
                        client["expires"] = (datetime.datetime
2467
2263
                                             .utcnow()
2468
2264
                                             + client["timeout"])
2469
 
                        logger.debug("Last checker succeeded,"
2470
 
                                     " keeping {0} enabled"
2471
 
                                     .format(client_name))
 
2265
                    
2472
2266
            try:
2473
2267
                client["secret"] = (
2474
2268
                    pgp.decrypt(client["encrypted_secret"],
2480
2274
                             .format(client_name))
2481
2275
                client["secret"] = (
2482
2276
                    client_settings[client_name]["secret"])
 
2277
 
2483
2278
    
2484
2279
    # Add/remove clients based on new changes made to config
2485
 
    for client_name in (set(old_client_settings)
2486
 
                        - set(client_settings)):
 
2280
    for client_name in set(old_client_settings) - set(client_settings):
2487
2281
        del clients_data[client_name]
2488
 
    for client_name in (set(client_settings)
2489
 
                        - set(old_client_settings)):
 
2282
    for client_name in set(client_settings) - set(old_client_settings):
2490
2283
        clients_data[client_name] = client_settings[client_name]
2491
 
    
2492
 
    # Create all client objects
 
2284
 
 
2285
    # Create clients all clients
2493
2286
    for client_name, client in clients_data.iteritems():
2494
2287
        tcp_server.clients[client_name] = client_class(
2495
2288
            name = client_name, settings = client)
2496
2289
    
2497
2290
    if not tcp_server.clients:
2498
2291
        logger.warning("No clients defined")
2499
 
    
 
2292
        
2500
2293
    if not debug:
2501
2294
        try:
2502
2295
            with pidfile:
2510
2303
            # "pidfile" was never created
2511
2304
            pass
2512
2305
        del pidfilename
 
2306
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2513
2307
    
2514
2308
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2515
2309
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2516
2310
    
2517
2311
    if use_dbus:
2518
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2519
 
                                        "se.bsnet.fukt.Mandos"})
2520
 
        class MandosDBusService(DBusObjectWithProperties):
 
2312
        class MandosDBusService(dbus.service.Object):
2521
2313
            """A D-Bus proxy object"""
2522
2314
            def __init__(self):
2523
2315
                dbus.service.Object.__init__(self, bus, "/")
2524
2316
            _interface = "se.recompile.Mandos"
2525
2317
            
2526
 
            @dbus_interface_annotations(_interface)
2527
 
            def _foo(self):
2528
 
                return { "org.freedesktop.DBus.Property"
2529
 
                         ".EmitsChangedSignal":
2530
 
                             "false"}
2531
 
            
2532
2318
            @dbus.service.signal(_interface, signature="o")
2533
2319
            def ClientAdded(self, objpath):
2534
2320
                "D-Bus signal"
2576
2362
            
2577
2363
            del _interface
2578
2364
        
2579
 
        mandos_dbus_service = MandosDBusService()
 
2365
        class MandosDBusServiceTransitional(MandosDBusService):
 
2366
            __metaclass__ = AlternateDBusNamesMetaclass
 
2367
        mandos_dbus_service = MandosDBusServiceTransitional()
2580
2368
    
2581
2369
    def cleanup():
2582
2370
        "Cleanup function; run on exit"
2615
2403
                del client_settings[client.name]["secret"]
2616
2404
        
2617
2405
        try:
2618
 
            with (tempfile.NamedTemporaryFile
2619
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2620
 
                   dir=os.path.dirname(stored_state_path),
2621
 
                   delete=False)) as stored_state:
 
2406
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2407
                                                prefix="clients-",
 
2408
                                                dir=os.path.dirname
 
2409
                                                (stored_state_path))
 
2410
            with os.fdopen(tempfd, "wb") as stored_state:
2622
2411
                pickle.dump((clients, client_settings), stored_state)
2623
 
                tempname=stored_state.name
2624
2412
            os.rename(tempname, stored_state_path)
2625
2413
        except (IOError, OSError) as e:
 
2414
            logger.warning("Could not save persistent state: {0}"
 
2415
                           .format(e))
2626
2416
            if not debug:
2627
2417
                try:
2628
2418
                    os.remove(tempname)
2629
2419
                except NameError:
2630
2420
                    pass
2631
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2632
 
                logger.warning("Could not save persistent state: {0}"
2633
 
                               .format(os.strerror(e.errno)))
2634
 
            else:
2635
 
                logger.warning("Could not save persistent state:",
2636
 
                               exc_info=e)
 
2421
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2422
                                   errno.EEXIST)):
2637
2423
                raise e
2638
2424
        
2639
2425
        # Delete all clients, and settings from config
2667
2453
    service.port = tcp_server.socket.getsockname()[1]
2668
2454
    if use_ipv6:
2669
2455
        logger.info("Now listening on address %r, port %d,"
2670
 
                    " flowinfo %d, scope_id %d",
2671
 
                    *tcp_server.socket.getsockname())
 
2456
                    " flowinfo %d, scope_id %d"
 
2457
                    % tcp_server.socket.getsockname())
2672
2458
    else:                       # IPv4
2673
 
        logger.info("Now listening on address %r, port %d",
2674
 
                    *tcp_server.socket.getsockname())
 
2459
        logger.info("Now listening on address %r, port %d"
 
2460
                    % tcp_server.socket.getsockname())
2675
2461
    
2676
2462
    #service.interface = tcp_server.socket.getsockname()[3]
2677
2463
    
2680
2466
        try:
2681
2467
            service.activate()
2682
2468
        except dbus.exceptions.DBusException as error:
2683
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2469
            logger.critical("DBusException: %s", error)
2684
2470
            cleanup()
2685
2471
            sys.exit(1)
2686
2472
        # End of Avahi example code
2693
2479
        logger.debug("Starting main loop")
2694
2480
        main_loop.run()
2695
2481
    except AvahiError as error:
2696
 
        logger.critical("Avahi Error", exc_info=error)
 
2482
        logger.critical("AvahiError: %s", error)
2697
2483
        cleanup()
2698
2484
        sys.exit(1)
2699
2485
    except KeyboardInterrupt: