/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-15 19:35:03 UTC
  • Revision ID: teddy@recompile.se-20140715193503-e18hls7m4rv4l6iq
mandos-client: Fix mem free bug.

* plugins.d/mandos-client.c (add_server): Hide warning.
  (main): Free server->ip too, not just the server struct.

Show diffs side-by-side

added added

removed removed

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