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