/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-05-31 15:56:58 UTC
  • Revision ID: teddy@recompile.se-20150531155658-l7znu7zlqr2dmuwd
mandos: Generate better messages in exceptions.

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

Show diffs side-by-side

added added

removed removed

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