/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-07-14 21:41:08 UTC
  • Revision ID: teddy@recompile.se-20140714214108-awg7u6gaiy7d40dz
mandos-monitor: New "verbose" mode to see less important log messages.

* mandos-monitor (MandosClientWidget.__init__): Log client creation.
  (MandosClientWidget.checker_completed): Log a successful checker.
  (MandosClientWidget.checker_started): Log starting of a checker.
  (UserInterface.__init__): New optional "log_level" argument.
  (UserInterface.log_message, UserInterface.log_message_raw): Take
                                                              optional
                                                              "level"
                                                              arg.
  (UserInterface.toggle_log_display): Log visibility change.
  (UserInterface.change_log_display): Log wrap mode change.
  (UserInterface.process_input): Show new "v" key in help message and
                                 process "v" key if pressed.
* mandos-monitor.xml (KEYS): Document new "v" key.

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