/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-01-08 10:19:33 UTC
  • Revision ID: teddy@recompile.se-20120108101933-xbtodqgepxax8hn1
Tags: version-1.5.2-1
* Makefile (version): Changed to "1.5.2".
* NEWS (Version 1.5.2): New entry.
* debian/changelog (1.5.2-1): - '' -

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-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 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
 
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.2"
 
88
version = "1.5.2"
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
    
172
171
    def password_encode(self, password):
173
172
        # Passphrase can not be empty and can not contain newlines or
174
173
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        encoded = b"mandos" + binascii.hexlify(password)
176
 
        if len(encoded) > 2048:
177
 
            # GnuPG can't handle long passwords, so encode differently
178
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
179
 
                       .replace(b"\n", b"\\n")
180
 
                       .replace(b"\0", b"\\x00"))
181
 
        return encoded
 
174
        return b"mandos" + binascii.hexlify(password)
182
175
    
183
176
    def encrypt(self, data, password):
184
 
        passphrase = self.password_encode(password)
185
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
186
 
                                         ) as passfile:
187
 
            passfile.write(passphrase)
188
 
            passfile.flush()
189
 
            proc = subprocess.Popen(['gpg', '--symmetric',
190
 
                                     '--passphrase-file',
191
 
                                     passfile.name]
192
 
                                    + self.gnupgargs,
193
 
                                    stdin = subprocess.PIPE,
194
 
                                    stdout = subprocess.PIPE,
195
 
                                    stderr = subprocess.PIPE)
196
 
            ciphertext, err = proc.communicate(input = data)
197
 
        if proc.returncode != 0:
198
 
            raise PGPError(err)
 
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
199
191
        return ciphertext
200
192
    
201
193
    def decrypt(self, data, password):
202
 
        passphrase = self.password_encode(password)
203
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
204
 
                                         ) as passfile:
205
 
            passfile.write(passphrase)
206
 
            passfile.flush()
207
 
            proc = subprocess.Popen(['gpg', '--decrypt',
208
 
                                     '--passphrase-file',
209
 
                                     passfile.name]
210
 
                                    + self.gnupgargs,
211
 
                                    stdin = subprocess.PIPE,
212
 
                                    stdout = subprocess.PIPE,
213
 
                                    stderr = subprocess.PIPE)
214
 
            decrypted_plaintext, err = proc.communicate(input
215
 
                                                        = data)
216
 
        if proc.returncode != 0:
217
 
            raise PGPError(err)
 
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
218
208
        return decrypted_plaintext
219
209
 
220
210
 
 
211
 
221
212
class AvahiError(Exception):
222
213
    def __init__(self, value, *args, **kwargs):
223
214
        self.value = value
240
231
               Used to optionally bind to the specified interface.
241
232
    name: string; Example: 'Mandos'
242
233
    type: string; Example: '_mandos._tcp'.
243
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
234
                  See <http://www.dns-sd.org/ServiceTypes.html>
244
235
    port: integer; what port to announce
245
236
    TXT: list of strings; TXT record for the service
246
237
    domain: string; Domain to publish on, default to .local if empty.
252
243
    server: D-Bus Server
253
244
    bus: dbus.SystemBus()
254
245
    """
255
 
    
256
246
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
257
247
                 servicetype = None, port = None, TXT = None,
258
248
                 domain = "", host = "", max_renames = 32768,
271
261
        self.server = None
272
262
        self.bus = bus
273
263
        self.entry_group_state_changed_match = None
274
 
    
275
264
    def rename(self):
276
265
        """Derived from the Avahi example code"""
277
266
        if self.rename_count >= self.max_renames:
287
276
        try:
288
277
            self.add()
289
278
        except dbus.exceptions.DBusException as error:
290
 
            logger.critical("D-Bus Exception", exc_info=error)
 
279
            logger.critical("DBusException: %s", error)
291
280
            self.cleanup()
292
281
            os._exit(1)
293
282
        self.rename_count += 1
294
 
    
295
283
    def remove(self):
296
284
        """Derived from the Avahi example code"""
297
285
        if self.entry_group_state_changed_match is not None:
299
287
            self.entry_group_state_changed_match = None
300
288
        if self.group is not None:
301
289
            self.group.Reset()
302
 
    
303
290
    def add(self):
304
291
        """Derived from the Avahi example code"""
305
292
        self.remove()
322
309
            dbus.UInt16(self.port),
323
310
            avahi.string_array_to_txt_array(self.TXT))
324
311
        self.group.Commit()
325
 
    
326
312
    def entry_group_state_changed(self, state, error):
327
313
        """Derived from the Avahi example code"""
328
314
        logger.debug("Avahi entry group state change: %i", state)
335
321
        elif state == avahi.ENTRY_GROUP_FAILURE:
336
322
            logger.critical("Avahi: Error in group state changed %s",
337
323
                            unicode(error))
338
 
            raise AvahiGroupError("State changed: {0!s}"
339
 
                                  .format(error))
340
 
    
 
324
            raise AvahiGroupError("State changed: %s"
 
325
                                  % unicode(error))
341
326
    def cleanup(self):
342
327
        """Derived from the Avahi example code"""
343
328
        if self.group is not None:
348
333
                pass
349
334
            self.group = None
350
335
        self.remove()
351
 
    
352
336
    def server_state_changed(self, state, error=None):
353
337
        """Derived from the Avahi example code"""
354
338
        logger.debug("Avahi server state change: %i", state)
373
357
                logger.debug("Unknown state: %r", state)
374
358
            else:
375
359
                logger.debug("Unknown state: %r: %r", state, error)
376
 
    
377
360
    def activate(self):
378
361
        """Derived from the Avahi example code"""
379
362
        if self.server is None:
386
369
                                 self.server_state_changed)
387
370
        self.server_state_changed(self.server.GetState())
388
371
 
389
 
 
390
372
class AvahiServiceToSyslog(AvahiService):
391
373
    def rename(self):
392
374
        """Add the new name to the syslog messages"""
393
375
        ret = AvahiService.rename(self)
394
376
        syslogger.setFormatter(logging.Formatter
395
 
                               ('Mandos ({0}) [%(process)d]:'
396
 
                                ' %(levelname)s: %(message)s'
397
 
                                .format(self.name)))
 
377
                               ('Mandos (%s) [%%(process)d]:'
 
378
                                ' %%(levelname)s: %%(message)s'
 
379
                                % self.name))
398
380
        return ret
399
381
 
400
 
 
401
382
def timedelta_to_milliseconds(td):
402
383
    "Convert a datetime.timedelta() to milliseconds"
403
384
    return ((td.days * 24 * 60 * 60 * 1000)
404
385
            + (td.seconds * 1000)
405
386
            + (td.microseconds // 1000))
406
 
 
407
 
 
 
387
        
408
388
class Client(object):
409
389
    """A representation of a client host served by this server.
410
390
    
435
415
    last_checked_ok: datetime.datetime(); (UTC) or None
436
416
    last_checker_status: integer between 0 and 255 reflecting exit
437
417
                         status of last checker. -1 reflects crashed
438
 
                         checker, -2 means no checker completed yet.
 
418
                         checker, or None.
439
419
    last_enabled: datetime.datetime(); (UTC) or None
440
420
    name:       string; from the config file, used in log messages and
441
421
                        D-Bus identifiers
446
426
    runtime_expansions: Allowed attributes for runtime expansion.
447
427
    expires:    datetime.datetime(); time (UTC) when a client will be
448
428
                disabled, or None
449
 
    server_settings: The server_settings dict from main()
450
429
    """
451
430
    
452
431
    runtime_expansions = ("approval_delay", "approval_duration",
453
 
                          "created", "enabled", "expires",
454
 
                          "fingerprint", "host", "interval",
455
 
                          "last_approval_request", "last_checked_ok",
 
432
                          "created", "enabled", "fingerprint",
 
433
                          "host", "interval", "last_checked_ok",
456
434
                          "last_enabled", "name", "timeout")
457
 
    client_defaults = { "timeout": "PT5M",
458
 
                        "extended_timeout": "PT15M",
459
 
                        "interval": "PT2M",
 
435
    client_defaults = { "timeout": "5m",
 
436
                        "extended_timeout": "15m",
 
437
                        "interval": "2m",
460
438
                        "checker": "fping -q -- %%(host)s",
461
439
                        "host": "",
462
 
                        "approval_delay": "PT0S",
463
 
                        "approval_duration": "PT1S",
 
440
                        "approval_delay": "0s",
 
441
                        "approval_duration": "1s",
464
442
                        "approved_by_default": "True",
465
443
                        "enabled": "True",
466
444
                        }
479
457
    
480
458
    def approval_delay_milliseconds(self):
481
459
        return timedelta_to_milliseconds(self.approval_delay)
482
 
    
 
460
 
483
461
    @staticmethod
484
462
    def config_parser(config):
485
463
        """Construct a new dict of client settings of this form:
510
488
                          "rb") as secfile:
511
489
                    client["secret"] = secfile.read()
512
490
            else:
513
 
                raise TypeError("No secret or secfile for section {0}"
514
 
                                .format(section))
 
491
                raise TypeError("No secret or secfile for section %s"
 
492
                                % section)
515
493
            client["timeout"] = string_to_delta(section["timeout"])
516
494
            client["extended_timeout"] = string_to_delta(
517
495
                section["extended_timeout"])
523
501
            client["checker_command"] = section["checker"]
524
502
            client["last_approval_request"] = None
525
503
            client["last_checked_ok"] = None
526
 
            client["last_checker_status"] = -2
 
504
            client["last_checker_status"] = None
527
505
        
528
506
        return settings
529
 
    
530
 
    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."""
531
513
        self.name = name
532
 
        if server_settings is None:
533
 
            server_settings = {}
534
 
        self.server_settings = server_settings
535
514
        # adding all client settings
536
515
        for setting, value in settings.iteritems():
537
516
            setattr(self, setting, value)
545
524
        else:
546
525
            self.last_enabled = None
547
526
            self.expires = None
548
 
        
 
527
       
549
528
        logger.debug("Creating client %r", self.name)
550
529
        # Uppercase and remove spaces from fingerprint for later
551
530
        # comparison purposes with return value from the fingerprint()
553
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
554
533
        self.created = settings.get("created",
555
534
                                    datetime.datetime.utcnow())
556
 
        
 
535
 
557
536
        # attributes specific for this server instance
558
537
        self.checker = None
559
538
        self.checker_initiator_tag = None
587
566
        if getattr(self, "enabled", False):
588
567
            # Already enabled
589
568
            return
 
569
        self.send_changedstate()
590
570
        self.expires = datetime.datetime.utcnow() + self.timeout
591
571
        self.enabled = True
592
572
        self.last_enabled = datetime.datetime.utcnow()
593
573
        self.init_checker()
594
 
        self.send_changedstate()
595
574
    
596
575
    def disable(self, quiet=True):
597
576
        """Disable this client."""
598
577
        if not getattr(self, "enabled", False):
599
578
            return False
600
579
        if not quiet:
 
580
            self.send_changedstate()
 
581
        if not quiet:
601
582
            logger.info("Disabling client %s", self.name)
602
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
583
        if getattr(self, "disable_initiator_tag", False):
603
584
            gobject.source_remove(self.disable_initiator_tag)
604
585
            self.disable_initiator_tag = None
605
586
        self.expires = None
606
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
587
        if getattr(self, "checker_initiator_tag", False):
607
588
            gobject.source_remove(self.checker_initiator_tag)
608
589
            self.checker_initiator_tag = None
609
590
        self.stop_checker()
610
591
        self.enabled = False
611
 
        if not quiet:
612
 
            self.send_changedstate()
613
592
        # Do not run this again if called by a gobject.timeout_add
614
593
        return False
615
594
    
619
598
    def init_checker(self):
620
599
        # Schedule a new checker to be started an 'interval' from now,
621
600
        # and every interval from then on.
622
 
        if self.checker_initiator_tag is not None:
623
 
            gobject.source_remove(self.checker_initiator_tag)
624
601
        self.checker_initiator_tag = (gobject.timeout_add
625
602
                                      (self.interval_milliseconds(),
626
603
                                       self.start_checker))
627
604
        # Schedule a disable() when 'timeout' has passed
628
 
        if self.disable_initiator_tag is not None:
629
 
            gobject.source_remove(self.disable_initiator_tag)
630
605
        self.disable_initiator_tag = (gobject.timeout_add
631
606
                                   (self.timeout_milliseconds(),
632
607
                                    self.disable))
651
626
            logger.warning("Checker for %(name)s crashed?",
652
627
                           vars(self))
653
628
    
654
 
    def checked_ok(self):
655
 
        """Assert that the client has been seen, alive and well."""
656
 
        self.last_checked_ok = datetime.datetime.utcnow()
657
 
        self.last_checker_status = 0
658
 
        self.bump_timeout()
659
 
    
660
 
    def bump_timeout(self, timeout=None):
661
 
        """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
        """
662
635
        if timeout is None:
663
636
            timeout = self.timeout
 
637
        self.last_checked_ok = datetime.datetime.utcnow()
664
638
        if self.disable_initiator_tag is not None:
665
639
            gobject.source_remove(self.disable_initiator_tag)
666
 
            self.disable_initiator_tag = None
667
640
        if getattr(self, "enabled", False):
668
641
            self.disable_initiator_tag = (gobject.timeout_add
669
642
                                          (timedelta_to_milliseconds
679
652
        If a checker already exists, leave it running and do
680
653
        nothing."""
681
654
        # The reason for not killing a running checker is that if we
682
 
        # did that, and if a checker (for some reason) started running
683
 
        # slowly and taking more than 'interval' time, then the client
684
 
        # would inevitably timeout, since no checker would get a
685
 
        # chance to run to completion.  If we instead leave running
 
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
686
659
        # checkers alone, the checker would have to take more time
687
660
        # than 'timeout' for the client to be disabled, which is as it
688
661
        # should be.
690
663
        # If a checker exists, make sure it is not a zombie
691
664
        try:
692
665
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
 
        except AttributeError:
694
 
            pass
695
 
        except OSError as error:
696
 
            if error.errno != errno.ECHILD:
697
 
                raise
 
666
        except (AttributeError, OSError) as error:
 
667
            if (isinstance(error, OSError)
 
668
                and error.errno != errno.ECHILD):
 
669
                raise error
698
670
        else:
699
671
            if pid:
700
672
                logger.warning("Checker was a zombie")
703
675
                                      self.current_checker_command)
704
676
        # Start a new checker if needed
705
677
        if self.checker is None:
706
 
            # Escape attributes for the shell
707
 
            escaped_attrs = dict(
708
 
                (attr, re.escape(unicode(getattr(self, attr))))
709
 
                for attr in
710
 
                self.runtime_expansions)
711
678
            try:
712
 
                command = self.checker_command % escaped_attrs
713
 
            except TypeError as error:
714
 
                logger.error('Could not format string "%s"',
715
 
                             self.checker_command, exc_info=error)
716
 
                return True # Try again later
 
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
717
697
            self.current_checker_command = command
718
698
            try:
719
699
                logger.info("Starting checker %r for %s",
722
702
                # in normal mode, that is already done by daemon(),
723
703
                # and in debug mode we don't want to.  (Stdin is
724
704
                # always replaced by /dev/null.)
725
 
                # The exception is when not debugging but nevertheless
726
 
                # running in the foreground; use the previously
727
 
                # created wnull.
728
 
                popen_args = {}
729
 
                if (not self.server_settings["debug"]
730
 
                    and self.server_settings["foreground"]):
731
 
                    popen_args.update({"stdout": wnull,
732
 
                                       "stderr": wnull })
733
705
                self.checker = subprocess.Popen(command,
734
706
                                                close_fds=True,
735
 
                                                shell=True, cwd="/",
736
 
                                                **popen_args)
737
 
            except OSError as error:
738
 
                logger.error("Failed to start subprocess",
739
 
                             exc_info=error)
740
 
                return True
741
 
            self.checker_callback_tag = (gobject.child_watch_add
742
 
                                         (self.checker.pid,
743
 
                                          self.checker_callback,
744
 
                                          data=command))
745
 
            # The checker may have completed before the gobject
746
 
            # watch was added.  Check for this.
747
 
            try:
 
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.
748
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)
749
718
            except OSError as error:
750
 
                if error.errno == errno.ECHILD:
751
 
                    # This should never happen
752
 
                    logger.error("Child process vanished",
753
 
                                 exc_info=error)
754
 
                    return True
755
 
                raise
756
 
            if pid:
757
 
                gobject.source_remove(self.checker_callback_tag)
758
 
                self.checker_callback(pid, status, command)
 
719
                logger.error("Failed to start subprocess: %s",
 
720
                             error)
759
721
        # Re-run this periodically if run by gobject.timeout_add
760
722
        return True
761
723
    
768
730
            return
769
731
        logger.debug("Stopping checker for %(name)s", vars(self))
770
732
        try:
771
 
            self.checker.terminate()
 
733
            os.kill(self.checker.pid, signal.SIGTERM)
772
734
            #time.sleep(0.5)
773
735
            #if self.checker.poll() is None:
774
 
            #    self.checker.kill()
 
736
            #    os.kill(self.checker.pid, signal.SIGKILL)
775
737
        except OSError as error:
776
738
            if error.errno != errno.ESRCH: # No such process
777
739
                raise
794
756
    # "Set" method, so we fail early here:
795
757
    if byte_arrays and signature != "ay":
796
758
        raise ValueError("Byte arrays not supported for non-'ay'"
797
 
                         " signature {0!r}".format(signature))
 
759
                         " signature %r" % signature)
798
760
    def decorator(func):
799
761
        func._dbus_is_property = True
800
762
        func._dbus_interface = dbus_interface
808
770
    return decorator
809
771
 
810
772
 
811
 
def dbus_interface_annotations(dbus_interface):
812
 
    """Decorator for marking functions returning interface annotations
813
 
    
814
 
    Usage:
815
 
    
816
 
    @dbus_interface_annotations("org.example.Interface")
817
 
    def _foo(self):  # Function name does not matter
818
 
        return {"org.freedesktop.DBus.Deprecated": "true",
819
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
820
 
                    "false"}
821
 
    """
822
 
    def decorator(func):
823
 
        func._dbus_is_interface = True
824
 
        func._dbus_interface = dbus_interface
825
 
        func._dbus_name = dbus_interface
826
 
        return func
827
 
    return decorator
828
 
 
829
 
 
830
 
def dbus_annotations(annotations):
831
 
    """Decorator to annotate D-Bus methods, signals or properties
832
 
    Usage:
833
 
    
834
 
    @dbus_service_property("org.example.Interface", signature="b",
835
 
                           access="r")
836
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
837
 
                        "org.freedesktop.DBus.Property."
838
 
                        "EmitsChangedSignal": "false"})
839
 
    def Property_dbus_property(self):
840
 
        return dbus.Boolean(False)
841
 
    """
842
 
    def decorator(func):
843
 
        func._dbus_annotations = annotations
844
 
        return func
845
 
    return decorator
846
 
 
847
 
 
848
773
class DBusPropertyException(dbus.exceptions.DBusException):
849
774
    """A base class for D-Bus property-related exceptions
850
775
    """
873
798
    """
874
799
    
875
800
    @staticmethod
876
 
    def _is_dbus_thing(thing):
877
 
        """Returns a function testing if an attribute is a D-Bus thing
878
 
        
879
 
        If called like _is_dbus_thing("method") it returns a function
880
 
        suitable for use as predicate to inspect.getmembers().
881
 
        """
882
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
883
 
                                   False)
 
801
    def _is_dbus_property(obj):
 
802
        return getattr(obj, "_dbus_is_property", False)
884
803
    
885
 
    def _get_all_dbus_things(self, thing):
 
804
    def _get_all_dbus_properties(self):
886
805
        """Returns a generator of (name, attribute) pairs
887
806
        """
888
 
        return ((getattr(athing.__get__(self), "_dbus_name",
889
 
                         name),
890
 
                 athing.__get__(self))
 
807
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
891
808
                for cls in self.__class__.__mro__
892
 
                for name, athing in
893
 
                inspect.getmembers(cls,
894
 
                                   self._is_dbus_thing(thing)))
 
809
                for name, prop in
 
810
                inspect.getmembers(cls, self._is_dbus_property))
895
811
    
896
812
    def _get_dbus_property(self, interface_name, property_name):
897
813
        """Returns a bound method if one exists which is a D-Bus
899
815
        """
900
816
        for cls in  self.__class__.__mro__:
901
817
            for name, value in (inspect.getmembers
902
 
                                (cls,
903
 
                                 self._is_dbus_thing("property"))):
 
818
                                (cls, self._is_dbus_property)):
904
819
                if (value._dbus_name == property_name
905
820
                    and value._dbus_interface == interface_name):
906
821
                    return value.__get__(self)
934
849
            # The byte_arrays option is not supported yet on
935
850
            # signatures other than "ay".
936
851
            if prop._dbus_signature != "ay":
937
 
                raise ValueError("Byte arrays not supported for non-"
938
 
                                 "'ay' signature {0!r}"
939
 
                                 .format(prop._dbus_signature))
 
852
                raise ValueError
940
853
            value = dbus.ByteArray(b''.join(chr(byte)
941
854
                                            for byte in value))
942
855
        prop(value)
950
863
        Note: Will not include properties with access="write".
951
864
        """
952
865
        properties = {}
953
 
        for name, prop in self._get_all_dbus_things("property"):
 
866
        for name, prop in self._get_all_dbus_properties():
954
867
            if (interface_name
955
868
                and interface_name != prop._dbus_interface):
956
869
                # Interface non-empty but did not match
971
884
                         path_keyword='object_path',
972
885
                         connection_keyword='connection')
973
886
    def Introspect(self, object_path, connection):
974
 
        """Overloading of standard D-Bus method.
975
 
        
976
 
        Inserts property tags and interface annotation tags.
 
887
        """Standard D-Bus method, overloaded to insert property tags.
977
888
        """
978
889
        xmlstring = dbus.service.Object.Introspect(self, object_path,
979
890
                                                   connection)
986
897
                e.setAttribute("access", prop._dbus_access)
987
898
                return e
988
899
            for if_tag in document.getElementsByTagName("interface"):
989
 
                # Add property tags
990
900
                for tag in (make_tag(document, name, prop)
991
901
                            for name, prop
992
 
                            in self._get_all_dbus_things("property")
 
902
                            in self._get_all_dbus_properties()
993
903
                            if prop._dbus_interface
994
904
                            == if_tag.getAttribute("name")):
995
905
                    if_tag.appendChild(tag)
996
 
                # Add annotation tags
997
 
                for typ in ("method", "signal", "property"):
998
 
                    for tag in if_tag.getElementsByTagName(typ):
999
 
                        annots = dict()
1000
 
                        for name, prop in (self.
1001
 
                                           _get_all_dbus_things(typ)):
1002
 
                            if (name == tag.getAttribute("name")
1003
 
                                and prop._dbus_interface
1004
 
                                == if_tag.getAttribute("name")):
1005
 
                                annots.update(getattr
1006
 
                                              (prop,
1007
 
                                               "_dbus_annotations",
1008
 
                                               {}))
1009
 
                        for name, value in annots.iteritems():
1010
 
                            ann_tag = document.createElement(
1011
 
                                "annotation")
1012
 
                            ann_tag.setAttribute("name", name)
1013
 
                            ann_tag.setAttribute("value", value)
1014
 
                            tag.appendChild(ann_tag)
1015
 
                # Add interface annotation tags
1016
 
                for annotation, value in dict(
1017
 
                    itertools.chain.from_iterable(
1018
 
                        annotations().iteritems()
1019
 
                        for name, annotations in
1020
 
                        self._get_all_dbus_things("interface")
1021
 
                        if name == if_tag.getAttribute("name")
1022
 
                        )).iteritems():
1023
 
                    ann_tag = document.createElement("annotation")
1024
 
                    ann_tag.setAttribute("name", annotation)
1025
 
                    ann_tag.setAttribute("value", value)
1026
 
                    if_tag.appendChild(ann_tag)
1027
906
                # Add the names to the return values for the
1028
907
                # "org.freedesktop.DBus.Properties" methods
1029
908
                if (if_tag.getAttribute("name")
1044
923
        except (AttributeError, xml.dom.DOMException,
1045
924
                xml.parsers.expat.ExpatError) as error:
1046
925
            logger.error("Failed to override Introspection method",
1047
 
                         exc_info=error)
 
926
                         error)
1048
927
        return xmlstring
1049
928
 
1050
929
 
1051
 
def datetime_to_dbus(dt, variant_level=0):
 
930
def datetime_to_dbus (dt, variant_level=0):
1052
931
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1053
932
    if dt is None:
1054
933
        return dbus.String("", variant_level = variant_level)
1056
935
                       variant_level=variant_level)
1057
936
 
1058
937
 
1059
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1060
 
    """A class decorator; applied to a subclass of
1061
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1062
 
    interface names according to the "alt_interface_names" mapping.
1063
 
    Usage:
1064
 
    
1065
 
    @alternate_dbus_interfaces({"org.example.Interface":
1066
 
                                    "net.example.AlternateInterface"})
1067
 
    class SampleDBusObject(dbus.service.Object):
1068
 
        @dbus.service.method("org.example.Interface")
1069
 
        def SampleDBusMethod():
1070
 
            pass
1071
 
    
1072
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1073
 
    reachable via two interfaces: "org.example.Interface" and
1074
 
    "net.example.AlternateInterface", the latter of which will have
1075
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1076
 
    "true", unless "deprecate" is passed with a False value.
1077
 
    
1078
 
    This works for methods and signals, and also for D-Bus properties
1079
 
    (from DBusObjectWithProperties) and interfaces (from the
1080
 
    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.
1081
942
    """
1082
 
    def wrapper(cls):
1083
 
        for orig_interface_name, alt_interface_name in (
1084
 
            alt_interface_names.iteritems()):
1085
 
            attr = {}
1086
 
            interface_names = set()
1087
 
            # Go though all attributes of the class
1088
 
            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):
1089
950
                # Ignore non-D-Bus attributes, and D-Bus attributes
1090
951
                # with the wrong interface name
1091
952
                if (not hasattr(attribute, "_dbus_interface")
1092
953
                    or not attribute._dbus_interface
1093
 
                    .startswith(orig_interface_name)):
 
954
                    .startswith("se.recompile.Mandos")):
1094
955
                    continue
1095
956
                # Create an alternate D-Bus interface name based on
1096
957
                # the current name
1097
958
                alt_interface = (attribute._dbus_interface
1098
 
                                 .replace(orig_interface_name,
1099
 
                                          alt_interface_name))
1100
 
                interface_names.add(alt_interface)
 
959
                                 .replace("se.recompile.Mandos",
 
960
                                          "se.bsnet.fukt.Mandos"))
1101
961
                # Is this a D-Bus signal?
1102
962
                if getattr(attribute, "_dbus_is_signal", False):
1103
 
                    # Extract the original non-method undecorated
1104
 
                    # function by black magic
 
963
                    # Extract the original non-method function by
 
964
                    # black magic
1105
965
                    nonmethod_func = (dict(
1106
966
                            zip(attribute.func_code.co_freevars,
1107
967
                                attribute.__closure__))["func"]
1118
978
                                nonmethod_func.func_name,
1119
979
                                nonmethod_func.func_defaults,
1120
980
                                nonmethod_func.func_closure)))
1121
 
                    # Copy annotations, if any
1122
 
                    try:
1123
 
                        new_function._dbus_annotations = (
1124
 
                            dict(attribute._dbus_annotations))
1125
 
                    except AttributeError:
1126
 
                        pass
1127
981
                    # Define a creator of a function to call both the
1128
 
                    # original and alternate functions, so both the
1129
 
                    # original and alternate signals gets sent when
1130
 
                    # the function is called
 
982
                    # old and new functions, so both the old and new
 
983
                    # signals gets sent when the function is called
1131
984
                    def fixscope(func1, func2):
1132
985
                        """This function is a scope container to pass
1133
986
                        func1 and func2 to the "call_both" function
1140
993
                        return call_both
1141
994
                    # Create the "call_both" function and add it to
1142
995
                    # the class
1143
 
                    attr[attrname] = fixscope(attribute, new_function)
 
996
                    attr[attrname] = fixscope(attribute,
 
997
                                              new_function)
1144
998
                # Is this a D-Bus method?
1145
999
                elif getattr(attribute, "_dbus_is_method", False):
1146
1000
                    # Create a new, but exactly alike, function
1157
1011
                                        attribute.func_name,
1158
1012
                                        attribute.func_defaults,
1159
1013
                                        attribute.func_closure)))
1160
 
                    # Copy annotations, if any
1161
 
                    try:
1162
 
                        attr[attrname]._dbus_annotations = (
1163
 
                            dict(attribute._dbus_annotations))
1164
 
                    except AttributeError:
1165
 
                        pass
1166
1014
                # Is this a D-Bus property?
1167
1015
                elif getattr(attribute, "_dbus_is_property", False):
1168
1016
                    # Create a new, but exactly alike, function
1182
1030
                                        attribute.func_name,
1183
1031
                                        attribute.func_defaults,
1184
1032
                                        attribute.func_closure)))
1185
 
                    # Copy annotations, if any
1186
 
                    try:
1187
 
                        attr[attrname]._dbus_annotations = (
1188
 
                            dict(attribute._dbus_annotations))
1189
 
                    except AttributeError:
1190
 
                        pass
1191
 
                # Is this a D-Bus interface?
1192
 
                elif getattr(attribute, "_dbus_is_interface", False):
1193
 
                    # Create a new, but exactly alike, function
1194
 
                    # object.  Decorate it to be a new D-Bus interface
1195
 
                    # with the alternate D-Bus interface name.  Add it
1196
 
                    # to the class.
1197
 
                    attr[attrname] = (dbus_interface_annotations
1198
 
                                      (alt_interface)
1199
 
                                      (types.FunctionType
1200
 
                                       (attribute.func_code,
1201
 
                                        attribute.func_globals,
1202
 
                                        attribute.func_name,
1203
 
                                        attribute.func_defaults,
1204
 
                                        attribute.func_closure)))
1205
 
            if deprecate:
1206
 
                # Deprecate all alternate interfaces
1207
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1208
 
                for interface_name in interface_names:
1209
 
                    @dbus_interface_annotations(interface_name)
1210
 
                    def func(self):
1211
 
                        return { "org.freedesktop.DBus.Deprecated":
1212
 
                                     "true" }
1213
 
                    # Find an unused name
1214
 
                    for aname in (iname.format(i)
1215
 
                                  for i in itertools.count()):
1216
 
                        if aname not in attr:
1217
 
                            attr[aname] = func
1218
 
                            break
1219
 
            if interface_names:
1220
 
                # Replace the class with a new subclass of it with
1221
 
                # methods, signals, etc. as created above.
1222
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1223
 
                           (cls,), attr)
1224
 
        return cls
1225
 
    return wrapper
1226
 
 
1227
 
 
1228
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1229
 
                                "se.bsnet.fukt.Mandos"})
 
1033
        return type.__new__(mcs, name, bases, attr)
 
1034
 
 
1035
 
1230
1036
class ClientDBus(Client, DBusObjectWithProperties):
1231
1037
    """A Client class using D-Bus
1232
1038
    
1252
1058
                                 ("/clients/" + client_object_name))
1253
1059
        DBusObjectWithProperties.__init__(self, self.bus,
1254
1060
                                          self.dbus_object_path)
1255
 
    
 
1061
        
1256
1062
    def notifychangeproperty(transform_func,
1257
1063
                             dbus_name, type_func=lambda x: x,
1258
1064
                             variant_level=1):
1281
1087
        
1282
1088
        return property(lambda self: getattr(self, attrname), setter)
1283
1089
    
 
1090
    
1284
1091
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1285
1092
    approvals_pending = notifychangeproperty(dbus.Boolean,
1286
1093
                                             "ApprovalPending",
1293
1100
                                       checker is not None)
1294
1101
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1295
1102
                                           "LastCheckedOK")
1296
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1297
 
                                               "LastCheckerStatus")
1298
1103
    last_approval_request = notifychangeproperty(
1299
1104
        datetime_to_dbus, "LastApprovalRequest")
1300
1105
    approved_by_default = notifychangeproperty(dbus.Boolean,
1368
1173
        return False
1369
1174
    
1370
1175
    def approve(self, value=True):
 
1176
        self.send_changedstate()
1371
1177
        self.approved = value
1372
1178
        gobject.timeout_add(timedelta_to_milliseconds
1373
1179
                            (self.approval_duration),
1374
1180
                            self._reset_approved)
1375
 
        self.send_changedstate()
 
1181
    
1376
1182
    
1377
1183
    ## D-Bus methods, signals & properties
1378
1184
    _interface = "se.recompile.Mandos.Client"
1379
1185
    
1380
 
    ## Interfaces
1381
 
    
1382
 
    @dbus_interface_annotations(_interface)
1383
 
    def _foo(self):
1384
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1385
 
                     "false"}
1386
 
    
1387
1186
    ## Signals
1388
1187
    
1389
1188
    # CheckerCompleted - signal
1540
1339
            return
1541
1340
        return datetime_to_dbus(self.last_checked_ok)
1542
1341
    
1543
 
    # LastCheckerStatus - property
1544
 
    @dbus_service_property(_interface, signature="n",
1545
 
                           access="read")
1546
 
    def LastCheckerStatus_dbus_property(self):
1547
 
        return dbus.Int16(self.last_checker_status)
1548
 
    
1549
1342
    # Expires - property
1550
1343
    @dbus_service_property(_interface, signature="s", access="read")
1551
1344
    def Expires_dbus_property(self):
1562
1355
    def Timeout_dbus_property(self, value=None):
1563
1356
        if value is None:       # get
1564
1357
            return dbus.UInt64(self.timeout_milliseconds())
1565
 
        old_timeout = self.timeout
1566
1358
        self.timeout = datetime.timedelta(0, 0, 0, value)
1567
 
        # Reschedule disabling
 
1359
        # Reschedule timeout
1568
1360
        if self.enabled:
1569
1361
            now = datetime.datetime.utcnow()
1570
 
            self.expires += self.timeout - old_timeout
1571
 
            if self.expires <= now:
 
1362
            time_to_die = timedelta_to_milliseconds(
 
1363
                (self.last_checked_ok + self.timeout) - now)
 
1364
            if time_to_die <= 0:
1572
1365
                # The timeout has passed
1573
1366
                self.disable()
1574
1367
            else:
 
1368
                self.expires = (now +
 
1369
                                datetime.timedelta(milliseconds =
 
1370
                                                   time_to_die))
1575
1371
                if (getattr(self, "disable_initiator_tag", None)
1576
1372
                    is None):
1577
1373
                    return
1578
1374
                gobject.source_remove(self.disable_initiator_tag)
1579
 
                self.disable_initiator_tag = (
1580
 
                    gobject.timeout_add(
1581
 
                        timedelta_to_milliseconds(self.expires - now),
1582
 
                        self.disable))
 
1375
                self.disable_initiator_tag = (gobject.timeout_add
 
1376
                                              (time_to_die,
 
1377
                                               self.disable))
1583
1378
    
1584
1379
    # ExtendedTimeout - property
1585
1380
    @dbus_service_property(_interface, signature="t",
1664
1459
        self._pipe.send(('setattr', name, value))
1665
1460
 
1666
1461
 
 
1462
class ClientDBusTransitional(ClientDBus):
 
1463
    __metaclass__ = AlternateDBusNamesMetaclass
 
1464
 
 
1465
 
1667
1466
class ClientHandler(socketserver.BaseRequestHandler, object):
1668
1467
    """A class to handle client connections.
1669
1468
    
1705
1504
            logger.debug("Protocol version: %r", line)
1706
1505
            try:
1707
1506
                if int(line.strip().split()[0]) > 1:
1708
 
                    raise RuntimeError(line)
 
1507
                    raise RuntimeError
1709
1508
            except (ValueError, IndexError, RuntimeError) as error:
1710
1509
                logger.error("Unknown protocol version: %s", error)
1711
1510
                return
1773
1572
                    #wait until timeout or approved
1774
1573
                    time = datetime.datetime.now()
1775
1574
                    client.changedstate.acquire()
1776
 
                    client.changedstate.wait(
1777
 
                        float(timedelta_to_milliseconds(delay)
1778
 
                              / 1000))
 
1575
                    (client.changedstate.wait
 
1576
                     (float(client.timedelta_to_milliseconds(delay)
 
1577
                            / 1000)))
1779
1578
                    client.changedstate.release()
1780
1579
                    time2 = datetime.datetime.now()
1781
1580
                    if (time2 - time) >= delay:
1797
1596
                    try:
1798
1597
                        sent = session.send(client.secret[sent_size:])
1799
1598
                    except gnutls.errors.GNUTLSError as error:
1800
 
                        logger.warning("gnutls send failed",
1801
 
                                       exc_info=error)
 
1599
                        logger.warning("gnutls send failed")
1802
1600
                        return
1803
1601
                    logger.debug("Sent: %d, remaining: %d",
1804
1602
                                 sent, len(client.secret)
1807
1605
                
1808
1606
                logger.info("Sending secret to %s", client.name)
1809
1607
                # bump the timeout using extended_timeout
1810
 
                client.bump_timeout(client.extended_timeout)
 
1608
                client.checked_ok(client.extended_timeout)
1811
1609
                if self.server.use_dbus:
1812
1610
                    # Emit D-Bus signal
1813
1611
                    client.GotSecret()
1818
1616
                try:
1819
1617
                    session.bye()
1820
1618
                except gnutls.errors.GNUTLSError as error:
1821
 
                    logger.warning("GnuTLS bye failed",
1822
 
                                   exc_info=error)
 
1619
                    logger.warning("GnuTLS bye failed")
1823
1620
    
1824
1621
    @staticmethod
1825
1622
    def peer_certificate(session):
1897
1694
    def process_request(self, request, address):
1898
1695
        """Start a new process to process the request."""
1899
1696
        proc = multiprocessing.Process(target = self.sub_process_main,
1900
 
                                       args = (request, address))
 
1697
                                       args = (request,
 
1698
                                               address))
1901
1699
        proc.start()
1902
1700
        return proc
1903
1701
 
1918
1716
    
1919
1717
    def add_pipe(self, parent_pipe, proc):
1920
1718
        """Dummy function; override as necessary"""
1921
 
        raise NotImplementedError()
 
1719
        raise NotImplementedError
1922
1720
 
1923
1721
 
1924
1722
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1931
1729
        use_ipv6:       Boolean; to use IPv6 or not
1932
1730
    """
1933
1731
    def __init__(self, server_address, RequestHandlerClass,
1934
 
                 interface=None, use_ipv6=True, socketfd=None):
1935
 
        """If socketfd is set, use that file descriptor instead of
1936
 
        creating a new one with socket.socket().
1937
 
        """
 
1732
                 interface=None, use_ipv6=True):
1938
1733
        self.interface = interface
1939
1734
        if use_ipv6:
1940
1735
            self.address_family = socket.AF_INET6
1941
 
        if socketfd is not None:
1942
 
            # Save the file descriptor
1943
 
            self.socketfd = socketfd
1944
 
            # Save the original socket.socket() function
1945
 
            self.socket_socket = socket.socket
1946
 
            # To implement --socket, we monkey patch socket.socket.
1947
 
            # 
1948
 
            # (When socketserver.TCPServer is a new-style class, we
1949
 
            # could make self.socket into a property instead of monkey
1950
 
            # patching socket.socket.)
1951
 
            # 
1952
 
            # Create a one-time-only replacement for socket.socket()
1953
 
            @functools.wraps(socket.socket)
1954
 
            def socket_wrapper(*args, **kwargs):
1955
 
                # Restore original function so subsequent calls are
1956
 
                # not affected.
1957
 
                socket.socket = self.socket_socket
1958
 
                del self.socket_socket
1959
 
                # This time only, return a new socket object from the
1960
 
                # saved file descriptor.
1961
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1962
 
            # Replace socket.socket() function with wrapper
1963
 
            socket.socket = socket_wrapper
1964
 
        # The socketserver.TCPServer.__init__ will call
1965
 
        # socket.socket(), which might be our replacement,
1966
 
        # socket_wrapper(), if socketfd was set.
1967
1736
        socketserver.TCPServer.__init__(self, server_address,
1968
1737
                                        RequestHandlerClass)
1969
 
    
1970
1738
    def server_bind(self):
1971
1739
        """This overrides the normal server_bind() function
1972
1740
        to bind to an interface if one was specified, and also NOT to
1980
1748
                try:
1981
1749
                    self.socket.setsockopt(socket.SOL_SOCKET,
1982
1750
                                           SO_BINDTODEVICE,
1983
 
                                           str(self.interface + '\0'))
 
1751
                                           str(self.interface
 
1752
                                               + '\0'))
1984
1753
                except socket.error as error:
1985
 
                    if error.errno == errno.EPERM:
1986
 
                        logger.error("No permission to bind to"
1987
 
                                     " interface %s", self.interface)
1988
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1754
                    if error[0] == errno.EPERM:
 
1755
                        logger.error("No permission to"
 
1756
                                     " bind to interface %s",
 
1757
                                     self.interface)
 
1758
                    elif error[0] == errno.ENOPROTOOPT:
1989
1759
                        logger.error("SO_BINDTODEVICE not available;"
1990
1760
                                     " cannot bind to interface %s",
1991
1761
                                     self.interface)
1992
 
                    elif error.errno == errno.ENODEV:
1993
 
                        logger.error("Interface %s does not exist,"
1994
 
                                     " cannot bind", self.interface)
1995
1762
                    else:
1996
1763
                        raise
1997
1764
        # Only bind(2) the socket if we really need to.
2000
1767
                if self.address_family == socket.AF_INET6:
2001
1768
                    any_address = "::" # in6addr_any
2002
1769
                else:
2003
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1770
                    any_address = socket.INADDR_ANY
2004
1771
                self.server_address = (any_address,
2005
1772
                                       self.server_address[1])
2006
1773
            elif not self.server_address[1]:
2027
1794
    """
2028
1795
    def __init__(self, server_address, RequestHandlerClass,
2029
1796
                 interface=None, use_ipv6=True, clients=None,
2030
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1797
                 gnutls_priority=None, use_dbus=True):
2031
1798
        self.enabled = False
2032
1799
        self.clients = clients
2033
1800
        if self.clients is None:
2037
1804
        IPv6_TCPServer.__init__(self, server_address,
2038
1805
                                RequestHandlerClass,
2039
1806
                                interface = interface,
2040
 
                                use_ipv6 = use_ipv6,
2041
 
                                socketfd = socketfd)
 
1807
                                use_ipv6 = use_ipv6)
2042
1808
    def server_activate(self):
2043
1809
        if self.enabled:
2044
1810
            return socketserver.TCPServer.server_activate(self)
2057
1823
    
2058
1824
    def handle_ipc(self, source, condition, parent_pipe=None,
2059
1825
                   proc = None, client_object=None):
 
1826
        condition_names = {
 
1827
            gobject.IO_IN: "IN",   # There is data to read.
 
1828
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1829
                                    # blocking).
 
1830
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1831
            gobject.IO_ERR: "ERR", # Error condition.
 
1832
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1833
                                    # broken, usually for pipes and
 
1834
                                    # sockets).
 
1835
            }
 
1836
        conditions_string = ' | '.join(name
 
1837
                                       for cond, name in
 
1838
                                       condition_names.iteritems()
 
1839
                                       if cond & condition)
2060
1840
        # error, or the other end of multiprocessing.Pipe has closed
2061
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1841
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2062
1842
            # Wait for other process to exit
2063
1843
            proc.join()
2064
1844
            return False
2122
1902
        return True
2123
1903
 
2124
1904
 
2125
 
def rfc3339_duration_to_delta(duration):
2126
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2127
 
    
2128
 
    >>> rfc3339_duration_to_delta("P7D")
2129
 
    datetime.timedelta(7)
2130
 
    >>> rfc3339_duration_to_delta("PT60S")
2131
 
    datetime.timedelta(0, 60)
2132
 
    >>> rfc3339_duration_to_delta("PT60M")
2133
 
    datetime.timedelta(0, 3600)
2134
 
    >>> rfc3339_duration_to_delta("PT24H")
2135
 
    datetime.timedelta(1)
2136
 
    >>> rfc3339_duration_to_delta("P1W")
2137
 
    datetime.timedelta(7)
2138
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2139
 
    datetime.timedelta(0, 330)
2140
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2141
 
    datetime.timedelta(1, 200)
2142
 
    """
2143
 
    
2144
 
    # Parsing an RFC 3339 duration with regular expressions is not
2145
 
    # possible - there would have to be multiple places for the same
2146
 
    # values, like seconds.  The current code, while more esoteric, is
2147
 
    # cleaner without depending on a parsing library.  If Python had a
2148
 
    # built-in library for parsing we would use it, but we'd like to
2149
 
    # avoid excessive use of external libraries.
2150
 
    
2151
 
    # New type for defining tokens, syntax, and semantics all-in-one
2152
 
    Token = collections.namedtuple("Token",
2153
 
                                   ("regexp", # To match token; if
2154
 
                                              # "value" is not None,
2155
 
                                              # must have a "group"
2156
 
                                              # containing digits
2157
 
                                    "value",  # datetime.timedelta or
2158
 
                                              # None
2159
 
                                    "followers")) # Tokens valid after
2160
 
                                                  # this token
2161
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2162
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2163
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2164
 
    token_second = Token(re.compile(r"(\d+)S"),
2165
 
                         datetime.timedelta(seconds=1),
2166
 
                         frozenset((token_end,)))
2167
 
    token_minute = Token(re.compile(r"(\d+)M"),
2168
 
                         datetime.timedelta(minutes=1),
2169
 
                         frozenset((token_second, token_end)))
2170
 
    token_hour = Token(re.compile(r"(\d+)H"),
2171
 
                       datetime.timedelta(hours=1),
2172
 
                       frozenset((token_minute, token_end)))
2173
 
    token_time = Token(re.compile(r"T"),
2174
 
                       None,
2175
 
                       frozenset((token_hour, token_minute,
2176
 
                                  token_second)))
2177
 
    token_day = Token(re.compile(r"(\d+)D"),
2178
 
                      datetime.timedelta(days=1),
2179
 
                      frozenset((token_time, token_end)))
2180
 
    token_month = Token(re.compile(r"(\d+)M"),
2181
 
                        datetime.timedelta(weeks=4),
2182
 
                        frozenset((token_day, token_end)))
2183
 
    token_year = Token(re.compile(r"(\d+)Y"),
2184
 
                       datetime.timedelta(weeks=52),
2185
 
                       frozenset((token_month, token_end)))
2186
 
    token_week = Token(re.compile(r"(\d+)W"),
2187
 
                       datetime.timedelta(weeks=1),
2188
 
                       frozenset((token_end,)))
2189
 
    token_duration = Token(re.compile(r"P"), None,
2190
 
                           frozenset((token_year, token_month,
2191
 
                                      token_day, token_time,
2192
 
                                      token_week))),
2193
 
    # Define starting values
2194
 
    value = datetime.timedelta() # Value so far
2195
 
    found_token = None
2196
 
    followers = frozenset(token_duration,) # Following valid tokens
2197
 
    s = duration                # String left to parse
2198
 
    # Loop until end token is found
2199
 
    while found_token is not token_end:
2200
 
        # Search for any currently valid tokens
2201
 
        for token in followers:
2202
 
            match = token.regexp.match(s)
2203
 
            if match is not None:
2204
 
                # Token found
2205
 
                if token.value is not None:
2206
 
                    # Value found, parse digits
2207
 
                    factor = int(match.group(1), 10)
2208
 
                    # Add to value so far
2209
 
                    value += factor * token.value
2210
 
                # Strip token from string
2211
 
                s = token.regexp.sub("", s, 1)
2212
 
                # Go to found token
2213
 
                found_token = token
2214
 
                # Set valid next tokens
2215
 
                followers = found_token.followers
2216
 
                break
2217
 
        else:
2218
 
            # No currently valid tokens were found
2219
 
            raise ValueError("Invalid RFC 3339 duration")
2220
 
    # End token found
2221
 
    return value
2222
 
 
2223
 
 
2224
1905
def string_to_delta(interval):
2225
1906
    """Parse a string and return a datetime.timedelta
2226
1907
    
2237
1918
    >>> string_to_delta('5m 30s')
2238
1919
    datetime.timedelta(0, 330)
2239
1920
    """
2240
 
    
2241
 
    try:
2242
 
        return rfc3339_duration_to_delta(interval)
2243
 
    except ValueError:
2244
 
        pass
2245
 
    
2246
1921
    timevalue = datetime.timedelta(0)
2247
1922
    for s in interval.split():
2248
1923
        try:
2259
1934
            elif suffix == "w":
2260
1935
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2261
1936
            else:
2262
 
                raise ValueError("Unknown suffix {0!r}"
2263
 
                                 .format(suffix))
2264
 
        except IndexError as e:
 
1937
                raise ValueError("Unknown suffix %r" % suffix)
 
1938
        except (ValueError, IndexError) as e:
2265
1939
            raise ValueError(*(e.args))
2266
1940
        timevalue += delta
2267
1941
    return timevalue
2280
1954
        sys.exit()
2281
1955
    if not noclose:
2282
1956
        # Close all standard open file descriptors
2283
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1957
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2284
1958
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2285
1959
            raise OSError(errno.ENODEV,
2286
 
                          "{0} not a character device"
2287
 
                          .format(os.devnull))
 
1960
                          "%s not a character device"
 
1961
                          % os.path.devnull)
2288
1962
        os.dup2(null, sys.stdin.fileno())
2289
1963
        os.dup2(null, sys.stdout.fileno())
2290
1964
        os.dup2(null, sys.stderr.fileno())
2299
1973
    
2300
1974
    parser = argparse.ArgumentParser()
2301
1975
    parser.add_argument("-v", "--version", action="version",
2302
 
                        version = "%(prog)s {0}".format(version),
 
1976
                        version = "%%(prog)s %s" % version,
2303
1977
                        help="show version number and exit")
2304
1978
    parser.add_argument("-i", "--interface", metavar="IF",
2305
1979
                        help="Bind to interface IF")
2311
1985
                        help="Run self-test")
2312
1986
    parser.add_argument("--debug", action="store_true",
2313
1987
                        help="Debug mode; run in foreground and log"
2314
 
                        " to terminal", default=None)
 
1988
                        " to terminal")
2315
1989
    parser.add_argument("--debuglevel", metavar="LEVEL",
2316
1990
                        help="Debug level for stdout output")
2317
1991
    parser.add_argument("--priority", help="GnuTLS"
2324
1998
                        " files")
2325
1999
    parser.add_argument("--no-dbus", action="store_false",
2326
2000
                        dest="use_dbus", help="Do not provide D-Bus"
2327
 
                        " system bus interface", default=None)
 
2001
                        " system bus interface")
2328
2002
    parser.add_argument("--no-ipv6", action="store_false",
2329
 
                        dest="use_ipv6", help="Do not use IPv6",
2330
 
                        default=None)
 
2003
                        dest="use_ipv6", help="Do not use IPv6")
2331
2004
    parser.add_argument("--no-restore", action="store_false",
2332
2005
                        dest="restore", help="Do not restore stored"
2333
 
                        " state", default=None)
2334
 
    parser.add_argument("--socket", type=int,
2335
 
                        help="Specify a file descriptor to a network"
2336
 
                        " socket to use instead of creating one")
 
2006
                        " state")
2337
2007
    parser.add_argument("--statedir", metavar="DIR",
2338
2008
                        help="Directory to save/restore state in")
2339
 
    parser.add_argument("--foreground", action="store_true",
2340
 
                        help="Run in foreground", default=None)
2341
2009
    
2342
2010
    options = parser.parse_args()
2343
2011
    
2352
2020
                        "port": "",
2353
2021
                        "debug": "False",
2354
2022
                        "priority":
2355
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2023
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2356
2024
                        "servicename": "Mandos",
2357
2025
                        "use_dbus": "True",
2358
2026
                        "use_ipv6": "True",
2359
2027
                        "debuglevel": "",
2360
2028
                        "restore": "True",
2361
 
                        "socket": "",
2362
 
                        "statedir": "/var/lib/mandos",
2363
 
                        "foreground": "False",
 
2029
                        "statedir": "/var/lib/mandos"
2364
2030
                        }
2365
2031
    
2366
2032
    # Parse config file for server-global settings
2371
2037
    # Convert the SafeConfigParser object to a dict
2372
2038
    server_settings = server_config.defaults()
2373
2039
    # Use the appropriate methods on the non-string config options
2374
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2040
    for option in ("debug", "use_dbus", "use_ipv6"):
2375
2041
        server_settings[option] = server_config.getboolean("DEFAULT",
2376
2042
                                                           option)
2377
2043
    if server_settings["port"]:
2378
2044
        server_settings["port"] = server_config.getint("DEFAULT",
2379
2045
                                                       "port")
2380
 
    if server_settings["socket"]:
2381
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2382
 
                                                         "socket")
2383
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2384
 
        # over with an opened os.devnull.  But we don't want this to
2385
 
        # happen with a supplied network socket.
2386
 
        if 0 <= server_settings["socket"] <= 2:
2387
 
            server_settings["socket"] = os.dup(server_settings
2388
 
                                               ["socket"])
2389
2046
    del server_config
2390
2047
    
2391
2048
    # Override the settings from the config file with command line
2393
2050
    for option in ("interface", "address", "port", "debug",
2394
2051
                   "priority", "servicename", "configdir",
2395
2052
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2396
 
                   "statedir", "socket", "foreground"):
 
2053
                   "statedir"):
2397
2054
        value = getattr(options, option)
2398
2055
        if value is not None:
2399
2056
            server_settings[option] = value
2402
2059
    for option in server_settings.keys():
2403
2060
        if type(server_settings[option]) is str:
2404
2061
            server_settings[option] = unicode(server_settings[option])
2405
 
    # Force all boolean options to be boolean
2406
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2407
 
                   "foreground"):
2408
 
        server_settings[option] = bool(server_settings[option])
2409
 
    # Debug implies foreground
2410
 
    if server_settings["debug"]:
2411
 
        server_settings["foreground"] = True
2412
2062
    # Now we have our good server settings in "server_settings"
2413
2063
    
2414
2064
    ##################################################################
2420
2070
    use_ipv6 = server_settings["use_ipv6"]
2421
2071
    stored_state_path = os.path.join(server_settings["statedir"],
2422
2072
                                     stored_state_file)
2423
 
    foreground = server_settings["foreground"]
2424
2073
    
2425
2074
    if debug:
2426
2075
        initlogger(debug, logging.DEBUG)
2433
2082
    
2434
2083
    if server_settings["servicename"] != "Mandos":
2435
2084
        syslogger.setFormatter(logging.Formatter
2436
 
                               ('Mandos ({0}) [%(process)d]:'
2437
 
                                ' %(levelname)s: %(message)s'
2438
 
                                .format(server_settings
2439
 
                                        ["servicename"])))
 
2085
                               ('Mandos (%s) [%%(process)d]:'
 
2086
                                ' %%(levelname)s: %%(message)s'
 
2087
                                % server_settings["servicename"]))
2440
2088
    
2441
2089
    # Parse config file with clients
2442
2090
    client_config = configparser.SafeConfigParser(Client
2455
2103
                              use_ipv6=use_ipv6,
2456
2104
                              gnutls_priority=
2457
2105
                              server_settings["priority"],
2458
 
                              use_dbus=use_dbus,
2459
 
                              socketfd=(server_settings["socket"]
2460
 
                                        or None))
2461
 
    if not foreground:
2462
 
        pidfilename = "/run/mandos.pid"
2463
 
        if not os.path.isdir("/run/."):
2464
 
            pidfilename = "/var/run/mandos.pid"
2465
 
        pidfile = None
 
2106
                              use_dbus=use_dbus)
 
2107
    if not debug:
 
2108
        pidfilename = "/var/run/mandos.pid"
2466
2109
        try:
2467
2110
            pidfile = open(pidfilename, "w")
2468
 
        except IOError as e:
2469
 
            logger.error("Could not open file %r", pidfilename,
2470
 
                         exc_info=e)
 
2111
        except IOError:
 
2112
            logger.error("Could not open file %r", pidfilename)
2471
2113
    
2472
 
    for name in ("_mandos", "mandos", "nobody"):
 
2114
    try:
 
2115
        uid = pwd.getpwnam("_mandos").pw_uid
 
2116
        gid = pwd.getpwnam("_mandos").pw_gid
 
2117
    except KeyError:
2473
2118
        try:
2474
 
            uid = pwd.getpwnam(name).pw_uid
2475
 
            gid = pwd.getpwnam(name).pw_gid
2476
 
            break
 
2119
            uid = pwd.getpwnam("mandos").pw_uid
 
2120
            gid = pwd.getpwnam("mandos").pw_gid
2477
2121
        except KeyError:
2478
 
            continue
2479
 
    else:
2480
 
        uid = 65534
2481
 
        gid = 65534
 
2122
            try:
 
2123
                uid = pwd.getpwnam("nobody").pw_uid
 
2124
                gid = pwd.getpwnam("nobody").pw_gid
 
2125
            except KeyError:
 
2126
                uid = 65534
 
2127
                gid = 65534
2482
2128
    try:
2483
2129
        os.setgid(gid)
2484
2130
        os.setuid(uid)
2485
2131
    except OSError as error:
2486
 
        if error.errno != errno.EPERM:
2487
 
            raise
 
2132
        if error[0] != errno.EPERM:
 
2133
            raise error
2488
2134
    
2489
2135
    if debug:
2490
2136
        # Enable all possible GnuTLS debugging
2501
2147
         .gnutls_global_set_log_function(debug_gnutls))
2502
2148
        
2503
2149
        # Redirect stdin so all checkers get /dev/null
2504
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2150
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2505
2151
        os.dup2(null, sys.stdin.fileno())
2506
2152
        if null > 2:
2507
2153
            os.close(null)
2508
2154
    
2509
2155
    # Need to fork before connecting to D-Bus
2510
 
    if not foreground:
 
2156
    if not debug:
2511
2157
        # Close all input and output, do double fork, etc.
2512
2158
        daemon()
2513
2159
    
2514
 
    # multiprocessing will use threads, so before we use gobject we
2515
 
    # need to inform gobject that threads will be used.
2516
2160
    gobject.threads_init()
2517
2161
    
2518
2162
    global main_loop
2519
2163
    # From the Avahi example code
2520
 
    DBusGMainLoop(set_as_default=True)
 
2164
    DBusGMainLoop(set_as_default=True )
2521
2165
    main_loop = gobject.MainLoop()
2522
2166
    bus = dbus.SystemBus()
2523
2167
    # End of Avahi example code
2529
2173
                            ("se.bsnet.fukt.Mandos", bus,
2530
2174
                             do_not_queue=True))
2531
2175
        except dbus.exceptions.NameExistsException as e:
2532
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2176
            logger.error(unicode(e) + ", disabling D-Bus")
2533
2177
            use_dbus = False
2534
2178
            server_settings["use_dbus"] = False
2535
2179
            tcp_server.use_dbus = False
2547
2191
    
2548
2192
    client_class = Client
2549
2193
    if use_dbus:
2550
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2194
        client_class = functools.partial(ClientDBusTransitional,
 
2195
                                         bus = bus)
2551
2196
    
2552
2197
    client_settings = Client.config_parser(client_config)
2553
2198
    old_client_settings = {}
2554
2199
    clients_data = {}
2555
2200
    
2556
 
    # This is used to redirect stdout and stderr for checker processes
2557
 
    global wnull
2558
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2559
 
    # Only used if server is running in foreground but not in debug
2560
 
    # mode
2561
 
    if debug or not foreground:
2562
 
        wnull.close()
2563
 
    
2564
2201
    # Get client data and settings from last running state.
2565
2202
    if server_settings["restore"]:
2566
2203
        try:
2569
2206
                                                     (stored_state))
2570
2207
            os.remove(stored_state_path)
2571
2208
        except IOError as e:
2572
 
            if e.errno == errno.ENOENT:
2573
 
                logger.warning("Could not load persistent state: {0}"
2574
 
                                .format(os.strerror(e.errno)))
2575
 
            else:
2576
 
                logger.critical("Could not load persistent state:",
2577
 
                                exc_info=e)
 
2209
            logger.warning("Could not load persistent state: {0}"
 
2210
                           .format(e))
 
2211
            if e.errno != errno.ENOENT:
2578
2212
                raise
2579
2213
        except EOFError as e:
2580
2214
            logger.warning("Could not load persistent state: "
2581
 
                           "EOFError:", exc_info=e)
 
2215
                           "EOFError: {0}".format(e))
2582
2216
    
2583
2217
    with PGPEngine() as pgp:
2584
2218
        for client_name, client in clients_data.iteritems():
2585
 
            # Skip removed clients
2586
 
            if client_name not in client_settings:
2587
 
                continue
2588
 
            
2589
2219
            # Decide which value to use after restoring saved state.
2590
2220
            # We have three different values: Old config file,
2591
2221
            # new config file, and saved state.
2641
2271
                             .format(client_name))
2642
2272
                client["secret"] = (
2643
2273
                    client_settings[client_name]["secret"])
 
2274
 
2644
2275
    
2645
2276
    # Add/remove clients based on new changes made to config
2646
2277
    for client_name in (set(old_client_settings)
2649
2280
    for client_name in (set(client_settings)
2650
2281
                        - set(old_client_settings)):
2651
2282
        clients_data[client_name] = client_settings[client_name]
2652
 
    
 
2283
 
2653
2284
    # Create all client objects
2654
2285
    for client_name, client in clients_data.iteritems():
2655
2286
        tcp_server.clients[client_name] = client_class(
2656
 
            name = client_name, settings = client,
2657
 
            server_settings = server_settings)
 
2287
            name = client_name, settings = client)
2658
2288
    
2659
2289
    if not tcp_server.clients:
2660
2290
        logger.warning("No clients defined")
2661
 
    
2662
 
    if not foreground:
2663
 
        if pidfile is not None:
2664
 
            try:
2665
 
                with pidfile:
2666
 
                    pid = os.getpid()
2667
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2668
 
            except IOError:
2669
 
                logger.error("Could not write to file %r with PID %d",
2670
 
                             pidfilename, pid)
2671
 
        del pidfile
 
2291
        
 
2292
    if not debug:
 
2293
        try:
 
2294
            with pidfile:
 
2295
                pid = os.getpid()
 
2296
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2297
            del pidfile
 
2298
        except IOError:
 
2299
            logger.error("Could not write to file %r with PID %d",
 
2300
                         pidfilename, pid)
 
2301
        except NameError:
 
2302
            # "pidfile" was never created
 
2303
            pass
2672
2304
        del pidfilename
 
2305
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2673
2306
    
2674
2307
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2675
2308
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2676
2309
    
2677
2310
    if use_dbus:
2678
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2679
 
                                        "se.bsnet.fukt.Mandos"})
2680
 
        class MandosDBusService(DBusObjectWithProperties):
 
2311
        class MandosDBusService(dbus.service.Object):
2681
2312
            """A D-Bus proxy object"""
2682
2313
            def __init__(self):
2683
2314
                dbus.service.Object.__init__(self, bus, "/")
2684
2315
            _interface = "se.recompile.Mandos"
2685
2316
            
2686
 
            @dbus_interface_annotations(_interface)
2687
 
            def _foo(self):
2688
 
                return { "org.freedesktop.DBus.Property"
2689
 
                         ".EmitsChangedSignal":
2690
 
                             "false"}
2691
 
            
2692
2317
            @dbus.service.signal(_interface, signature="o")
2693
2318
            def ClientAdded(self, objpath):
2694
2319
                "D-Bus signal"
2736
2361
            
2737
2362
            del _interface
2738
2363
        
2739
 
        mandos_dbus_service = MandosDBusService()
 
2364
        class MandosDBusServiceTransitional(MandosDBusService):
 
2365
            __metaclass__ = AlternateDBusNamesMetaclass
 
2366
        mandos_dbus_service = MandosDBusServiceTransitional()
2740
2367
    
2741
2368
    def cleanup():
2742
2369
        "Cleanup function; run on exit"
2743
2370
        service.cleanup()
2744
2371
        
2745
2372
        multiprocessing.active_children()
2746
 
        wnull.close()
2747
2373
        if not (tcp_server.clients or client_settings):
2748
2374
            return
2749
2375
        
2761
2387
                # A list of attributes that can not be pickled
2762
2388
                # + secret.
2763
2389
                exclude = set(("bus", "changedstate", "secret",
2764
 
                               "checker", "server_settings"))
 
2390
                               "checker"))
2765
2391
                for name, typ in (inspect.getmembers
2766
2392
                                  (dbus.service.Object)):
2767
2393
                    exclude.add(name)
2776
2402
                del client_settings[client.name]["secret"]
2777
2403
        
2778
2404
        try:
2779
 
            with (tempfile.NamedTemporaryFile
2780
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2781
 
                   dir=os.path.dirname(stored_state_path),
2782
 
                   delete=False)) as stored_state:
 
2405
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2406
                                                prefix="clients-",
 
2407
                                                dir=os.path.dirname
 
2408
                                                (stored_state_path))
 
2409
            with os.fdopen(tempfd, "wb") as stored_state:
2783
2410
                pickle.dump((clients, client_settings), stored_state)
2784
 
                tempname=stored_state.name
2785
2411
            os.rename(tempname, stored_state_path)
2786
2412
        except (IOError, OSError) as e:
 
2413
            logger.warning("Could not save persistent state: {0}"
 
2414
                           .format(e))
2787
2415
            if not debug:
2788
2416
                try:
2789
2417
                    os.remove(tempname)
2790
2418
                except NameError:
2791
2419
                    pass
2792
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2793
 
                logger.warning("Could not save persistent state: {0}"
2794
 
                               .format(os.strerror(e.errno)))
2795
 
            else:
2796
 
                logger.warning("Could not save persistent state:",
2797
 
                               exc_info=e)
2798
 
                raise
 
2420
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2421
                                   errno.EEXIST)):
 
2422
                raise e
2799
2423
        
2800
2424
        # Delete all clients, and settings from config
2801
2425
        while tcp_server.clients:
2828
2452
    service.port = tcp_server.socket.getsockname()[1]
2829
2453
    if use_ipv6:
2830
2454
        logger.info("Now listening on address %r, port %d,"
2831
 
                    " flowinfo %d, scope_id %d",
2832
 
                    *tcp_server.socket.getsockname())
 
2455
                    " flowinfo %d, scope_id %d"
 
2456
                    % tcp_server.socket.getsockname())
2833
2457
    else:                       # IPv4
2834
 
        logger.info("Now listening on address %r, port %d",
2835
 
                    *tcp_server.socket.getsockname())
 
2458
        logger.info("Now listening on address %r, port %d"
 
2459
                    % tcp_server.socket.getsockname())
2836
2460
    
2837
2461
    #service.interface = tcp_server.socket.getsockname()[3]
2838
2462
    
2841
2465
        try:
2842
2466
            service.activate()
2843
2467
        except dbus.exceptions.DBusException as error:
2844
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2468
            logger.critical("DBusException: %s", error)
2845
2469
            cleanup()
2846
2470
            sys.exit(1)
2847
2471
        # End of Avahi example code
2854
2478
        logger.debug("Starting main loop")
2855
2479
        main_loop.run()
2856
2480
    except AvahiError as error:
2857
 
        logger.critical("Avahi Error", exc_info=error)
 
2481
        logger.critical("AvahiError: %s", error)
2858
2482
        cleanup()
2859
2483
        sys.exit(1)
2860
2484
    except KeyboardInterrupt: