/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2011-12-27 14:15:40 UTC
  • Revision ID: teddy@recompile.se-20111227141540-ajrabf33q59jfa7t
Reorder TODO entries

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
67
65
import types
68
66
import binascii
69
67
import tempfile
70
 
import itertools
71
 
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'])
148
146
    
149
147
    def __enter__(self):
150
148
        return self
151
149
    
152
 
    def __exit__(self, exc_type, exc_value, traceback):
 
150
    def __exit__ (self, exc_type, exc_value, traceback):
153
151
        self._cleanup()
154
152
        return False
155
153
    
175
173
        return b"mandos" + binascii.hexlify(password)
176
174
    
177
175
    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)
 
176
        self.gnupg.passphrase = self.password_encode(password)
 
177
        with open(os.devnull) as devnull:
 
178
            try:
 
179
                proc = self.gnupg.run(['--symmetric'],
 
180
                                      create_fhs=['stdin', 'stdout'],
 
181
                                      attach_fhs={'stderr': devnull})
 
182
                with contextlib.closing(proc.handles['stdin']) as f:
 
183
                    f.write(data)
 
184
                with contextlib.closing(proc.handles['stdout']) as f:
 
185
                    ciphertext = f.read()
 
186
                proc.wait()
 
187
            except IOError as e:
 
188
                raise PGPError(e)
 
189
        self.gnupg.passphrase = None
193
190
        return ciphertext
194
191
    
195
192
    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)
 
193
        self.gnupg.passphrase = self.password_encode(password)
 
194
        with open(os.devnull) as devnull:
 
195
            try:
 
196
                proc = self.gnupg.run(['--decrypt'],
 
197
                                      create_fhs=['stdin', 'stdout'],
 
198
                                      attach_fhs={'stderr': devnull})
 
199
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
200
                    f.write(data)
 
201
                with contextlib.closing(proc.handles['stdout']) as f:
 
202
                    decrypted_plaintext = f.read()
 
203
                proc.wait()
 
204
            except IOError as e:
 
205
                raise PGPError(e)
 
206
        self.gnupg.passphrase = None
212
207
        return decrypted_plaintext
213
208
 
214
209
 
 
210
 
215
211
class AvahiError(Exception):
216
212
    def __init__(self, value, *args, **kwargs):
217
213
        self.value = value
234
230
               Used to optionally bind to the specified interface.
235
231
    name: string; Example: 'Mandos'
236
232
    type: string; Example: '_mandos._tcp'.
237
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
233
                  See <http://www.dns-sd.org/ServiceTypes.html>
238
234
    port: integer; what port to announce
239
235
    TXT: list of strings; TXT record for the service
240
236
    domain: string; Domain to publish on, default to .local if empty.
246
242
    server: D-Bus Server
247
243
    bus: dbus.SystemBus()
248
244
    """
249
 
    
250
245
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
251
246
                 servicetype = None, port = None, TXT = None,
252
247
                 domain = "", host = "", max_renames = 32768,
265
260
        self.server = None
266
261
        self.bus = bus
267
262
        self.entry_group_state_changed_match = None
268
 
    
269
263
    def rename(self):
270
264
        """Derived from the Avahi example code"""
271
265
        if self.rename_count >= self.max_renames:
281
275
        try:
282
276
            self.add()
283
277
        except dbus.exceptions.DBusException as error:
284
 
            logger.critical("D-Bus Exception", exc_info=error)
 
278
            logger.critical("DBusException: %s", error)
285
279
            self.cleanup()
286
280
            os._exit(1)
287
281
        self.rename_count += 1
288
 
    
289
282
    def remove(self):
290
283
        """Derived from the Avahi example code"""
291
284
        if self.entry_group_state_changed_match is not None:
293
286
            self.entry_group_state_changed_match = None
294
287
        if self.group is not None:
295
288
            self.group.Reset()
296
 
    
297
289
    def add(self):
298
290
        """Derived from the Avahi example code"""
299
291
        self.remove()
316
308
            dbus.UInt16(self.port),
317
309
            avahi.string_array_to_txt_array(self.TXT))
318
310
        self.group.Commit()
319
 
    
320
311
    def entry_group_state_changed(self, state, error):
321
312
        """Derived from the Avahi example code"""
322
313
        logger.debug("Avahi entry group state change: %i", state)
329
320
        elif state == avahi.ENTRY_GROUP_FAILURE:
330
321
            logger.critical("Avahi: Error in group state changed %s",
331
322
                            unicode(error))
332
 
            raise AvahiGroupError("State changed: {0!s}"
333
 
                                  .format(error))
334
 
    
 
323
            raise AvahiGroupError("State changed: %s"
 
324
                                  % unicode(error))
335
325
    def cleanup(self):
336
326
        """Derived from the Avahi example code"""
337
327
        if self.group is not None:
342
332
                pass
343
333
            self.group = None
344
334
        self.remove()
345
 
    
346
335
    def server_state_changed(self, state, error=None):
347
336
        """Derived from the Avahi example code"""
348
337
        logger.debug("Avahi server state change: %i", state)
367
356
                logger.debug("Unknown state: %r", state)
368
357
            else:
369
358
                logger.debug("Unknown state: %r: %r", state, error)
370
 
    
371
359
    def activate(self):
372
360
        """Derived from the Avahi example code"""
373
361
        if self.server is None:
380
368
                                 self.server_state_changed)
381
369
        self.server_state_changed(self.server.GetState())
382
370
 
383
 
 
384
371
class AvahiServiceToSyslog(AvahiService):
385
372
    def rename(self):
386
373
        """Add the new name to the syslog messages"""
387
374
        ret = AvahiService.rename(self)
388
375
        syslogger.setFormatter(logging.Formatter
389
 
                               ('Mandos ({0}) [%(process)d]:'
390
 
                                ' %(levelname)s: %(message)s'
391
 
                                .format(self.name)))
 
376
                               ('Mandos (%s) [%%(process)d]:'
 
377
                                ' %%(levelname)s: %%(message)s'
 
378
                                % self.name))
392
379
        return ret
393
380
 
394
 
 
395
381
def timedelta_to_milliseconds(td):
396
382
    "Convert a datetime.timedelta() to milliseconds"
397
383
    return ((td.days * 24 * 60 * 60 * 1000)
398
384
            + (td.seconds * 1000)
399
385
            + (td.microseconds // 1000))
400
 
 
401
 
 
 
386
        
402
387
class Client(object):
403
388
    """A representation of a client host served by this server.
404
389
    
429
414
    last_checked_ok: datetime.datetime(); (UTC) or None
430
415
    last_checker_status: integer between 0 and 255 reflecting exit
431
416
                         status of last checker. -1 reflects crashed
432
 
                         checker, -2 means no checker completed yet.
 
417
                         checker, or None.
433
418
    last_enabled: datetime.datetime(); (UTC) or None
434
419
    name:       string; from the config file, used in log messages and
435
420
                        D-Bus identifiers
436
421
    secret:     bytestring; sent verbatim (over TLS) to client
437
422
    timeout:    datetime.timedelta(); How long from last_checked_ok
438
423
                                      until this client is disabled
439
 
    extended_timeout:   extra long timeout when secret has been sent
 
424
    extended_timeout:   extra long timeout when password has been sent
440
425
    runtime_expansions: Allowed attributes for runtime expansion.
441
426
    expires:    datetime.datetime(); time (UTC) when a client will be
442
427
                disabled, or None
443
428
    """
444
429
    
445
430
    runtime_expansions = ("approval_delay", "approval_duration",
446
 
                          "created", "enabled", "expires",
447
 
                          "fingerprint", "host", "interval",
448
 
                          "last_approval_request", "last_checked_ok",
 
431
                          "created", "enabled", "fingerprint",
 
432
                          "host", "interval", "last_checked_ok",
449
433
                          "last_enabled", "name", "timeout")
450
 
    client_defaults = { "timeout": "PT5M",
451
 
                        "extended_timeout": "PT15M",
452
 
                        "interval": "PT2M",
 
434
    client_defaults = { "timeout": "5m",
 
435
                        "extended_timeout": "15m",
 
436
                        "interval": "2m",
453
437
                        "checker": "fping -q -- %%(host)s",
454
438
                        "host": "",
455
 
                        "approval_delay": "PT0S",
456
 
                        "approval_duration": "PT1S",
 
439
                        "approval_delay": "0s",
 
440
                        "approval_duration": "1s",
457
441
                        "approved_by_default": "True",
458
442
                        "enabled": "True",
459
443
                        }
472
456
    
473
457
    def approval_delay_milliseconds(self):
474
458
        return timedelta_to_milliseconds(self.approval_delay)
475
 
    
 
459
 
476
460
    @staticmethod
477
461
    def config_parser(config):
478
 
        """Construct a new dict of client settings of this form:
 
462
        """ Construct a new dict of client settings of this form:
479
463
        { client_name: {setting_name: value, ...}, ...}
480
 
        with exceptions for any special settings as defined above.
481
 
        NOTE: Must be a pure function. Must return the same result
482
 
        value given the same arguments.
483
 
        """
 
