/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-12-31 23:05:34 UTC
  • Revision ID: teddy@recompile.se-20111231230534-o5w0uhwx30gwhmk7
Updated year in copyright notices.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
 
import collections
72
68
 
73
69
import dbus
74
70
import dbus.service
79
75
import ctypes.util
80
76
import xml.dom.minidom
81
77
import inspect
 
78
import GnuPGInterface
82
79
 
83
80
try:
84
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
88
85
    except ImportError:
89
86
        SO_BINDTODEVICE = None
90
87
 
91
 
version = "1.6.0"
 
88
version = "1.4.1"
92
89
stored_state_file = "clients.pickle"
93
90
 
94
91
logger = logging.getLogger()
139
136
class PGPEngine(object):
140
137
    """A simple class for OpenPGP symmetric encryption & decryption"""
141
138
    def __init__(self):
 
139
        self.gnupg = GnuPGInterface.GnuPG()
142
140
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
143
 
        self.gnupgargs = ['--batch',
144
 
                          '--home', self.tempdir,
145
 
                          '--force-mdc',
146
 
                          '--quiet',
147
 
                          '--no-use-agent']
 
141
        self.gnupg = GnuPGInterface.GnuPG()
 
142
        self.gnupg.options.meta_interactive = False
 
143
        self.gnupg.options.homedir = self.tempdir
 
144
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
145
                                              '--quiet',
 
146
                                              '--no-use-agent'])
148
147
    
149
148
    def __enter__(self):
150
149
        return self
151
150
    
152
 
    def __exit__(self, exc_type, exc_value, traceback):
 
151
    def __exit__ (self, exc_type, exc_value, traceback):
153
152
        self._cleanup()
154
153
        return False
155
154
    
175
174
        return b"mandos" + binascii.hexlify(password)
176
175
    
177
176
    def encrypt(self, data, password):
178
 
        passphrase = self.password_encode(password)
179
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
180
 
                                         ) as passfile:
181
 
            passfile.write(passphrase)
182
 
            passfile.flush()
183
 
            proc = subprocess.Popen(['gpg', '--symmetric',
184
 
                                     '--passphrase-file',
185
 
                                     passfile.name]
186
 
                                    + self.gnupgargs,
187
 
                                    stdin = subprocess.PIPE,
188
 
                                    stdout = subprocess.PIPE,
189
 
                                    stderr = subprocess.PIPE)
190
 
            ciphertext, err = proc.communicate(input = data)
191
 
        if proc.returncode != 0:
192
 
            raise PGPError(err)
 
177
        self.gnupg.passphrase = self.password_encode(password)
 
178
        with open(os.devnull) as devnull:
 
179
            try:
 
180
                proc = self.gnupg.run(['--symmetric'],
 
181
                                      create_fhs=['stdin', 'stdout'],
 
182
                                      attach_fhs={'stderr': devnull})
 
183
                with contextlib.closing(proc.handles['stdin']) as f:
 
184
                    f.write(data)
 
185
                with contextlib.closing(proc.handles['stdout']) as f:
 
186
                    ciphertext = f.read()
 
187
                proc.wait()
 
188
            except IOError as e:
 
189
                raise PGPError(e)
 
190
        self.gnupg.passphrase = None
193
191
        return ciphertext
194
192
    
195
193
    def decrypt(self, data, password):
196
 
        passphrase = self.password_encode(password)
197
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
198
 
                                         ) as passfile:
199
 
            passfile.write(passphrase)
200
 
            passfile.flush()
201
 
            proc = subprocess.Popen(['gpg', '--decrypt',
202
 
                                     '--passphrase-file',
203
 
                                     passfile.name]
204
 
                                    + self.gnupgargs,
205
 
                                    stdin = subprocess.PIPE,
206
 
                                    stdout = subprocess.PIPE,
207
 
                                    stderr = subprocess.PIPE)
208
 
            decrypted_plaintext, err = proc.communicate(input
209
 
                                                        = data)
210
 
        if proc.returncode != 0:
211
 
            raise PGPError(err)
 
194
        self.gnupg.passphrase = self.password_encode(password)
 
195
        with open(os.devnull) as devnull:
 
196
            try:
 
197
                proc = self.gnupg.run(['--decrypt'],
 
198
                                      create_fhs=['stdin', 'stdout'],
 
199
                                      attach_fhs={'stderr': devnull})
 
200
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
201
                    f.write(data)
 
202
                with contextlib.closing(proc.handles['stdout']) as f:
 
203
                    decrypted_plaintext = f.read()
 
204
                proc.wait()
 
205
            except IOError as e:
 
206
                raise PGPError(e)
 
207
        self.gnupg.passphrase = None
212
208
        return decrypted_plaintext
213
209
 
214
210
 
 
211
 
215
212
class AvahiError(Exception):
216
213
    def __init__(self, value, *args, **kwargs):
217
214
        self.value = value
234
231
               Used to optionally bind to the specified interface.
235
232
    name: string; Example: 'Mandos'
236
233
    type: string; Example: '_mandos._tcp'.
237
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
234
                  See <http://www.dns-sd.org/ServiceTypes.html>
238
235
    port: integer; what port to announce
239
236
    TXT: list of strings; TXT record for the service
240
237
    domain: string; Domain to publish on, default to .local if empty.
246
243
    server: D-Bus Server
247
244
    bus: dbus.SystemBus()
248
245
    """
249
 
    
250
246
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
247
                 servicetype = None, port = None, TXT = None,
252
248
                 domain = "", host = "", max_renames = 32768,
265
261
        self.server = None
266
262
        self.bus = bus
267
263
        self.entry_group_state_changed_match = None
268
 
    
269
264
    def rename(self):
270
265
        """Derived from the Avahi example code"""
271
266
        if self.rename_count >= self.max_renames:
281
276
        try:
282
277
            self.add()
283
278
        except dbus.exceptions.DBusException as error:
284
 
            logger.critical("D-Bus Exception", exc_info=error)
 
279
            logger.critical("DBusException: %s", error)
285
280
            self.cleanup()
286
281
            os._exit(1)
287
282
        self.rename_count += 1
288
 
    
289
283
    def remove(self):
290
284
        """Derived from the Avahi example code"""
291
285
        if self.entry_group_state_changed_match is not None:
293
287
            self.entry_group_state_changed_match = None
294
288
        if self.group is not None:
295
289
            self.group.Reset()
296
 
    
297
290
    def add(self):
298
291
        """Derived from the Avahi example code"""
299
292
        self.remove()
316
309
            dbus.UInt16(self.port),
317
310
            avahi.string_array_to_txt_array(self.TXT))
318
311
        self.group.Commit()
319
 
    
320
312
    def entry_group_state_changed(self, state, error):
321
313
        """Derived from the Avahi example code"""
322
314
        logger.debug("Avahi entry group state change: %i", state)
329
321
        elif state == avahi.ENTRY_GROUP_FAILURE:
330
322
            logger.critical("Avahi: Error in group state changed %s",
331
323
                            unicode(error))
332
 
            raise AvahiGroupError("State changed: {0!s}"
333
 
                                  .format(error))
334
 
    
 
324
            raise AvahiGroupError("State changed: %s"
 
325
                                  % unicode(error))
335
326
    def cleanup(self):
336
327
        """Derived from the Avahi example code"""
337
328
        if self.group is not None:
342
333
                pass
343
334
            self.group = None
344
335
        self.remove()
345
 
    
346
336
    def server_state_changed(self, state, error=None):
347
337
        """Derived from the Avahi example code"""
348
338
        logger.debug("Avahi server state change: %i", state)
367
357
                logger.debug("Unknown state: %r", state)
368
358
            else:
369
359
                logger.debug("Unknown state: %r: %r", state, error)
370
 
    
371
360
    def activate(self):
372
361
        """Derived from the Avahi example code"""
373
362
        if self.server is None:
380
369
                                 self.server_state_changed)
381
370
        self.server_state_changed(self.server.GetState())
382
371
 
383
 
 
384
372
class AvahiServiceToSyslog(AvahiService):
385
373
    def rename(self):
386
374
        """Add the new name to the syslog messages"""
387
375
        ret = AvahiService.rename(self)
388
376
        syslogger.setFormatter(logging.Formatter
389
 
                               ('Mandos ({0}) [%(process)d]:'
390
 
                                ' %(levelname)s: %(message)s'
391
 
                                .format(self.name)))
 
377
                               ('Mandos (%s) [%%(process)d]:'
 
378
                                ' %%(levelname)s: %%(message)s'
 
379
                                % self.name))
392
380
        return ret
393
381
 
394
 
 
395
382
def timedelta_to_milliseconds(td):
396
383
    "Convert a datetime.timedelta() to milliseconds"
397
384
    return ((td.days * 24 * 60 * 60 * 1000)
398
385
            + (td.seconds * 1000)
399
386
            + (td.microseconds // 1000))
400
 
 
401
 
 
 
387
        
402
388
class Client(object):
403
389
    """A representation of a client host served by this server.
404
390
    
429
415
    last_checked_ok: datetime.datetime(); (UTC) or None
430
416
    last_checker_status: integer between 0 and 255 reflecting exit
431
417
                         status of last checker. -1 reflects crashed
432
 
                         checker, -2 means no checker completed yet.
 
418
                         checker, or None.
433
419
    last_enabled: datetime.datetime(); (UTC) or None
434
420
    name:       string; from the config file, used in log messages and
