/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-31 15:56:58 UTC
  • Revision ID: teddy@recompile.se-20150531155658-l7znu7zlqr2dmuwd
mandos: Generate better messages in exceptions.

mandos (ProxyClient.__init__): Include fingerprint in KeyError().
(rfc3339_duration_to_delta): Include duration in ValueError().

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