464
        with exceptions for any special settings as defined above"""
484
465
        settings = {}
485
466
        for client_name in config.sections():
486
467
            section = dict(config.items(client_name))
490
471
            # Reformat values from string types to Python types
491
472
            client["approved_by_default"] = config.getboolean(
492
473
                client_name, "approved_by_default")
493
 
            client["enabled"] = config.getboolean(client_name,
494
 
                                                  "enabled")
 
474
            client["enabled"] = config.getboolean(client_name, "enabled")
495
475
            
496
476
            client["fingerprint"] = (section["fingerprint"].upper()
497
477
                                     .replace(" ", ""))
503
483
                          "rb") as secfile:
504
484
                    client["secret"] = secfile.read()
505
485
            else:
506
 
                raise TypeError("No secret or secfile for section {0}"
507
 
                                .format(section))
 
486
                raise TypeError("No secret or secfile for section %s"
 
487
                                % section)
508
488
            client["timeout"] = string_to_delta(section["timeout"])
509
489
            client["extended_timeout"] = string_to_delta(
510
490
                section["extended_timeout"])
516
496
            client["checker_command"] = section["checker"]
517
497
            client["last_approval_request"] = None
518
498
            client["last_checked_ok"] = None
519
 
            client["last_checker_status"] = -2
520
 
        
 
499
            client["last_checker_status"] = None
 
500
            if client["enabled"]:
 
501
                client["last_enabled"] = datetime.datetime.utcnow()
 
502
                client["expires"] = (datetime.datetime.utcnow()
 
503
                                     + client["timeout"])
 
504
            else:
 
505
                client["last_enabled"] = None
 
506
                client["expires"] = None
 
507
 
521
508
        return settings
522
 
    
 
509
        
 
510
        
523
511
    def __init__(self, settings, name = None):
 
512
        """Note: the 'checker' key in 'config' sets the
 
513
        'checker_command' attribute and *not* the 'checker'
 
514
        attribute."""
524
515
        self.name = name
525
516
        # adding all client settings
526
517
        for setting, value in settings.iteritems():
527
518
            setattr(self, setting, value)
528
519
        
529
 
        if self.enabled:
530
 
            if not hasattr(self, "last_enabled"):
531
 
                self.last_enabled = datetime.datetime.utcnow()
532
 
            if not hasattr(self, "expires"):
533
 
                self.expires = (datetime.datetime.utcnow()
534
 
                                + self.timeout)
535
 
        else:
536
 
            self.last_enabled = None
537
 
            self.expires = None
538
 
        
539
520
        logger.debug("Creating client %r", self.name)
540
521
        # Uppercase and remove spaces from fingerprint for later
541
522
        # comparison purposes with return value from the fingerprint()
542
523
        # function
543
524
        logger.debug("  Fingerprint: %s", self.fingerprint)
544
 
        self.created = settings.get("created",
545
 
                                    datetime.datetime.utcnow())
546
 
        
 
525
        self.created = settings.get("created", datetime.datetime.utcnow())
 
526
 
547
527
        # attributes specific for this server instance
548
528
        self.checker = None
549
529
        self.checker_initiator_tag = None
577
557
        if getattr(self, "enabled", False):
578
558
            # Already enabled
579
559
            return
 
560
        self.send_changedstate()
580
561
        self.expires = datetime.datetime.utcnow() + self.timeout
581
562
        self.enabled = True
582
563
        self.last_enabled = datetime.datetime.utcnow()
583
564
        self.init_checker()
584
 
        self.send_changedstate()
585
565
    
586
566
    def disable(self, quiet=True):
587
567
        """Disable this client."""
588
568
        if not getattr(self, "enabled", False):
589
569
            return False
590
570
        if not quiet:
 
571
            self.send_changedstate()
 
572
        if not quiet:
591
573
            logger.info("Disabling client %s", self.name)
592
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
574
        if getattr(self, "disable_initiator_tag", False):
593
575
            gobject.source_remove(self.disable_initiator_tag)
594
576
            self.disable_initiator_tag = None
595
577
        self.expires = None
596
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
578
        if getattr(self, "checker_initiator_tag", False):
597
579
            gobject.source_remove(self.checker_initiator_tag)
598
580
            self.checker_initiator_tag = None
599
581
        self.stop_checker()
600
582
        self.enabled = False
601
 
        if not quiet:
602
 
            self.send_changedstate()
603
583
        # Do not run this again if called by a gobject.timeout_add
604
584
        return False
605
585
    
609
589
    def init_checker(self):
610
590
        # Schedule a new checker to be started an 'interval' from now,
611
591
        # and every interval from then on.
612
 
        if self.checker_initiator_tag is not None:
613
 
            gobject.source_remove(self.checker_initiator_tag)
614
592
        self.checker_initiator_tag = (gobject.timeout_add
615
593
                                      (self.interval_milliseconds(),
616
594
                                       self.start_checker))
617
595
        # Schedule a disable() when 'timeout' has passed
618
 
        if self.disable_initiator_tag is not None:
619
 
            gobject.source_remove(self.disable_initiator_tag)
620
596
        self.disable_initiator_tag = (gobject.timeout_add
621
597
                                   (self.timeout_milliseconds(),
622
598
                                    self.disable))
641
617
            logger.warning("Checker for %(name)s crashed?",
642
618
                           vars(self))
643
619
    
644
 
    def checked_ok(self):
645
 
        """Assert that the client has been seen, alive and well."""
646
 
        self.last_checked_ok = datetime.datetime.utcnow()
647
 
        self.last_checker_status = 0
648
 
        self.bump_timeout()
649
 
    
650
 
    def bump_timeout(self, timeout=None):
651
 
        """Bump up the timeout for this client."""
 
620
    def checked_ok(self, timeout=None):
 
621
        """Bump up the timeout for this client.
 
622
        
 
623
        This should only be called when the client has been seen,
 
624
        alive and well.
 
625
        """
652
626
        if timeout is None:
653
627
            timeout = self.timeout
 
628
        self.last_checked_ok = datetime.datetime.utcnow()
654
629
        if self.disable_initiator_tag is not None:
655
630
            gobject.source_remove(self.disable_initiator_tag)
656
 
            self.disable_initiator_tag = None
657
631
        if getattr(self, "enabled", False):
658
632
            self.disable_initiator_tag = (gobject.timeout_add
659
633
                                          (timedelta_to_milliseconds
669
643
        If a checker already exists, leave it running and do
670
644
        nothing."""
671
645
        # The reason for not killing a running checker is that if we
672
 
        # did that, and if a checker (for some reason) started running
673
 
        # slowly and taking more than 'interval' time, then the client
674
 
        # would inevitably timeout, since no checker would get a
675
 
        # chance to run to completion.  If we instead leave running
 
646
        # did that, then if a checker (for some reason) started
 
647
        # running slowly and taking more than 'interval' time, the
 
648
        # client would inevitably timeout, since no checker would get
 
649
        # a chance to run to completion.  If we instead leave running
676
650
        # checkers alone, the checker would have to take more time
677
651
        # than 'timeout' for the client to be disabled, which is as it
678
652
        # should be.
692
666
                                      self.current_checker_command)
693
667
        # Start a new checker if needed
694
668
        if self.checker is None:
695
 
            # Escape attributes for the shell
696
 
            escaped_attrs = dict(
697
 
                (attr, re.escape(unicode(getattr(self, attr))))
698
 
                for attr in
699
 
                self.runtime_expansions)
700
669
            try:
701
 
                command = self.checker_command % escaped_attrs
702
 
            except TypeError as error:
703
 
                logger.error('Could not format string "%s"',
704
 
                             self.checker_command, exc_info=error)
705
 
                return True # Try again later
 
670
                # In case checker_command has exactly one % operator
 
671
                command = self.checker_command % self.host
 
672
            except TypeError:
 
673
                # Escape attributes for the shell
 
674
                escaped_attrs = dict(
 
675
                    (attr,
 
676
                     re.escape(unicode(str(getattr(self, attr, "")),
 
677
                                       errors=
 
678
                                       'replace')))
 
679
                    for attr in
 
680
                    self.runtime_expansions)
 
681
                
 
682
                try:
 
683
                    command = self.checker_command % escaped_attrs
 
684
                except TypeError as error:
 
685
                    logger.error('Could not format string "%s":'
 
686
                                 ' %s', self.checker_command, error)
 
687
                    return True # Try again later
706
688
            self.current_checker_command = command
707
689
            try:
708
690
                logger.info("Starting checker %r for %s",
714
696
                self.checker = subprocess.Popen(command,
715
697
                                                close_fds=True,
716
698
                                                shell=True, cwd="/")
717
 
            except OSError as error:
718
 
                logger.error("Failed to start subprocess",
719
 
                             exc_info=error)
720
 
                return True
721
 
            self.checker_callback_tag = (gobject.child_watch_add
722
 
                                         (self.checker.pid,
723
 
                                          self.checker_callback,
724
 
                                          data=command))
725
 
            # The checker may have completed before the gobject
726
 
            # watch was added.  Check for this.
727
 
            try:
 
699
                self.checker_callback_tag = (gobject.child_watch_add
 
700
                                             (self.checker.pid,
 
701
                                              self.checker_callback,
 
702
                                              data=command))
 
703
                # The checker may have completed before the gobject
 
704
                # watch was added.  Check for this.
728
705
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
706
                if pid:
 
707
                    gobject.source_remove(self.checker_callback_tag)
 
708
                    self.checker_callback(pid, status, command)
729
709
            except OSError as error:
730
 
                if error.errno == errno.ECHILD:
731
 
                    # This should never happen
732
 
                    logger.error("Child process vanished",
733
 
                                 exc_info=error)
734
 
                    return True
735
 
                raise
736
 
            if pid:
737
 
                gobject.source_remove(self.checker_callback_tag)
738
 
                self.checker_callback(pid, status, command)
 
710
                logger.error("Failed to start subprocess: %s",
 
711
                             error)
739
712
        # Re-run this periodically if run by gobject.timeout_add
740
713
        return True
741
714
    
748
721
            return
749
722
        logger.debug("Stopping checker for %(name)s", vars(self))
750
723
        try:
751
 
            self.checker.terminate()
 
724
            os.kill(self.checker.pid, signal.SIGTERM)
752
725
            #time.sleep(0.5)
753
726
            #if self.checker.poll() is None:
754
 
            #    self.checker.kill()
 
727
            #    os.kill(self.checker.pid, signal.SIGKILL)
755
728
        except OSError as error:
756
729
            if error.errno != errno.ESRCH: # No such process
757
730
                raise
774
747
    # "Set" method, so we fail early here:
775
748
    if byte_arrays and signature != "ay":
776
749
        raise ValueError("Byte arrays not supported for non-'ay'"
777
 
                         " signature {0!r}".format(signature))
 
750
                         " signature %r" % signature)
778
751
    def decorator(func):
779
752
        func._dbus_is_property = True
780
753
        func._dbus_interface = dbus_interface
788
761
    return decorator
789
762
 
790
763
 
791
 
def dbus_interface_annotations(dbus_interface):
792
 
    """Decorator for marking functions returning interface annotations
793
 
    
794
 
    Usage:
795
 
    
796
 
    @dbus_interface_annotations("org.example.Interface")
797
 
    def _foo(self):  # Function name does not matter
798
 
        return {"org.freedesktop.DBus.Deprecated": "true",
799
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
800
 
                    "false"}
801
 
    """
802
 
    def decorator(func):
803
 
        func._dbus_is_interface = True
804
 
        func._dbus_interface = dbus_interface
805
 
        func._dbus_name = dbus_interface
806
 
        return func
807
 
    return decorator
808
 
 
809
 
 
810
 
def dbus_annotations(annotations):
811
 
    """Decorator to annotate D-Bus methods, signals or properties
812
 
    Usage:
813
 
    
814
 
    @dbus_service_property("org.example.Interface", signature="b",
815
 
                           access="r")
816
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
817
 
                        "org.freedesktop.DBus.Property."
818
 
                        "EmitsChangedSignal": "false"})
819
 
    def Property_dbus_property(self):
820
 
        return dbus.Boolean(False)
821
 
    """
822
 
    def decorator(func):
823
 
        func._dbus_annotations = annotations
824
 
        return func
825
 
    return decorator
826
 
 
827
 
 
828
764
class DBusPropertyException(dbus.exceptions.DBusException):
829
765
    """A base class for D-Bus property-related exceptions
830
766
    """
853
789
    """
854
790
    
855
791
    @staticmethod
856
 
    def _is_dbus_thing(thing):
857
 
        """Returns a function testing if an attribute is a D-Bus thing
858
 
        
859
 
        If called like _is_dbus_thing("method") it returns a function
860
 
        suitable for use as predicate to inspect.getmembers().
861
 
        """
862
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
863
 
                                   False)
 
792
    def _is_dbus_property(obj):
 
793
        return getattr(obj, "_dbus_is_property", False)
864
794
    
865
 
    def _get_all_dbus_things(self, thing):
 
795
    def _get_all_dbus_properties(self):
866
796
        """Returns a generator of (name, attribute) pairs
867
797
        """
868
 
        return ((getattr(athing.__get__(self), "_dbus_name",
869
 
                         name),
870
 
                 athing.__get__(self))
 
798
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
871
799
                for cls in self.__class__.__mro__
872
 
                for name, athing in
873
 
                inspect.getmembers(cls,
874
 
                                   self._is_dbus_thing(thing)))
 
800
                for name, prop in
 
801
                inspect.getmembers(cls, self._is_dbus_property))
875
802
    
876
803
    def _get_dbus_property(self, interface_name, property_name):
877
804
        """Returns a bound method if one exists which is a D-Bus
879
806
        """
880
807
        for cls in  self.__class__.__mro__:
881
808
            for name, value in (inspect.getmembers
882
 
                                (cls,
883
 
                                 self._is_dbus_thing("property"))):
 
809
                                (cls, self._is_dbus_property)):
884
810
                if (value._dbus_name == property_name
885
811
                    and value._dbus_interface == interface_name):
886
812
                    return value.__get__(self)
915
841
            # signatures other than "ay".
916
842
            if prop._dbus_signature != "ay":
917
843
                raise ValueError
918
 
            value = dbus.ByteArray(b''.join(chr(byte)
919
 
                                            for byte in value))
 
844
            value = dbus.ByteArray(''.join(unichr(byte)
 
845
                                           for byte in value))
920
846
        prop(value)
921
847
    
922
848
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
928
854
        Note: Will not include properties with access="write".
929
855
        """
930
856
        properties = {}
931
 
        for name, prop in self._get_all_dbus_things("property"):
 
857
        for name, prop in self._get_all_dbus_properties():
932
858
            if (interface_name
933
859
                and interface_name != prop._dbus_interface):
934
860
                # Interface non-empty but did not match
949
875
                         path_keyword='object_path',
950
876
                         connection_keyword='connection')
951
877
    def Introspect(self, object_path, connection):
952
 
        """Overloading of standard D-Bus method.
953
 
        
954
 
        Inserts property tags and interface annotation tags.
 
878
        """Standard D-Bus method, overloaded to insert property tags.
955
879
        """
956
880
        xmlstring = dbus.service.Object.Introspect(self, object_path,
957
881
                                                   connection)
964
888
                e.setAttribute("access", prop._dbus_access)
965
889
                return e
966
890
            for if_tag in document.getElementsByTagName("interface"):
967
 
                # Add property tags
968
891
                for tag in (make_tag(document, name, prop)
969
892
                            for name, prop
970
 
                            in self._get_all_dbus_things("property")
 
893
                            in self._get_all_dbus_properties()
971
894
                            if prop._dbus_interface
972
895
                            == if_tag.getAttribute("name")):
973
896
                    if_tag.appendChild(tag)
974
 
                # Add annotation tags
975
 
                for typ in ("method", "signal", "property"):
976
 
                    for tag in if_tag.getElementsByTagName(typ):
977
 
                        annots = dict()
978
 
                        for name, prop in (self.
979
 
                                           _get_all_dbus_things(typ)):
980
 
                            if (name == tag.getAttribute("name")
981
 
                                and prop._dbus_interface
982
 
                                == if_tag.getAttribute("name")):
983
 
                                annots.update(getattr
984
 
                                              (prop,
985
 
                                               "_dbus_annotations",
986
 
                                               {}))
987
 
                        for name, value in annots.iteritems():
988
 
                            ann_tag = document.createElement(
989
 
                                "annotation")
990
 
                            ann_tag.setAttribute("name", name)
991
 
                            ann_tag.setAttribute("value", value)
992
 
                            tag.appendChild(ann_tag)
993
 
                # Add interface annotation tags
994
 
                for annotation, value in dict(
995
 
                    itertools.chain.from_iterable(
996
 
                        annotations().iteritems()
997
 
                        for name, annotations in
998
 
                        self._get_all_dbus_things("interface")
999
 
                        if name == if_tag.getAttribute("name")
1000
 
                        )).iteritems():
1001
 
                    ann_tag = document.createElement("annotation")
1002
 
                    ann_tag.setAttribute("name", annotation)
1003
 
                    ann_tag.setAttribute("value", value)
1004
 
                    if_tag.appendChild(ann_tag)
1005
897
                # Add the names to the return values for the
1006
898
                # "org.freedesktop.DBus.Properties" methods
1007
899
                if (if_tag.getAttribute("name")
1022
914
        except (AttributeError, xml.dom.DOMException,
1023
915
                xml.parsers.expat.ExpatError) as error:
1024
916
            logger.error("Failed to override Introspection method",
1025
 
                         exc_info=error)
 
917
                         error)
1026
918
        return xmlstring
1027
919
 
1028
920
 
1029
 
def datetime_to_dbus(dt, variant_level=0):
 
921
def datetime_to_dbus (dt, variant_level=0):
1030
922
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1031
923
    if dt is None:
1032
924
        return dbus.String("", variant_level = variant_level)
1034
926
                       variant_level=variant_level)
1035
927
 
1036
928
 
1037
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1038
 
    """A class decorator; applied to a subclass of
1039
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1040
 
    interface names according to the "alt_interface_names" mapping.
1041
 
    Usage:
1042
 
    
1043
 
    @alternate_dbus_interfaces({"org.example.Interface":
1044
 
                                    "net.example.AlternateInterface"})
1045
 
    class SampleDBusObject(dbus.service.Object):
1046
 
        @dbus.service.method("org.example.Interface")
1047
 
        def SampleDBusMethod():
1048
 
            pass
1049
 
    
1050
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1051
 
    reachable via two interfaces: "org.example.Interface" and
1052
 
    "net.example.AlternateInterface", the latter of which will have
1053
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1054
 
    "true", unless "deprecate" is passed with a False value.
1055
 
    
1056
 
    This works for methods and signals, and also for D-Bus properties
1057
 
    (from DBusObjectWithProperties) and interfaces (from the
1058
 
    dbus_interface_annotations decorator).
 
929
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
930
                                  .__metaclass__):
 
931
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
932
    will add additional D-Bus attributes matching a certain pattern.
1059
933
    """
1060
 
    def wrapper(cls):
1061
 
        for orig_interface_name, alt_interface_name in (
1062
 
            alt_interface_names.iteritems()):
1063
 
            attr = {}
1064
 
            interface_names = set()
1065
 
            # Go though all attributes of the class
1066
 
            for attrname, attribute in inspect.getmembers(cls):
 
934
    def __new__(mcs, name, bases, attr):
 
935
        # Go through all the base classes which could have D-Bus
 
936
        # methods, signals, or properties in them
 
937
        for base in (b for b in bases
 
938
                     if issubclass(b, dbus.service.Object)):
 
939
            # Go though all attributes of the base class
 
940
            for attrname, attribute in inspect.getmembers(base):
1067
941
                # Ignore non-D-Bus attributes, and D-Bus attributes
1068
942
                # with the wrong interface name
1069
943
                if (not hasattr(attribute, "_dbus_interface")
1070
944
                    or not attribute._dbus_interface
1071
 
                    .startswith(orig_interface_name)):
 
945
                    .startswith("se.recompile.Mandos")):
1072
946
                    continue
1073
947
                # Create an alternate D-Bus interface name based on
1074
948
                # the current name
1075
949
                alt_interface = (attribute._dbus_interface
1076
 
                                 .replace(orig_interface_name,
1077
 
                                          alt_interface_name))
1078
 
                interface_names.add(alt_interface)
 
950
                                 .replace("se.recompile.Mandos",
 
951
                                          "se.bsnet.fukt.Mandos"))
1079
952
                # Is this a D-Bus signal?
1080
953
                if getattr(attribute, "_dbus_is_signal", False):
1081
 
                    # Extract the original non-method undecorated
1082
 
                    # function by black magic
 
954
                    # Extract the original non-method function by
 
955
                    # black magic
1083
956
                    nonmethod_func = (dict(
1084
957
                            zip(attribute.func_code.co_freevars,
1085
958
                                attribute.__closure__))["func"]
1096
969
                                nonmethod_func.func_name,
1097
970
                                nonmethod_func.func_defaults,
1098
971
                                nonmethod_func.func_closure)))
1099
 
                    # Copy annotations, if any
1100
 
                    try:
1101
 
                        new_function._dbus_annotations = (
1102
 
                            dict(attribute._dbus_annotations))
1103
 
                    except AttributeError:
1104
 
                        pass
1105
972
                    # Define a creator of a function to call both the
1106
 
                    # original and alternate functions, so both the
1107
 
                    # original and alternate signals gets sent when
1108
 
                    # the function is called
 
973
                    # old and new functions, so both the old and new
 
974
                    # signals gets sent when the function is called
1109
975
                    def fixscope(func1, func2):
1110
976
                        """This function is a scope container to pass
1111
977
                        func1 and func2 to the "call_both" function
1118
984
                        return call_both
1119
985
                    # Create the "call_both" function and add it to
1120
986
                    # the class
1121
 
                    attr[attrname] = fixscope(attribute, new_function)
 
987
                    attr[attrname] = fixscope(attribute,
 
988
                                              new_function)
1122
989
                # Is this a D-Bus method?
1123
990
                elif getattr(attribute, "_dbus_is_method", False):
1124
991
                    # Create a new, but exactly alike, function
1135
1002
                                        attribute.func_name,
1136
1003
                                        attribute.func_defaults,
1137
1004
                                        attribute.func_closure)))
1138
 
                    # Copy annotations, if any
1139
 
                    try:
1140
 
                        attr[attrname]._dbus_annotations = (
1141
 
                            dict(attribute._dbus_annotations))
1142
 
                    except AttributeError:
1143
 
                        pass
1144
1005
                # Is this a D-Bus property?
1145
1006
                elif getattr(attribute, "_dbus_is_property", False):
1146
1007
                    # Create a new, but exactly alike, function
1160
1021
                                        attribute.func_name,
1161
1022
                                        attribute.func_defaults,
1162
1023
                                        attribute.func_closure)))
1163
 
                    # Copy annotations, if any
1164
 
                    try:
1165
 
                        attr[attrname]._dbus_annotations = (
1166
 
                            dict(attribute._dbus_annotations))
1167
 
                    except AttributeError:
1168
 
                        pass
1169
 
                # Is this a D-Bus interface?
1170
 
                elif getattr(attribute, "_dbus_is_interface", False):
1171
 
                    # Create a new, but exactly alike, function
1172
 
                    # object.  Decorate it to be a new D-Bus interface
1173
 
                    # with the alternate D-Bus interface name.  Add it
1174
 
                    # to the class.
1175
 
                    attr[attrname] = (dbus_interface_annotations
1176
 
                                      (alt_interface)
1177
 
                                      (types.FunctionType
1178
 
                                       (attribute.func_code,
1179
 
                                        attribute.func_globals,
1180
 
                                        attribute.func_name,
1181
 
                                        attribute.func_defaults,
1182
 
                                        attribute.func_closure)))
1183
 
            if deprecate:
1184
 
                # Deprecate all alternate interfaces
1185
 
                iname="_AlternateDBusNames_interface_annotation{0}"
1186
 
                for interface_name in interface_names:
1187
 
                    @dbus_interface_annotations(interface_name)
1188
 
                    def func(self):
1189
 
                        return { "org.freedesktop.DBus.Deprecated":
1190
 
                                     "true" }
1191
 
                    # Find an unused name
1192
 
                    for aname in (iname.format(i)
1193
 
                                  for i in itertools.count()):
1194
 
                        if aname not in attr:
1195
 
                            attr[aname] = func
1196
 
                            break
1197
 
            if interface_names:
1198
 
                # Replace the class with a new subclass of it with
1199
 
                # methods, signals, etc. as created above.
1200
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1201
 
                           (cls,), attr)
1202
 
        return cls
1203
 
    return wrapper
1204
 
 
1205
 
 
1206
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1207
 
                                "se.bsnet.fukt.Mandos"})
 
1024
        return type.__new__(mcs, name, bases, attr)
 
1025
 
 
1026
 
1208
1027
class ClientDBus(Client, DBusObjectWithProperties):
1209
1028
    """A Client class using D-Bus
1210
1029
    
1221
1040
    def __init__(self, bus = None, *args, **kwargs):
1222
1041
        self.bus = bus
1223
1042
        Client.__init__(self, *args, **kwargs)
 
1043
        self._approvals_pending = 0
 
1044
        
 
1045
        self._approvals_pending = 0
1224
1046
        # Only now, when this client is initialized, can it show up on
1225
1047
        # the D-Bus
1226
1048
        client_object_name = unicode(self.name).translate(
1230
1052
                                 ("/clients/" + client_object_name))
1231
1053
        DBusObjectWithProperties.__init__(self, self.bus,
1232
1054
                                          self.dbus_object_path)
1233
 
    
 
1055
        
1234
1056
    def notifychangeproperty(transform_func,
1235
1057
                             dbus_name, type_func=lambda x: x,
1236
1058
                             variant_level=1):
1259
1081
        
1260
1082
        return property(lambda self: getattr(self, attrname), setter)
1261
1083
    
 
1084
    
1262
1085
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1263
1086
    approvals_pending = notifychangeproperty(dbus.Boolean,
1264
1087
                                             "ApprovalPending",
1271
1094
                                       checker is not None)
1272
1095
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1273
1096
                                           "LastCheckedOK")
1274
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1275
 
                                               "LastCheckerStatus")
1276
1097
    last_approval_request = notifychangeproperty(
1277
1098
        datetime_to_dbus, "LastApprovalRequest")
1278
1099
    approved_by_default = notifychangeproperty(dbus.Boolean,
1346
1167
        return False
1347
1168
    
1348
1169
    def approve(self, value=True):
 
1170
        self.send_changedstate()
1349
1171
        self.approved = value
1350
1172
        gobject.timeout_add(timedelta_to_milliseconds
1351
1173
                            (self.approval_duration),
1352
1174
                            self._reset_approved)
1353
 
        self.send_changedstate()
 
1175
    
1354
1176
    
1355
1177
    ## D-Bus methods, signals & properties
1356
1178
    _interface = "se.recompile.Mandos.Client"
1357
1179
    
1358
 
    ## Interfaces
1359
 
    
1360
 
    @dbus_interface_annotations(_interface)
1361
 
    def _foo(self):
1362
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1363
 
                     "false"}
1364
 
    
1365
1180
    ## Signals
1366
1181
    
1367
1182
    # CheckerCompleted - signal
1403
1218
        "D-Bus signal"
1404
1219
        return self.need_approval()
1405
1220
    
 
1221
    # NeRwequest - signal
 
1222
    @dbus.service.signal(_interface, signature="s")
 
1223
    def NewRequest(self, ip):
 
1224
        """D-Bus signal
 
1225
        Is sent after a client request a password.
 
1226
        """
 
1227
        pass
 
1228
    
1406
1229
    ## Methods
1407
1230
    
1408
1231
    # Approve - method
1518
1341
            return
1519
1342
        return datetime_to_dbus(self.last_checked_ok)
1520
1343
    
1521
 
    # LastCheckerStatus - property
1522
 
    @dbus_service_property(_interface, signature="n",
1523
 
                           access="read")
1524
 
    def LastCheckerStatus_dbus_property(self):
1525
 
        return dbus.Int16(self.last_checker_status)
1526
 
    
1527
1344
    # Expires - property
1528
1345
    @dbus_service_property(_interface, signature="s", access="read")
1529
1346
    def Expires_dbus_property(self):
1540
1357
    def Timeout_dbus_property(self, value=None):
1541
1358
        if value is None:       # get
1542
1359
            return dbus.UInt64(self.timeout_milliseconds())
1543
 
        old_timeout = self.timeout
1544
1360
        self.timeout = datetime.timedelta(0, 0, 0, value)
1545
 
        # Reschedule disabling
1546
 
        if self.enabled:
1547
 
            now = datetime.datetime.utcnow()
1548
 
            self.expires += self.timeout - old_timeout
1549
 
            if self.expires <= now:
1550
 
                # The timeout has passed
1551
 
                self.disable()
1552
 
            else:
1553
 
                if (getattr(self, "disable_initiator_tag", None)
1554
 
                    is None):
1555
 
                    return
1556
 
                gobject.source_remove(self.disable_initiator_tag)
1557
 
                self.disable_initiator_tag = (
1558
 
                    gobject.timeout_add(
1559
 
                        timedelta_to_milliseconds(self.expires - now),
1560
 
                        self.disable))
 
1361
        if getattr(self, "disable_initiator_tag", None) is None:
 
1362
            return
 
1363
        # Reschedule timeout
 
1364
        gobject.source_remove(self.disable_initiator_tag)
 
1365
        self.disable_initiator_tag = None
 
1366
        self.expires = None
 
1367
        time_to_die = timedelta_to_milliseconds((self
 
1368
                                                 .last_checked_ok
 
1369
                                                 + self.timeout)
 
1370
                                                - datetime.datetime
 
1371
                                                .utcnow())
 
1372
        if time_to_die <= 0:
 
1373
            # The timeout has passed
 
1374
            self.disable()
 
1375
        else:
 
1376
            self.expires = (datetime.datetime.utcnow()
 
1377
                            + datetime.timedelta(milliseconds =
 
1378
                                                 time_to_die))
 
1379
            self.disable_initiator_tag = (gobject.timeout_add
 
1380
                                          (time_to_die, self.disable))
1561
1381
    
1562
1382
    # ExtendedTimeout - property
1563
1383
    @dbus_service_property(_interface, signature="t",
1642
1462
        self._pipe.send(('setattr', name, value))
1643
1463
 
1644
1464
 
 
1465
class ClientDBusTransitional(ClientDBus):
 
1466
    __metaclass__ = AlternateDBusNamesMetaclass
 
1467
 
 
1468
 
1645
1469
class ClientHandler(socketserver.BaseRequestHandler, object):
1646
1470
    """A class to handle client connections.
1647
1471
    
1715
1539
                except KeyError:
1716
1540
                    return
1717
1541
                
 
1542
                if self.server.use_dbus:
 
1543
                    # Emit D-Bus signal
 
1544
                    client.NewRequest(str(self.client_address))
 
1545
                
1718
1546
                if client.approval_delay:
1719
1547
                    delay = client.approval_delay
1720
1548
                    client.approvals_pending += 1
1751
1579
                    #wait until timeout or approved
1752
1580
                    time = datetime.datetime.now()
1753
1581
                    client.changedstate.acquire()
1754
 
                    client.changedstate.wait(
1755
 
                        float(timedelta_to_milliseconds(delay)
1756
 
                              / 1000))
 
1582
                    (client.changedstate.wait
 
1583
                     (float(client.timedelta_to_milliseconds(delay)
 
1584
                            / 1000)))
1757
1585
                    client.changedstate.release()
1758
1586
                    time2 = datetime.datetime.now()
1759
1587
                    if (time2 - time) >= delay:
1775
1603
                    try:
1776
1604
                        sent = session.send(client.secret[sent_size:])
1777
1605
                    except gnutls.errors.GNUTLSError as error:
1778
 
                        logger.warning("gnutls send failed",
1779
 
                                       exc_info=error)
 
1606
                        logger.warning("gnutls send failed")
1780
1607
                        return
1781
1608
                    logger.debug("Sent: %d, remaining: %d",
1782
1609
                                 sent, len(client.secret)
1785
1612
                
1786
1613
                logger.info("Sending secret to %s", client.name)
1787
1614
                # bump the timeout using extended_timeout
1788
 
                client.bump_timeout(client.extended_timeout)
 
1615
                client.checked_ok(client.extended_timeout)
1789
1616
                if self.server.use_dbus:
1790
1617
                    # Emit D-Bus signal
1791
1618
                    client.GotSecret()
1796
1623
                try:
1797
1624
                    session.bye()
1798
1625
                except gnutls.errors.GNUTLSError as error:
1799
 
                    logger.warning("GnuTLS bye failed",
1800
 
                                   exc_info=error)
 
1626
                    logger.warning("GnuTLS bye failed")
1801
1627
    
1802
1628
    @staticmethod
1803
1629
    def peer_certificate(session):
1875
1701
    def process_request(self, request, address):
1876
1702
        """Start a new process to process the request."""
1877
1703
        proc = multiprocessing.Process(target = self.sub_process_main,
1878
 
                                       args = (request, address))
 
1704
                                       args = (request,
 
1705
                                               address))
1879
1706
        proc.start()
1880
1707
        return proc
1881
1708
 
1909
1736
        use_ipv6:       Boolean; to use IPv6 or not
1910
1737
    """
1911
1738
    def __init__(self, server_address, RequestHandlerClass,
1912
 
                 interface=None, use_ipv6=True, socketfd=None):
1913
 
        """If socketfd is set, use that file descriptor instead of
1914
 
        creating a new one with socket.socket().
1915
 
        """
 
1739
                 interface=None, use_ipv6=True):
1916
1740
        self.interface = interface
1917
1741
        if use_ipv6:
1918
1742
            self.address_family = socket.AF_INET6
1919
 
        if socketfd is not None:
1920
 
            # Save the file descriptor
1921
 
            self.socketfd = socketfd
1922
 
            # Save the original socket.socket() function
1923
 
            self.socket_socket = socket.socket
1924
 
            # To implement --socket, we monkey patch socket.socket.
1925
 
            # 
1926
 
            # (When socketserver.TCPServer is a new-style class, we
1927
 
            # could make self.socket into a property instead of monkey
1928
 
            # patching socket.socket.)
1929
 
            # 
1930
 
            # Create a one-time-only replacement for socket.socket()
1931
 
            @functools.wraps(socket.socket)
1932
 
            def socket_wrapper(*args, **kwargs):
1933
 
                # Restore original function so subsequent calls are
1934
 
                # not affected.
1935
 
                socket.socket = self.socket_socket
1936
 
                del self.socket_socket
1937
 
                # This time only, return a new socket object from the
1938
 
                # saved file descriptor.
1939
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1940
 
            # Replace socket.socket() function with wrapper
1941
 
            socket.socket = socket_wrapper
1942
 
        # The socketserver.TCPServer.__init__ will call
1943
 
        # socket.socket(), which might be our replacement,
1944
 
        # socket_wrapper(), if socketfd was set.
1945
1743
        socketserver.TCPServer.__init__(self, server_address,
1946
1744
                                        RequestHandlerClass)
1947
 
    
1948
1745
    def server_bind(self):
1949
1746
        """This overrides the normal server_bind() function
1950
1747
        to bind to an interface if one was specified, and also NOT to
1958
1755
                try:
1959
1756
                    self.socket.setsockopt(socket.SOL_SOCKET,
1960
1757
                                           SO_BINDTODEVICE,
1961
 
                                           str(self.interface + '\0'))
 
1758
                                           str(self.interface
 
1759
                                               + '\0'))
1962
1760
                except socket.error as error:
1963
 
                    if error.errno == errno.EPERM:
1964
 
                        logger.error("No permission to bind to"
1965
 
                                     " interface %s", self.interface)
1966
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1761
                    if error[0] == errno.EPERM:
 
1762
                        logger.error("No permission to"
 
1763
                                     " bind to interface %s",
 
1764
                                     self.interface)
 
1765
                    elif error[0] == errno.ENOPROTOOPT:
1967
1766
                        logger.error("SO_BINDTODEVICE not available;"
1968
1767
                                     " cannot bind to interface %s",
1969
1768
                                     self.interface)
1970
 
                    elif error.errno == errno.ENODEV:
1971
 
                        logger.error("Interface %s does not exist,"
1972
 
                                     " cannot bind", self.interface)
1973
1769
                    else:
1974
1770
                        raise
1975
1771
        # Only bind(2) the socket if we really need to.
2005
1801
    """
2006
1802
    def __init__(self, server_address, RequestHandlerClass,
2007
1803
                 interface=None, use_ipv6=True, clients=None,
2008
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1804
                 gnutls_priority=None, use_dbus=True):
2009
1805
        self.enabled = False
2010
1806
        self.clients = clients
2011
1807
        if self.clients is None:
2015
1811
        IPv6_TCPServer.__init__(self, server_address,
2016
1812
                                RequestHandlerClass,
2017
1813
                                interface = interface,
2018
 
                                use_ipv6 = use_ipv6,
2019
 
                                socketfd = socketfd)
 
1814
                                use_ipv6 = use_ipv6)
2020
1815
    def server_activate(self):
2021
1816
        if self.enabled:
2022
1817
            return socketserver.TCPServer.server_activate(self)
2035
1830
    
2036
1831
    def handle_ipc(self, source, condition, parent_pipe=None,
2037
1832
                   proc = None, client_object=None):
 
1833
        condition_names = {
 
1834
            gobject.IO_IN: "IN",   # There is data to read.
 
1835
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1836
                                    # blocking).
 
1837
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1838
            gobject.IO_ERR: "ERR", # Error condition.
 
1839
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1840
                                    # broken, usually for pipes and
 
1841
                                    # sockets).
 
1842
            }
 
1843
        conditions_string = ' | '.join(name
 
1844
                                       for cond, name in
 
1845
                                       condition_names.iteritems()
 
1846
                                       if cond & condition)
2038
1847
        # error, or the other end of multiprocessing.Pipe has closed
2039
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
 
1848
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2040
1849
            # Wait for other process to exit
2041
1850
            proc.join()
2042
1851
            return False
2100
1909
        return True
2101
1910
 
2102
1911
 
2103
 
def rfc3339_duration_to_delta(duration):
2104
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2105
 
    
2106
 
    >>> rfc3339_duration_to_delta("P7D")
2107
 
    datetime.timedelta(7)
2108
 
    >>> rfc3339_duration_to_delta("PT60S")
2109
 
    datetime.timedelta(0, 60)
2110
 
    >>> rfc3339_duration_to_delta("PT60M")
2111
 
    datetime.timedelta(0, 3600)
2112
 
    >>> rfc3339_duration_to_delta("PT24H")
2113
 
    datetime.timedelta(1)
2114
 
    >>> rfc3339_duration_to_delta("P1W")
2115
 
    datetime.timedelta(7)
2116
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2117
 
    datetime.timedelta(0, 330)
2118
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2119
 
    datetime.timedelta(1, 200)
2120
 
    """
2121
 
    
2122
 
    # Parsing an RFC 3339 duration with regular expressions is not
2123
 
    # possible - there would have to be multiple places for the same
2124
 
    # values, like seconds.  The current code, while more esoteric, is
2125
 
    # cleaner without depending on a parsing library.  If Python had a
2126
 
    # built-in library for parsing we would use it, but we'd like to
2127
 
    # avoid excessive use of external libraries.
2128
 
    
2129
 
    # New type for defining tokens, syntax, and semantics all-in-one
2130
 
    Token = collections.namedtuple("Token",
2131
 
                                   ("regexp", # To match token; if
2132
 
                                              # "value" is not None,
2133
 
                                              # must have a "group"
2134
 
                                              # containing digits
2135
 
                                    "value",  # datetime.timedelta or
2136
 
                                              # None
2137
 
                                    "followers")) # Tokens valid after
2138
 
                                                  # this token
2139
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2140
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2141
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2142
 
    token_second = Token(re.compile(r"(\d+)S"),
2143
 
                         datetime.timedelta(seconds=1),
2144
 
                         frozenset((token_end,)))
2145
 
    token_minute = Token(re.compile(r"(\d+)M"),
2146
 
                         datetime.timedelta(minutes=1),
2147
 
                         frozenset((token_second, token_end)))
2148
 
    token_hour = Token(re.compile(r"(\d+)H"),
2149
 
                       datetime.timedelta(hours=1),
2150
 
                       frozenset((token_minute, token_end)))
2151
 
    token_time = Token(re.compile(r"T"),
2152
 
                       None,
2153
 
                       frozenset((token_hour, token_minute,
2154
 
                                  token_second)))
2155
 
    token_day = Token(re.compile(r"(\d+)D"),
2156
 
                      datetime.timedelta(days=1),
2157
 
                      frozenset((token_time, token_end)))
2158
 
    token_month = Token(re.compile(r"(\d+)M"),
2159
 
                        datetime.timedelta(weeks=4),
2160
 
                        frozenset((token_day, token_end)))
2161
 
    token_year = Token(re.compile(r"(\d+)Y"),
2162
 
                       datetime.timedelta(weeks=52),
2163
 
                       frozenset((token_month, token_end)))
2164
 
    token_week = Token(re.compile(r"(\d+)W"),
2165
 
                       datetime.timedelta(weeks=1),
2166
 
                       frozenset((token_end,)))
2167
 
    token_duration = Token(re.compile(r"P"), None,
2168
 
                           frozenset((token_year, token_month,
2169
 
                                      token_day, token_time,
2170
 
                                      token_week))),
2171
 
    # Define starting values
2172
 
    value = datetime.timedelta() # Value so far
2173
 
    found_token = None
2174
 
    followers = frozenset(token_duration,) # Following valid tokens
2175
 
    s = duration                # String left to parse
2176
 
    # Loop until end token is found
2177
 
    while found_token is not token_end:
2178
 
        # Search for any currently valid tokens
2179
 
        for token in followers:
2180
 
            match = token.regexp.match(s)
2181
 
            if match is not None:
2182
 
                # Token found
2183
 
                if token.value is not None:
2184
 
                    # Value found, parse digits
2185
 
                    factor = int(match.group(1), 10)
2186
 
                    # Add to value so far
2187
 
                    value += factor * token.value
2188
 
                # Strip token from string
2189
 
                s = token.regexp.sub("", s, 1)
2190
 
                # Go to found token
2191
 
                found_token = token
2192
 
                # Set valid next tokens
2193
 
                followers = found_token.followers
2194
 
                break
2195
 
        else:
2196
 
            # No currently valid tokens were found
2197
 
            raise ValueError("Invalid RFC 3339 duration")
2198
 
    # End token found
2199
 
    return value
2200
 
 
2201
 
 
2202
1912
def string_to_delta(interval):
2203
1913
    """Parse a string and return a datetime.timedelta
2204
1914
    
2215
1925
    >>> string_to_delta('5m 30s')
2216
1926
    datetime.timedelta(0, 330)
2217
1927
    """
2218
 
    
2219
 
    try:
2220
 
        return rfc3339_duration_to_delta(interval)
2221
 
    except ValueError:
2222
 
        pass
2223
 
    
2224
1928
    timevalue = datetime.timedelta(0)
2225
1929
    for s in interval.split():
2226
1930
        try:
2237
1941
            elif suffix == "w":
2238
1942
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2239
1943
            else:
2240
 
                raise ValueError("Unknown suffix {0!r}"
2241
 
                                 .format(suffix))
 
1944
                raise ValueError("Unknown suffix %r" % suffix)
2242
1945
        except (ValueError, IndexError) as e:
2243
1946
            raise ValueError(*(e.args))
2244
1947
        timevalue += delta
2258
1961
        sys.exit()
2259
1962
    if not noclose:
2260
1963
        # Close all standard open file descriptors
2261
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1964
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2262
1965
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2263
1966
            raise OSError(errno.ENODEV,
2264
 
                          "{0} not a character device"
2265
 
                          .format(os.devnull))
 
1967
                          "%s not a character device"
 
1968
                          % os.path.devnull)
2266
1969
        os.dup2(null, sys.stdin.fileno())
2267
1970
        os.dup2(null, sys.stdout.fileno())
2268
1971
        os.dup2(null, sys.stderr.fileno())
2277
1980
    
2278
1981
    parser = argparse.ArgumentParser()
2279
1982
    parser.add_argument("-v", "--version", action="version",
2280
 
                        version = "%(prog)s {0}".format(version),
 
1983
                        version = "%%(prog)s %s" % version,
2281
1984
                        help="show version number and exit")
2282
1985
    parser.add_argument("-i", "--interface", metavar="IF",
2283
1986
                        help="Bind to interface IF")
2308
2011
    parser.add_argument("--no-restore", action="store_false",
2309
2012
                        dest="restore", help="Do not restore stored"
2310
2013
                        " state")
2311
 
    parser.add_argument("--socket", type=int,
2312
 
                        help="Specify a file descriptor to a network"
2313
 
                        " socket to use instead of creating one")
2314
2014
    parser.add_argument("--statedir", metavar="DIR",
2315
2015
                        help="Directory to save/restore state in")
2316
 
    parser.add_argument("--foreground", action="store_true",
2317
 
                        help="Run in foreground")
2318
2016
    
2319
2017
    options = parser.parse_args()
2320
2018
    
2335
2033
                        "use_ipv6": "True",
2336
2034
                        "debuglevel": "",
2337
2035
                        "restore": "True",
2338
 
                        "socket": "",
2339
 
                        "statedir": "/var/lib/mandos",
2340
 
                        "foreground": "False",
 
2036
                        "statedir": "/var/lib/mandos"
2341
2037
                        }
2342
2038
    
2343
2039
    # Parse config file for server-global settings
2348
2044
    # Convert the SafeConfigParser object to a dict
2349
2045
    server_settings = server_config.defaults()
2350
2046
    # Use the appropriate methods on the non-string config options
2351
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
2047
    for option in ("debug", "use_dbus", "use_ipv6"):
2352
2048
        server_settings[option] = server_config.getboolean("DEFAULT",
2353
2049
                                                           option)
2354
2050
    if server_settings["port"]:
2355
2051
        server_settings["port"] = server_config.getint("DEFAULT",
2356
2052
                                                       "port")
2357
 
    if server_settings["socket"]:
2358
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2359
 
                                                         "socket")
2360
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2361
 
        # over with an opened os.devnull.  But we don't want this to
2362
 
        # happen with a supplied network socket.
2363
 
        if 0 <= server_settings["socket"] <= 2:
2364
 
            server_settings["socket"] = os.dup(server_settings
2365
 
                                               ["socket"])
2366
2053
    del server_config
2367
2054
    
2368
2055
    # Override the settings from the config file with command line
2370
2057
    for option in ("interface", "address", "port", "debug",
2371
2058
                   "priority", "servicename", "configdir",
2372
2059
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2373
 
                   "statedir", "socket", "foreground"):
 
2060
                   "statedir"):
2374
2061
        value = getattr(options, option)
2375
2062
        if value is not None:
2376
2063
            server_settings[option] = value
2379
2066
    for option in server_settings.keys():
2380
2067
        if type(server_settings[option]) is str:
2381
2068
            server_settings[option] = unicode(server_settings[option])
2382
 
    # Debug implies foreground
2383
 
    if server_settings["debug"]:
2384
 
        server_settings["foreground"] = True
2385
2069
    # Now we have our good server settings in "server_settings"
2386
2070
    
2387
2071
    ##################################################################
2393
2077
    use_ipv6 = server_settings["use_ipv6"]
2394
2078
    stored_state_path = os.path.join(server_settings["statedir"],
2395
2079
                                     stored_state_file)
2396
 
    foreground = server_settings["foreground"]
2397
2080
    
2398
2081
    if debug:
2399
2082
        initlogger(debug, logging.DEBUG)
2406
2089
    
2407
2090
    if server_settings["servicename"] != "Mandos":
2408
2091
        syslogger.setFormatter(logging.Formatter
2409
 
                               ('Mandos ({0}) [%(process)d]:'
2410
 
                                ' %(levelname)s: %(message)s'
2411
 
                                .format(server_settings
2412
 
                                        ["servicename"])))
 
2092
                               ('Mandos (%s) [%%(process)d]:'
 
2093
                                ' %%(levelname)s: %%(message)s'
 
2094
                                % server_settings["servicename"]))
2413
2095
    
2414
2096
    # Parse config file with clients
2415
 
    client_config = configparser.SafeConfigParser(Client
2416
 
                                                  .client_defaults)
 
2097
    client_config = configparser.SafeConfigParser(Client.client_defaults)
2417
2098
    client_config.read(os.path.join(server_settings["configdir"],
2418
2099
                                    "clients.conf"))
2419
2100
    
2428
2109
                              use_ipv6=use_ipv6,
2429
2110
                              gnutls_priority=
2430
2111
                              server_settings["priority"],
2431
 
                              use_dbus=use_dbus,
2432
 
                              socketfd=(server_settings["socket"]
2433
 
                                        or None))
2434
 
    if not foreground:
 
2112
                              use_dbus=use_dbus)
 
2113
    if not debug:
2435
2114
        pidfilename = "/var/run/mandos.pid"
2436
 
        pidfile = None
2437
2115
        try:
2438
2116
            pidfile = open(pidfilename, "w")
2439
 
        except IOError as e:
2440
 
            logger.error("Could not open file %r", pidfilename,
2441
 
                         exc_info=e)
 
2117
        except IOError:
 
2118
            logger.error("Could not open file %r", pidfilename)
2442
2119
    
2443
 
    for name in ("_mandos", "mandos", "nobody"):
 
2120
    try:
 
2121
        uid = pwd.getpwnam("_mandos").pw_uid
 
2122
        gid = pwd.getpwnam("_mandos").pw_gid
 
2123
    except KeyError:
2444
2124
        try:
2445
 
            uid = pwd.getpwnam(name).pw_uid
2446
 
            gid = pwd.getpwnam(name).pw_gid
2447
 
            break
 
2125
            uid = pwd.getpwnam("mandos").pw_uid
 
2126
            gid = pwd.getpwnam("mandos").pw_gid
2448
2127
        except KeyError:
2449
 
            continue
2450
 
    else:
2451
 
        uid = 65534
2452
 
        gid = 65534
 
2128
            try:
 
2129
                uid = pwd.getpwnam("nobody").pw_uid
 
2130
                gid = pwd.getpwnam("nobody").pw_gid
 
2131
            except KeyError:
 
2132
                uid = 65534
 
2133
                gid = 65534
2453
2134
    try:
2454
2135
        os.setgid(gid)
2455
2136
        os.setuid(uid)
2456
2137
    except OSError as error:
2457
 
        if error.errno != errno.EPERM:
 
2138
        if error[0] != errno.EPERM:
2458
2139
            raise error
2459
2140
    
2460
2141
    if debug:
2472
2153
         .gnutls_global_set_log_function(debug_gnutls))
2473
2154
        
2474
2155
        # Redirect stdin so all checkers get /dev/null
2475
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
2156
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2476
2157
        os.dup2(null, sys.stdin.fileno())
2477
2158
        if null > 2:
2478
2159
            os.close(null)
2479
2160
    
2480
2161
    # Need to fork before connecting to D-Bus
2481
 
    if not foreground:
 
2162
    if not debug:
2482
2163
        # Close all input and output, do double fork, etc.
2483
2164
        daemon()
2484
2165
    
2485
 
    # multiprocessing will use threads, so before we use gobject we
2486
 
    # need to inform gobject that threads will be used.
2487
2166
    gobject.threads_init()
2488
2167
    
2489
2168
    global main_loop
2490
2169
    # From the Avahi example code
2491
 
    DBusGMainLoop(set_as_default=True)
 
2170
    DBusGMainLoop(set_as_default=True )
2492
2171
    main_loop = gobject.MainLoop()
2493
2172
    bus = dbus.SystemBus()
2494
2173
    # End of Avahi example code
2500
2179
                            ("se.bsnet.fukt.Mandos", bus,
2501
2180
                             do_not_queue=True))
2502
2181
        except dbus.exceptions.NameExistsException as e:
2503
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
2182
            logger.error(unicode(e) + ", disabling D-Bus")
2504
2183
            use_dbus = False
2505
2184
            server_settings["use_dbus"] = False
2506
2185
            tcp_server.use_dbus = False
2518
2197
    
2519
2198
    client_class = Client
2520
2199
    if use_dbus:
2521
 
        client_class = functools.partial(ClientDBus, bus = bus)
 
2200
        client_class = functools.partial(ClientDBusTransitional,
 
2201
                                         bus = bus)
2522
2202
    
2523
2203
    client_settings = Client.config_parser(client_config)
2524
2204
    old_client_settings = {}
2532
2212
                                                     (stored_state))
2533
2213
            os.remove(stored_state_path)
2534
2214
        except IOError as e:
2535
 
            if e.errno == errno.ENOENT:
2536
 
                logger.warning("Could not load persistent state: {0}"
2537
 
                                .format(os.strerror(e.errno)))
2538
 
            else:
2539
 
                logger.critical("Could not load persistent state:",
2540
 
                                exc_info=e)
 
2215
            logger.warning("Could not load persistent state: {0}"
 
2216
                           .format(e))
 
2217
            if e.errno != errno.ENOENT:
2541
2218
                raise
2542
2219
        except EOFError as e:
2543
2220
            logger.warning("Could not load persistent state: "
2544
 
                           "EOFError:", exc_info=e)
 
2221
                           "EOFError: {0}".format(e))
2545
2222
    
2546
2223
    with PGPEngine() as pgp:
2547
2224
        for client_name, client in clients_data.iteritems():
2564
2241
            
2565
2242
            # Clients who has passed its expire date can still be
2566
2243
            # enabled if its last checker was successful.  Clients
2567
 
            # whose checker succeeded before we stored its state is
2568
 
            # assumed to have successfully run all checkers during
2569
 
            # downtime.
 
2244
            # whose checker failed before we stored its state is
 
2245
            # assumed to have failed all checkers during downtime.
2570
2246
            if client["enabled"]:
2571
2247
                if datetime.datetime.utcnow() >= client["expires"]:
2572
2248
                    if not client["last_checked_ok"]:
2573
2249
                        logger.warning(
2574
2250
                            "disabling client {0} - Client never "
2575
 
                            "performed a successful checker"
2576
 
                            .format(client_name))
 
2251
                            "performed a successfull checker"
 
2252
                            .format(client["name"]))
2577
2253
                        client["enabled"] = False
2578
2254
                    elif client["last_checker_status"] != 0:
2579
2255
                        logger.warning(
2580
2256
                            "disabling client {0} - Client "
2581
2257
                            "last checker failed with error code {1}"
2582
 
                            .format(client_name,
 
2258
                            .format(client["name"],
2583
2259
                                    client["last_checker_status"]))
2584
2260
                        client["enabled"] = False
2585
2261
                    else:
2586
2262
                        client["expires"] = (datetime.datetime
2587
2263
                                             .utcnow()
2588
2264
                                             + client["timeout"])
2589
 
                        logger.debug("Last checker succeeded,"
2590
 
                                     " keeping {0} enabled"
2591
 
                                     .format(client_name))
 
2265
                    
2592
2266
            try:
2593
2267
                client["secret"] = (
2594
2268
                    pgp.decrypt(client["encrypted_secret"],
2600
2274
                             .format(client_name))
2601
2275
                client["secret"] = (
2602
2276
                    client_settings[client_name]["secret"])
 
2277
 
2603
2278
    
2604
2279
    # Add/remove clients based on new changes made to config
2605
 
    for client_name in (set(old_client_settings)
2606
 
                        - set(client_settings)):
 
2280
    for client_name in set(old_client_settings) - set(client_settings):
2607
2281
        del clients_data[client_name]
2608
 
    for client_name in (set(client_settings)
2609
 
                        - set(old_client_settings)):
 
2282
    for client_name in set(client_settings) - set(old_client_settings):
2610
2283
        clients_data[client_name] = client_settings[client_name]
2611
 
    
2612
 
    # Create all client objects
 
2284
 
 
2285
    # Create clients all clients
2613
2286
    for client_name, client in clients_data.iteritems():
2614
2287
        tcp_server.clients[client_name] = client_class(
2615
2288
            name = client_name, settings = client)
2616
2289
    
2617
2290
    if not tcp_server.clients:
2618
2291
        logger.warning("No clients defined")
2619
 
    
2620
 
    if not foreground:
2621
 
        if pidfile is not None:
2622
 
            try:
2623
 
                with pidfile:
2624
 
                    pid = os.getpid()
2625
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2626
 
            except IOError:
2627
 
                logger.error("Could not write to file %r with PID %d",
2628
 
                             pidfilename, pid)
2629
 
        del pidfile
 
2292
        
 
2293
    if not debug:
 
2294
        try:
 
2295
            with pidfile:
 
2296
                pid = os.getpid()
 
2297
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2298
            del pidfile
 
2299
        except IOError:
 
2300
            logger.error("Could not write to file %r with PID %d",
 
2301
                         pidfilename, pid)
 
2302
        except NameError:
 
2303
            # "pidfile" was never created
 
2304
            pass
2630
2305
        del pidfilename
 
2306
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2631
2307
    
2632
2308
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2633
2309
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2634
2310
    
2635
2311
    if use_dbus:
2636
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2637
 
                                        "se.bsnet.fukt.Mandos"})
2638
 
        class MandosDBusService(DBusObjectWithProperties):
 
2312
        class MandosDBusService(dbus.service.Object):
2639
2313
            """A D-Bus proxy object"""
2640
2314
            def __init__(self):
2641
2315
                dbus.service.Object.__init__(self, bus, "/")
2642
2316
            _interface = "se.recompile.Mandos"
2643
2317
            
2644
 
            @dbus_interface_annotations(_interface)
2645
 
            def _foo(self):
2646
 
                return { "org.freedesktop.DBus.Property"
2647
 
                         ".EmitsChangedSignal":
2648
 
                             "false"}
2649
 
            
2650
2318
            @dbus.service.signal(_interface, signature="o")
2651
2319
            def ClientAdded(self, objpath):
2652
2320
                "D-Bus signal"
2694
2362
            
2695
2363
            del _interface
2696
2364
        
2697
 
        mandos_dbus_service = MandosDBusService()
 
2365
        class MandosDBusServiceTransitional(MandosDBusService):
 
2366
            __metaclass__ = AlternateDBusNamesMetaclass
 
2367
        mandos_dbus_service = MandosDBusServiceTransitional()
2698
2368
    
2699
2369
    def cleanup():
2700
2370
        "Cleanup function; run on exit"
2733
2403
                del client_settings[client.name]["secret"]
2734
2404
        
2735
2405
        try:
2736
 
            with (tempfile.NamedTemporaryFile
2737
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2738
 
                   dir=os.path.dirname(stored_state_path),
2739
 
                   delete=False)) as stored_state:
 
2406
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2407
                                                prefix="clients-",
 
2408
                                                dir=os.path.dirname
 
2409
                                                (stored_state_path))
 
2410
            with os.fdopen(tempfd, "wb") as stored_state:
2740
2411
                pickle.dump((clients, client_settings), stored_state)
2741
 
                tempname=stored_state.name
2742
2412
            os.rename(tempname, stored_state_path)
2743
2413
        except (IOError, OSError) as e:
 
2414
            logger.warning("Could not save persistent state: {0}"
 
2415
                           .format(e))
2744
2416
            if not debug:
2745
2417
                try:
2746
2418
                    os.remove(tempname)
2747
2419
                except NameError:
2748
2420
                    pass
2749
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2750
 
                logger.warning("Could not save persistent state: {0}"
2751
 
                               .format(os.strerror(e.errno)))
2752
 
            else:
2753
 
                logger.warning("Could not save persistent state:",
2754
 
                               exc_info=e)
 
2421
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2422
                                   errno.EEXIST)):
2755
2423
                raise e
2756
2424
        
2757
2425
        # Delete all clients, and settings from config
2785
2453
    service.port = tcp_server.socket.getsockname()[1]
2786
2454
    if use_ipv6:
2787
2455
        logger.info("Now listening on address %r, port %d,"
2788
 
                    " flowinfo %d, scope_id %d",
2789
 
                    *tcp_server.socket.getsockname())
 
2456
                    " flowinfo %d, scope_id %d"
 
2457
                    % tcp_server.socket.getsockname())
2790
2458
    else:                       # IPv4
2791
 
        logger.info("Now listening on address %r, port %d",
2792
 
                    *tcp_server.socket.getsockname())
 
2459
        logger.info("Now listening on address %r, port %d"
 
2460
                    % tcp_server.socket.getsockname())
2793
2461
    
2794
2462
    #service.interface = tcp_server.socket.getsockname()[3]
2795
2463
    
2798
2466
        try:
2799
2467
            service.activate()
2800
2468
        except dbus.exceptions.DBusException as error:
2801
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2469
            logger.critical("DBusException: %s", error)
2802
2470
            cleanup()
2803
2471
            sys.exit(1)
2804
2472
        # End of Avahi example code
2811
2479
        logger.debug("Starting main loop")
2812
2480
        main_loop.run()
2813
2481
    except AvahiError as error:
2814
 
        logger.critical("Avahi Error", exc_info=error)
 
2482
        logger.critical("AvahiError: %s", error)
2815
2483
        cleanup()
2816
2484
        sys.exit(1)
2817
2485
    except KeyboardInterrupt: