/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-15 21:02:37 UTC
  • mfrom: (237.7.106 trunk)
  • Revision ID: teddy@recompile.se-20120115210237-6mcl2zuoxyn5smr5
Merge from trunk.

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