/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-05-23 12:07:07 UTC
  • mto: (237.7.304 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150523120707-t5fq0brh2kxkvw8g
mandos: Some more minor changes to prepare for Python 3.

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