/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: 2014-02-16 02:42:42 UTC
  • Revision ID: teddy@recompile.se-20140216024242-9wiw1nkxgt7ohovj
Fix running of self-tests.

* debian/control (Build-Depends): Add Python dependencies to
                                  successfully run self-tests.
* debian/copyright: GPLv3 now has its own license file - use it.
* debian/watch: Set PGP signature URL.
* mandos (main): Bug fix: When running self-tests, set exit code.
* mandos-ctl (main): Cosmetic fix; use os.EX_OK instead of plain 0.

Show diffs side-by-side

added added

removed removed

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