435
421
                        D-Bus identifiers
436
422
    secret:     bytestring; sent verbatim (over TLS) to client
437
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
438
424
                                      until this client is disabled
439
 
    extended_timeout:   extra long timeout when secret has been sent
 
425
    extended_timeout:   extra long timeout when password has been sent
440
426
    runtime_expansions: Allowed attributes for runtime expansion.
441
427
    expires:    datetime.datetime(); time (UTC) when a client will be
442
428
                disabled, or None
443
 
    server_settings: The server_settings dict from main()
444
429
    """
445
430
    
446
431
    runtime_expansions = ("approval_delay", "approval_duration",
447
 
                          "created", "enabled", "expires",
448
 
                          "fingerprint", "host", "interval",
449
 
                          "last_approval_request", "last_checked_ok",
 
432
                          "created", "enabled", "fingerprint",
 
433
                          "host", "interval", "last_checked_ok",
450
434
                          "last_enabled", "name", "timeout")
451
 
    client_defaults = { "timeout": "PT5M",
452
 
                        "extended_timeout": "PT15M",
453
 
                        "interval": "PT2M",
 
435
    client_defaults = { "timeout": "5m",
 
436
                        "extended_timeout": "15m",
 
437
                        "interval": "2m",
454
438
                        "checker": "fping -q -- %%(host)s",
455
439
                        "host": "",
456
 
                        "approval_delay": "PT0S",
457
 
                        "approval_duration": "PT1S",
 
440
                        "approval_delay": "0s",
 
441
                        "approval_duration": "1s",
458
442
                        "approved_by_default": "True",
459
443
                        "enabled": "True",
460
444
                        }
473
457
    
474
458
    def approval_delay_milliseconds(self):
475
459
        return timedelta_to_milliseconds(self.approval_delay)
476
 
    
 
460
 
477
461
    @staticmethod
478
462
    def config_parser(config):
479
463
        """Construct a new dict of client settings of this form:
504
488
                          "rb") as secfile:
505
489
                    client["secret"] = secfile.read()
506
490
            else:
507
 
                raise TypeError("No secret or secfile for section {0}"
508
 
                                .format(section))
 
491
                raise TypeError("No secret or secfile for section %s"
 
492
                                % section)
509
493
            client["timeout"] = string_to_delta(section["timeout"])
510
494
            client["extended_timeout"] = string_to_delta(
511
495
                section["extended_timeout"])
517
501
            client["checker_command"] = section["checker"]
518
502
            client["last_approval_request"] = None
519
503
            client["last_checked_ok"] = None
520
 
            client["last_checker_status"] = -2
 
504
            client["last_checker_status"] = None
521
505
        
522
506
        return settings
523
 
    
524
 
    def __init__(self, settings, name = None, server_settings=None):
 
507
        
 
508
        
 
509
    def __init__(self, settings, name = None):
 
510
        """Note: the 'checker' key in 'config' sets the
 
511
        'checker_command' attribute and *not* the 'checker'
 
512
        attribute."""
525
513
        self.name = name
526
 
        if server_settings is None:
527
 
            server_settings = {}
528
 
        self.server_settings = server_settings
529
514
        # adding all client settings
530
515
        for setting, value in settings.iteritems():
531
516
            setattr(self, setting, value)
539
524
        else:
540
525
            self.last_enabled = None
541
526
            self.expires = None
542
 
        
 
527
       
543
528
        logger.debug("Creating client %r", self.name)
544
529
        # Uppercase and remove spaces from fingerprint for later
545
530
        # comparison purposes with return value from the fingerprint()
547
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
548
533
        self.created = settings.get("created",
549
534
                                    datetime.datetime.utcnow())
550
 
        
 
535
 
551
536
        # attributes specific for this server instance
552
537
        self.checker = None
553
538
        self.checker_initiator_tag = None
581
566
        if getattr(self, "enabled", False):
582
567
            # Already enabled
583
568
            return
 
569
        self.send_changedstate()
584
570
        self.expires = datetime.datetime.utcnow() + self.timeout
585
571
        self.enabled = True
586
572
        self.last_enabled = datetime.datetime.utcnow()
587
573
        self.init_checker()
588
 
        self.send_changedstate()
589
574
    
590
575
    def disable(self, quiet=True):
591
576
        """Disable this client."""
592
577
        if not getattr(self, "enabled", False):
593
578
            return False
594
579
        if not quiet:
 
580
            self.send_changedstate()
 
581
        if not quiet:
595
582
            logger.info("Disabling client %s", self.name)
596
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
583
        if getattr(self, "disable_initiator_tag", False):
597
584
            gobject.source_remove(self.disable_initiator_tag)
598
585
            self.disable_initiator_tag = None
599
586
        self.expires = None
600
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
587
        if getattr(self, "checker_initiator_tag", False):
601
588
            gobject.source_remove(self.checker_initiator_tag)
602
589
            self.checker_initiator_tag = None
603
590
        self.stop_checker()
604
591
        self.enabled = False
605
 
        if not quiet:
606
 
            self.send_changedstate()
607
592
        # Do not run this again if called by a gobject.timeout_add
608
593
        return False
609
594
    
613
598
    def init_checker(self):
614
599
        # Schedule a new checker to be started an 'interval' from now,
615
600
        # and every interval from then on.
616
 
        if self.checker_initiator_tag is not None:
617
 
            gobject.source_remove(self.checker_initiator_tag)
618
601
        self.checker_initiator_tag = (gobject.timeout_add
619
602
                                      (self.interval_milliseconds(),
620
603
                                       self.start_checker))
621
604
        # Schedule a disable() when 'timeout' has passed
622
 
        if self.disable_initiator_tag is not None:
623
 
            gobject.source_remove(self.disable_initiator_tag)
624
605
        self.disable_initiator_tag = (gobject.timeout_add
625
606
                                   (self.timeout_milliseconds(),
626
607
                                    self.disable))
645
626
            logger.warning("Checker for %(name)s crashed?",
646
627
                           vars(self))
647
628
    
648
 
    def checked_ok(self):
649
 
        """Assert that the client has been seen, alive and well."""
650
 
        self.last_checked_ok = datetime.datetime.utcnow()
651
 
        self.last_checker_status = 0
652
 
        self.bump_timeout()
653
 
    
654
 
    def bump_timeout(self, timeout=None):
655
 
        """Bump up the timeout for this client."""
 
629
    def checked_ok(self, timeout=None):
 
630
        """Bump up the timeout for this client.
 
631
        
 
632
        This should only be called when the client has been seen,
 
633
        alive and well.
 
634
        """
656
635
        if timeout is None:
657
636
            timeout = self.timeout
 
637
        self.last_checked_ok = datetime.datetime.utcnow()
658
638
        if self.disable_initiator_tag is not None:
659
639
            gobject.source_remove(self.disable_initiator_tag)
660
 
            self.disable_initiator_tag = None
661
640
        if getattr(self, "enabled", False):
