/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-05-30 16:47:00 UTC
  • Revision ID: teddy@recompile.se-20150530164700-77zrd7964gdhbk1f
mandos: Disable D-Bus if any DBusException is raised when connecting.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python
 
1
#!/usr/bin/python2.7
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2013 Teddy Hogeborn
15
 
# Copyright © 2008-2013 Björn Påhlsson
 
14
# Copyright © 2008-2015 Teddy Hogeborn
 
15
# Copyright © 2008-2015 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
36
36
 
37
37
from future_builtins import *
38
38
 
39
 
import SocketServer as socketserver
 
39
try:
 
40
    import SocketServer as socketserver
 
41
except ImportError:
 
42
    import socketserver
40
43
import socket
41
44
import argparse
42
45
import datetime
47
50
import gnutls.library.functions
48
51
import gnutls.library.constants
49
52
import gnutls.library.types
50
 
import ConfigParser as configparser
 
53
try:
 
54
    import ConfigParser as configparser
 
55
except ImportError:
 
56
    import configparser
51
57
import sys
52
58
import re
53
59
import os
62
68
import struct
63
69
import fcntl
64
70
import functools
65
 
import cPickle as pickle
 
71
try:
 
72
    import cPickle as pickle
 
73
except ImportError:
 
74
    import pickle
66
75
import multiprocessing
67
76
import types
68
77
import binascii
72
81
 
73
82
import dbus
74
83
import dbus.service
75
 
import gobject
 
84
try:
 
85
    import gobject
 
86
except ImportError:
 
87
    from gi.repository import GObject as gobject
76
88
import avahi
77
89
from dbus.mainloop.glib import DBusGMainLoop
78
90
import ctypes
88
100
    except ImportError:
89
101
        SO_BINDTODEVICE = None
90
102
 
91
 
version = "1.6.1"
 
103
if sys.version_info.major == 2:
 
104
    str = unicode
 
105
 
 
106
version = "1.6.9"
92
107
stored_state_file = "clients.pickle"
93
108
 
94
109
logger = logging.getLogger()
95
 
syslogger = (logging.handlers.SysLogHandler
96
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
 
              address = str("/dev/log")))
 
110
syslogger = None
98
111
 
99
112
try:
100
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
101
 
                      (ctypes.util.find_library("c"))
102
 
                      .if_nametoindex)
 
113
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
114
        ctypes.util.find_library("c")).if_nametoindex
103
115
except (OSError, AttributeError):
 
116
    
104
117
    def if_nametoindex(interface):
105
118
        "Get an interface index the hard way, i.e. using fcntl()"
106
119
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
107
120
        with contextlib.closing(socket.socket()) as s:
108
121
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
109
 
                                struct.pack(str("16s16x"),
110
 
                                            interface))
111
 
        interface_index = struct.unpack(str("I"),
112
 
                                        ifreq[16:20])[0]
 
122
                                struct.pack(b"16s16x", interface))
 
123
        interface_index = struct.unpack("I", ifreq[16:20])[0]
113
124
        return interface_index
114
125
 
115
126
 
116
127
def initlogger(debug, level=logging.WARNING):
117
128
    """init logger and add loglevel"""
118
129
    
 
130
    global syslogger
 
131
    syslogger = (logging.handlers.SysLogHandler(
 
132
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
133
        address = "/dev/log"))
119
134
    syslogger.setFormatter(logging.Formatter
120
135
                           ('Mandos [%(process)d]: %(levelname)s:'
121
136
                            ' %(message)s'))
138
153
 
139
154
class PGPEngine(object):
140
155
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
156
    
141
157
    def __init__(self):
142
158
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
143
159
        self.gnupgargs = ['--batch',
182
198
    
183
199
    def encrypt(self, data, password):
184
200
        passphrase = self.password_encode(password)
185
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
186
 
                                         ) as passfile:
 
201
        with tempfile.NamedTemporaryFile(
 
202
                dir=self.tempdir) as passfile:
187
203
            passfile.write(passphrase)
188
204
            passfile.flush()
189
205
            proc = subprocess.Popen(['gpg', '--symmetric',
200
216
    
201
217
    def decrypt(self, data, password):
202
218
        passphrase = self.password_encode(password)
203
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
204
 
                                         ) as passfile:
 
219
        with tempfile.NamedTemporaryFile(
 
220
                dir = self.tempdir) as passfile:
205
221
            passfile.write(passphrase)
206
222
            passfile.flush()
207
223
            proc = subprocess.Popen(['gpg', '--decrypt',
211
227
                                    stdin = subprocess.PIPE,
212
228
                                    stdout = subprocess.PIPE,
213
229
                                    stderr = subprocess.PIPE)
214
 
            decrypted_plaintext, err = proc.communicate(input
215
 
                                                        = data)
 
230
            decrypted_plaintext, err = proc.communicate(input = data)
216
231
        if proc.returncode != 0:
217
232
            raise PGPError(err)
218
233
        return decrypted_plaintext
221
236
class AvahiError(Exception):
222
237
    def __init__(self, value, *args, **kwargs):
223
238
        self.value = value
224
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
225
 
    def __unicode__(self):
226
 
        return unicode(repr(self.value))
 
239
        return super(AvahiError, self).__init__(value, *args,
 
240
                                                **kwargs)
 
241
 
227
242
 
228
243
class AvahiServiceError(AvahiError):
229
244
    pass
230
245
 
 
246
 
231
247
class AvahiGroupError(AvahiError):
232
248
    pass
233
249
 
253
269
    bus: dbus.SystemBus()
254
270
    """
255
271
    
256
 
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
257
 
                 servicetype = None, port = None, TXT = None,
258
 
                 domain = "", host = "", max_renames = 32768,
259
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
272
    def __init__(self,
 
273
                 interface = avahi.IF_UNSPEC,
 
274
                 name = None,
 
275
                 servicetype = None,
 
276
                 port = None,
 
277
                 TXT = None,
 
278
                 domain = "",
 
279
                 host = "",
 
280
                 max_renames = 32768,
 
281
                 protocol = avahi.PROTO_UNSPEC,
 
282
                 bus = None):
260
283
        self.interface = interface
261
284
        self.name = name
262
285
        self.type = servicetype
272
295
        self.bus = bus
273
296
        self.entry_group_state_changed_match = None
274
297
    
275
 
    def rename(self):
 
298
    def rename(self, remove=True):
276
299
        """Derived from the Avahi example code"""
277
300
        if self.rename_count >= self.max_renames:
278
301
            logger.critical("No suitable Zeroconf service name found"
279
302
                            " after %i retries, exiting.",
280
303
                            self.rename_count)
281
304
            raise AvahiServiceError("Too many renames")
282
 
        self.name = unicode(self.server
283
 
                            .GetAlternativeServiceName(self.name))
 
305
        self.name = str(
 
306
            self.server.GetAlternativeServiceName(self.name))
 
307
        self.rename_count += 1
284
308
        logger.info("Changing Zeroconf service name to %r ...",
285
309
                    self.name)
286
 
        self.remove()
 
310
        if remove:
 
311
            self.remove()
287
312
        try:
288
313
            self.add()
289
314
        except dbus.exceptions.DBusException as error:
290
 
            logger.critical("D-Bus Exception", exc_info=error)
291
 
            self.cleanup()
292
 
            os._exit(1)
293
 
        self.rename_count += 1
 
315
            if (error.get_dbus_name()
 
316
                == "org.freedesktop.Avahi.CollisionError"):
 
317
                logger.info("Local Zeroconf service name collision.")
 
318
                return self.rename(remove=False)
 
319
            else:
 
320
                logger.critical("D-Bus Exception", exc_info=error)
 
321
                self.cleanup()
 
322
                os._exit(1)
294
323
    
295
324
    def remove(self):
296
325
        """Derived from the Avahi example code"""
334
363
            self.rename()
335
364
        elif state == avahi.ENTRY_GROUP_FAILURE:
336
365
            logger.critical("Avahi: Error in group state changed %s",
337
 
                            unicode(error))
338
 
            raise AvahiGroupError("State changed: {0!s}"
339
 
                                  .format(error))
 
366
                            str(error))
 
367
            raise AvahiGroupError("State changed: {!s}".format(error))
340
368
    
341
369
    def cleanup(self):
342
370
        """Derived from the Avahi example code"""
352
380
    def server_state_changed(self, state, error=None):
353
381
        """Derived from the Avahi example code"""
354
382
        logger.debug("Avahi server state change: %i", state)
355
 
        bad_states = { avahi.SERVER_INVALID:
356
 
                           "Zeroconf server invalid",
357
 
                       avahi.SERVER_REGISTERING: None,
358
 
                       avahi.SERVER_COLLISION:
359
 
                           "Zeroconf server name collision",
360
 
                       avahi.SERVER_FAILURE:
361
 
                           "Zeroconf server failure" }
 
383
        bad_states = {
 
384
            avahi.SERVER_INVALID: "Zeroconf server invalid",
 
385
            avahi.SERVER_REGISTERING: None,
 
386
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
 
387
            avahi.SERVER_FAILURE: "Zeroconf server failure",
 
388
        }
362
389
        if state in bad_states:
363
390
            if bad_states[state] is not None:
364
391
                if error is None:
383
410
                                    follow_name_owner_changes=True),
384
411
                avahi.DBUS_INTERFACE_SERVER)
385
412
        self.server.connect_to_signal("StateChanged",
386
 
                                 self.server_state_changed)
 
413
                                      self.server_state_changed)
387
414
        self.server_state_changed(self.server.GetState())
388
415
 
389
416
 
390
417
class AvahiServiceToSyslog(AvahiService):
391
 
    def rename(self):
 
418
    def rename(self, *args, **kwargs):
392
419
        """Add the new name to the syslog messages"""
393
 
        ret = AvahiService.rename(self)
394
 
        syslogger.setFormatter(logging.Formatter
395
 
                               ('Mandos ({0}) [%(process)d]:'
396
 
                                ' %(levelname)s: %(message)s'
397
 
                                .format(self.name)))
 
420
        ret = AvahiService.rename(self, *args, **kwargs)
 
421
        syslogger.setFormatter(logging.Formatter(
 
422
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
423
            .format(self.name)))
398
424
        return ret
399
425
 
400
426
 
401
 
def timedelta_to_milliseconds(td):
402
 
    "Convert a datetime.timedelta() to milliseconds"
403
 
    return ((td.days * 24 * 60 * 60 * 1000)
404
 
            + (td.seconds * 1000)
405
 
            + (td.microseconds // 1000))
406
 
 
407
 
 
408
427
class Client(object):
409
428
    """A representation of a client host served by this server.
410
429
    
454
473
                          "fingerprint", "host", "interval",
455
474
                          "last_approval_request", "last_checked_ok",
456
475
                          "last_enabled", "name", "timeout")
457
 
    client_defaults = { "timeout": "PT5M",
458
 
                        "extended_timeout": "PT15M",
459
 
                        "interval": "PT2M",
460
 
                        "checker": "fping -q -- %%(host)s",
461
 
                        "host": "",
462
 
                        "approval_delay": "PT0S",
463
 
                        "approval_duration": "PT1S",
464
 
                        "approved_by_default": "True",
465
 
                        "enabled": "True",
466
 
                        }
467
 
    
468
 
    def timeout_milliseconds(self):
469
 
        "Return the 'timeout' attribute in milliseconds"
470
 
        return timedelta_to_milliseconds(self.timeout)
471
 
    
472
 
    def extended_timeout_milliseconds(self):
473
 
        "Return the 'extended_timeout' attribute in milliseconds"
474
 
        return timedelta_to_milliseconds(self.extended_timeout)
475
 
    
476
 
    def interval_milliseconds(self):
477
 
        "Return the 'interval' attribute in milliseconds"
478
 
        return timedelta_to_milliseconds(self.interval)
479
 
    
480
 
    def approval_delay_milliseconds(self):
481
 
        return timedelta_to_milliseconds(self.approval_delay)
 
476
    client_defaults = {
 
477
        "timeout": "PT5M",
 
478
        "extended_timeout": "PT15M",
 
479
        "interval": "PT2M",
 
480
        "checker": "fping -q -- %%(host)s",
 
481
        "host": "",
 
482
        "approval_delay": "PT0S",
 
483
        "approval_duration": "PT1S",
 
484
        "approved_by_default": "True",
 
485
        "enabled": "True",
 
486
    }
482
487
    
483
488
    @staticmethod
484
489
    def config_parser(config):
500
505
            client["enabled"] = config.getboolean(client_name,
501
506
                                                  "enabled")
502
507
            
 
508
            # Uppercase and remove spaces from fingerprint for later
 
509
            # comparison purposes with return value from the
 
510
            # fingerprint() function
503
511
            client["fingerprint"] = (section["fingerprint"].upper()
504
512
                                     .replace(" ", ""))
505
513
            if "secret" in section:
510
518
                          "rb") as secfile:
511
519
                    client["secret"] = secfile.read()
512
520
            else:
513
 
                raise TypeError("No secret or secfile for section {0}"
 
521
                raise TypeError("No secret or secfile for section {}"
514
522
                                .format(section))
515
523
            client["timeout"] = string_to_delta(section["timeout"])
516
524
            client["extended_timeout"] = string_to_delta(
533
541
            server_settings = {}
534
542
        self.server_settings = server_settings
535
543
        # adding all client settings
536
 
        for setting, value in settings.iteritems():
 
544
        for setting, value in settings.items():
537
545
            setattr(self, setting, value)
538
546
        
539
547
        if self.enabled:
547
555
            self.expires = None
548
556
        
549
557
        logger.debug("Creating client %r", self.name)
550
 
        # Uppercase and remove spaces from fingerprint for later
551
 
        # comparison purposes with return value from the fingerprint()
552
 
        # function
553
558
        logger.debug("  Fingerprint: %s", self.fingerprint)
554
559
        self.created = settings.get("created",
555
560
                                    datetime.datetime.utcnow())
562
567
        self.current_checker_command = None
563
568
        self.approved = None
564
569
        self.approvals_pending = 0
565
 
        self.changedstate = (multiprocessing_manager
566
 
                             .Condition(multiprocessing_manager
567
 
                                        .Lock()))
568
 
        self.client_structure = [attr for attr in
569
 
                                 self.__dict__.iterkeys()
 
570
        self.changedstate = multiprocessing_manager.Condition(
 
571
            multiprocessing_manager.Lock())
 
572
        self.client_structure = [attr
 
573
                                 for attr in self.__dict__.iterkeys()
570
574
                                 if not attr.startswith("_")]
571
575
        self.client_structure.append("client_structure")
572
576
        
573
 
        for name, t in inspect.getmembers(type(self),
574
 
                                          lambda obj:
575
 
                                              isinstance(obj,
576
 
                                                         property)):
 
577
        for name, t in inspect.getmembers(
 
578
                type(self), lambda obj: isinstance(obj, property)):
577
579
            if not name.startswith("_"):
578
580
                self.client_structure.append(name)
579
581
    
621
623
        # and every interval from then on.
622
624
        if self.checker_initiator_tag is not None:
623
625
            gobject.source_remove(self.checker_initiator_tag)
624
 
        self.checker_initiator_tag = (gobject.timeout_add
625
 
                                      (self.interval_milliseconds(),
626
 
                                       self.start_checker))
 
626
        self.checker_initiator_tag = gobject.timeout_add(
 
627
            int(self.interval.total_seconds() * 1000),
 
628
            self.start_checker)
627
629
        # Schedule a disable() when 'timeout' has passed
628
630
        if self.disable_initiator_tag is not None:
629
631
            gobject.source_remove(self.disable_initiator_tag)
630
 
        self.disable_initiator_tag = (gobject.timeout_add
631
 
                                   (self.timeout_milliseconds(),
632
 
                                    self.disable))
 
632
        self.disable_initiator_tag = gobject.timeout_add(
 
633
            int(self.timeout.total_seconds() * 1000), self.disable)
633
634
        # Also start a new checker *right now*.
634
635
        self.start_checker()
635
636
    
644
645
                            vars(self))
645
646
                self.checked_ok()
646
647
            else:
647
 
                logger.info("Checker for %(name)s failed",
648
 
                            vars(self))
 
648
                logger.info("Checker for %(name)s failed", vars(self))
649
649
        else:
650
650
            self.last_checker_status = -1
651
651
            logger.warning("Checker for %(name)s crashed?",
665
665
            gobject.source_remove(self.disable_initiator_tag)
666
666
            self.disable_initiator_tag = None
667
667
        if getattr(self, "enabled", False):
668
 
            self.disable_initiator_tag = (gobject.timeout_add
669
 
                                          (timedelta_to_milliseconds
670
 
                                           (timeout), self.disable))
 
668
            self.disable_initiator_tag = gobject.timeout_add(
 
669
                int(timeout.total_seconds() * 1000), self.disable)
671
670
            self.expires = datetime.datetime.utcnow() + timeout
672
671
    
673
672
    def need_approval(self):
690
689
        # If a checker exists, make sure it is not a zombie
691
690
        try:
692
691
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
693
 
        except (AttributeError, OSError) as error:
694
 
            if (isinstance(error, OSError)
695
 
                and error.errno != errno.ECHILD):
696
 
                raise error
 
692
        except AttributeError:
 
693
            pass
 
694
        except OSError as error:
 
695
            if error.errno != errno.ECHILD:
 
696
                raise
697
697
        else:
698
698
            if pid:
699
699
                logger.warning("Checker was a zombie")
703
703
        # Start a new checker if needed
704
704
        if self.checker is None:
705
705
            # Escape attributes for the shell
706
 
            escaped_attrs = dict(
707
 
                (attr, re.escape(unicode(getattr(self, attr))))
708
 
                for attr in
709
 
                self.runtime_expansions)
 
706
            escaped_attrs = {
 
707
                attr: re.escape(str(getattr(self, attr)))
 
708
                for attr in self.runtime_expansions }
710
709
            try:
711
710
                command = self.checker_command % escaped_attrs
712
711
            except TypeError as error:
713
712
                logger.error('Could not format string "%s"',
714
 
                             self.checker_command, exc_info=error)
715
 
                return True # Try again later
 
713
                             self.checker_command,
 
714
                             exc_info=error)
 
715
                return True     # Try again later
716
716
            self.current_checker_command = command
717
717
            try:
718
 
                logger.info("Starting checker %r for %s",
719
 
                            command, self.name)
 
718
                logger.info("Starting checker %r for %s", command,
 
719
                            self.name)
720
720
                # We don't need to redirect stdout and stderr, since
721
721
                # in normal mode, that is already done by daemon(),
722
722
                # and in debug mode we don't want to.  (Stdin is
731
731
                                       "stderr": wnull })
732
732
                self.checker = subprocess.Popen(command,
733
733
                                                close_fds=True,
734
 
                                                shell=True, cwd="/",
 
734
                                                shell=True,
 
735
                                                cwd="/",
735
736
                                                **popen_args)
736
737
            except OSError as error:
737
738
                logger.error("Failed to start subprocess",
738
739
                             exc_info=error)
739
740
                return True
740
 
            self.checker_callback_tag = (gobject.child_watch_add
741
 
                                         (self.checker.pid,
742
 
                                          self.checker_callback,
743
 
                                          data=command))
 
741
            self.checker_callback_tag = gobject.child_watch_add(
 
742
                self.checker.pid, self.checker_callback, data=command)
744
743
            # The checker may have completed before the gobject
745
744
            # watch was added.  Check for this.
746
745
            try:
777
776
        self.checker = None
778
777
 
779
778
 
780
 
def dbus_service_property(dbus_interface, signature="v",
781
 
                          access="readwrite", byte_arrays=False):
 
779
def dbus_service_property(dbus_interface,
 
780
                          signature="v",
 
781
                          access="readwrite",
 
782
                          byte_arrays=False):
782
783
    """Decorators for marking methods of a DBusObjectWithProperties to
783
784
    become properties on the D-Bus.
784
785
    
793
794
    # "Set" method, so we fail early here:
794
795
    if byte_arrays and signature != "ay":
795
796
        raise ValueError("Byte arrays not supported for non-'ay'"
796
 
                         " signature {0!r}".format(signature))
 
797
                         " signature {!r}".format(signature))
 
798
    
797
799
    def decorator(func):
798
800
        func._dbus_is_property = True
799
801
        func._dbus_interface = dbus_interface
804
806
            func._dbus_name = func._dbus_name[:-14]
805
807
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
806
808
        return func
 
809
    
807
810
    return decorator
808
811
 
809
812
 
818
821
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
819
822
                    "false"}
820
823
    """
 
824
    
821
825
    def decorator(func):
822
826
        func._dbus_is_interface = True
823
827
        func._dbus_interface = dbus_interface
824
828
        func._dbus_name = dbus_interface
825
829
        return func
 
830
    
826
831
    return decorator
827
832
 
828
833
 
830
835
    """Decorator to annotate D-Bus methods, signals or properties
831
836
    Usage:
832
837
    
 
838
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
839
                       "org.freedesktop.DBus.Property."
 
840
                       "EmitsChangedSignal": "false"})
833
841
    @dbus_service_property("org.example.Interface", signature="b",
834
842
                           access="r")
835
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
836
 
                        "org.freedesktop.DBus.Property."
837
 
                        "EmitsChangedSignal": "false"})
838
843
    def Property_dbus_property(self):
839
844
        return dbus.Boolean(False)
840
845
    """
 
846
    
841
847
    def decorator(func):
842
848
        func._dbus_annotations = annotations
843
849
        return func
 
850
    
844
851
    return decorator
845
852
 
846
853
 
847
854
class DBusPropertyException(dbus.exceptions.DBusException):
848
855
    """A base class for D-Bus property-related exceptions
849
856
    """
850
 
    def __unicode__(self):
851
 
        return unicode(str(self))
 
857
    pass
852
858
 
853
859
 
854
860
class DBusPropertyAccessException(DBusPropertyException):
878
884
        If called like _is_dbus_thing("method") it returns a function
879
885
        suitable for use as predicate to inspect.getmembers().
880
886
        """
881
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
 
887
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
882
888
                                   False)
883
889
    
884
890
    def _get_all_dbus_things(self, thing):
885
891
        """Returns a generator of (name, attribute) pairs
886
892
        """
887
 
        return ((getattr(athing.__get__(self), "_dbus_name",
888
 
                         name),
 
893
        return ((getattr(athing.__get__(self), "_dbus_name", name),
889
894
                 athing.__get__(self))
890
895
                for cls in self.__class__.__mro__
891
896
                for name, athing in
892
 
                inspect.getmembers(cls,
893
 
                                   self._is_dbus_thing(thing)))
 
897
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
894
898
    
895
899
    def _get_dbus_property(self, interface_name, property_name):
896
900
        """Returns a bound method if one exists which is a D-Bus
897
901
        property with the specified name and interface.
898
902
        """
899
 
        for cls in  self.__class__.__mro__:
900
 
            for name, value in (inspect.getmembers
901
 
                                (cls,
902
 
                                 self._is_dbus_thing("property"))):
 
903
        for cls in self.__class__.__mro__:
 
904
            for name, value in inspect.getmembers(
 
905
                    cls, self._is_dbus_thing("property")):
903
906
                if (value._dbus_name == property_name
904
907
                    and value._dbus_interface == interface_name):
905
908
                    return value.__get__(self)
906
909
        
907
910
        # No such property
908
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
909
 
                                   + interface_name + "."
910
 
                                   + property_name)
 
911
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
912
            self.dbus_object_path, interface_name, property_name))
911
913
    
912
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
914
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
915
                         in_signature="ss",
913
916
                         out_signature="v")
914
917
    def Get(self, interface_name, property_name):
915
918
        """Standard D-Bus property Get() method, see D-Bus standard.
933
936
            # The byte_arrays option is not supported yet on
934
937
            # signatures other than "ay".
935
938
            if prop._dbus_signature != "ay":
936
 
                raise ValueError
 
939
                raise ValueError("Byte arrays not supported for non-"
 
940
                                 "'ay' signature {!r}"
 
941
                                 .format(prop._dbus_signature))
937
942
            value = dbus.ByteArray(b''.join(chr(byte)
938
943
                                            for byte in value))
939
944
        prop(value)
940
945
    
941
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
946
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
947
                         in_signature="s",
942
948
                         out_signature="a{sv}")
943
949
    def GetAll(self, interface_name):
944
950
        """Standard D-Bus property GetAll() method, see D-Bus
959
965
            if not hasattr(value, "variant_level"):
960
966
                properties[name] = value
961
967
                continue
962
 
            properties[name] = type(value)(value, variant_level=
963
 
                                           value.variant_level+1)
 
968
            properties[name] = type(value)(
 
969
                value, variant_level = value.variant_level + 1)
964
970
        return dbus.Dictionary(properties, signature="sv")
965
971
    
 
972
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
973
    def PropertiesChanged(self, interface_name, changed_properties,
 
974
                          invalidated_properties):
 
975
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
976
        standard.
 
977
        """
 
978
        pass
 
979
    
966
980
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
967
981
                         out_signature="s",
968
982
                         path_keyword='object_path',
976
990
                                                   connection)
977
991
        try:
978
992
            document = xml.dom.minidom.parseString(xmlstring)
 
993
            
979
994
            def make_tag(document, name, prop):
980
995
                e = document.createElement("property")
981
996
                e.setAttribute("name", name)
982
997
                e.setAttribute("type", prop._dbus_signature)
983
998
                e.setAttribute("access", prop._dbus_access)
984
999
                return e
 
1000
            
985
1001
            for if_tag in document.getElementsByTagName("interface"):
986
1002
                # Add property tags
987
1003
                for tag in (make_tag(document, name, prop)
999
1015
                            if (name == tag.getAttribute("name")
1000
1016
                                and prop._dbus_interface
1001
1017
                                == if_tag.getAttribute("name")):
1002
 
                                annots.update(getattr
1003
 
                                              (prop,
1004
 
                                               "_dbus_annotations",
1005
 
                                               {}))
1006
 
                        for name, value in annots.iteritems():
 
1018
                                annots.update(getattr(
 
1019
                                    prop, "_dbus_annotations", {}))
 
1020
                        for name, value in annots.items():
1007
1021
                            ann_tag = document.createElement(
1008
1022
                                "annotation")
1009
1023
                            ann_tag.setAttribute("name", name)
1012
1026
                # Add interface annotation tags
1013
1027
                for annotation, value in dict(
1014
1028
                    itertools.chain.from_iterable(
1015
 
                        annotations().iteritems()
1016
 
                        for name, annotations in
1017
 
                        self._get_all_dbus_things("interface")
 
1029
                        annotations().items()
 
1030
                        for name, annotations
 
1031
                        in self._get_all_dbus_things("interface")
1018
1032
                        if name == if_tag.getAttribute("name")
1019
 
                        )).iteritems():
 
1033
                        )).items():
1020
1034
                    ann_tag = document.createElement("annotation")
1021
1035
                    ann_tag.setAttribute("name", annotation)
1022
1036
                    ann_tag.setAttribute("value", value)
1049
1063
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1050
1064
    if dt is None:
1051
1065
        return dbus.String("", variant_level = variant_level)
1052
 
    return dbus.String(dt.isoformat(),
1053
 
                       variant_level=variant_level)
 
1066
    return dbus.String(dt.isoformat(), variant_level=variant_level)
1054
1067
 
1055
1068
 
1056
1069
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1076
1089
    (from DBusObjectWithProperties) and interfaces (from the
1077
1090
    dbus_interface_annotations decorator).
1078
1091
    """
 
1092
    
1079
1093
    def wrapper(cls):
1080
1094
        for orig_interface_name, alt_interface_name in (
1081
 
            alt_interface_names.iteritems()):
 
1095
                alt_interface_names.items()):
1082
1096
            attr = {}
1083
1097
            interface_names = set()
1084
1098
            # Go though all attributes of the class
1086
1100
                # Ignore non-D-Bus attributes, and D-Bus attributes
1087
1101
                # with the wrong interface name
1088
1102
                if (not hasattr(attribute, "_dbus_interface")
1089
 
                    or not attribute._dbus_interface
1090
 
                    .startswith(orig_interface_name)):
 
1103
                    or not attribute._dbus_interface.startswith(
 
1104
                        orig_interface_name)):
1091
1105
                    continue
1092
1106
                # Create an alternate D-Bus interface name based on
1093
1107
                # the current name
1094
 
                alt_interface = (attribute._dbus_interface
1095
 
                                 .replace(orig_interface_name,
1096
 
                                          alt_interface_name))
 
1108
                alt_interface = attribute._dbus_interface.replace(
 
1109
                    orig_interface_name, alt_interface_name)
1097
1110
                interface_names.add(alt_interface)
1098
1111
                # Is this a D-Bus signal?
1099
1112
                if getattr(attribute, "_dbus_is_signal", False):
1100
1113
                    # Extract the original non-method undecorated
1101
1114
                    # function by black magic
1102
1115
                    nonmethod_func = (dict(
1103
 
                            zip(attribute.func_code.co_freevars,
1104
 
                                attribute.__closure__))["func"]
1105
 
                                      .cell_contents)
 
1116
                        zip(attribute.func_code.co_freevars,
 
1117
                            attribute.__closure__))
 
1118
                                      ["func"].cell_contents)
1106
1119
                    # Create a new, but exactly alike, function
1107
1120
                    # object, and decorate it to be a new D-Bus signal
1108
1121
                    # with the alternate D-Bus interface name
1109
 
                    new_function = (dbus.service.signal
1110
 
                                    (alt_interface,
1111
 
                                     attribute._dbus_signature)
 
1122
                    new_function = (dbus.service.signal(
 
1123
                        alt_interface, attribute._dbus_signature)
1112
1124
                                    (types.FunctionType(
1113
 
                                nonmethod_func.func_code,
1114
 
                                nonmethod_func.func_globals,
1115
 
                                nonmethod_func.func_name,
1116
 
                                nonmethod_func.func_defaults,
1117
 
                                nonmethod_func.func_closure)))
 
1125
                                        nonmethod_func.func_code,
 
1126
                                        nonmethod_func.func_globals,
 
1127
                                        nonmethod_func.func_name,
 
1128
                                        nonmethod_func.func_defaults,
 
1129
                                        nonmethod_func.func_closure)))
1118
1130
                    # Copy annotations, if any
1119
1131
                    try:
1120
 
                        new_function._dbus_annotations = (
1121
 
                            dict(attribute._dbus_annotations))
 
1132
                        new_function._dbus_annotations = dict(
 
1133
                            attribute._dbus_annotations)
1122
1134
                    except AttributeError:
1123
1135
                        pass
1124
1136
                    # Define a creator of a function to call both the
1129
1141
                        """This function is a scope container to pass
1130
1142
                        func1 and func2 to the "call_both" function
1131
1143
                        outside of its arguments"""
 
1144
                        
1132
1145
                        def call_both(*args, **kwargs):
1133
1146
                            """This function will emit two D-Bus
1134
1147
                            signals by calling func1 and func2"""
1135
1148
                            func1(*args, **kwargs)
1136
1149
                            func2(*args, **kwargs)
 
1150
                        
1137
1151
                        return call_both
1138
1152
                    # Create the "call_both" function and add it to
1139
1153
                    # the class
1144
1158
                    # object.  Decorate it to be a new D-Bus method
1145
1159
                    # with the alternate D-Bus interface name.  Add it
1146
1160
                    # to the class.
1147
 
                    attr[attrname] = (dbus.service.method
1148
 
                                      (alt_interface,
1149
 
                                       attribute._dbus_in_signature,
1150
 
                                       attribute._dbus_out_signature)
1151
 
                                      (types.FunctionType
1152
 
                                       (attribute.func_code,
1153
 
                                        attribute.func_globals,
1154
 
                                        attribute.func_name,
1155
 
                                        attribute.func_defaults,
1156
 
                                        attribute.func_closure)))
 
1161
                    attr[attrname] = (
 
1162
                        dbus.service.method(
 
1163
                            alt_interface,
 
1164
                            attribute._dbus_in_signature,
 
1165
                            attribute._dbus_out_signature)
 
1166
                        (types.FunctionType(attribute.func_code,
 
1167
                                            attribute.func_globals,
 
1168
                                            attribute.func_name,
 
1169
                                            attribute.func_defaults,
 
1170
                                            attribute.func_closure)))
1157
1171
                    # Copy annotations, if any
1158
1172
                    try:
1159
 
                        attr[attrname]._dbus_annotations = (
1160
 
                            dict(attribute._dbus_annotations))
 
1173
                        attr[attrname]._dbus_annotations = dict(
 
1174
                            attribute._dbus_annotations)
1161
1175
                    except AttributeError:
1162
1176
                        pass
1163
1177
                # Is this a D-Bus property?
1166
1180
                    # object, and decorate it to be a new D-Bus
1167
1181
                    # property with the alternate D-Bus interface
1168
1182
                    # name.  Add it to the class.
1169
 
                    attr[attrname] = (dbus_service_property
1170
 
                                      (alt_interface,
1171
 
                                       attribute._dbus_signature,
1172
 
                                       attribute._dbus_access,
1173
 
                                       attribute
1174
 
                                       ._dbus_get_args_options
1175
 
                                       ["byte_arrays"])
1176
 
                                      (types.FunctionType
1177
 
                                       (attribute.func_code,
1178
 
                                        attribute.func_globals,
1179
 
                                        attribute.func_name,
1180
 
                                        attribute.func_defaults,
1181
 
                                        attribute.func_closure)))
 
1183
                    attr[attrname] = (dbus_service_property(
 
1184
                        alt_interface, attribute._dbus_signature,
 
1185
                        attribute._dbus_access,
 
1186
                        attribute._dbus_get_args_options
 
1187
                        ["byte_arrays"])
 
1188
                                      (types.FunctionType(
 
1189
                                          attribute.func_code,
 
1190
                                          attribute.func_globals,
 
1191
                                          attribute.func_name,
 
1192
                                          attribute.func_defaults,
 
1193
                                          attribute.func_closure)))
1182
1194
                    # Copy annotations, if any
1183
1195
                    try:
1184
 
                        attr[attrname]._dbus_annotations = (
1185
 
                            dict(attribute._dbus_annotations))
 
1196
                        attr[attrname]._dbus_annotations = dict(
 
1197
                            attribute._dbus_annotations)
1186
1198
                    except AttributeError:
1187
1199
                        pass
1188
1200
                # Is this a D-Bus interface?
1191
1203
                    # object.  Decorate it to be a new D-Bus interface
1192
1204
                    # with the alternate D-Bus interface name.  Add it
1193
1205
                    # to the class.
1194
 
                    attr[attrname] = (dbus_interface_annotations
1195
 
                                      (alt_interface)
1196
 
                                      (types.FunctionType
1197
 
                                       (attribute.func_code,
1198
 
                                        attribute.func_globals,
1199
 
                                        attribute.func_name,
1200
 
                                        attribute.func_defaults,
1201
 
                                        attribute.func_closure)))
 
1206
                    attr[attrname] = (
 
1207
                        dbus_interface_annotations(alt_interface)
 
1208
                        (types.FunctionType(attribute.func_code,
 
1209
                                            attribute.func_globals,
 
1210
                                            attribute.func_name,
 
1211
                                            attribute.func_defaults,
 
1212
                                            attribute.func_closure)))
1202
1213
            if deprecate:
1203
1214
                # Deprecate all alternate interfaces
1204
 
                iname="_AlternateDBusNames_interface_annotation{0}"
 
1215
                iname="_AlternateDBusNames_interface_annotation{}"
1205
1216
                for interface_name in interface_names:
 
1217
                    
1206
1218
                    @dbus_interface_annotations(interface_name)
1207
1219
                    def func(self):
1208
1220
                        return { "org.freedesktop.DBus.Deprecated":
1209
 
                                     "true" }
 
1221
                                 "true" }
1210
1222
                    # Find an unused name
1211
1223
                    for aname in (iname.format(i)
1212
1224
                                  for i in itertools.count()):
1216
1228
            if interface_names:
1217
1229
                # Replace the class with a new subclass of it with
1218
1230
                # methods, signals, etc. as created above.
1219
 
                cls = type(b"{0}Alternate".format(cls.__name__),
1220
 
                           (cls,), attr)
 
1231
                cls = type(b"{}Alternate".format(cls.__name__),
 
1232
                           (cls, ), attr)
1221
1233
        return cls
 
1234
    
1222
1235
    return wrapper
1223
1236
 
1224
1237
 
1225
1238
@alternate_dbus_interfaces({"se.recompile.Mandos":
1226
 
                                "se.bsnet.fukt.Mandos"})
 
1239
                            "se.bsnet.fukt.Mandos"})
1227
1240
class ClientDBus(Client, DBusObjectWithProperties):
1228
1241
    """A Client class using D-Bus
1229
1242
    
1233
1246
    """
1234
1247
    
1235
1248
    runtime_expansions = (Client.runtime_expansions
1236
 
                          + ("dbus_object_path",))
 
1249
                          + ("dbus_object_path", ))
 
1250
    
 
1251
    _interface = "se.recompile.Mandos.Client"
1237
1252
    
1238
1253
    # dbus.service.Object doesn't use super(), so we can't either.
1239
1254
    
1242
1257
        Client.__init__(self, *args, **kwargs)
1243
1258
        # Only now, when this client is initialized, can it show up on
1244
1259
        # the D-Bus
1245
 
        client_object_name = unicode(self.name).translate(
 
1260
        client_object_name = str(self.name).translate(
1246
1261
            {ord("."): ord("_"),
1247
1262
             ord("-"): ord("_")})
1248
 
        self.dbus_object_path = (dbus.ObjectPath
1249
 
                                 ("/clients/" + client_object_name))
 
1263
        self.dbus_object_path = dbus.ObjectPath(
 
1264
            "/clients/" + client_object_name)
1250
1265
        DBusObjectWithProperties.__init__(self, self.bus,
1251
1266
                                          self.dbus_object_path)
1252
1267
    
1253
 
    def notifychangeproperty(transform_func,
1254
 
                             dbus_name, type_func=lambda x: x,
1255
 
                             variant_level=1):
 
1268
    def notifychangeproperty(transform_func, dbus_name,
 
1269
                             type_func=lambda x: x,
 
1270
                             variant_level=1,
 
1271
                             invalidate_only=False,
 
1272
                             _interface=_interface):
1256
1273
        """ Modify a variable so that it's a property which announces
1257
1274
        its changes to DBus.
1258
1275
        
1263
1280
                   to the D-Bus.  Default: no transform
1264
1281
        variant_level: D-Bus variant level.  Default: 1
1265
1282
        """
1266
 
        attrname = "_{0}".format(dbus_name)
 
1283
        attrname = "_{}".format(dbus_name)
 
1284
        
1267
1285
        def setter(self, value):
1268
1286
            if hasattr(self, "dbus_object_path"):
1269
1287
                if (not hasattr(self, attrname) or
1270
1288
                    type_func(getattr(self, attrname, None))
1271
1289
                    != type_func(value)):
1272
 
                    dbus_value = transform_func(type_func(value),
1273
 
                                                variant_level
1274
 
                                                =variant_level)
1275
 
                    self.PropertyChanged(dbus.String(dbus_name),
1276
 
                                         dbus_value)
 
1290
                    if invalidate_only:
 
1291
                        self.PropertiesChanged(
 
1292
                            _interface, dbus.Dictionary(),
 
1293
                            dbus.Array((dbus_name, )))
 
1294
                    else:
 
1295
                        dbus_value = transform_func(
 
1296
                            type_func(value),
 
1297
                            variant_level = variant_level)
 
1298
                        self.PropertyChanged(dbus.String(dbus_name),
 
1299
                                             dbus_value)
 
1300
                        self.PropertiesChanged(
 
1301
                            _interface,
 
1302
                            dbus.Dictionary({ dbus.String(dbus_name):
 
1303
                                              dbus_value }),
 
1304
                            dbus.Array())
1277
1305
            setattr(self, attrname, value)
1278
1306
        
1279
1307
        return property(lambda self: getattr(self, attrname), setter)
1285
1313
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1286
1314
    last_enabled = notifychangeproperty(datetime_to_dbus,
1287
1315
                                        "LastEnabled")
1288
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1289
 
                                   type_func = lambda checker:
1290
 
                                       checker is not None)
 
1316
    checker = notifychangeproperty(
 
1317
        dbus.Boolean, "CheckerRunning",
 
1318
        type_func = lambda checker: checker is not None)
1291
1319
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1292
1320
                                           "LastCheckedOK")
1293
1321
    last_checker_status = notifychangeproperty(dbus.Int16,
1296
1324
        datetime_to_dbus, "LastApprovalRequest")
1297
1325
    approved_by_default = notifychangeproperty(dbus.Boolean,
1298
1326
                                               "ApprovedByDefault")
1299
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1300
 
                                          "ApprovalDelay",
1301
 
                                          type_func =
1302
 
                                          timedelta_to_milliseconds)
 
1327
    approval_delay = notifychangeproperty(
 
1328
        dbus.UInt64, "ApprovalDelay",
 
1329
        type_func = lambda td: td.total_seconds() * 1000)
1303
1330
    approval_duration = notifychangeproperty(
1304
1331
        dbus.UInt64, "ApprovalDuration",
1305
 
        type_func = timedelta_to_milliseconds)
 
1332
        type_func = lambda td: td.total_seconds() * 1000)
1306
1333
    host = notifychangeproperty(dbus.String, "Host")
1307
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1308
 
                                   type_func =
1309
 
                                   timedelta_to_milliseconds)
 
1334
    timeout = notifychangeproperty(
 
1335
        dbus.UInt64, "Timeout",
 
1336
        type_func = lambda td: td.total_seconds() * 1000)
1310
1337
    extended_timeout = notifychangeproperty(
1311
1338
        dbus.UInt64, "ExtendedTimeout",
1312
 
        type_func = timedelta_to_milliseconds)
1313
 
    interval = notifychangeproperty(dbus.UInt64,
1314
 
                                    "Interval",
1315
 
                                    type_func =
1316
 
                                    timedelta_to_milliseconds)
 
1339
        type_func = lambda td: td.total_seconds() * 1000)
 
1340
    interval = notifychangeproperty(
 
1341
        dbus.UInt64, "Interval",
 
1342
        type_func = lambda td: td.total_seconds() * 1000)
1317
1343
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1344
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1345
                                  invalidate_only=True)
1318
1346
    
1319
1347
    del notifychangeproperty
1320
1348
    
1347
1375
                                       *args, **kwargs)
1348
1376
    
1349
1377
    def start_checker(self, *args, **kwargs):
1350
 
        old_checker = self.checker
1351
 
        if self.checker is not None:
1352
 
            old_checker_pid = self.checker.pid
1353
 
        else:
1354
 
            old_checker_pid = None
 
1378
        old_checker_pid = getattr(self.checker, "pid", None)
1355
1379
        r = Client.start_checker(self, *args, **kwargs)
1356
1380
        # Only if new checker process was started
1357
1381
        if (self.checker is not None
1366
1390
    
1367
1391
    def approve(self, value=True):
1368
1392
        self.approved = value
1369
 
        gobject.timeout_add(timedelta_to_milliseconds
1370
 
                            (self.approval_duration),
1371
 
                            self._reset_approved)
 
1393
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1394
                                * 1000), self._reset_approved)
1372
1395
        self.send_changedstate()
1373
1396
    
1374
1397
    ## D-Bus methods, signals & properties
1375
 
    _interface = "se.recompile.Mandos.Client"
1376
1398
    
1377
1399
    ## Interfaces
1378
1400
    
1379
 
    @dbus_interface_annotations(_interface)
1380
 
    def _foo(self):
1381
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1382
 
                     "false"}
1383
 
    
1384
1401
    ## Signals
1385
1402
    
1386
1403
    # CheckerCompleted - signal
1396
1413
        pass
1397
1414
    
1398
1415
    # PropertyChanged - signal
 
1416
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1399
1417
    @dbus.service.signal(_interface, signature="sv")
1400
1418
    def PropertyChanged(self, property, value):
1401
1419
        "D-Bus signal"
1465
1483
        return dbus.Boolean(bool(self.approvals_pending))
1466
1484
    
1467
1485
    # ApprovedByDefault - property
1468
 
    @dbus_service_property(_interface, signature="b",
 
1486
    @dbus_service_property(_interface,
 
1487
                           signature="b",
1469
1488
                           access="readwrite")
1470
1489
    def ApprovedByDefault_dbus_property(self, value=None):
1471
1490
        if value is None:       # get
1473
1492
        self.approved_by_default = bool(value)
1474
1493
    
1475
1494
    # ApprovalDelay - property
1476
 
    @dbus_service_property(_interface, signature="t",
 
1495
    @dbus_service_property(_interface,
 
1496
                           signature="t",
1477
1497
                           access="readwrite")
1478
1498
    def ApprovalDelay_dbus_property(self, value=None):
1479
1499
        if value is None:       # get
1480
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1500
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1501
                               * 1000)
1481
1502
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1482
1503
    
1483
1504
    # ApprovalDuration - property
1484
 
    @dbus_service_property(_interface, signature="t",
 
1505
    @dbus_service_property(_interface,
 
1506
                           signature="t",
1485
1507
                           access="readwrite")
1486
1508
    def ApprovalDuration_dbus_property(self, value=None):
1487
1509
        if value is None:       # get
1488
 
            return dbus.UInt64(timedelta_to_milliseconds(
1489
 
                    self.approval_duration))
 
1510
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1511
                               * 1000)
1490
1512
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1491
1513
    
1492
1514
    # Name - property
1500
1522
        return dbus.String(self.fingerprint)
1501
1523
    
1502
1524
    # Host - property
1503
 
    @dbus_service_property(_interface, signature="s",
 
1525
    @dbus_service_property(_interface,
 
1526
                           signature="s",
1504
1527
                           access="readwrite")
1505
1528
    def Host_dbus_property(self, value=None):
1506
1529
        if value is None:       # get
1507
1530
            return dbus.String(self.host)
1508
 
        self.host = unicode(value)
 
1531
        self.host = str(value)
1509
1532
    
1510
1533
    # Created - property
1511
1534
    @dbus_service_property(_interface, signature="s", access="read")
1518
1541
        return datetime_to_dbus(self.last_enabled)
1519
1542
    
1520
1543
    # Enabled - property
1521
 
    @dbus_service_property(_interface, signature="b",
 
1544
    @dbus_service_property(_interface,
 
1545
                           signature="b",
1522
1546
                           access="readwrite")
1523
1547
    def Enabled_dbus_property(self, value=None):
1524
1548
        if value is None:       # get
1529
1553
            self.disable()
1530
1554
    
1531
1555
    # LastCheckedOK - property
1532
 
    @dbus_service_property(_interface, signature="s",
 
1556
    @dbus_service_property(_interface,
 
1557
                           signature="s",
1533
1558
                           access="readwrite")
1534
1559
    def LastCheckedOK_dbus_property(self, value=None):
1535
1560
        if value is not None:
1538
1563
        return datetime_to_dbus(self.last_checked_ok)
1539
1564
    
1540
1565
    # LastCheckerStatus - property
1541
 
    @dbus_service_property(_interface, signature="n",
1542
 
                           access="read")
 
1566
    @dbus_service_property(_interface, signature="n", access="read")
1543
1567
    def LastCheckerStatus_dbus_property(self):
1544
1568
        return dbus.Int16(self.last_checker_status)
1545
1569
    
1554
1578
        return datetime_to_dbus(self.last_approval_request)
1555
1579
    
1556
1580
    # Timeout - property
1557
 
    @dbus_service_property(_interface, signature="t",
 
1581
    @dbus_service_property(_interface,
 
1582
                           signature="t",
1558
1583
                           access="readwrite")
1559
1584
    def Timeout_dbus_property(self, value=None):
1560
1585
        if value is None:       # get
1561
 
            return dbus.UInt64(self.timeout_milliseconds())
 
1586
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
1562
1587
        old_timeout = self.timeout
1563
1588
        self.timeout = datetime.timedelta(0, 0, 0, value)
1564
1589
        # Reschedule disabling
1573
1598
                    is None):
1574
1599
                    return
1575
1600
                gobject.source_remove(self.disable_initiator_tag)
1576
 
                self.disable_initiator_tag = (
1577
 
                    gobject.timeout_add(
1578
 
                        timedelta_to_milliseconds(self.expires - now),
1579
 
                        self.disable))
 
1601
                self.disable_initiator_tag = gobject.timeout_add(
 
1602
                    int((self.expires - now).total_seconds() * 1000),
 
1603
                    self.disable)
1580
1604
    
1581
1605
    # ExtendedTimeout - property
1582
 
    @dbus_service_property(_interface, signature="t",
 
1606
    @dbus_service_property(_interface,
 
1607
                           signature="t",
1583
1608
                           access="readwrite")
1584
1609
    def ExtendedTimeout_dbus_property(self, value=None):
1585
1610
        if value is None:       # get
1586
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1611
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1612
                               * 1000)
1587
1613
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1588
1614
    
1589
1615
    # Interval - property
1590
 
    @dbus_service_property(_interface, signature="t",
 
1616
    @dbus_service_property(_interface,
 
1617
                           signature="t",
1591
1618
                           access="readwrite")
1592
1619
    def Interval_dbus_property(self, value=None):
1593
1620
        if value is None:       # get
1594
 
            return dbus.UInt64(self.interval_milliseconds())
 
1621
            return dbus.UInt64(self.interval.total_seconds() * 1000)
1595
1622
        self.interval = datetime.timedelta(0, 0, 0, value)
1596
1623
        if getattr(self, "checker_initiator_tag", None) is None:
1597
1624
            return
1598
1625
        if self.enabled:
1599
1626
            # Reschedule checker run
1600
1627
            gobject.source_remove(self.checker_initiator_tag)
1601
 
            self.checker_initiator_tag = (gobject.timeout_add
1602
 
                                          (value, self.start_checker))
1603
 
            self.start_checker()    # Start one now, too
 
1628
            self.checker_initiator_tag = gobject.timeout_add(
 
1629
                value, self.start_checker)
 
1630
            self.start_checker() # Start one now, too
1604
1631
    
1605
1632
    # Checker - property
1606
 
    @dbus_service_property(_interface, signature="s",
 
1633
    @dbus_service_property(_interface,
 
1634
                           signature="s",
1607
1635
                           access="readwrite")
1608
1636
    def Checker_dbus_property(self, value=None):
1609
1637
        if value is None:       # get
1610
1638
            return dbus.String(self.checker_command)
1611
 
        self.checker_command = unicode(value)
 
1639
        self.checker_command = str(value)
1612
1640
    
1613
1641
    # CheckerRunning - property
1614
 
    @dbus_service_property(_interface, signature="b",
 
1642
    @dbus_service_property(_interface,
 
1643
                           signature="b",
1615
1644
                           access="readwrite")
1616
1645
    def CheckerRunning_dbus_property(self, value=None):
1617
1646
        if value is None:       # get
1627
1656
        return self.dbus_object_path # is already a dbus.ObjectPath
1628
1657
    
1629
1658
    # Secret = property
1630
 
    @dbus_service_property(_interface, signature="ay",
1631
 
                           access="write", byte_arrays=True)
 
1659
    @dbus_service_property(_interface,
 
1660
                           signature="ay",
 
1661
                           access="write",
 
1662
                           byte_arrays=True)
1632
1663
    def Secret_dbus_property(self, value):
1633
 
        self.secret = str(value)
 
1664
        self.secret = bytes(value)
1634
1665
    
1635
1666
    del _interface
1636
1667
 
1650
1681
        if data[0] == 'data':
1651
1682
            return data[1]
1652
1683
        if data[0] == 'function':
 
1684
            
1653
1685
            def func(*args, **kwargs):
1654
1686
                self._pipe.send(('funcall', name, args, kwargs))
1655
1687
                return self._pipe.recv()[1]
 
1688
            
1656
1689
            return func
1657
1690
    
1658
1691
    def __setattr__(self, name, value):
1670
1703
    def handle(self):
1671
1704
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1672
1705
            logger.info("TCP connection from: %s",
1673
 
                        unicode(self.client_address))
 
1706
                        str(self.client_address))
1674
1707
            logger.debug("Pipe FD: %d",
1675
1708
                         self.server.child_pipe.fileno())
1676
1709
            
1677
 
            session = (gnutls.connection
1678
 
                       .ClientSession(self.request,
1679
 
                                      gnutls.connection
1680
 
                                      .X509Credentials()))
 
1710
            session = gnutls.connection.ClientSession(
 
1711
                self.request, gnutls.connection .X509Credentials())
1681
1712
            
1682
1713
            # Note: gnutls.connection.X509Credentials is really a
1683
1714
            # generic GnuTLS certificate credentials object so long as
1692
1723
            priority = self.server.gnutls_priority
1693
1724
            if priority is None:
1694
1725
                priority = "NORMAL"
1695
 
            (gnutls.library.functions
1696
 
             .gnutls_priority_set_direct(session._c_object,
1697
 
                                         priority, None))
 
1726
            gnutls.library.functions.gnutls_priority_set_direct(
 
1727
                session._c_object, priority, None)
1698
1728
            
1699
1729
            # Start communication using the Mandos protocol
1700
1730
            # Get protocol number
1702
1732
            logger.debug("Protocol version: %r", line)
1703
1733
            try:
1704
1734
                if int(line.strip().split()[0]) > 1:
1705
 
                    raise RuntimeError
 
1735
                    raise RuntimeError(line)
1706
1736
            except (ValueError, IndexError, RuntimeError) as error:
1707
1737
                logger.error("Unknown protocol version: %s", error)
1708
1738
                return
1720
1750
            approval_required = False
1721
1751
            try:
1722
1752
                try:
1723
 
                    fpr = self.fingerprint(self.peer_certificate
1724
 
                                           (session))
 
1753
                    fpr = self.fingerprint(
 
1754
                        self.peer_certificate(session))
1725
1755
                except (TypeError,
1726
1756
                        gnutls.errors.GNUTLSError) as error:
1727
1757
                    logger.warning("Bad certificate: %s", error)
1742
1772
                while True:
1743
1773
                    if not client.enabled:
1744
1774
                        logger.info("Client %s is disabled",
1745
 
                                       client.name)
 
1775
                                    client.name)
1746
1776
                        if self.server.use_dbus:
1747
1777
                            # Emit D-Bus signal
1748
1778
                            client.Rejected("Disabled")
1757
1787
                        if self.server.use_dbus:
1758
1788
                            # Emit D-Bus signal
1759
1789
                            client.NeedApproval(
1760
 
                                client.approval_delay_milliseconds(),
1761
 
                                client.approved_by_default)
 
1790
                                client.approval_delay.total_seconds()
 
1791
                                * 1000, client.approved_by_default)
1762
1792
                    else:
1763
1793
                        logger.warning("Client %s was not approved",
1764
1794
                                       client.name)
1770
1800
                    #wait until timeout or approved
1771
1801
                    time = datetime.datetime.now()
1772
1802
                    client.changedstate.acquire()
1773
 
                    client.changedstate.wait(
1774
 
                        float(timedelta_to_milliseconds(delay)
1775
 
                              / 1000))
 
1803
                    client.changedstate.wait(delay.total_seconds())
1776
1804
                    client.changedstate.release()
1777
1805
                    time2 = datetime.datetime.now()
1778
1806
                    if (time2 - time) >= delay:
1797
1825
                        logger.warning("gnutls send failed",
1798
1826
                                       exc_info=error)
1799
1827
                        return
1800
 
                    logger.debug("Sent: %d, remaining: %d",
1801
 
                                 sent, len(client.secret)
1802
 
                                 - (sent_size + sent))
 
1828
                    logger.debug("Sent: %d, remaining: %d", sent,
 
1829
                                 len(client.secret) - (sent_size
 
1830
                                                       + sent))
1803
1831
                    sent_size += sent
1804
1832
                
1805
1833
                logger.info("Sending secret to %s", client.name)
1822
1850
    def peer_certificate(session):
1823
1851
        "Return the peer's OpenPGP certificate as a bytestring"
1824
1852
        # If not an OpenPGP certificate...
1825
 
        if (gnutls.library.functions
1826
 
            .gnutls_certificate_type_get(session._c_object)
 
1853
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
1854
                session._c_object)
1827
1855
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1828
1856
            # ...do the normal thing
1829
1857
            return session.peer_certificate
1843
1871
    def fingerprint(openpgp):
1844
1872
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1845
1873
        # New GnuTLS "datum" with the OpenPGP public key
1846
 
        datum = (gnutls.library.types
1847
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1848
 
                                             ctypes.POINTER
1849
 
                                             (ctypes.c_ubyte)),
1850
 
                                 ctypes.c_uint(len(openpgp))))
 
1874
        datum = gnutls.library.types.gnutls_datum_t(
 
1875
            ctypes.cast(ctypes.c_char_p(openpgp),
 
1876
                        ctypes.POINTER(ctypes.c_ubyte)),
 
1877
            ctypes.c_uint(len(openpgp)))
1851
1878
        # New empty GnuTLS certificate
1852
1879
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1853
 
        (gnutls.library.functions
1854
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
1880
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
1881
            ctypes.byref(crt))
1855
1882
        # Import the OpenPGP public key into the certificate
1856
 
        (gnutls.library.functions
1857
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1858
 
                                    gnutls.library.constants
1859
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
1883
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
1884
            crt, ctypes.byref(datum),
 
1885
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1860
1886
        # Verify the self signature in the key
1861
1887
        crtverify = ctypes.c_uint()
1862
 
        (gnutls.library.functions
1863
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
1864
 
                                         ctypes.byref(crtverify)))
 
1888
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
1889
            crt, 0, ctypes.byref(crtverify))
1865
1890
        if crtverify.value != 0:
1866
1891
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1867
 
            raise (gnutls.errors.CertificateSecurityError
1868
 
                   ("Verify failed"))
 
1892
            raise gnutls.errors.CertificateSecurityError(
 
1893
                "Verify failed")
1869
1894
        # New buffer for the fingerprint
1870
1895
        buf = ctypes.create_string_buffer(20)
1871
1896
        buf_len = ctypes.c_size_t()
1872
1897
        # Get the fingerprint from the certificate into the buffer
1873
 
        (gnutls.library.functions
1874
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1875
 
                                             ctypes.byref(buf_len)))
 
1898
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
1899
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
1876
1900
        # Deinit the certificate
1877
1901
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1878
1902
        # Convert the buffer to a Python bytestring
1884
1908
 
1885
1909
class MultiprocessingMixIn(object):
1886
1910
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1911
    
1887
1912
    def sub_process_main(self, request, address):
1888
1913
        try:
1889
1914
            self.finish_request(request, address)
1901
1926
 
1902
1927
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1903
1928
    """ adds a pipe to the MixIn """
 
1929
    
1904
1930
    def process_request(self, request, client_address):
1905
1931
        """Overrides and wraps the original process_request().
1906
1932
        
1915
1941
    
1916
1942
    def add_pipe(self, parent_pipe, proc):
1917
1943
        """Dummy function; override as necessary"""
1918
 
        raise NotImplementedError
 
1944
        raise NotImplementedError()
1919
1945
 
1920
1946
 
1921
1947
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1927
1953
        interface:      None or a network interface name (string)
1928
1954
        use_ipv6:       Boolean; to use IPv6 or not
1929
1955
    """
 
1956
    
1930
1957
    def __init__(self, server_address, RequestHandlerClass,
1931
 
                 interface=None, use_ipv6=True, socketfd=None):
 
1958
                 interface=None,
 
1959
                 use_ipv6=True,
 
1960
                 socketfd=None):
1932
1961
        """If socketfd is set, use that file descriptor instead of
1933
1962
        creating a new one with socket.socket().
1934
1963
        """
1975
2004
                             self.interface)
1976
2005
            else:
1977
2006
                try:
1978
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1979
 
                                           SO_BINDTODEVICE,
1980
 
                                           str(self.interface + '\0'))
 
2007
                    self.socket.setsockopt(
 
2008
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2009
                        (self.interface + "\0").encode("utf-8"))
1981
2010
                except socket.error as error:
1982
2011
                    if error.errno == errno.EPERM:
1983
2012
                        logger.error("No permission to bind to"
2001
2030
                self.server_address = (any_address,
2002
2031
                                       self.server_address[1])
2003
2032
            elif not self.server_address[1]:
2004
 
                self.server_address = (self.server_address[0],
2005
 
                                       0)
 
2033
                self.server_address = (self.server_address[0], 0)
2006
2034
#                 if self.interface:
2007
2035
#                     self.server_address = (self.server_address[0],
2008
2036
#                                            0, # port
2022
2050
    
2023
2051
    Assumes a gobject.MainLoop event loop.
2024
2052
    """
 
2053
    
2025
2054
    def __init__(self, server_address, RequestHandlerClass,
2026
 
                 interface=None, use_ipv6=True, clients=None,
2027
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
2055
                 interface=None,
 
2056
                 use_ipv6=True,
 
2057
                 clients=None,
 
2058
                 gnutls_priority=None,
 
2059
                 use_dbus=True,
 
2060
                 socketfd=None):
2028
2061
        self.enabled = False
2029
2062
        self.clients = clients
2030
2063
        if self.clients is None:
2036
2069
                                interface = interface,
2037
2070
                                use_ipv6 = use_ipv6,
2038
2071
                                socketfd = socketfd)
 
2072
    
2039
2073
    def server_activate(self):
2040
2074
        if self.enabled:
2041
2075
            return socketserver.TCPServer.server_activate(self)
2045
2079
    
2046
2080
    def add_pipe(self, parent_pipe, proc):
2047
2081
        # Call "handle_ipc" for both data and EOF events
2048
 
        gobject.io_add_watch(parent_pipe.fileno(),
2049
 
                             gobject.IO_IN | gobject.IO_HUP,
2050
 
                             functools.partial(self.handle_ipc,
2051
 
                                               parent_pipe =
2052
 
                                               parent_pipe,
2053
 
                                               proc = proc))
 
2082
        gobject.io_add_watch(
 
2083
            parent_pipe.fileno(),
 
2084
            gobject.IO_IN | gobject.IO_HUP,
 
2085
            functools.partial(self.handle_ipc,
 
2086
                              parent_pipe = parent_pipe,
 
2087
                              proc = proc))
2054
2088
    
2055
 
    def handle_ipc(self, source, condition, parent_pipe=None,
2056
 
                   proc = None, client_object=None):
 
2089
    def handle_ipc(self, source, condition,
 
2090
                   parent_pipe=None,
 
2091
                   proc = None,
 
2092
                   client_object=None):
2057
2093
        # error, or the other end of multiprocessing.Pipe has closed
2058
2094
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2059
2095
            # Wait for other process to exit
2082
2118
                parent_pipe.send(False)
2083
2119
                return False
2084
2120
            
2085
 
            gobject.io_add_watch(parent_pipe.fileno(),
2086
 
                                 gobject.IO_IN | gobject.IO_HUP,
2087
 
                                 functools.partial(self.handle_ipc,
2088
 
                                                   parent_pipe =
2089
 
                                                   parent_pipe,
2090
 
                                                   proc = proc,
2091
 
                                                   client_object =
2092
 
                                                   client))
 
2121
            gobject.io_add_watch(
 
2122
                parent_pipe.fileno(),
 
2123
                gobject.IO_IN | gobject.IO_HUP,
 
2124
                functools.partial(self.handle_ipc,
 
2125
                                  parent_pipe = parent_pipe,
 
2126
                                  proc = proc,
 
2127
                                  client_object = client))
2093
2128
            parent_pipe.send(True)
2094
2129
            # remove the old hook in favor of the new above hook on
2095
2130
            # same fileno
2101
2136
            
2102
2137
            parent_pipe.send(('data', getattr(client_object,
2103
2138
                                              funcname)(*args,
2104
 
                                                         **kwargs)))
 
2139
                                                        **kwargs)))
2105
2140
        
2106
2141
        if command == 'getattr':
2107
2142
            attrname = request[1]
2108
2143
            if callable(client_object.__getattribute__(attrname)):
2109
 
                parent_pipe.send(('function',))
 
2144
                parent_pipe.send(('function', ))
2110
2145
            else:
2111
 
                parent_pipe.send(('data', client_object
2112
 
                                  .__getattribute__(attrname)))
 
2146
                parent_pipe.send((
 
2147
                    'data', client_object.__getattribute__(attrname)))
2113
2148
        
2114
2149
        if command == 'setattr':
2115
2150
            attrname = request[1]
2155
2190
                                              # None
2156
2191
                                    "followers")) # Tokens valid after
2157
2192
                                                  # this token
 
2193
    Token = collections.namedtuple("Token", (
 
2194
        "regexp",  # To match token; if "value" is not None, must have
 
2195
                   # a "group" containing digits
 
2196
        "value",   # datetime.timedelta or None
 
2197
        "followers"))           # Tokens valid after this token
2158
2198
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2159
2199
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2160
2200
    token_end = Token(re.compile(r"$"), None, frozenset())
2161
2201
    token_second = Token(re.compile(r"(\d+)S"),
2162
2202
                         datetime.timedelta(seconds=1),
2163
 
                         frozenset((token_end,)))
 
2203
                         frozenset((token_end, )))
2164
2204
    token_minute = Token(re.compile(r"(\d+)M"),
2165
2205
                         datetime.timedelta(minutes=1),
2166
2206
                         frozenset((token_second, token_end)))
2182
2222
                       frozenset((token_month, token_end)))
2183
2223
    token_week = Token(re.compile(r"(\d+)W"),
2184
2224
                       datetime.timedelta(weeks=1),
2185
 
                       frozenset((token_end,)))
 
2225
                       frozenset((token_end, )))
2186
2226
    token_duration = Token(re.compile(r"P"), None,
2187
2227
                           frozenset((token_year, token_month,
2188
2228
                                      token_day, token_time,
2189
 
                                      token_week))),
 
2229
                                      token_week)))
2190
2230
    # Define starting values
2191
2231
    value = datetime.timedelta() # Value so far
2192
2232
    found_token = None
2193
 
    followers = frozenset(token_duration,) # Following valid tokens
 
2233
    followers = frozenset((token_duration,)) # Following valid tokens
2194
2234
    s = duration                # String left to parse
2195
2235
    # Loop until end token is found
2196
2236
    while found_token is not token_end:
2243
2283
    timevalue = datetime.timedelta(0)
2244
2284
    for s in interval.split():
2245
2285
        try:
2246
 
            suffix = unicode(s[-1])
 
2286
            suffix = s[-1]
2247
2287
            value = int(s[:-1])
2248
2288
            if suffix == "d":
2249
2289
                delta = datetime.timedelta(value)
2256
2296
            elif suffix == "w":
2257
2297
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2258
2298
            else:
2259
 
                raise ValueError("Unknown suffix {0!r}"
2260
 
                                 .format(suffix))
2261
 
        except (ValueError, IndexError) as e:
 
2299
                raise ValueError("Unknown suffix {!r}".format(suffix))
 
2300
        except IndexError as e:
2262
2301
            raise ValueError(*(e.args))
2263
2302
        timevalue += delta
2264
2303
    return timevalue
2280
2319
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2281
2320
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2282
2321
            raise OSError(errno.ENODEV,
2283
 
                          "{0} not a character device"
 
2322
                          "{} not a character device"
2284
2323
                          .format(os.devnull))
2285
2324
        os.dup2(null, sys.stdin.fileno())
2286
2325
        os.dup2(null, sys.stdout.fileno())
2296
2335
    
2297
2336
    parser = argparse.ArgumentParser()
2298
2337
    parser.add_argument("-v", "--version", action="version",
2299
 
                        version = "%(prog)s {0}".format(version),
 
2338
                        version = "%(prog)s {}".format(version),
2300
2339
                        help="show version number and exit")
2301
2340
    parser.add_argument("-i", "--interface", metavar="IF",
2302
2341
                        help="Bind to interface IF")
2335
2374
                        help="Directory to save/restore state in")
2336
2375
    parser.add_argument("--foreground", action="store_true",
2337
2376
                        help="Run in foreground", default=None)
 
2377
    parser.add_argument("--no-zeroconf", action="store_false",
 
2378
                        dest="zeroconf", help="Do not use Zeroconf",
 
2379
                        default=None)
2338
2380
    
2339
2381
    options = parser.parse_args()
2340
2382
    
2341
2383
    if options.check:
2342
2384
        import doctest
2343
 
        doctest.testmod()
2344
 
        sys.exit()
 
2385
        fail_count, test_count = doctest.testmod()
 
2386
        sys.exit(os.EX_OK if fail_count == 0 else 1)
2345
2387
    
2346
2388
    # Default values for config file for server-global settings
2347
2389
    server_defaults = { "interface": "",
2349
2391
                        "port": "",
2350
2392
                        "debug": "False",
2351
2393
                        "priority":
2352
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2394
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2395
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2353
2396
                        "servicename": "Mandos",
2354
2397
                        "use_dbus": "True",
2355
2398
                        "use_ipv6": "True",
2358
2401
                        "socket": "",
2359
2402
                        "statedir": "/var/lib/mandos",
2360
2403
                        "foreground": "False",
2361
 
                        }
 
2404
                        "zeroconf": "True",
 
2405
                    }
2362
2406
    
2363
2407
    # Parse config file for server-global settings
2364
2408
    server_config = configparser.SafeConfigParser(server_defaults)
2365
2409
    del server_defaults
2366
 
    server_config.read(os.path.join(options.configdir,
2367
 
                                    "mandos.conf"))
 
2410
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
2368
2411
    # Convert the SafeConfigParser object to a dict
2369
2412
    server_settings = server_config.defaults()
2370
2413
    # Use the appropriate methods on the non-string config options
2388
2431
    # Override the settings from the config file with command line
2389
2432
    # options, if set.
2390
2433
    for option in ("interface", "address", "port", "debug",
2391
 
                   "priority", "servicename", "configdir",
2392
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2393
 
                   "statedir", "socket", "foreground"):
 
2434
                   "priority", "servicename", "configdir", "use_dbus",
 
2435
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2436
                   "socket", "foreground", "zeroconf"):
2394
2437
        value = getattr(options, option)
2395
2438
        if value is not None:
2396
2439
            server_settings[option] = value
2397
2440
    del options
2398
2441
    # Force all strings to be unicode
2399
2442
    for option in server_settings.keys():
2400
 
        if type(server_settings[option]) is str:
2401
 
            server_settings[option] = unicode(server_settings[option])
 
2443
        if isinstance(server_settings[option], bytes):
 
2444
            server_settings[option] = (server_settings[option]
 
2445
                                       .decode("utf-8"))
2402
2446
    # Force all boolean options to be boolean
2403
2447
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2404
 
                   "foreground"):
 
2448
                   "foreground", "zeroconf"):
2405
2449
        server_settings[option] = bool(server_settings[option])
2406
2450
    # Debug implies foreground
2407
2451
    if server_settings["debug"]:
2410
2454
    
2411
2455
    ##################################################################
2412
2456
    
 
2457
    if (not server_settings["zeroconf"]
 
2458
        and not (server_settings["port"]
 
2459
                 or server_settings["socket"] != "")):
 
2460
        parser.error("Needs port or socket to work without Zeroconf")
 
2461
    
2413
2462
    # For convenience
2414
2463
    debug = server_settings["debug"]
2415
2464
    debuglevel = server_settings["debuglevel"]
2418
2467
    stored_state_path = os.path.join(server_settings["statedir"],
2419
2468
                                     stored_state_file)
2420
2469
    foreground = server_settings["foreground"]
 
2470
    zeroconf = server_settings["zeroconf"]
2421
2471
    
2422
2472
    if debug:
2423
2473
        initlogger(debug, logging.DEBUG)
2429
2479
            initlogger(debug, level)
2430
2480
    
2431
2481
    if server_settings["servicename"] != "Mandos":
2432
 
        syslogger.setFormatter(logging.Formatter
2433
 
                               ('Mandos ({0}) [%(process)d]:'
2434
 
                                ' %(levelname)s: %(message)s'
2435
 
                                .format(server_settings
2436
 
                                        ["servicename"])))
 
2482
        syslogger.setFormatter(
 
2483
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2484
                              ' %(levelname)s: %(message)s'.format(
 
2485
                                  server_settings["servicename"])))
2437
2486
    
2438
2487
    # Parse config file with clients
2439
2488
    client_config = configparser.SafeConfigParser(Client
2444
2493
    global mandos_dbus_service
2445
2494
    mandos_dbus_service = None
2446
2495
    
2447
 
    tcp_server = MandosServer((server_settings["address"],
2448
 
                               server_settings["port"]),
2449
 
                              ClientHandler,
2450
 
                              interface=(server_settings["interface"]
2451
 
                                         or None),
2452
 
                              use_ipv6=use_ipv6,
2453
 
                              gnutls_priority=
2454
 
                              server_settings["priority"],
2455
 
                              use_dbus=use_dbus,
2456
 
                              socketfd=(server_settings["socket"]
2457
 
                                        or None))
 
2496
    socketfd = None
 
2497
    if server_settings["socket"] != "":
 
2498
        socketfd = server_settings["socket"]
 
2499
    tcp_server = MandosServer(
 
2500
        (server_settings["address"], server_settings["port"]),
 
2501
        ClientHandler,
 
2502
        interface=(server_settings["interface"] or None),
 
2503
        use_ipv6=use_ipv6,
 
2504
        gnutls_priority=server_settings["priority"],
 
2505
        use_dbus=use_dbus,
 
2506
        socketfd=socketfd)
2458
2507
    if not foreground:
2459
2508
        pidfilename = "/run/mandos.pid"
 
2509
        if not os.path.isdir("/run/."):
 
2510
            pidfilename = "/var/run/mandos.pid"
2460
2511
        pidfile = None
2461
2512
        try:
2462
2513
            pidfile = open(pidfilename, "w")
2479
2530
        os.setuid(uid)
2480
2531
    except OSError as error:
2481
2532
        if error.errno != errno.EPERM:
2482
 
            raise error
 
2533
            raise
2483
2534
    
2484
2535
    if debug:
2485
2536
        # Enable all possible GnuTLS debugging
2492
2543
        def debug_gnutls(level, string):
2493
2544
            logger.debug("GnuTLS: %s", string[:-1])
2494
2545
        
2495
 
        (gnutls.library.functions
2496
 
         .gnutls_global_set_log_function(debug_gnutls))
 
2546
        gnutls.library.functions.gnutls_global_set_log_function(
 
2547
            debug_gnutls)
2497
2548
        
2498
2549
        # Redirect stdin so all checkers get /dev/null
2499
2550
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2519
2570
    if use_dbus:
2520
2571
        try:
2521
2572
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2522
 
                                            bus, do_not_queue=True)
2523
 
            old_bus_name = (dbus.service.BusName
2524
 
                            ("se.bsnet.fukt.Mandos", bus,
2525
 
                             do_not_queue=True))
2526
 
        except dbus.exceptions.NameExistsException as e:
 
2573
                                            bus,
 
2574
                                            do_not_queue=True)
 
2575
            old_bus_name = dbus.service.BusName(
 
2576
                "se.bsnet.fukt.Mandos", bus,
 
2577
                do_not_queue=True)
 
2578
        except dbus.exceptions.DBusException as e:
2527
2579
            logger.error("Disabling D-Bus:", exc_info=e)
2528
2580
            use_dbus = False
2529
2581
            server_settings["use_dbus"] = False
2530
2582
            tcp_server.use_dbus = False
2531
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2532
 
    service = AvahiServiceToSyslog(name =
2533
 
                                   server_settings["servicename"],
2534
 
                                   servicetype = "_mandos._tcp",
2535
 
                                   protocol = protocol, bus = bus)
2536
 
    if server_settings["interface"]:
2537
 
        service.interface = (if_nametoindex
2538
 
                             (str(server_settings["interface"])))
 
2583
    if zeroconf:
 
2584
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2585
        service = AvahiServiceToSyslog(
 
2586
            name = server_settings["servicename"],
 
2587
            servicetype = "_mandos._tcp",
 
2588
            protocol = protocol,
 
2589
            bus = bus)
 
2590
        if server_settings["interface"]:
 
2591
            service.interface = if_nametoindex(
 
2592
                server_settings["interface"].encode("utf-8"))
2539
2593
    
2540
2594
    global multiprocessing_manager
2541
2595
    multiprocessing_manager = multiprocessing.Manager()
2560
2614
    if server_settings["restore"]:
2561
2615
        try:
2562
2616
            with open(stored_state_path, "rb") as stored_state:
2563
 
                clients_data, old_client_settings = (pickle.load
2564
 
                                                     (stored_state))
 
2617
                clients_data, old_client_settings = pickle.load(
 
2618
                    stored_state)
2565
2619
            os.remove(stored_state_path)
2566
2620
        except IOError as e:
2567
2621
            if e.errno == errno.ENOENT:
2568
 
                logger.warning("Could not load persistent state: {0}"
2569
 
                                .format(os.strerror(e.errno)))
 
2622
                logger.warning("Could not load persistent state:"
 
2623
                               " {}".format(os.strerror(e.errno)))
2570
2624
            else:
2571
2625
                logger.critical("Could not load persistent state:",
2572
2626
                                exc_info=e)
2573
2627
                raise
2574
2628
        except EOFError as e:
2575
2629
            logger.warning("Could not load persistent state: "
2576
 
                           "EOFError:", exc_info=e)
 
2630
                           "EOFError:",
 
2631
                           exc_info=e)
2577
2632
    
2578
2633
    with PGPEngine() as pgp:
2579
 
        for client_name, client in clients_data.iteritems():
 
2634
        for client_name, client in clients_data.items():
2580
2635
            # Skip removed clients
2581
2636
            if client_name not in client_settings:
2582
2637
                continue
2591
2646
                    # For each value in new config, check if it
2592
2647
                    # differs from the old config value (Except for
2593
2648
                    # the "secret" attribute)
2594
 
                    if (name != "secret" and
2595
 
                        value != old_client_settings[client_name]
2596
 
                        [name]):
 
2649
                    if (name != "secret"
 
2650
                        and (value !=
 
2651
                             old_client_settings[client_name][name])):
2597
2652
                        client[name] = value
2598
2653
                except KeyError:
2599
2654
                    pass
2607
2662
                if datetime.datetime.utcnow() >= client["expires"]:
2608
2663
                    if not client["last_checked_ok"]:
2609
2664
                        logger.warning(
2610
 
                            "disabling client {0} - Client never "
2611
 
                            "performed a successful checker"
2612
 
                            .format(client_name))
 
2665
                            "disabling client {} - Client never "
 
2666
                            "performed a successful checker".format(
 
2667
                                client_name))
2613
2668
                        client["enabled"] = False
2614
2669
                    elif client["last_checker_status"] != 0:
2615
2670
                        logger.warning(
2616
 
                            "disabling client {0} - Client "
2617
 
                            "last checker failed with error code {1}"
2618
 
                            .format(client_name,
2619
 
                                    client["last_checker_status"]))
 
2671
                            "disabling client {} - Client last"
 
2672
                            " checker failed with error code"
 
2673
                            " {}".format(
 
2674
                                client_name,
 
2675
                                client["last_checker_status"]))
2620
2676
                        client["enabled"] = False
2621
2677
                    else:
2622
 
                        client["expires"] = (datetime.datetime
2623
 
                                             .utcnow()
2624
 
                                             + client["timeout"])
 
2678
                        client["expires"] = (
 
2679
                            datetime.datetime.utcnow()
 
2680
                            + client["timeout"])
2625
2681
                        logger.debug("Last checker succeeded,"
2626
 
                                     " keeping {0} enabled"
2627
 
                                     .format(client_name))
 
2682
                                     " keeping {} enabled".format(
 
2683
                                         client_name))
2628
2684
            try:
2629
 
                client["secret"] = (
2630
 
                    pgp.decrypt(client["encrypted_secret"],
2631
 
                                client_settings[client_name]
2632
 
                                ["secret"]))
 
2685
                client["secret"] = pgp.decrypt(
 
2686
                    client["encrypted_secret"],
 
2687
                    client_settings[client_name]["secret"])
2633
2688
            except PGPError:
2634
2689
                # If decryption fails, we use secret from new settings
2635
 
                logger.debug("Failed to decrypt {0} old secret"
2636
 
                             .format(client_name))
2637
 
                client["secret"] = (
2638
 
                    client_settings[client_name]["secret"])
 
2690
                logger.debug("Failed to decrypt {} old secret".format(
 
2691
                    client_name))
 
2692
                client["secret"] = (client_settings[client_name]
 
2693
                                    ["secret"])
2639
2694
    
2640
2695
    # Add/remove clients based on new changes made to config
2641
2696
    for client_name in (set(old_client_settings)
2646
2701
        clients_data[client_name] = client_settings[client_name]
2647
2702
    
2648
2703
    # Create all client objects
2649
 
    for client_name, client in clients_data.iteritems():
 
2704
    for client_name, client in clients_data.items():
2650
2705
        tcp_server.clients[client_name] = client_class(
2651
 
            name = client_name, settings = client,
 
2706
            name = client_name,
 
2707
            settings = client,
2652
2708
            server_settings = server_settings)
2653
2709
    
2654
2710
    if not tcp_server.clients:
2659
2715
            try:
2660
2716
                with pidfile:
2661
2717
                    pid = os.getpid()
2662
 
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2718
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
2663
2719
            except IOError:
2664
2720
                logger.error("Could not write to file %r with PID %d",
2665
2721
                             pidfilename, pid)
2670
2726
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2671
2727
    
2672
2728
    if use_dbus:
2673
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2674
 
                                        "se.bsnet.fukt.Mandos"})
 
2729
        
 
2730
        @alternate_dbus_interfaces(
 
2731
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2675
2732
        class MandosDBusService(DBusObjectWithProperties):
2676
2733
            """A D-Bus proxy object"""
 
2734
            
2677
2735
            def __init__(self):
2678
2736
                dbus.service.Object.__init__(self, bus, "/")
 
2737
            
2679
2738
            _interface = "se.recompile.Mandos"
2680
2739
            
2681
2740
            @dbus_interface_annotations(_interface)
2682
2741
            def _foo(self):
2683
 
                return { "org.freedesktop.DBus.Property"
2684
 
                         ".EmitsChangedSignal":
2685
 
                             "false"}
 
2742
                return {
 
2743
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2744
                    "false" }
2686
2745
            
2687
2746
            @dbus.service.signal(_interface, signature="o")
2688
2747
            def ClientAdded(self, objpath):
2702
2761
            @dbus.service.method(_interface, out_signature="ao")
2703
2762
            def GetAllClients(self):
2704
2763
                "D-Bus method"
2705
 
                return dbus.Array(c.dbus_object_path
2706
 
                                  for c in
 
2764
                return dbus.Array(c.dbus_object_path for c in
2707
2765
                                  tcp_server.clients.itervalues())
2708
2766
            
2709
2767
            @dbus.service.method(_interface,
2711
2769
            def GetAllClientsWithProperties(self):
2712
2770
                "D-Bus method"
2713
2771
                return dbus.Dictionary(
2714
 
                    ((c.dbus_object_path, c.GetAll(""))
2715
 
                     for c in tcp_server.clients.itervalues()),
 
2772
                    { c.dbus_object_path: c.GetAll("")
 
2773
                      for c in tcp_server.clients.itervalues() },
2716
2774
                    signature="oa{sv}")
2717
2775
            
2718
2776
            @dbus.service.method(_interface, in_signature="o")
2735
2793
    
2736
2794
    def cleanup():
2737
2795
        "Cleanup function; run on exit"
2738
 
        service.cleanup()
 
2796
        if zeroconf:
 
2797
            service.cleanup()
2739
2798
        
2740
2799
        multiprocessing.active_children()
2741
2800
        wnull.close()
2755
2814
                
2756
2815
                # A list of attributes that can not be pickled
2757
2816
                # + secret.
2758
 
                exclude = set(("bus", "changedstate", "secret",
2759
 
                               "checker", "server_settings"))
2760
 
                for name, typ in (inspect.getmembers
2761
 
                                  (dbus.service.Object)):
 
2817
                exclude = { "bus", "changedstate", "secret",
 
2818
                            "checker", "server_settings" }
 
2819
                for name, typ in inspect.getmembers(dbus.service
 
2820
                                                    .Object):
2762
2821
                    exclude.add(name)
2763
2822
                
2764
2823
                client_dict["encrypted_secret"] = (client
2771
2830
                del client_settings[client.name]["secret"]
2772
2831
        
2773
2832
        try:
2774
 
            with (tempfile.NamedTemporaryFile
2775
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2776
 
                   dir=os.path.dirname(stored_state_path),
2777
 
                   delete=False)) as stored_state:
 
2833
            with tempfile.NamedTemporaryFile(
 
2834
                    mode='wb',
 
2835
                    suffix=".pickle",
 
2836
                    prefix='clients-',
 
2837
                    dir=os.path.dirname(stored_state_path),
 
2838
                    delete=False) as stored_state:
2778
2839
                pickle.dump((clients, client_settings), stored_state)
2779
 
                tempname=stored_state.name
 
2840
                tempname = stored_state.name
2780
2841
            os.rename(tempname, stored_state_path)
2781
2842
        except (IOError, OSError) as e:
2782
2843
            if not debug:
2785
2846
                except NameError:
2786
2847
                    pass
2787
2848
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2788
 
                logger.warning("Could not save persistent state: {0}"
 
2849
                logger.warning("Could not save persistent state: {}"
2789
2850
                               .format(os.strerror(e.errno)))
2790
2851
            else:
2791
2852
                logger.warning("Could not save persistent state:",
2792
2853
                               exc_info=e)
2793
 
                raise e
 
2854
                raise
2794
2855
        
2795
2856
        # Delete all clients, and settings from config
2796
2857
        while tcp_server.clients:
2801
2862
            client.disable(quiet=True)
2802
2863
            if use_dbus:
2803
2864
                # Emit D-Bus signal
2804
 
                mandos_dbus_service.ClientRemoved(client
2805
 
                                                  .dbus_object_path,
2806
 
                                                  client.name)
 
2865
                mandos_dbus_service.ClientRemoved(
 
2866
                    client.dbus_object_path, client.name)
2807
2867
        client_settings.clear()
2808
2868
    
2809
2869
    atexit.register(cleanup)
2820
2880
    tcp_server.server_activate()
2821
2881
    
2822
2882
    # Find out what port we got
2823
 
    service.port = tcp_server.socket.getsockname()[1]
 
2883
    if zeroconf:
 
2884
        service.port = tcp_server.socket.getsockname()[1]
2824
2885
    if use_ipv6:
2825
2886
        logger.info("Now listening on address %r, port %d,"
2826
2887
                    " flowinfo %d, scope_id %d",
2832
2893
    #service.interface = tcp_server.socket.getsockname()[3]
2833
2894
    
2834
2895
    try:
2835
 
        # From the Avahi example code
2836
 
        try:
2837
 
            service.activate()
2838
 
        except dbus.exceptions.DBusException as error:
2839
 
            logger.critical("D-Bus Exception", exc_info=error)
2840
 
            cleanup()
2841
 
            sys.exit(1)
2842
 
        # End of Avahi example code
 
2896
        if zeroconf:
 
2897
            # From the Avahi example code
 
2898
            try:
 
2899
                service.activate()
 
2900
            except dbus.exceptions.DBusException as error:
 
2901
                logger.critical("D-Bus Exception", exc_info=error)
 
2902
                cleanup()
 
2903
                sys.exit(1)
 
2904
            # End of Avahi example code
2843
2905
        
2844
2906
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2845
2907
                             lambda *args, **kwargs:
2860
2922
    # Must run before the D-Bus bus name gets deregistered
2861
2923
    cleanup()
2862
2924
 
 
2925
 
2863
2926
if __name__ == '__main__':
2864
2927
    main()