662
641
            self.disable_initiator_tag = (gobject.timeout_add
663
642
                                          (timedelta_to_milliseconds
673
652
        If a checker already exists, leave it running and do
674
653
        nothing."""
675
654
        # The reason for not killing a running checker is that if we
676
 
        # did that, and if a checker (for some reason) started running
677
 
        # slowly and taking more than 'interval' time, then the client
678
 
        # would inevitably timeout, since no checker would get a
679
 
        # chance to run to completion.  If we instead leave running
 
655
        # did that, then if a checker (for some reason) started
 
656
        # running slowly and taking more than 'interval' time, the
 
657
        # client would inevitably timeout, since no checker would get
 
658
        # a chance to run to completion.  If we instead leave running
680
659
        # checkers alone, the checker would have to take more time
681
660
        # than 'timeout' for the client to be disabled, which is as it
682
661
        # should be.
696
675
                                      self.current_checker_command)
697
676
        # Start a new checker if needed
698
677
        if self.checker is None:
699
 
            # Escape attributes for the shell
700
 
            escaped_attrs = dict(
701
 
                (attr, re.escape(unicode(getattr(self, attr))))
702
 
                for attr in
703
 
                self.runtime_expansions)
704
678
            try:
705
 
                command = self.checker_command % escaped_attrs
706
 
            except TypeError as error:
707
 
                logger.error('Could not format string "%s"',
708
 
                             self.checker_command, exc_info=error)
709
 
                return True # Try again later
 
679
                # In case checker_command has exactly one % operator
 
680
                command = self.checker_command % self.host
 
681
            except TypeError:
 
682
                # Escape attributes for the shell
 
683
                escaped_attrs = dict(
 
684
                    (attr,
 
685
                     re.escape(unicode(str(getattr(self, attr, "")),
 
686
                                       errors=
 
687
                                       'replace')))
 
688
                    for attr in
 
689
                    self.runtime_expansions)
 
690
                
 
691
                try:
 
692
                    command = self.checker_command % escaped_attrs
 
693
                except TypeError as error:
 
694
                    logger.error('Could not format string "%s":'
 
695
                                 ' %s', self.checker_command, error)
 
696
                    return True # Try again later
710
697
            self.current_checker_command = command
711
698
            try:
712
699
                logger.info("Starting checker %r for %s",
715
702
                # in normal mode, that is already done by daemon(),
716
703
                # and in debug mode we don't want to.  (Stdin is
717
704
                # always replaced by /dev/null.)
718
 
                # The exception is when not debugging but nevertheless
719
 
                # running in the foreground; use the previously
720
 
                # created wnull.
721
 
                popen_args = {}
722
 
                if (not self.server_settings["debug"]
723
 
                    and self.server_settings["foreground"]):
724
 
                    popen_args.update({"stdout": wnull,
725
 
                                       "stderr": wnull })
726
705
                self.checker = subprocess.Popen(command,
727
706
                                                close_fds=True,
728
 
                                                shell=True, cwd="/",
729
 
                                                **popen_args)
730
 
            except OSError as error:
731
 
                logger.error("Failed to start subprocess",
732
 
                             exc_info=error)
733
 
                return True
734
 
            self.checker_callback_tag = (gobject.child_watch_add
735
 
                                         (self.checker.pid,
736
 
                                          self.checker_callback,
737
 
                                          data=command))
738
 
            # The checker may have completed before the gobject
739
 
            # watch was added.  Check for this.
740
 
            try:
 
707
                                                shell=True, cwd="/")
 
708
                self.checker_callback_tag = (gobject.child_watch_add
 
709
                                             (self.checker.pid,
 
710
                                              self.checker_callback,
 
711
                                              data=command))
 
712
                # The checker may have completed before the gobject
 
713
                # watch was added.  Check for this.
741
714
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
715
                if pid:
 
716
                    gobject.source_remove(self.checker_callback_tag)
 
717
                    self.checker_callback(pid, status, command)
742
718
            except OSError as error:
743
 
                if error.errno == errno.ECHILD:
744
 
                    # This should never happen
745
 
                    logger.error("Child process vanished",
746
 
                                 exc_info=error)
747
 
                    return True
748
 
                raise
749
 
            if pid:
750
 
                gobject.source_remove(self.checker_callback_tag)
751
 
                self.checker_callback(pid, status, command)
 
719
                logger.error("Failed to start subprocess: %s",
 
720
                             error)
752
721
        # Re-run this periodically if run by gobject.timeout_add
753
722
        return True
754
723
    
761
730
            return
762
731
        logger.debug("Stopping checker for %(name)s", vars(self))
763
732
        try:
764
 
            self.checker.terminate()
 
733
            os.kill(self.checker.pid, signal.SIGTERM)
765
734
            #time.sleep(0.5)
766
735
            #if self.checker.poll() is None:
767
 
            #    self.checker.kill()
 
736
            #    os.kill(self.checker.pid, signal.SIGKILL)
768
737
        except OSError as error:
769
738
            if error.errno != errno.ESRCH: # No such process
770
739
                raise
787
756
    # "Set" method, so we fail early here:
788
757
    if byte_arrays and signature != "ay":
789
758
        raise ValueError("Byte arrays not supported for non-'ay'"
790
 
                         " signature {0!r}".format(signature))
 
759
                         " signature %r" % signature)
791
760
    def decorator(func):
792
761
        func._dbus_is_property = True
793
762
        func._dbus_interface = dbus_interface
801
770
    return decorator
802
771
 
803
772
 
804
 
def dbus_interface_annotations(dbus_interface):
805
 
    """Decorator for marking functions returning interface annotations
806
 
    
807
 
    Usage:
808
 
    
809
 
    @dbus_interface_annotations("org.example.Interface")
810
 
    def _foo(self):  # Function name does not matter
811
 
        return {"org.freedesktop.DBus.Deprecated": "true",
812
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
813
 
                    "false"}
814
 
    """
815
 
    def decorator(func):
816
 
        func._dbus_is_interface = True
817
 
        func._dbus_interface = dbus_interface
818
 
        func._dbus_name = dbus_interface
819
 
        return func
820
 
    return decorator
821
 
 
822
 
 
823
 
def dbus_annotations(annotations):
824
 
    """Decorator to annotate D-Bus methods, signals or properties
825
 
    Usage:
826
 
    
827
 
    @dbus_service_property("org.example.Interface", signature="b",
828
 
                           access="r")
829
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
830
 
                        "org.freedesktop.DBus.Property."
831
 
                        "EmitsChangedSignal": "false"})
832
 
    def Property_dbus_property(self):
833
 
        return dbus.Boolean(False)
834
 
    """
835
 
    def decorator(func):
836
 
        func._dbus_annotations = annotations
837
 
        return func
838
 
    return decorator
839
 
 
840
 
 
841
773
class DBusPropertyException(dbus.exceptions.DBusException):
842
774
    """A base class for D-Bus property-related exceptions
843
775
    """
866
798
    """
867
799
    
868
800
    @staticmethod
869
 
    def _is_dbus_thing(thing):
870
 
        """Returns a function testing if an attribute is a D-Bus thing
871
 
        
872
 
        If called like _is_dbus_thing("method") it returns a function
873
 
        suitable for use as predicate to inspect.getmembers().
874
 
        """
875
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
876
 
                                   False)
 
801
    def _is_dbus_property(obj):
 
802
        return getattr(obj, "_dbus_is_property", False)
877
803
    
878
 
    def _get_all_dbus_things(self, thing):
 
804
    def _get_all_dbus_properties(self):
879
805
        """Returns a generator of (name, attribute) pairs
880
806
        """
881
 
        return ((getattr(athing.__get__(self), "_dbus_name",
882
 
                         name),
883
 
                 athing.__get__(self))
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
884
808
                for cls in self.__class__.__mro__
885
 
                for name, athing in
886
 
                inspect.getmembers(cls,
887
 
                                   self._is_dbus_thing(thing)))
 
809
                for name, prop in
 
810
                inspect.getmembers(cls, self._is_dbus_property))
888
811
    
889
812
    def _get_dbus_property(self, interface_name, property_name):
890
813
        """Returns a bound method if one exists which is a D-Bus
892
815
        """
893
816
        for cls in  self.__class__.__mro__:
894
817
            for name, value in (inspect.getmembers
895
 
                                (cls,
896
 
                                 self._is_dbus_thing("property"))):
 
818
                                (cls, self._is_dbus_property)):
897
819
                if (value._dbus_name == property_name
898
820
                    and value._dbus_interface == interface_name):
899
821
                    return value.__get__(self)
928
850
            # signatures other than "ay".
929
851
            if prop._dbus_signature != "ay":
930
852
                raise ValueError
931
 
            value = dbus.ByteArray(b''.join(chr(byte)
932
 
                                            for byte in value))
 
853
            value = dbus.ByteArray(''.join(unichr(byte)
 
854
                                           for byte in value))
933
855
        prop(value)
934
856
    
935
857
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
941
863
        Note: Will not include properties with access="write".
942
864
        """
943
865
        properties = {}
944
 
        for name, prop in self._get_all_dbus_things("property"):
 
866
        for name, prop in self._get_all_dbus_properties():
945
867
            if (interface_name
946
868
                and interface_name != prop._dbus_interface):
947
869
                # Interface non-empty but did not match
962
884
                         path_keyword='object_path',
963
885
                         connection_keyword='connection')
964
886
    def Introspect(self, object_path, connection):
965
 
        """Overloading of standard D-Bus method.
966
 
        
967
 
        Inserts property tags and interface annotation tags.
 
887
        """Standard D-Bus method, overloaded to insert property tags.
968
888
        """
969
889
        xmlstring = dbus.service.Object.Introspect(self, object_path,
970
890
                                                   connection)
977
897
                e.setAttribute("access", prop._dbus_access)
978
898
                return e
979
899
            for if_tag in document.getElementsByTagName("interface"):
980
 
                # Add property tags
981
900
                for tag in (make_tag(document, name, prop)
982
901
                            for name, prop
983
 
                            in self._get_all_dbus_things("property")
 
902
                            in self._get_all_dbus_properties()
984
903
                            if prop._dbus_interface
985
904
                            == if_tag.getAttribute("name")):
986
905
                    if_tag.appendChild(tag)
987
 
                # Add annotation tags
988
 
                for typ in ("method", "signal", "property"):
989
 
                    for tag in if_tag.getElementsByTagName(typ):
990
 
                        annots = dict()
991
 
                        for name, prop in (self.
992
 
                                           _get_all_dbus_things(typ)):
993
 
                            if (name == tag.getAttribute("name")
994
 
                                and prop._dbus_interface
995
 
                                == if_tag.getAttribute("name")):
996
 
                                annots.update(getattr
997
 
                                              (prop,
998
 
                                               "_dbus_annotations",
999
 
                                               {}))
1000
 
                        for name, value in annots.iteritems():
1001
 
                            ann_tag = document.createElement(
1002
 
                                "annotation")
1003
 
                            ann_tag.setAttribute("name", name)
1004
 
                            ann_tag.setAttribute("value", value)
1005
 
                            tag.appendChild(ann_tag)
1006
 
                # Add interface annotation tags
1007
 
                for annotation, value in dict(
1008
 
                    itertools.chain.from_iterable(
1009
 
                        annotations().iteritems()
1010
 
                        for name, annotations in
1011
 
                        self._get_all_dbus_things("interface")
1012
 
                        if name == if_tag.getAttribute("name")
1013
 
                        )).iteritems():
1014
 
                    ann_tag = document.createElement("annotation")
1015
 
                    ann_tag.setAttribute("name", annotation)
1016
 
                    ann_tag.setAttribute("value", value)
1017
 
                    if_tag.appendChild(ann_tag)
1018
906
                # Add the names to the return values for the
1019
907
                # "org.freedesktop.DBus.Properties" methods
1020
908
                if (if_tag.getAttribute("name")
1035
923
        except (AttributeError, xml.dom.DOMException,
1036
924
                xml.parsers.expat.ExpatError) as error:
1037
925
            logger.error("Failed to override Introspection method",
1038
 
                         exc_info=error)
 
926
                         error)
1039
927
        return xmlstring
1040
928
 
1041
929
 
1042
 
def datetime_to_dbus(dt, variant_level=0):
 
930
def datetime_to_dbus (dt, variant_level=0):
1043
931
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1044
932
    if dt is None:
1045
933
        return dbus.String("", variant_level = variant_level)
1047
935
                       variant_level=variant_level)
1048
936
 
1049
937
 
1050
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1051
 
    """A class decorator; applied to a subclass of
1052
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1053
 
    interface names according to the "alt_interface_names" mapping.
1054
 
    Usage:
1055
 
    
1056
 
    @alternate_dbus_interfaces({"org.example.Interface":
1057
 
                                    "net.example.AlternateInterface"})
1058
 
    class SampleDBusObject(dbus.service.Object):
1059
 
        @dbus.service.method("org.example.Interface")
1060
 
        def SampleDBusMethod():
1061
 
            pass
1062
 
    
1063
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1064
 
    reachable via two interfaces: "org.example.Interface" and
1065
 
    "net.example.AlternateInterface", the latter of which will have
1066
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1067
 
    "true", unless "deprecate" is passed with a False value.
1068
 
    
1069
 
    This works for methods and signals, and also for D-Bus properties
1070
 
    (from DBusObjectWithProperties) and interfaces (from the
1071
 
    dbus_interface_annotations decorator).
 
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
939
                                  .__metaclass__):
 
940
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
941
    will add additional D-Bus attributes matching a certain pattern.
1072
942
    """
1073
 
    def wrapper(cls):
1074
 
        for orig_interface_name, alt_interface_name in (
1075
 
            alt_interface_names.iteritems()):
1076
 
            attr = {}
1077
 
            interface_names = set()
1078
 
            # Go though all attributes of the class
1079
 
            for attrname, attribute in inspect.getmembers(cls):
 
943
    def __new__(mcs, name, bases, attr):
 
944
        # Go through all the base classes which could have D-Bus
 
945
        # methods, signals, or properties in them
 
946
        for base in (b for b in bases
 
947
                     if issubclass(b, dbus.service.Object)):
 
948
            # Go though all attributes of the base class
 
949
            for attrname, attribute in inspect.getmembers(base):
1080
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
1081
951
                # with the wrong interface name
1082
952
                if (not hasattr(attribute, "_dbus_interface")
1083
953
                    or not attribute._dbus_interface
1084
 
                    .startswith(orig_interface_name)):
 
954
                    .startswith("se.recompile.Mandos")):
1085
955
                    continue
1086
956
                # Create an alternate D-Bus interface name based on
1087
957
                # the current name
1088
958
                alt_interface = (attribute._dbus_interface
1089
 
                                 .replace(orig_interface_name,
1090
 
                                          alt_interface_name))
1091
 
                interface_names.add(alt_interface)
 
959
                                 .replace("se.recompile.Mandos",
 
960
                                          "se.bsnet.fukt.Mandos"))
1092
961
                # Is this a D-Bus signal?
1093
962
                if getattr(attribute, "_dbus_is_signal", False):
1094
 
                    # Extract the original non-method undecorated
1095
 
                    # function by black magic
 
963
                    # Extract the original non-method function by
 
964
                    # black magic
1096
965
                    nonmethod_func = (dict(
1097
966
                            zip(attribute.func_code.co_freevars,
1098
967
                                attribute.__closure__))["func"]
1109
978
                                nonmethod_func.func_name,
1110
979
                                nonmethod_func.func_defaults,
1111
980
                                nonmethod_func.func_closure)))
1112
 
                    # Copy annotations, if any
1113
 
                    try:
1114
 
                        new_function._dbus_annotations = (
1115
 
                            dict(attribute._dbus_annotations))
1116
 
                    except AttributeError:
1117
 
                        pass
1118
981
                    # Define a creator of a function to call both the
1119
 
                    # original and alternate functions, so both the
1120
 
                    # original and alternate signals gets sent when
1121
 
                    # the function is called
 
982
                    # old and new functions, so both the old and new
 
983
                    # signals gets sent when the function is called
1122
984
                    def fixscope(func1, func2):
1123
985
                        """This function is a scope container to pass
1124
986
                        func1 and func2 to the "call_both" function
1131
993
                        return call_both
1132
994
                    # Create the "call_both" function and add it to
1133
995
                    # the class
1134
 
                    attr[attrname] = fixscope(attribute, new_function)
 
996
                    attr[attrname] = fixscope(attribute,
 
997
                                              new_function)
1135
998
                # Is this a D-Bus method?
1136
999
                elif getattr(attribute, "_dbus_is_method", False):
1137
1000
                    # Create a new, but exactly alike, function
1148
1011
                                        attribute.func_name,
1149
1012
                                        attribute.func_defaults,
1150
1013
                                        attribute.func_closure)))
1151
 
                    # Copy annotations, if any
1152
 
                    try:
1153
 
                        attr[attrname]._dbus_annotations = (
1154
 
                            dict(attribute._dbus_annotations))
1155
 
                    except AttributeError:
1156
 
                        pass
1157
1014
                # Is this a D-Bus property?
1158
1015
                elif getattr(attribute, "_dbus_is_property", False):
1159
1016
                    # Create a new, but exactly alike, function
1173
1030
                                        attribute.func_name,
1174
1031
                                        attribute.func_defaults,
1175
1032
                                        attribute.func_closure)))
1176
 
                    # Copy annotations, if any
1177
 
                    try:
1178
 
                        attr[attrname]._dbus_annotations = (
1179
 
                            dict(attribute._dbus_annotations))
1180
 
                    except AttributeError:
1181
 
                        pass
1182
 
                # Is this a D-Bus interface?
1183
 
                elif getattr(attribute, "_dbus_is_interface", False):
1184
 
                    # Create a new, but exactly alike, function
1185
 
                    # object.  Decorate it to be a new D-Bus interface
1186
 
                    # with the alternate D-Bus interface name.  Add it
1187
 
                    # to the class.
1188
 
                    attr[attrname] = (dbus_interface_annotations
1189
 
                                      (alt_interface)
1190
 
                                      (types.FunctionType
1191
 
                                       (attribute.func_code,
1192
 
                                        attribute.func_globals,
1193
 
                                        attribute.func_name,
1194
 
                                        attribute.func_defaults,
1195
 
                                        attribute.func_closure)))
1196
 
            if deprecate:
1197
 
                # Deprecate all alternate interfaces
1198
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1199
 
                for interface_name in interface_names:
1200
 
                    @dbus_interface_annotations(interface_name)
1201
 
                    def func(self):
1202
 
                        return { "org.freedesktop.DBus.Deprecated":
1203
 
                                     "true" }
1204
 
                    # Find an unused name
1205
 
                    for aname in (iname.format(i)
1206
 
                                  for i in itertools.count()):
1207
 
                        if aname not in attr:
1208
 
                            attr[aname] = func
1209
 
                            break
1210
 
            if interface_names:
1211
 
                # Replace the class with a new subclass of it with
1212
 
                # methods, signals, etc. as created above.
1213
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1214
 
                           (cls,), attr)
1215
 
        return cls
1216
 
    return wrapper
1217
 
 
1218
 
 
1219
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1220
 
                                "se.bsnet.fukt.Mandos"})
 
1033
        return type.__new__(mcs, name, bases, attr)
 
1034
 
 
1035
 
1221
1036
class ClientDBus(Client, DBusObjectWithProperties):
1222
1037
    """A Client class using D-Bus
1223
1038
    
1234
1049
    def __init__(self, bus = None, *args, **kwargs):
1235
1050
        self.bus = bus
1236
1051
        Client.__init__(self, *args, **kwargs)
 
1052
        self._approvals_pending = 0
 
1053
        
 
1054
        self._approvals_pending = 0
1237
1055
        # Only now, when this client is initialized, can it show up on
1238
1056
        # the D-Bus
1239
1057
        client_object_name = unicode(self.name).translate(
1243
1061
                                 ("/clients/" + client_object_name))
1244
1062
        DBusObjectWithProperties.__init__(self, self.bus,
1245
1063
                                          self.dbus_object_path)
1246
 
    
 
1064
        
1247
1065
    def notifychangeproperty(transform_func,
1248
1066
                             dbus_name, type_func=lambda x: x,
1249
1067
                             variant_level=1):
1272
1090
        
1273
1091
        return property(lambda self: getattr(self, attrname), setter)
1274
1092
    
 
1093
    
1275
1094
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1276
1095
    approvals_pending = notifychangeproperty(dbus.Boolean,
1277
1096
                                             "ApprovalPending",
1284
1103
                                       checker is not None)
1285
1104
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1286
1105
                                           "LastCheckedOK")
1287
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1288
 
                                               "LastCheckerStatus")
1289
1106
    last_approval_request = notifychangeproperty(
1290
1107
        datetime_to_dbus, "LastApprovalRequest")
1291
1108
    approved_by_default = notifychangeproperty(dbus.Boolean,
1359
1176
        return False
1360
1177
    
1361
1178
    def approve(self, value=True):
 
1179
        self.send_changedstate()
1362
1180
        self.approved = value
1363
1181
        gobject.timeout_add(timedelta_to_milliseconds
1364
1182
                            (self.approval_duration),
1365
1183
                            self._reset_approved)
1366
 
        self.send_changedstate()
 
1184
    
1367
1185
    
1368
1186
    ## D-Bus methods, signals & properties
1369
1187
    _interface = "se.recompile.Mandos.Client"
1370
1188
    
1371
 
    ## Interfaces
1372
 
    
1373
 
    @dbus_interface_annotations(_interface)
1374
 
    def _foo(self):
1375
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1376
 
                     "false"}
1377
 
    
1378
1189
    ## Signals
1379
1190
    
1380
1191
    # CheckerCompleted - signal
1416
1227
        "D-Bus signal"
1417
1228
        return self.need_approval()
1418
1229
    
 
1230
    # NeRwequest - signal
 
1231
    @dbus.service.signal(_interface, signature="s")
 
1232
    def NewRequest(self, ip):
 
1233
        """D-Bus signal
 
1234
        Is sent after a client request a password.
 
1235
        """
 
1236
        pass
 
1237
    
1419
1238
    ## Methods
1420
1239
    
1421
1240
    # Approve - method
1531
1350
            return
1532
1351
        return datetime_to_dbus(self.last_checked_ok)
1533
1352
    
1534
 
    # LastCheckerStatus - property
1535
 
    @dbus_service_property(_interface, signature="n",
1536
 
                           access="read")
1537
 
    def LastCheckerStatus_dbus_property(self):
1538
 
        return dbus.Int16(self.last_checker_status)
1539
 
    
1540
1353
    # Expires - property
1541
1354
    @dbus_service_property(_interface, signature="s", access="read")
1542
1355
    def Expires_dbus_property(self):
1553
1366
    def Timeout_dbus_property(self, value=None):
1554
1367
        if value is None:       # get
1555
1368
            return dbus.UInt64(self.timeout_milliseconds())
1556
 
        old_timeout = self.timeout
1557
1369
        self.timeout = datetime.timedelta(0, 0, 0, value)
1558
 
        # Reschedule disabling
 
1370
        # Reschedule timeout
1559
1371
        if self.enabled:
1560
1372
            now = datetime.datetime.utcnow()
1561
 
            self.expires += self.timeout - old_timeout
1562
 
            if self.expires <= now:
 
1373
            time_to_die = timedelta_to_milliseconds(
 
1374
                (self.last_checked_ok + self.timeout) - now)
 
1375
            if time_to_die <= 0:
1563
1376
                # The timeout has passed
1564
1377
                self.disable()
1565
1378
            else:
 
1379
                self.expires = (now +
 
1380
                                datetime.timedelta(milliseconds =
 
1381
                                                   time_to_die))
1566
1382
                if (getattr(self, "disable_initiator_tag", None)
1567
1383
                    is None):
1568
1384
                    return
1569
1385
                gobject.source_remove(self.disable_initiator_tag)
1570
 
                self.disable_initiator_tag = (
1571
 
                    gobject.timeout_add(
1572
 
                        timedelta_to_milliseconds(self.expires - now),
1573
 
                        self.disable))
 
1386
                self.disable_initiator_tag = (gobject.timeout_add
 
1387
                                              (time_to_die,
 
1388
                                               self.disable))
1574
1389
    
1575
1390
    # ExtendedTimeout - property
1576
1391
    @dbus_service_property(_interface, signature="t",
1655
1470
        self._pipe.send(('setattr', name, value))
1656
1471
 
1657
1472
 
 
1473
class ClientDBusTransitional(ClientDBus):
 
1474
    __metaclass__ = AlternateDBusNamesMetaclass
 
1475
 
 
1476
 
1658
1477
class ClientHandler(socketserver.BaseRequestHandler, object):
1659
1478
    """A class to handle client connections.
1660
1479
    
1728
1547
                except KeyError:
1729
1548
                    return
1730
1549
                
 
1550
                if self.server.use_dbus:
 
1551
                    # Emit D-Bus signal
 
1552
                    client.NewRequest(str(self.client_address))
 
1553
                
1731
1554
                if client.approval_delay:
1732
1555
                    delay = client.approval_delay
1733
1556
                    client.approvals_pending += 1
1764
1587
                    #wait until timeout or approved
1765
1588
                    time = datetime.datetime.now()
1766
1589
                    client.changedstate.acquire()
1767
 
                    client.changedstate.wait(
1768
 
                        float(timedelta_to_milliseconds(delay)
1769
 
                              / 1000))
 
1590
                    (client.changedstate.wait
 
1591
                     (float(client.timedelta_to_milliseconds(delay)
 
1592
                            / 1000)))
1770
1593
                    client.changedstate.release()
1771
1594
                    time2 = datetime.datetime.now()
1772
1595
                    if (time2 - time) >= delay:
1788
1611
                    try:
1789
1612
                        sent = session.send(client.secret[sent_size:])
1790
1613
                    except gnutls.errors.GNUTLSError as error:
1791
 
                        logger.warning("gnutls send failed",
1792
 
                                       exc_info=error)
 
1614
                        logger.warning("gnutls send failed")
1793
1615
                        return
1794
1616
                    logger.debug("Sent: %d, remaining: %d",
1795
1617
                                 sent, len(client.secret)
1798
1620
                
1799
1621
                logger.info("Sending secret to %s", client.name)
1800
1622
                # bump the timeout using extended_timeout
1801
 
                client.bump_timeout(client.extended_timeout)
 
1623
                client.checked_ok(client.extended_timeout)
1802
1624
                if self.server.use_dbus:
1803
1625
                    # Emit D-Bus signal
1804
1626
                    client.GotSecret()
1809
1631
                try:
1810
1632
                    session.bye()
1811
1633
                except gnutls.errors.GNUTLSError as error:
1812
 
                    logger.warning("GnuTLS bye failed",
1813
 
                                   exc_info=error)
 
1634
                    logger.warning("GnuTLS bye failed")
1814
1635
    
1815
1636
    @staticmethod
1816
1637
    def peer_certificate(session):
1888
1709
    def process_request(self, request, address):
1889
1710
        """Start a new process to process the request."""
1890
1711
        proc = multiprocessing.Process(target = self.sub_process_main,
1891
 
                                       args = (request, address))
 
1712
                                       args = (request,
 
1713
                                               address))
1892
1714
        proc.start()
1893
1715
        return proc
1894
1716
 
1922
1744
        use_ipv6:       Boolean; to use IPv6 or not
1923
1745
    """
1924
1746
    def __init__(self, server_address, RequestHandlerClass,
1925
 
                 interface=None, use_ipv6=True, socketfd=None):
1926
 
        """If socketfd is set, use that file descriptor instead of
1927
 
        creating a new one with socket.socket().
1928
 
        """
 
1747
                 interface=None, use_ipv6=True):
1929
1748
        self.interface = interface
1930
1749
        if use_ipv6:
1931
1750
            self.address_family = socket.AF_INET6
1932
 
        if socketfd is not None:
1933
 
            # Save the file descriptor
1934
 
            self.socketfd = socketfd
1935
 
            # Save the original socket.socket() function
1936
 
            self.socket_socket = socket.socket
1937
 
            # To implement --socket, we monkey patch socket.socket.
1938
 
            # 
1939
 
            # (When socketserver.TCPServer is a new-style class, we
1940
 
            # could make self.socket into a property instead of monkey
1941
 
            # patching socket.socket.)
1942
 
            # 
1943
 
            # Create a one-time-only replacement for socket.socket()
1944
 
            @functools.wraps(socket.socket)
1945
 
            def socket_wrapper(*args, **kwargs):
1946
 
                # Restore original function so subsequent calls are
1947
 
                # not affected.
1948
 
                socket.socket = self.socket_socket
1949
 
                del self.socket_socket
1950
 
                # This time only, return a new socket object from the
1951
 
                # saved file descriptor.
1952
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1953
 
            # Replace socket.socket() function with wrapper
1954
 
            socket.socket = socket_wrapper
1955
 
        # The socketserver.TCPServer.__init__ will call
1956
 
        # socket.socket(), which might be our replacement,
1957
 
        # socket_wrapper(), if socketfd was set.
1958
1751
        socketserver.TCPServer.__init__(self, server_address,
1959
1752
                                        RequestHandlerClass)
1960
 
    
1961
1753
    def server_bind(self):
1962
1754
        """This overrides the normal server_bind() function
1963
1755
        to bind to an interface if one was specified, and also NOT to
1971
1763
                try:
1972
1764
                    self.socket.setsockopt(socket.SOL_SOCKET,
1973
1765
                                           SO_BINDTODEVICE,
1974
 
                                           str(self.interface + '\0'))
 
1766
                                           str(self.interface
 
1767
                                               + '\0'))
1975
1768
                except socket.error as error:
1976
 
                    if error.errno == errno.EPERM:
1977
 
                        logger.error("No permission to bind to"
1978
 
                                     " interface %s", self.interface)
1979
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1769
                    if error[0] == errno.EPERM:
 
1770
                        logger.error("No permission to"
 
1771
                                     " bind to interface %s",
 
1772
                                     self.interface)
 
1773
                    elif error[0] == errno.ENOPROTOOPT:
1980
1774
                        logger.error("SO_BINDTODEVICE not available;"
1981
1775
                                     " cannot bind to interface %s",
1982
1776
                                     self.interface)
1983
 
                    elif error.errno == errno.ENODEV:
1984
 
                        logger.error("Interface %s does not exist,"
1985
 
                                     " cannot bind", self.interface)
1986
1777
                    else:
1987
1778
                        raise
1988
1779
        # Only bind(2) the socket if we really need to.
1991
1782
                if self.address_family == socket.AF_INET6:
1992
1783
                    any_address = "::" # in6addr_any
1993
1784
                else:
1994
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1785
                    any_address = socket.INADDR_ANY
1995
1786
                self.server_address = (any_address,
1996
1787
                                       self.server_address[1])
1997
1788
            elif not self.server_address[1]:
2018
1809
    """
2019
1810
    def __init__(self, server_address, RequestHandlerClass,
2020
1811
                 interface=None, use_ipv6=True, clients=None,
2021
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1812
                 gnutls_priority=None, use_dbus=True):
2022
1813
        self.enabled = False
2023
1814
        self.clients = clients
2024
1815
        if self.clients is None:
2028
1819
        IPv6_TCPServer.__init__(self, server_address,
2029
1820
                                RequestHandlerClass,
2030
1821
                                interface = interface,
2031
 
                                use_ipv6 = use_ipv6,
2032
 
                                socketfd = socketfd)
 
1822
                                use_ipv6 = use_ipv6)
2033
1823
    def server_activate(self):
2034
1824
        if self.enabled:
2035
1825
            return socketserver.TCPServer.server_activate(self)
2048
1838
    
2049
1839
    def handle_ipc(self, source, condition, parent_pipe=None,
2050
1840
                   proc = None, client_object=None):
 
1841
        condition_names = {
 
1842
            gobject.IO_IN: "IN",   # There is data to read.
 
1843
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1844
                                    # blocking).
 
1845
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1846
            gobject.IO_ERR: "ERR", # Error condition.
 
1847
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1848
                                    # broken, usually for pipes and
 
1849
                                    # sockets).
 
1850
            }
 
1851
        conditions_string = ' | '.join(name
 
1852
                                       for cond, name in
 
1853
                                       condition_names.iteritems()
 
1854
                                       if cond & condition)
2051
1855
        # error, or the other end of multiprocessing.Pipe has closed
2052
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1856
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2053
1857
            # Wait for other process to exit
2054
1858
            proc.join()
2055
1859
            return False
2113
1917
        return True
2114
1918
 
2115
1919
 
2116
 
def rfc3339_duration_to_delta(duration):
2117
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2118
 
    
2119
 
    >>> rfc3339_duration_to_delta("P7D")
2120
 
    datetime.timedelta(7)
2121
 
    >>> rfc3339_duration_to_delta("PT60S")
2122
 
    datetime.timedelta(0, 60)
2123
 
    >>> rfc3339_duration_to_delta("PT60M")
2124
 
    datetime.timedelta(0, 3600)
2125
 
    >>> rfc3339_duration_to_delta("PT24H")
2126
 
    datetime.timedelta(1)
2127
 
    >>> rfc3339_duration_to_delta("P1W")
2128
 
    datetime.timedelta(7)
2129
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2130
 
    datetime.timedelta(0, 330)
2131
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2132
 
    datetime.timedelta(1, 200)
2133
 
    """
2134
 
    
2135
 
    # Parsing an RFC 3339 duration with regular expressions is not
2136
 
    # possible - there would have to be multiple places for the same
2137
 
    # values, like seconds.  The current code, while more esoteric, is
2138
 
    # cleaner without depending on a parsing library.  If Python had a
2139
 
    # built-in library for parsing we would use it, but we'd like to
2140
 
    # avoid excessive use of external libraries.
2141
 
    
2142
 
    # New type for defining tokens, syntax, and semantics all-in-one
2143
 
    Token = collections.namedtuple("Token",
2144
 
                                   ("regexp", # To match token; if
2145
 
                                              # "value" is not None,
2146
 
                                              # must have a "group"
2147
 
                                              # containing digits
2148
 
                                    "value",  # datetime.timedelta or
2149
 
                                              # None
2150
 
                                    "followers")) # Tokens valid after
2151
 
                                                  # this token
2152
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2153
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2154
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2155
 
    token_second = Token(re.compile(r"(\d+)S"),
2156
 
                         datetime.timedelta(seconds=1),
2157
 
                         frozenset((token_end,)))
2158
 
    token_minute = Token(re.compile(r"(\d+)M"),
2159
 
                         datetime.timedelta(minutes=1),
2160
 
                         frozenset((token_second, token_end)))
2161
 
    token_hour = Token(re.compile(r"(\d+)H"),
2162
 
                       datetime.timedelta(hours=1),
2163
 
                       frozenset((token_minute, token_end)))
2164
 
    token_time = Token(re.compile(r"T"),
2165
 
                       None,
2166
 
                       frozenset((token_hour, token_minute,
2167
 
                                  token_second)))
2168
 
    token_day = Token(re.compile(r"(\d+)D"),
2169
 
                      datetime.timedelta(days=1),
2170
 
                      frozenset((token_time, token_end)))
2171
 
    token_month = Token(re.compile(r"(\d+)M"),
2172
 
                        datetime.timedelta(weeks=4),
2173
 
                        frozenset((token_day, token_end)))
2174
 
    token_year = Token(re.compile(r"(\d+)Y"),
2175
 
                       datetime.timedelta(weeks=52),
2176
 
                       frozenset((token_month, token_end)))
2177
 
    token_week = Token(re.compile(r"(\d+)W"),
2178
 
                       datetime.timedelta(weeks=1),
2179
 
                       frozenset((token_end,)))
2180
 
    token_duration = Token(re.compile(r"P"), None,
2181
 
                           frozenset((token_year, token_month,
2182
 
                                      token_day, token_time,
2183
 
                                      token_week))),
2184
 
    # Define starting values
2185
 
    value = datetime.timedelta() # Value so far
2186
 
    found_token = None
2187
 
    followers = frozenset(token_duration,) # Following valid tokens
2188
 
    s = duration                # String left to parse
2189
 
    # Loop until end token is found
2190
 
    while found_token is not token_end:
2191
 
        # Search for any currently valid tokens
2192
 
        for token in followers:
2193
 
            match = token.regexp.match(s)
2194
 
            if match is not None:
2195
 
                # Token found
2196
 
                if token.value is not None:
2197
 
                    # Value found, parse digits
2198
 
                    factor = int(match.group(1), 10)
2199
 
                    # Add to value so far
2200
 
                    value += factor * token.value
2201
 
                # Strip token from string
2202
 
                s = token.regexp.sub("", s, 1)
2203
 
                # Go to found token
2204
 
                found_token = token
2205
 
                # Set valid next tokens
2206
 
                followers = found_token.followers
2207
 
                break
2208
 
        else:
2209
 
            # No currently valid tokens were found
2210
 
            raise ValueError("Invalid RFC 3339 duration")
2211
 
    # End token found
2212
 
    return value
2213
 
 
2214
 
 
2215
1920
def string_to_delta(interval):
2216
1921
    """Parse a string and return a datetime.timedelta
2217
1922
    
2228
1933
    >>> string_to_delta('5m 30s')
2229
1934
    datetime.timedelta(0, 330)
2230
1935
    """
2231
 
    
2232
 
    try:
2233
 
        return rfc3339_duration_to_delta(interval)
2234
 
    except ValueError:
2235
 
        pass
2236
 
    
2237
1936
    timevalue = datetime.timedelta(0)
2238
1937
    for s in interval.split():
2239
1938
        try:
2250
1949
            elif suffix == "w":
2251
1950
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2252
1951
            else:
2253
 
                raise ValueError("Unknown suffix {0!r}"
2254
 
                                 .format(suffix))
 
1952
                raise ValueError("Unknown suffix %r" % suffix)
2255
1953
        except (ValueError, IndexError) as e:
2256
1954
            raise ValueError(*(e.args))
2257
1955
        timevalue += delta
2271
1969
        sys.exit()
2272
1970
    if not noclose:
2273
1971
        # Close all standard open file descriptors
2274
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1972
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2275
1973
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2276
1974
            raise OSError(errno.ENODEV,
2277
 
                          "{0} not a character device"
2278
 
                          .format(os.devnull))
 
1975
                          "%s not a character device"
 
1976
                          % os.path.devnull)
2279
1977
        os.dup2(null, sys.stdin.fileno())
2280
1978
        os.dup2(null, sys.stdout.fileno())
2281
1979
        os.dup2(null, sys.stderr.fileno())
2290
1988
    
2291
1989
    parser = argparse.ArgumentParser()
2292
1990
    parser.add_argument("-v", "--version", action="version",
2293
 
                        version = "%(prog)s {0}".format(version),
 
1991
                        version = "%%(prog)s %s" % version,
2294
1992
                        help="show version number and exit")
2295
1993
    parser.add_argument("-i", "--interface", metavar="IF",
2296
1994
                        help="Bind to interface IF")
2302
2000
                        help="Run self-test")
2303
2001
    parser.add_argument("--debug", action="store_true",
2304
2002
                        help="Debug mode; run in foreground and log"
2305
 
                        " to terminal", default=None)
 
2003
                        " to terminal")
2306
2004
    parser.add_argument("--debuglevel", metavar="LEVEL",
2307
2005
                        help="Debug level for stdout output")
2308
2006
    parser.add_argument("--priority", help="GnuTLS"
2315
2013
                        " files")
2316
2014
    parser.add_argument("--no-dbus", action="store_false",
2317
2015
                        dest="use_dbus", help="Do not provide D-Bus"
2318
 
                        " system bus interface", default=None)
 
2016
                        " system bus interface")
2319
2017
    parser.add_argument("--no-ipv6", action="store_false",
2320
 
                        dest="use_ipv6", help="Do not use IPv6",
2321
 
                        default=None)
 
2018
                        dest="use_ipv6", help="Do not use IPv6")
2322
2019
    parser.add_argument("--no-restore", action="store_false",
2323
2020
                        dest="restore", help="Do not restore stored"
2324
 
                        " state", default=None)
2325
 
    parser.add_argument("--socket", type=int,
2326
 
                        help="Specify a file descriptor to a network"
2327
 
                        " socket to use instead of creating one")
 
2021
                        " state")
2328
2022
    parser.add_argument("--statedir", metavar="DIR",
2329
2023
                        help="Directory to save/restore state in")
2330
 
    parser.add_argument("--foreground", action="store_true",
2331
 
                        help="Run in foreground", default=None)
2332
2024
    
2333
2025
    options = parser.parse_args()
2334
2026
    
2343
2035
                        "port": "",
2344
2036
                        "debug": "False",
2345
2037
                        "priority":
2346
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
 
2038
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2347
2039
                        "servicename": "Mandos",
2348
2040
                        "use_dbus": "True",
2349
2041
                        "use_ipv6": "True",
2350
2042
                        "debuglevel": "",
2351
2043
                        "restore": "True",
2352
 
                        "socket": "",
2353
 
                        "statedir": "/var/lib/mandos",
2354
 
                        "foreground": "False",
 
2044
                        "statedir": "/var/lib/mandos"
2355
2045
                        }
2356
2046
    
2357
2047
    # Parse config file for server-global settings
2362
2052
    # Convert the SafeConfigParser object to a dict
2363
2053
    server_settings = server_config.defaults()
2364
2054
    # Use the appropriate methods on the non-string config options
2365
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2055
    for option in ("debug", "use_dbus", "use_ipv6"):
2366
2056
        server_settings[option] = server_config.getboolean("DEFAULT",
2367
2057
                                                           option)
2368
2058
    if server_settings["port"]:
2369
2059
        server_settings["port"] = server_config.getint("DEFAULT",
2370
2060
                                                       "port")
2371
 
    if server_settings["socket"]:
2372
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2373
 
                                                         "socket")
2374
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2375
 
        # over with an opened os.devnull.  But we don't want this to
2376
 
        # happen with a supplied network socket.
2377
 
        if 0 <= server_settings["socket"] <= 2:
2378
 
            server_settings["socket"] = os.dup(server_settings
2379
 
                                               ["socket"])
2380
2061
    del server_config
2381
2062
    
2382
2063
    # Override the settings from the config file with command line
2384
2065
    for option in ("interface", "address", "port", "debug",
2385
2066
                   "priority", "servicename", "configdir",
2386
2067
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2387
 
                   "statedir", "socket", "foreground"):
 
2068
                   "statedir"):
2388
2069
        value = getattr(options, option)
2389
2070
        if value is not None:
2390
2071
            server_settings[option] = value
2393
2074
    for option in server_settings.keys():
2394
2075
        if type(server_settings[option]) is str:
2395
2076
            server_settings[option] = unicode(server_settings[option])
2396
 
    # Force all boolean options to be boolean
2397
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2398
 
                   "foreground"):
2399
 
        server_settings[option] = bool(server_settings[option])
2400
 
    # Debug implies foreground
2401
 
    if server_settings["debug"]:
2402
 
        server_settings["foreground"] = True
2403
2077
    # Now we have our good server settings in "server_settings"
2404
2078
    
2405
2079
    ##################################################################
2411
2085
    use_ipv6 = server_settings["use_ipv6"]
2412
2086
    stored_state_path = os.path.join(server_settings["statedir"],
2413
2087
                                     stored_state_file)
2414
 
    foreground = server_settings["foreground"]
2415
2088
    
2416
2089
    if debug:
2417
2090
        initlogger(debug, logging.DEBUG)
2424
2097
    
2425
2098
    if server_settings["servicename"] != "Mandos":
2426
2099
        syslogger.setFormatter(logging.Formatter
2427
 
                               ('Mandos ({0}) [%(process)d]:'
2428
 
                                ' %(levelname)s: %(message)s'
2429
 
                                .format(server_settings
2430
 
                                        ["servicename"])))
 
2100
                               ('Mandos (%s) [%%(process)d]:'
 
2101
                                ' %%(levelname)s: %%(message)s'
 
2102
                                % server_settings["servicename"]))
2431
2103
    
2432
2104
    # Parse config file with clients
2433
2105
    client_config = configparser.SafeConfigParser(Client
2446
2118
                              use_ipv6=use_ipv6,
2447
2119
                              gnutls_priority=
2448
2120
                              server_settings["priority"],
2449
 
                              use_dbus=use_dbus,
2450
 
                              socketfd=(server_settings["socket"]
2451
 
                                        or None))
2452
 
    if not foreground:
 
2121
                              use_dbus=use_dbus)
 
2122
    if not debug:
2453
2123
        pidfilename = "/var/run/mandos.pid"
2454
 
        pidfile = None
2455
2124
        try:
2456
2125
            pidfile = open(pidfilename, "w")
2457
 
        except IOError as e:
2458
 
            logger.error("Could not open file %r", pidfilename,
2459
 
                         exc_info=e)
 
2126
        except IOError:
 
2127
            logger.error("Could not open file %r", pidfilename)
2460
2128
    
2461
 
    for name in ("_mandos", "mandos", "nobody"):
 
2129
    try:
 
2130
        uid = pwd.getpwnam("_mandos").pw_uid
 
2131
        gid = pwd.getpwnam("_mandos").pw_gid
 
2132
    except KeyError:
2462
2133
        try:
2463
 
            uid = pwd.getpwnam(name).pw_uid
2464
 
            gid = pwd.getpwnam(name).pw_gid
2465
 
            break
 
2134
            uid = pwd.getpwnam("mandos").pw_uid
 
2135
            gid = pwd.getpwnam("mandos").pw_gid
2466
2136
        except KeyError:
2467
 
            continue
2468
 
    else:
2469
 
        uid = 65534
2470
 
        gid = 65534
 
2137
            try:
 
2138
                uid = pwd.getpwnam("nobody").pw_uid
 
2139
                gid = pwd.getpwnam("nobody").pw_gid
 
2140
            except KeyError:
 
2141
                uid = 65534
 
2142
                gid = 65534
2471
2143
    try:
2472
2144
        os.setgid(gid)
2473
2145
        os.setuid(uid)
2474
2146
    except OSError as error:
2475
 
        if error.errno != errno.EPERM:
 
2147
        if error[0] != errno.EPERM:
2476
2148
            raise error
2477
2149
    
2478
2150
    if debug:
2490
2162
         .gnutls_global_set_log_function(debug_gnutls))
2491
2163
        
2492
2164
        # Redirect stdin so all checkers get /dev/null
2493
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2165
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2494
2166
        os.dup2(null, sys.stdin.fileno())
2495
2167
        if null > 2:
2496
2168
            os.close(null)
2497
2169
    
2498
2170
    # Need to fork before connecting to D-Bus
2499
 
    if not foreground:
 
2171
    if not debug:
2500
2172
        # Close all input and output, do double fork, etc.
2501
2173
        daemon()
2502
2174
    
2503
 
    # multiprocessing will use threads, so before we use gobject we
2504
 
    # need to inform gobject that threads will be used.
2505
2175
    gobject.threads_init()
2506
2176
    
2507
2177
    global main_loop
2508
2178
    # From the Avahi example code
2509
 
    DBusGMainLoop(set_as_default=True)
 
2179
    DBusGMainLoop(set_as_default=True )
2510
2180
    main_loop = gobject.MainLoop()
2511
2181
    bus = dbus.SystemBus()
2512
2182
    # End of Avahi example code
2518
2188
                            ("se.bsnet.fukt.Mandos", bus,
2519
2189
                             do_not_queue=True))
2520
2190
        except dbus.exceptions.NameExistsException as e:
2521
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2191
            logger.error(unicode(e) + ", disabling D-Bus")
2522
2192
            use_dbus = False
2523
2193
            server_settings["use_dbus"] = False
2524
2194
            tcp_server.use_dbus = False
2536
2206
    
2537
2207
    client_class = Client
2538
2208
    if use_dbus:
2539
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2209
        client_class = functools.partial(ClientDBusTransitional,
 
2210
                                         bus = bus)
2540
2211
    
2541
2212
    client_settings = Client.config_parser(client_config)
2542
2213
    old_client_settings = {}
2543
2214
    clients_data = {}
2544
2215
    
2545
 
    # This is used to redirect stdout and stderr for checker processes
2546
 
    global wnull
2547
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2548
 
    # Only used if server is running in foreground but not in debug
2549
 
    # mode
2550
 
    if debug or not foreground:
2551
 
        wnull.close()
2552
 
    
2553
2216
    # Get client data and settings from last running state.
2554
2217
    if server_settings["restore"]:
2555
2218
        try:
2558
2221
                                                     (stored_state))
2559
2222
            os.remove(stored_state_path)
2560
2223
        except IOError as e:
2561
 
            if e.errno == errno.ENOENT:
2562
 
                logger.warning("Could not load persistent state: {0}"
2563
 
                                .format(os.strerror(e.errno)))
2564
 
            else:
2565
 
                logger.critical("Could not load persistent state:",
2566
 
                                exc_info=e)
 
2224
            logger.warning("Could not load persistent state: {0}"
 
2225
                           .format(e))
 
2226
            if e.errno != errno.ENOENT:
2567
2227
                raise
2568
2228
        except EOFError as e:
2569
2229
            logger.warning("Could not load persistent state: "
2570
 
                           "EOFError:", exc_info=e)
 
2230
                           "EOFError: {0}".format(e))
2571
2231
    
2572
2232
    with PGPEngine() as pgp:
2573
2233
        for client_name, client in clients_data.iteritems():
2574
 
            # Skip removed clients
2575
 
            if client_name not in client_settings:
2576
 
                continue
2577
 
            
2578
2234
            # Decide which value to use after restoring saved state.
2579
2235
            # We have three different values: Old config file,
2580
2236
            # new config file, and saved state.
2594
2250
            
2595
2251
            # Clients who has passed its expire date can still be
2596
2252
            # enabled if its last checker was successful.  Clients
2597
 
            # whose checker succeeded before we stored its state is
2598
 
            # assumed to have successfully run all checkers during
2599
 
            # downtime.
 
2253
            # whose checker failed before we stored its state is
 
2254
            # assumed to have failed all checkers during downtime.
2600
2255
            if client["enabled"]:
2601
2256
                if datetime.datetime.utcnow() >= client["expires"]:
2602
2257
                    if not client["last_checked_ok"]:
2603
2258
                        logger.warning(
2604
2259
                            "disabling client {0} - Client never "
2605
 
                            "performed a successful checker"
2606
 
                            .format(client_name))
 
2260
                            "performed a successfull checker"
 
2261
                            .format(client["name"]))
2607
2262
                        client["enabled"] = False
2608
2263
                    elif client["last_checker_status"] != 0:
2609
2264
                        logger.warning(
2610
2265
                            "disabling client {0} - Client "
2611
2266
                            "last checker failed with error code {1}"
2612
 
                            .format(client_name,
 
2267
                            .format(client["name"],
2613
2268
                                    client["last_checker_status"]))
2614
2269
                        client["enabled"] = False
2615
2270
                    else:
2618
2273
                                             + client["timeout"])
2619
2274
                        logger.debug("Last checker succeeded,"
2620
2275
                                     " keeping {0} enabled"
2621
 
                                     .format(client_name))
 
2276
                                     .format(client["name"]))
2622
2277
            try:
2623
2278
                client["secret"] = (
2624
2279
                    pgp.decrypt(client["encrypted_secret"],
2630
2285
                             .format(client_name))
2631
2286
                client["secret"] = (
2632
2287
                    client_settings[client_name]["secret"])
 
2288
 
2633
2289
    
2634
2290
    # Add/remove clients based on new changes made to config
2635
2291
    for client_name in (set(old_client_settings)
2638
2294
    for client_name in (set(client_settings)
2639
2295
                        - set(old_client_settings)):
2640
2296
        clients_data[client_name] = client_settings[client_name]
2641
 
    
2642
 
    # Create all client objects
 
2297
 
 
2298
    # Create clients all clients
2643
2299
    for client_name, client in clients_data.iteritems():
2644
2300
        tcp_server.clients[client_name] = client_class(
2645
 
            name = client_name, settings = client,
2646
 
            server_settings = server_settings)
 
2301
            name = client_name, settings = client)
2647
2302
    
2648
2303
    if not tcp_server.clients:
2649
2304
        logger.warning("No clients defined")
2650
 
    
2651
 
    if not foreground:
2652
 
        if pidfile is not None:
2653
 
            try:
2654
 
                with pidfile:
2655
 
                    pid = os.getpid()
2656
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2657
 
            except IOError:
2658
 
                logger.error("Could not write to file %r with PID %d",
2659
 
                             pidfilename, pid)
2660
 
        del pidfile
 
2305
        
 
2306
    if not debug:
 
2307
        try:
 
2308
            with pidfile:
 
2309
                pid = os.getpid()
 
2310
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2311
            del pidfile
 
2312
        except IOError:
 
2313
            logger.error("Could not write to file %r with PID %d",
 
2314
                         pidfilename, pid)
 
2315
        except NameError:
 
2316
            # "pidfile" was never created
 
2317
            pass
2661
2318
        del pidfilename
 
2319
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2662
2320
    
2663
2321
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2664
2322
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2665
2323
    
2666
2324
    if use_dbus:
2667
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2668
 
                                        "se.bsnet.fukt.Mandos"})
2669
 
        class MandosDBusService(DBusObjectWithProperties):
 
2325
        class MandosDBusService(dbus.service.Object):
2670
2326
            """A D-Bus proxy object"""
2671
2327
            def __init__(self):
2672
2328
                dbus.service.Object.__init__(self, bus, "/")
2673
2329
            _interface = "se.recompile.Mandos"
2674
2330
            
2675
 
            @dbus_interface_annotations(_interface)
2676
 
            def _foo(self):
2677
 
                return { "org.freedesktop.DBus.Property"
2678
 
                         ".EmitsChangedSignal":
2679
 
                             "false"}
2680
 
            
2681
2331
            @dbus.service.signal(_interface, signature="o")
2682
2332
            def ClientAdded(self, objpath):
2683
2333
                "D-Bus signal"
2725
2375
            
2726
2376
            del _interface
2727
2377
        
2728
 
        mandos_dbus_service = MandosDBusService()
 
2378
        class MandosDBusServiceTransitional(MandosDBusService):
 
2379
            __metaclass__ = AlternateDBusNamesMetaclass
 
2380
        mandos_dbus_service = MandosDBusServiceTransitional()
2729
2381
    
2730
2382
    def cleanup():
2731
2383
        "Cleanup function; run on exit"
2732
2384
        service.cleanup()
2733
2385
        
2734
2386
        multiprocessing.active_children()
2735
 
        wnull.close()
2736
2387
        if not (tcp_server.clients or client_settings):
2737
2388
            return
2738
2389
        
2750
2401
                # A list of attributes that can not be pickled
2751
2402
                # + secret.
2752
2403
                exclude = set(("bus", "changedstate", "secret",
2753
 
                               "checker", "server_settings"))
 
2404
                               "checker"))
2754
2405
                for name, typ in (inspect.getmembers
2755
2406
                                  (dbus.service.Object)):
2756
2407
                    exclude.add(name)
2765
2416
                del client_settings[client.name]["secret"]
2766
2417
        
2767
2418
        try:
2768
 
            with (tempfile.NamedTemporaryFile
2769
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2770
 
                   dir=os.path.dirname(stored_state_path),
2771
 
                   delete=False)) as stored_state:
 
2419
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2420
                                                prefix="clients-",
 
2421
                                                dir=os.path.dirname
 
2422
                                                (stored_state_path))
 
2423
            with os.fdopen(tempfd, "wb") as stored_state:
2772
2424
                pickle.dump((clients, client_settings), stored_state)
2773
 
                tempname=stored_state.name
2774
2425
            os.rename(tempname, stored_state_path)
2775
2426
        except (IOError, OSError) as e:
 
2427
            logger.warning("Could not save persistent state: {0}"
 
2428
                           .format(e))
2776
2429
            if not debug:
2777
2430
                try:
2778
2431
                    os.remove(tempname)
2779
2432
                except NameError:
2780
2433
                    pass
2781
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2782
 
                logger.warning("Could not save persistent state: {0}"
2783
 
                               .format(os.strerror(e.errno)))
2784
 
            else:
2785
 
                logger.warning("Could not save persistent state:",
2786
 
                               exc_info=e)
 
2434
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2435
                                   errno.EEXIST)):
2787
2436
                raise e
2788
2437
        
2789
2438
        # Delete all clients, and settings from config
2817
2466
    service.port = tcp_server.socket.getsockname()[1]
2818
2467
    if use_ipv6:
2819
2468
        logger.info("Now listening on address %r, port %d,"
2820
 
                    " flowinfo %d, scope_id %d",
2821
 
                    *tcp_server.socket.getsockname())
 
2469
                    " flowinfo %d, scope_id %d"
 
2470
                    % tcp_server.socket.getsockname())
2822
2471
    else:                       # IPv4
2823
 
        logger.info("Now listening on address %r, port %d",
2824
 
                    *tcp_server.socket.getsockname())
 
2472
        logger.info("Now listening on address %r, port %d"
 
2473
                    % tcp_server.socket.getsockname())
2825
2474
    
2826
2475
    #service.interface = tcp_server.socket.getsockname()[3]
2827
2476
    
2830
2479
        try:
2831
2480
            service.activate()
2832
2481
        except dbus.exceptions.DBusException as error:
2833
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2482
            logger.critical("DBusException: %s", error)
2834
2483
            cleanup()
2835
2484
            sys.exit(1)
2836
2485
        # End of Avahi example code
2843
2492
        logger.debug("Starting main loop")
2844
2493
        main_loop.run()
2845
2494
    except AvahiError as error:
2846
 
        logger.critical("Avahi Error", exc_info=error)
 
2495
        logger.critical("AvahiError: %s", error)
2847
2496
        cleanup()
2848
2497
        sys.exit(1)
2849
2498
    except KeyboardInterrupt: