/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: 2014-02-16 03:56:48 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 309.
  • Revision ID: teddy@recompile.se-20140216035648-i6rjq2mp8jicxudo
Allow self-tests to run without needing /dev/log.

* mandos (main): Only open /dev/log on initlogger() call.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2016 Teddy Hogeborn
15
 
# Copyright © 2008-2016 Björn Påhlsson
 
14
# Copyright © 2008-2014 Teddy Hogeborn
 
15
# Copyright © 2008-2014 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
try:
38
 
    from future_builtins import *
39
 
except ImportError:
40
 
    pass
 
37
from future_builtins import *
41
38
 
42
 
try:
43
 
    import SocketServer as socketserver
44
 
except ImportError:
45
 
    import socketserver
 
39
import SocketServer as socketserver
46
40
import socket
47
41
import argparse
48
42
import datetime
49
43
import errno
50
 
try:
51
 
    import ConfigParser as configparser
52
 
except ImportError:
53
 
    import configparser
 
44
import gnutls.crypto
 
45
import gnutls.connection
 
46
import gnutls.errors
 
47
import gnutls.library.functions
 
48
import gnutls.library.constants
 
49
import gnutls.library.types
 
50
import ConfigParser as configparser
54
51
import sys
55
52
import re
56
53
import os
65
62
import struct
66
63
import fcntl
67
64
import functools
68
 
try:
69
 
    import cPickle as pickle
70
 
except ImportError:
71
 
    import pickle
 
65
import cPickle as pickle
72
66
import multiprocessing
73
67
import types
74
68
import binascii
75
69
import tempfile
76
70
import itertools
77
71
import collections
78
 
import codecs
79
72
 
80
73
import dbus
81
74
import dbus.service
82
 
from gi.repository import GLib
 
75
import gobject
 
76
import avahi
83
77
from dbus.mainloop.glib import DBusGMainLoop
84
78
import ctypes
85
79
import ctypes.util
86
80
import xml.dom.minidom
87
81
import inspect
88
82
 
89
 
# Try to find the value of SO_BINDTODEVICE:
90
83
try:
91
 
    # This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
92
 
    # newer, and it is also the most natural place for it:
93
84
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
94
85
except AttributeError:
95
86
    try:
96
 
        # This is where SO_BINDTODEVICE was up to and including Python
97
 
        # 2.6, and also 3.2:
98
87
        from IN import SO_BINDTODEVICE
99
88
    except ImportError:
100
 
        # In Python 2.7 it seems to have been removed entirely.
101
 
        # Try running the C preprocessor:
102
 
        try:
103
 
            cc = subprocess.Popen(["cc", "--language=c", "-E",
104
 
                                   "/dev/stdin"],
105
 
                                  stdin=subprocess.PIPE,
106
 
                                  stdout=subprocess.PIPE)
107
 
            stdout = cc.communicate(
108
 
                "#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
109
 
            SO_BINDTODEVICE = int(stdout.splitlines()[-1])
110
 
        except (OSError, ValueError, IndexError):
111
 
            # No value found
112
 
            SO_BINDTODEVICE = None
113
 
 
114
 
if sys.version_info.major == 2:
115
 
    str = unicode
116
 
 
117
 
version = "1.7.10"
 
89
        SO_BINDTODEVICE = None
 
90
 
 
91
version = "1.6.3"
118
92
stored_state_file = "clients.pickle"
119
93
 
120
94
logger = logging.getLogger()
121
95
syslogger = None
122
96
 
123
97
try:
124
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
125
 
        ctypes.util.find_library("c")).if_nametoindex
 
98
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
99
                      (ctypes.util.find_library("c"))
 
100
                      .if_nametoindex)
126
101
except (OSError, AttributeError):
127
 
    
128
102
    def if_nametoindex(interface):
129
103
        "Get an interface index the hard way, i.e. using fcntl()"
130
104
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
131
105
        with contextlib.closing(socket.socket()) as s:
132
106
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
133
 
                                struct.pack(b"16s16x", interface))
134
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
107
                                struct.pack(str("16s16x"),
 
108
                                            interface))
 
109
        interface_index = struct.unpack(str("I"),
 
110
                                        ifreq[16:20])[0]
135
111
        return interface_index
136
112
 
137
113
 
138
 
def copy_function(func):
139
 
    """Make a copy of a function"""
140
 
    if sys.version_info.major == 2:
141
 
        return types.FunctionType(func.func_code,
142
 
                                  func.func_globals,
143
 
                                  func.func_name,
144
 
                                  func.func_defaults,
145
 
                                  func.func_closure)
146
 
    else:
147
 
        return types.FunctionType(func.__code__,
148
 
                                  func.__globals__,
149
 
                                  func.__name__,
150
 
                                  func.__defaults__,
151
 
                                  func.__closure__)
152
 
 
153
 
 
154
114
def initlogger(debug, level=logging.WARNING):
155
115
    """init logger and add loglevel"""
156
116
    
157
 
    global syslogger
158
 
    syslogger = (logging.handlers.SysLogHandler(
159
 
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
160
 
        address = "/dev/log"))
 
117
    syslogger = (logging.handlers.SysLogHandler
 
118
                 (facility =
 
119
                  logging.handlers.SysLogHandler.LOG_DAEMON,
 
120
                  address = str("/dev/log")))
161
121
    syslogger.setFormatter(logging.Formatter
162
122
                           ('Mandos [%(process)d]: %(levelname)s:'
163
123
                            ' %(message)s'))
180
140
 
181
141
class PGPEngine(object):
182
142
    """A simple class for OpenPGP symmetric encryption & decryption"""
183
 
    
184
143
    def __init__(self):
185
144
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
186
 
        self.gpg = "gpg"
187
 
        try:
188
 
            output = subprocess.check_output(["gpgconf"])
189
 
            for line in output.splitlines():
190
 
                name, text, path = line.split(b":")
191
 
                if name == "gpg":
192
 
                    self.gpg = path
193
 
                    break
194
 
        except OSError as e:
195
 
            if e.errno != errno.ENOENT:
196
 
                raise
197
145
        self.gnupgargs = ['--batch',
198
 
                          '--homedir', self.tempdir,
 
146
                          '--home', self.tempdir,
199
147
                          '--force-mdc',
200
 
                          '--quiet']
201
 
        # Only GPG version 1 has the --no-use-agent option.
202
 
        if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
203
 
            self.gnupgargs.append("--no-use-agent")
 
148
                          '--quiet',
 
149
                          '--no-use-agent']
204
150
    
205
151
    def __enter__(self):
206
152
        return self
238
184
    
239
185
    def encrypt(self, data, password):
240
186
        passphrase = self.password_encode(password)
241
 
        with tempfile.NamedTemporaryFile(
242
 
                dir=self.tempdir) as passfile:
 
187
        with tempfile.NamedTemporaryFile(dir=self.tempdir
 
188
                                         ) as passfile:
243
189
            passfile.write(passphrase)
244
190
            passfile.flush()
245
 
            proc = subprocess.Popen([self.gpg, '--symmetric',
 
191
            proc = subprocess.Popen(['gpg', '--symmetric',
246
192
                                     '--passphrase-file',
247
193
                                     passfile.name]
248
194
                                    + self.gnupgargs,
256
202
    
257
203
    def decrypt(self, data, password):
258
204
        passphrase = self.password_encode(password)
259
 
        with tempfile.NamedTemporaryFile(
260
 
                dir = self.tempdir) as passfile:
 
205
        with tempfile.NamedTemporaryFile(dir = self.tempdir
 
206
                                         ) as passfile:
261
207
            passfile.write(passphrase)
262
208
            passfile.flush()
263
 
            proc = subprocess.Popen([self.gpg, '--decrypt',
 
209
            proc = subprocess.Popen(['gpg', '--decrypt',
264
210
                                     '--passphrase-file',
265
211
                                     passfile.name]
266
212
                                    + self.gnupgargs,
267
213
                                    stdin = subprocess.PIPE,
268
214
                                    stdout = subprocess.PIPE,
269
215
                                    stderr = subprocess.PIPE)
270
 
            decrypted_plaintext, err = proc.communicate(input = data)
 
216
            decrypted_plaintext, err = proc.communicate(input
 
217
                                                        = data)
271
218
        if proc.returncode != 0:
272
219
            raise PGPError(err)
273
220
        return decrypted_plaintext
274
221
 
275
 
# Pretend that we have an Avahi module
276
 
class Avahi(object):
277
 
    """This isn't so much a class as it is a module-like namespace.
278
 
    It is instantiated once, and simulates having an Avahi module."""
279
 
    IF_UNSPEC = -1              # avahi-common/address.h
280
 
    PROTO_UNSPEC = -1           # avahi-common/address.h
281
 
    PROTO_INET = 0              # avahi-common/address.h
282
 
    PROTO_INET6 = 1             # avahi-common/address.h
283
 
    DBUS_NAME = "org.freedesktop.Avahi"
284
 
    DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
285
 
    DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
286
 
    DBUS_PATH_SERVER = "/"
287
 
    def string_array_to_txt_array(self, t):
288
 
        return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
289
 
                           for s in t), signature="ay")
290
 
    ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
291
 
    ENTRY_GROUP_COLLISION = 3   # avahi-common/defs.h
292
 
    ENTRY_GROUP_FAILURE = 4     # avahi-common/defs.h
293
 
    SERVER_INVALID = 0          # avahi-common/defs.h
294
 
    SERVER_REGISTERING = 1      # avahi-common/defs.h
295
 
    SERVER_RUNNING = 2          # avahi-common/defs.h
296
 
    SERVER_COLLISION = 3        # avahi-common/defs.h
297
 
    SERVER_FAILURE = 4          # avahi-common/defs.h
298
 
avahi = Avahi()
299
222
 
300
223
class AvahiError(Exception):
301
224
    def __init__(self, value, *args, **kwargs):
302
225
        self.value = value
303
 
        return super(AvahiError, self).__init__(value, *args,
304
 
                                                **kwargs)
305
 
 
 
226
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
227
    def __unicode__(self):
 
228
        return unicode(repr(self.value))
306
229
 
307
230
class AvahiServiceError(AvahiError):
308
231
    pass
309
232
 
310
 
 
311
233
class AvahiGroupError(AvahiError):
312
234
    pass
313
235
 
333
255
    bus: dbus.SystemBus()
334
256
    """
335
257
    
336
 
    def __init__(self,
337
 
                 interface = avahi.IF_UNSPEC,
338
 
                 name = None,
339
 
                 servicetype = None,
340
 
                 port = None,
341
 
                 TXT = None,
342
 
                 domain = "",
343
 
                 host = "",
344
 
                 max_renames = 32768,
345
 
                 protocol = avahi.PROTO_UNSPEC,
346
 
                 bus = None):
 
258
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
 
259
                 servicetype = None, port = None, TXT = None,
 
260
                 domain = "", host = "", max_renames = 32768,
 
261
                 protocol = avahi.PROTO_UNSPEC, bus = None):
347
262
        self.interface = interface
348
263
        self.name = name
349
264
        self.type = servicetype
359
274
        self.bus = bus
360
275
        self.entry_group_state_changed_match = None
361
276
    
362
 
    def rename(self, remove=True):
 
277
    def rename(self):
363
278
        """Derived from the Avahi example code"""
364
279
        if self.rename_count >= self.max_renames:
365
280
            logger.critical("No suitable Zeroconf service name found"
366
281
                            " after %i retries, exiting.",
367
282
                            self.rename_count)
368
283
            raise AvahiServiceError("Too many renames")
369
 
        self.name = str(
370
 
            self.server.GetAlternativeServiceName(self.name))
371
 
        self.rename_count += 1
 
284
        self.name = unicode(self.server
 
285
                            .GetAlternativeServiceName(self.name))
372
286
        logger.info("Changing Zeroconf service name to %r ...",
373
287
                    self.name)
374
 
        if remove:
375
 
            self.remove()
 
288
        self.remove()
376
289
        try:
377
290
            self.add()
378
291
        except dbus.exceptions.DBusException as error:
379
 
            if (error.get_dbus_name()
380
 
                == "org.freedesktop.Avahi.CollisionError"):
381
 
                logger.info("Local Zeroconf service name collision.")
382
 
                return self.rename(remove=False)
383
 
            else:
384
 
                logger.critical("D-Bus Exception", exc_info=error)
385
 
                self.cleanup()
386
 
                os._exit(1)
 
292
            logger.critical("D-Bus Exception", exc_info=error)
 
293
            self.cleanup()
 
294
            os._exit(1)
 
295
        self.rename_count += 1
387
296
    
388
297
    def remove(self):
389
298
        """Derived from the Avahi example code"""
427
336
            self.rename()
428
337
        elif state == avahi.ENTRY_GROUP_FAILURE:
429
338
            logger.critical("Avahi: Error in group state changed %s",
430
 
                            str(error))
431
 
            raise AvahiGroupError("State changed: {!s}".format(error))
 
339
                            unicode(error))
 
340
            raise AvahiGroupError("State changed: {0!s}"
 
341
                                  .format(error))
432
342
    
433
343
    def cleanup(self):
434
344
        """Derived from the Avahi example code"""
444
354
    def server_state_changed(self, state, error=None):
445
355
        """Derived from the Avahi example code"""
446
356
        logger.debug("Avahi server state change: %i", state)
447
 
        bad_states = {
448
 
            avahi.SERVER_INVALID: "Zeroconf server invalid",
449
 
            avahi.SERVER_REGISTERING: None,
450
 
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
451
 
            avahi.SERVER_FAILURE: "Zeroconf server failure",
452
 
        }
 
357
        bad_states = { avahi.SERVER_INVALID:
 
358
                           "Zeroconf server invalid",
 
359
                       avahi.SERVER_REGISTERING: None,
 
360
                       avahi.SERVER_COLLISION:
 
361
                           "Zeroconf server name collision",
 
362
                       avahi.SERVER_FAILURE:
 
363
                           "Zeroconf server failure" }
453
364
        if state in bad_states:
454
365
            if bad_states[state] is not None:
455
366
                if error is None:
458
369
                    logger.error(bad_states[state] + ": %r", error)
459
370
            self.cleanup()
460
371
        elif state == avahi.SERVER_RUNNING:
461
 
            try:
462
 
                self.add()
463
 
            except dbus.exceptions.DBusException as error:
464
 
                if (error.get_dbus_name()
465
 
                    == "org.freedesktop.Avahi.CollisionError"):
466
 
                    logger.info("Local Zeroconf service name"
467
 
                                " collision.")
468
 
                    return self.rename(remove=False)
469
 
                else:
470
 
                    logger.critical("D-Bus Exception", exc_info=error)
471
 
                    self.cleanup()
472
 
                    os._exit(1)
 
372
            self.add()
473
373
        else:
474
374
            if error is None:
475
375
                logger.debug("Unknown state: %r", state)
485
385
                                    follow_name_owner_changes=True),
486
386
                avahi.DBUS_INTERFACE_SERVER)
487
387
        self.server.connect_to_signal("StateChanged",
488
 
                                      self.server_state_changed)
 
388
                                 self.server_state_changed)
489
389
        self.server_state_changed(self.server.GetState())
490
390
 
491
391
 
492
392
class AvahiServiceToSyslog(AvahiService):
493
 
    def rename(self, *args, **kwargs):
 
393
    def rename(self):
494
394
        """Add the new name to the syslog messages"""
495
 
        ret = AvahiService.rename(self, *args, **kwargs)
496
 
        syslogger.setFormatter(logging.Formatter(
497
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
498
 
            .format(self.name)))
 
395
        ret = AvahiService.rename(self)
 
396
        syslogger.setFormatter(logging.Formatter
 
397
                               ('Mandos ({0}) [%(process)d]:'
 
398
                                ' %(levelname)s: %(message)s'
 
399
                                .format(self.name)))
499
400
        return ret
500
401
 
501
 
# Pretend that we have a GnuTLS module
502
 
class GnuTLS(object):
503
 
    """This isn't so much a class as it is a module-like namespace.
504
 
    It is instantiated once, and simulates having a GnuTLS module."""
505
 
    
506
 
    _library = ctypes.cdll.LoadLibrary(
507
 
        ctypes.util.find_library("gnutls"))
508
 
    _need_version = b"3.3.0"
509
 
    def __init__(self):
510
 
        # Need to use class name "GnuTLS" here, since this method is
511
 
        # called before the assignment to the "gnutls" global variable
512
 
        # happens.
513
 
        if GnuTLS.check_version(self._need_version) is None:
514
 
            raise GnuTLS.Error("Needs GnuTLS {} or later"
515
 
                               .format(self._need_version))
516
 
    
517
 
    # Unless otherwise indicated, the constants and types below are
518
 
    # all from the gnutls/gnutls.h C header file.
519
 
    
520
 
    # Constants
521
 
    E_SUCCESS = 0
522
 
    E_INTERRUPTED = -52
523
 
    E_AGAIN = -28
524
 
    CRT_OPENPGP = 2
525
 
    CLIENT = 2
526
 
    SHUT_RDWR = 0
527
 
    CRD_CERTIFICATE = 1
528
 
    E_NO_CERTIFICATE_FOUND = -49
529
 
    OPENPGP_FMT_RAW = 0         # gnutls/openpgp.h
530
 
    
531
 
    # Types
532
 
    class session_int(ctypes.Structure):
533
 
        _fields_ = []
534
 
    session_t = ctypes.POINTER(session_int)
535
 
    class certificate_credentials_st(ctypes.Structure):
536
 
        _fields_ = []
537
 
    certificate_credentials_t = ctypes.POINTER(
538
 
        certificate_credentials_st)
539
 
    certificate_type_t = ctypes.c_int
540
 
    class datum_t(ctypes.Structure):
541
 
        _fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
542
 
                    ('size', ctypes.c_uint)]
543
 
    class openpgp_crt_int(ctypes.Structure):
544
 
        _fields_ = []
545
 
    openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
546
 
    openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
547
 
    log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
548
 
    credentials_type_t = ctypes.c_int
549
 
    transport_ptr_t = ctypes.c_void_p
550
 
    close_request_t = ctypes.c_int
551
 
    
552
 
    # Exceptions
553
 
    class Error(Exception):
554
 
        # We need to use the class name "GnuTLS" here, since this
555
 
        # exception might be raised from within GnuTLS.__init__,
556
 
        # which is called before the assignment to the "gnutls"
557
 
        # global variable has happened.
558
 
        def __init__(self, message = None, code = None, args=()):
559
 
            # Default usage is by a message string, but if a return
560
 
            # code is passed, convert it to a string with
561
 
            # gnutls.strerror()
562
 
            self.code = code
563
 
            if message is None and code is not None:
564
 
                message = GnuTLS.strerror(code)
565
 
            return super(GnuTLS.Error, self).__init__(
566
 
                message, *args)
567
 
    
568
 
    class CertificateSecurityError(Error):
569
 
        pass
570
 
    
571
 
    # Classes
572
 
    class Credentials(object):
573
 
        def __init__(self):
574
 
            self._c_object = gnutls.certificate_credentials_t()
575
 
            gnutls.certificate_allocate_credentials(
576
 
                ctypes.byref(self._c_object))
577
 
            self.type = gnutls.CRD_CERTIFICATE
578
 
        
579
 
        def __del__(self):
580
 
            gnutls.certificate_free_credentials(self._c_object)
581
 
    
582
 
    class ClientSession(object):
583
 
        def __init__(self, socket, credentials = None):
584
 
            self._c_object = gnutls.session_t()
585
 
            gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
586
 
            gnutls.set_default_priority(self._c_object)
587
 
            gnutls.transport_set_ptr(self._c_object, socket.fileno())
588
 
            gnutls.handshake_set_private_extensions(self._c_object,
589
 
                                                    True)
590
 
            self.socket = socket
591
 
            if credentials is None:
592
 
                credentials = gnutls.Credentials()
593
 
            gnutls.credentials_set(self._c_object, credentials.type,
594
 
                                   ctypes.cast(credentials._c_object,
595
 
                                               ctypes.c_void_p))
596
 
            self.credentials = credentials
597
 
        
598
 
        def __del__(self):
599
 
            gnutls.deinit(self._c_object)
600
 
        
601
 
        def handshake(self):
602
 
            return gnutls.handshake(self._c_object)
603
 
        
604
 
        def send(self, data):
605
 
            data = bytes(data)
606
 
            data_len = len(data)
607
 
            while data_len > 0:
608
 
                data_len -= gnutls.record_send(self._c_object,
609
 
                                               data[-data_len:],
610
 
                                               data_len)
611
 
        
612
 
        def bye(self):
613
 
            return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
614
 
    
615
 
    # Error handling functions
616
 
    def _error_code(result):
617
 
        """A function to raise exceptions on errors, suitable
618
 
        for the 'restype' attribute on ctypes functions"""
619
 
        if result >= 0:
620
 
            return result
621
 
        if result == gnutls.E_NO_CERTIFICATE_FOUND:
622
 
            raise gnutls.CertificateSecurityError(code = result)
623
 
        raise gnutls.Error(code = result)
624
 
    
625
 
    def _retry_on_error(result, func, arguments):
626
 
        """A function to retry on some errors, suitable
627
 
        for the 'errcheck' attribute on ctypes functions"""
628
 
        while result < 0:
629
 
            if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
630
 
                return _error_code(result)
631
 
            result = func(*arguments)
632
 
        return result
633
 
    
634
 
    # Unless otherwise indicated, the function declarations below are
635
 
    # all from the gnutls/gnutls.h C header file.
636
 
    
637
 
    # Functions
638
 
    priority_set_direct = _library.gnutls_priority_set_direct
639
 
    priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
640
 
                                    ctypes.POINTER(ctypes.c_char_p)]
641
 
    priority_set_direct.restype = _error_code
642
 
    
643
 
    init = _library.gnutls_init
644
 
    init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
645
 
    init.restype = _error_code
646
 
    
647
 
    set_default_priority = _library.gnutls_set_default_priority
648
 
    set_default_priority.argtypes = [session_t]
649
 
    set_default_priority.restype = _error_code
650
 
    
651
 
    record_send = _library.gnutls_record_send
652
 
    record_send.argtypes = [session_t, ctypes.c_void_p,
653
 
                            ctypes.c_size_t]
654
 
    record_send.restype = ctypes.c_ssize_t
655
 
    record_send.errcheck = _retry_on_error
656
 
    
657
 
    certificate_allocate_credentials = (
658
 
        _library.gnutls_certificate_allocate_credentials)
659
 
    certificate_allocate_credentials.argtypes = [
660
 
        ctypes.POINTER(certificate_credentials_t)]
661
 
    certificate_allocate_credentials.restype = _error_code
662
 
    
663
 
    certificate_free_credentials = (
664
 
        _library.gnutls_certificate_free_credentials)
665
 
    certificate_free_credentials.argtypes = [certificate_credentials_t]
666
 
    certificate_free_credentials.restype = None
667
 
    
668
 
    handshake_set_private_extensions = (
669
 
        _library.gnutls_handshake_set_private_extensions)
670
 
    handshake_set_private_extensions.argtypes = [session_t,
671
 
                                                 ctypes.c_int]
672
 
    handshake_set_private_extensions.restype = None
673
 
    
674
 
    credentials_set = _library.gnutls_credentials_set
675
 
    credentials_set.argtypes = [session_t, credentials_type_t,
676
 
                                ctypes.c_void_p]
677
 
    credentials_set.restype = _error_code
678
 
    
679
 
    strerror = _library.gnutls_strerror
680
 
    strerror.argtypes = [ctypes.c_int]
681
 
    strerror.restype = ctypes.c_char_p
682
 
    
683
 
    certificate_type_get = _library.gnutls_certificate_type_get
684
 
    certificate_type_get.argtypes = [session_t]
685
 
    certificate_type_get.restype = _error_code
686
 
    
687
 
    certificate_get_peers = _library.gnutls_certificate_get_peers
688
 
    certificate_get_peers.argtypes = [session_t,
689
 
                                      ctypes.POINTER(ctypes.c_uint)]
690
 
    certificate_get_peers.restype = ctypes.POINTER(datum_t)
691
 
    
692
 
    global_set_log_level = _library.gnutls_global_set_log_level
693
 
    global_set_log_level.argtypes = [ctypes.c_int]
694
 
    global_set_log_level.restype = None
695
 
    
696
 
    global_set_log_function = _library.gnutls_global_set_log_function
697
 
    global_set_log_function.argtypes = [log_func]
698
 
    global_set_log_function.restype = None
699
 
    
700
 
    deinit = _library.gnutls_deinit
701
 
    deinit.argtypes = [session_t]
702
 
    deinit.restype = None
703
 
    
704
 
    handshake = _library.gnutls_handshake
705
 
    handshake.argtypes = [session_t]
706
 
    handshake.restype = _error_code
707
 
    handshake.errcheck = _retry_on_error
708
 
    
709
 
    transport_set_ptr = _library.gnutls_transport_set_ptr
710
 
    transport_set_ptr.argtypes = [session_t, transport_ptr_t]
711
 
    transport_set_ptr.restype = None
712
 
    
713
 
    bye = _library.gnutls_bye
714
 
    bye.argtypes = [session_t, close_request_t]
715
 
    bye.restype = _error_code
716
 
    bye.errcheck = _retry_on_error
717
 
    
718
 
    check_version = _library.gnutls_check_version
719
 
    check_version.argtypes = [ctypes.c_char_p]
720
 
    check_version.restype = ctypes.c_char_p
721
 
    
722
 
    # All the function declarations below are from gnutls/openpgp.h
723
 
    
724
 
    openpgp_crt_init = _library.gnutls_openpgp_crt_init
725
 
    openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
726
 
    openpgp_crt_init.restype = _error_code
727
 
    
728
 
    openpgp_crt_import = _library.gnutls_openpgp_crt_import
729
 
    openpgp_crt_import.argtypes = [openpgp_crt_t,
730
 
                                   ctypes.POINTER(datum_t),
731
 
                                   openpgp_crt_fmt_t]
732
 
    openpgp_crt_import.restype = _error_code
733
 
    
734
 
    openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
735
 
    openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
736
 
                                        ctypes.POINTER(ctypes.c_uint)]
737
 
    openpgp_crt_verify_self.restype = _error_code
738
 
    
739
 
    openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
740
 
    openpgp_crt_deinit.argtypes = [openpgp_crt_t]
741
 
    openpgp_crt_deinit.restype = None
742
 
    
743
 
    openpgp_crt_get_fingerprint = (
744
 
        _library.gnutls_openpgp_crt_get_fingerprint)
745
 
    openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
746
 
                                            ctypes.c_void_p,
747
 
                                            ctypes.POINTER(
748
 
                                                ctypes.c_size_t)]
749
 
    openpgp_crt_get_fingerprint.restype = _error_code
750
 
    
751
 
    # Remove non-public functions
752
 
    del _error_code, _retry_on_error
753
 
# Create the global "gnutls" object, simulating a module
754
 
gnutls = GnuTLS()
755
 
 
756
 
def call_pipe(connection,       # : multiprocessing.Connection
757
 
              func, *args, **kwargs):
758
 
    """This function is meant to be called by multiprocessing.Process
759
 
    
760
 
    This function runs func(*args, **kwargs), and writes the resulting
761
 
    return value on the provided multiprocessing.Connection.
762
 
    """
763
 
    connection.send(func(*args, **kwargs))
764
 
    connection.close()
 
402
 
 
403
def timedelta_to_milliseconds(td):
 
404
    "Convert a datetime.timedelta() to milliseconds"
 
405
    return ((td.days * 24 * 60 * 60 * 1000)
 
406
            + (td.seconds * 1000)
 
407
            + (td.microseconds // 1000))
 
408
 
765
409
 
766
410
class Client(object):
767
411
    """A representation of a client host served by this server.
773
417
    checker:    subprocess.Popen(); a running checker process used
774
418
                                    to see if the client lives.
775
419
                                    'None' if no process is running.
776
 
    checker_callback_tag: a GLib event source tag, or None
 
420
    checker_callback_tag: a gobject event source tag, or None
777
421
    checker_command: string; External command which is run to check
778
422
                     if client lives.  %() expansions are done at
779
423
                     runtime with vars(self) as dict, so that for
780
424
                     instance %(name)s can be used in the command.
781
 
    checker_initiator_tag: a GLib event source tag, or None
 
425
    checker_initiator_tag: a gobject event source tag, or None
782
426
    created:    datetime.datetime(); (UTC) object creation
783
427
    client_structure: Object describing what attributes a client has
784
428
                      and is used for storing the client at exit
785
429
    current_checker_command: string; current running checker_command
786
 
    disable_initiator_tag: a GLib event source tag, or None
 
430
    disable_initiator_tag: a gobject event source tag, or None
787
431
    enabled:    bool()
788
432
    fingerprint: string (40 or 32 hexadecimal digits); used to
789
433
                 uniquely identify the client
794
438
    last_checker_status: integer between 0 and 255 reflecting exit
795
439
                         status of last checker. -1 reflects crashed
796
440
                         checker, -2 means no checker completed yet.
797
 
    last_checker_signal: The signal which killed the last checker, if
798
 
                         last_checker_status is -1
799
441
    last_enabled: datetime.datetime(); (UTC) or None
800
442
    name:       string; from the config file, used in log messages and
801
443
                        D-Bus identifiers
814
456
                          "fingerprint", "host", "interval",
815
457
                          "last_approval_request", "last_checked_ok",
816
458
                          "last_enabled", "name", "timeout")
817
 
    client_defaults = {
818
 
        "timeout": "PT5M",
819
 
        "extended_timeout": "PT15M",
820
 
        "interval": "PT2M",
821
 
        "checker": "fping -q -- %%(host)s",
822
 
        "host": "",
823
 
        "approval_delay": "PT0S",
824
 
        "approval_duration": "PT1S",
825
 
        "approved_by_default": "True",
826
 
        "enabled": "True",
827
 
    }
 
459
    client_defaults = { "timeout": "PT5M",
 
460
                        "extended_timeout": "PT15M",
 
461
                        "interval": "PT2M",
 
462
                        "checker": "fping -q -- %%(host)s",
 
463
                        "host": "",
 
464
                        "approval_delay": "PT0S",
 
465
                        "approval_duration": "PT1S",
 
466
                        "approved_by_default": "True",
 
467
                        "enabled": "True",
 
468
                        }
 
469
    
 
470
    def timeout_milliseconds(self):
 
471
        "Return the 'timeout' attribute in milliseconds"
 
472
        return timedelta_to_milliseconds(self.timeout)
 
473
    
 
474
    def extended_timeout_milliseconds(self):
 
475
        "Return the 'extended_timeout' attribute in milliseconds"
 
476
        return timedelta_to_milliseconds(self.extended_timeout)
 
477
    
 
478
    def interval_milliseconds(self):
 
479
        "Return the 'interval' attribute in milliseconds"
 
480
        return timedelta_to_milliseconds(self.interval)
 
481
    
 
482
    def approval_delay_milliseconds(self):
 
483
        return timedelta_to_milliseconds(self.approval_delay)
828
484
    
829
485
    @staticmethod
830
486
    def config_parser(config):
846
502
            client["enabled"] = config.getboolean(client_name,
847
503
                                                  "enabled")
848
504
            
849
 
            # Uppercase and remove spaces from fingerprint for later
850
 
            # comparison purposes with return value from the
851
 
            # fingerprint() function
852
505
            client["fingerprint"] = (section["fingerprint"].upper()
853
506
                                     .replace(" ", ""))
854
507
            if "secret" in section:
855
 
                client["secret"] = codecs.decode(section["secret"]
856
 
                                                 .encode("utf-8"),
857
 
                                                 "base64")
 
508
                client["secret"] = section["secret"].decode("base64")
858
509
            elif "secfile" in section:
859
510
                with open(os.path.expanduser(os.path.expandvars
860
511
                                             (section["secfile"])),
861
512
                          "rb") as secfile:
862
513
                    client["secret"] = secfile.read()
863
514
            else:
864
 
                raise TypeError("No secret or secfile for section {}"
 
515
                raise TypeError("No secret or secfile for section {0}"
865
516
                                .format(section))
866
517
            client["timeout"] = string_to_delta(section["timeout"])
867
518
            client["extended_timeout"] = string_to_delta(
884
535
            server_settings = {}
885
536
        self.server_settings = server_settings
886
537
        # adding all client settings
887
 
        for setting, value in settings.items():
 
538
        for setting, value in settings.iteritems():
888
539
            setattr(self, setting, value)
889
540
        
890
541
        if self.enabled:
898
549
            self.expires = None
899
550
        
900
551
        logger.debug("Creating client %r", self.name)
 
552
        # Uppercase and remove spaces from fingerprint for later
 
553
        # comparison purposes with return value from the fingerprint()
 
554
        # function
901
555
        logger.debug("  Fingerprint: %s", self.fingerprint)
902
556
        self.created = settings.get("created",
903
557
                                    datetime.datetime.utcnow())
910
564
        self.current_checker_command = None
911
565
        self.approved = None
912
566
        self.approvals_pending = 0
913
 
        self.changedstate = multiprocessing_manager.Condition(
914
 
            multiprocessing_manager.Lock())
915
 
        self.client_structure = [attr
916
 
                                 for attr in self.__dict__.keys()
 
567
        self.changedstate = (multiprocessing_manager
 
568
                             .Condition(multiprocessing_manager
 
569
                                        .Lock()))
 
570
        self.client_structure = [attr for attr in
 
571
                                 self.__dict__.iterkeys()
917
572
                                 if not attr.startswith("_")]
918
573
        self.client_structure.append("client_structure")
919
574
        
920
 
        for name, t in inspect.getmembers(
921
 
                type(self), lambda obj: isinstance(obj, property)):
 
575
        for name, t in inspect.getmembers(type(self),
 
576
                                          lambda obj:
 
577
                                              isinstance(obj,
 
578
                                                         property)):
922
579
            if not name.startswith("_"):
923
580
                self.client_structure.append(name)
924
581
    
945
602
        if not quiet:
946
603
            logger.info("Disabling client %s", self.name)
947
604
        if getattr(self, "disable_initiator_tag", None) is not None:
948
 
            GLib.source_remove(self.disable_initiator_tag)
 
605
            gobject.source_remove(self.disable_initiator_tag)
949
606
            self.disable_initiator_tag = None
950
607
        self.expires = None
951
608
        if getattr(self, "checker_initiator_tag", None) is not None:
952
 
            GLib.source_remove(self.checker_initiator_tag)
 
609
            gobject.source_remove(self.checker_initiator_tag)
953
610
            self.checker_initiator_tag = None
954
611
        self.stop_checker()
955
612
        self.enabled = False
956
613
        if not quiet:
957
614
            self.send_changedstate()
958
 
        # Do not run this again if called by a GLib.timeout_add
 
615
        # Do not run this again if called by a gobject.timeout_add
959
616
        return False
960
617
    
961
618
    def __del__(self):
965
622
        # Schedule a new checker to be started an 'interval' from now,
966
623
        # and every interval from then on.
967
624
        if self.checker_initiator_tag is not None:
968
 
            GLib.source_remove(self.checker_initiator_tag)
969
 
        self.checker_initiator_tag = GLib.timeout_add(
970
 
            int(self.interval.total_seconds() * 1000),
971
 
            self.start_checker)
 
625
            gobject.source_remove(self.checker_initiator_tag)
 
626
        self.checker_initiator_tag = (gobject.timeout_add
 
627
                                      (self.interval_milliseconds(),
 
628
                                       self.start_checker))
972
629
        # Schedule a disable() when 'timeout' has passed
973
630
        if self.disable_initiator_tag is not None:
974
 
            GLib.source_remove(self.disable_initiator_tag)
975
 
        self.disable_initiator_tag = GLib.timeout_add(
976
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
631
            gobject.source_remove(self.disable_initiator_tag)
 
632
        self.disable_initiator_tag = (gobject.timeout_add
 
633
                                   (self.timeout_milliseconds(),
 
634
                                    self.disable))
977
635
        # Also start a new checker *right now*.
978
636
        self.start_checker()
979
637
    
980
 
    def checker_callback(self, source, condition, connection,
981
 
                         command):
 
638
    def checker_callback(self, pid, condition, command):
982
639
        """The checker has completed, so take appropriate actions."""
983
640
        self.checker_callback_tag = None
984
641
        self.checker = None
985
 
        # Read return code from connection (see call_pipe)
986
 
        returncode = connection.recv()
987
 
        connection.close()
988
 
        
989
 
        if returncode >= 0:
990
 
            self.last_checker_status = returncode
991
 
            self.last_checker_signal = None
 
642
        if os.WIFEXITED(condition):
 
643
            self.last_checker_status = os.WEXITSTATUS(condition)
992
644
            if self.last_checker_status == 0:
993
645
                logger.info("Checker for %(name)s succeeded",
994
646
                            vars(self))
995
647
                self.checked_ok()
996
648
            else:
997
 
                logger.info("Checker for %(name)s failed", vars(self))
 
649
                logger.info("Checker for %(name)s failed",
 
650
                            vars(self))
998
651
        else:
999
652
            self.last_checker_status = -1
1000
 
            self.last_checker_signal = -returncode
1001
653
            logger.warning("Checker for %(name)s crashed?",
1002
654
                           vars(self))
1003
 
        return False
1004
655
    
1005
656
    def checked_ok(self):
1006
657
        """Assert that the client has been seen, alive and well."""
1007
658
        self.last_checked_ok = datetime.datetime.utcnow()
1008
659
        self.last_checker_status = 0
1009
 
        self.last_checker_signal = None
1010
660
        self.bump_timeout()
1011
661
    
1012
662
    def bump_timeout(self, timeout=None):
1014
664
        if timeout is None:
1015
665
            timeout = self.timeout
1016
666
        if self.disable_initiator_tag is not None:
1017
 
            GLib.source_remove(self.disable_initiator_tag)
 
667
            gobject.source_remove(self.disable_initiator_tag)
1018
668
            self.disable_initiator_tag = None
1019
669
        if getattr(self, "enabled", False):
1020
 
            self.disable_initiator_tag = GLib.timeout_add(
1021
 
                int(timeout.total_seconds() * 1000), self.disable)
 
670
            self.disable_initiator_tag = (gobject.timeout_add
 
671
                                          (timedelta_to_milliseconds
 
672
                                           (timeout), self.disable))
1022
673
            self.expires = datetime.datetime.utcnow() + timeout
1023
674
    
1024
675
    def need_approval(self):
1038
689
        # than 'timeout' for the client to be disabled, which is as it
1039
690
        # should be.
1040
691
        
1041
 
        if self.checker is not None and not self.checker.is_alive():
1042
 
            logger.warning("Checker was not alive; joining")
1043
 
            self.checker.join()
1044
 
            self.checker = None
 
692
        # If a checker exists, make sure it is not a zombie
 
693
        try:
 
694
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
695
        except AttributeError:
 
696
            pass
 
697
        except OSError as error:
 
698
            if error.errno != errno.ECHILD:
 
699
                raise
 
700
        else:
 
701
            if pid:
 
702
                logger.warning("Checker was a zombie")
 
703
                gobject.source_remove(self.checker_callback_tag)
 
704
                self.checker_callback(pid, status,
 
705
                                      self.current_checker_command)
1045
706
        # Start a new checker if needed
1046
707
        if self.checker is None:
1047
708
            # Escape attributes for the shell
1048
 
            escaped_attrs = {
1049
 
                attr: re.escape(str(getattr(self, attr)))
1050
 
                for attr in self.runtime_expansions }
 
709
            escaped_attrs = dict(
 
710
                (attr, re.escape(unicode(getattr(self, attr))))
 
711
                for attr in
 
712
                self.runtime_expansions)
1051
713
            try:
1052
714
                command = self.checker_command % escaped_attrs
1053
715
            except TypeError as error:
1054
716
                logger.error('Could not format string "%s"',
1055
 
                             self.checker_command,
 
717
                             self.checker_command, exc_info=error)
 
718
                return True # Try again later
 
719
            self.current_checker_command = command
 
720
            try:
 
721
                logger.info("Starting checker %r for %s",
 
722
                            command, self.name)
 
723
                # We don't need to redirect stdout and stderr, since
 
724
                # in normal mode, that is already done by daemon(),
 
725
                # and in debug mode we don't want to.  (Stdin is
 
726
                # always replaced by /dev/null.)
 
727
                # The exception is when not debugging but nevertheless
 
728
                # running in the foreground; use the previously
 
729
                # created wnull.
 
730
                popen_args = {}
 
731
                if (not self.server_settings["debug"]
 
732
                    and self.server_settings["foreground"]):
 
733
                    popen_args.update({"stdout": wnull,
 
734
                                       "stderr": wnull })
 
735
                self.checker = subprocess.Popen(command,
 
736
                                                close_fds=True,
 
737
                                                shell=True, cwd="/",
 
738
                                                **popen_args)
 
739
            except OSError as error:
 
740
                logger.error("Failed to start subprocess",
1056
741
                             exc_info=error)
1057
 
                return True     # Try again later
1058
 
            self.current_checker_command = command
1059
 
            logger.info("Starting checker %r for %s", command,
1060
 
                        self.name)
1061
 
            # We don't need to redirect stdout and stderr, since
1062
 
            # in normal mode, that is already done by daemon(),
1063
 
            # and in debug mode we don't want to.  (Stdin is
1064
 
            # always replaced by /dev/null.)
1065
 
            # The exception is when not debugging but nevertheless
1066
 
            # running in the foreground; use the previously
1067
 
            # created wnull.
1068
 
            popen_args = { "close_fds": True,
1069
 
                           "shell": True,
1070
 
                           "cwd": "/" }
1071
 
            if (not self.server_settings["debug"]
1072
 
                and self.server_settings["foreground"]):
1073
 
                popen_args.update({"stdout": wnull,
1074
 
                                   "stderr": wnull })
1075
 
            pipe = multiprocessing.Pipe(duplex = False)
1076
 
            self.checker = multiprocessing.Process(
1077
 
                target = call_pipe,
1078
 
                args = (pipe[1], subprocess.call, command),
1079
 
                kwargs = popen_args)
1080
 
            self.checker.start()
1081
 
            self.checker_callback_tag = GLib.io_add_watch(
1082
 
                pipe[0].fileno(), GLib.IO_IN,
1083
 
                self.checker_callback, pipe[0], command)
1084
 
        # Re-run this periodically if run by GLib.timeout_add
 
742
                return True
 
743
            self.checker_callback_tag = (gobject.child_watch_add
 
744
                                         (self.checker.pid,
 
745
                                          self.checker_callback,
 
746
                                          data=command))
 
747
            # The checker may have completed before the gobject
 
748
            # watch was added.  Check for this.
 
749
            try:
 
750
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
751
            except OSError as error:
 
752
                if error.errno == errno.ECHILD:
 
753
                    # This should never happen
 
754
                    logger.error("Child process vanished",
 
755
                                 exc_info=error)
 
756
                    return True
 
757
                raise
 
758
            if pid:
 
759
                gobject.source_remove(self.checker_callback_tag)
 
760
                self.checker_callback(pid, status, command)
 
761
        # Re-run this periodically if run by gobject.timeout_add
1085
762
        return True
1086
763
    
1087
764
    def stop_checker(self):
1088
765
        """Force the checker process, if any, to stop."""
1089
766
        if self.checker_callback_tag:
1090
 
            GLib.source_remove(self.checker_callback_tag)
 
767
            gobject.source_remove(self.checker_callback_tag)
1091
768
            self.checker_callback_tag = None
1092
769
        if getattr(self, "checker", None) is None:
1093
770
            return
1094
771
        logger.debug("Stopping checker for %(name)s", vars(self))
1095
 
        self.checker.terminate()
 
772
        try:
 
773
            self.checker.terminate()
 
774
            #time.sleep(0.5)
 
775
            #if self.checker.poll() is None:
 
776
            #    self.checker.kill()
 
777
        except OSError as error:
 
778
            if error.errno != errno.ESRCH: # No such process
 
779
                raise
1096
780
        self.checker = None
1097
781
 
1098
782
 
1099
 
def dbus_service_property(dbus_interface,
1100
 
                          signature="v",
1101
 
                          access="readwrite",
1102
 
                          byte_arrays=False):
 
783
def dbus_service_property(dbus_interface, signature="v",
 
784
                          access="readwrite", byte_arrays=False):
1103
785
    """Decorators for marking methods of a DBusObjectWithProperties to
1104
786
    become properties on the D-Bus.
1105
787
    
1114
796
    # "Set" method, so we fail early here:
1115
797
    if byte_arrays and signature != "ay":
1116
798
        raise ValueError("Byte arrays not supported for non-'ay'"
1117
 
                         " signature {!r}".format(signature))
1118
 
    
 
799
                         " signature {0!r}".format(signature))
1119
800
    def decorator(func):
1120
801
        func._dbus_is_property = True
1121
802
        func._dbus_interface = dbus_interface
1126
807
            func._dbus_name = func._dbus_name[:-14]
1127
808
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
1128
809
        return func
1129
 
    
1130
810
    return decorator
1131
811
 
1132
812
 
1141
821
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
1142
822
                    "false"}
1143
823
    """
1144
 
    
1145
824
    def decorator(func):
1146
825
        func._dbus_is_interface = True
1147
826
        func._dbus_interface = dbus_interface
1148
827
        func._dbus_name = dbus_interface
1149
828
        return func
1150
 
    
1151
829
    return decorator
1152
830
 
1153
831
 
1155
833
    """Decorator to annotate D-Bus methods, signals or properties
1156
834
    Usage:
1157
835
    
1158
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1159
 
                       "org.freedesktop.DBus.Property."
1160
 
                       "EmitsChangedSignal": "false"})
1161
836
    @dbus_service_property("org.example.Interface", signature="b",
1162
837
                           access="r")
 
838
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
839
                        "org.freedesktop.DBus.Property."
 
840
                        "EmitsChangedSignal": "false"})
1163
841
    def Property_dbus_property(self):
1164
842
        return dbus.Boolean(False)
1165
 
    
1166
 
    See also the DBusObjectWithAnnotations class.
1167
843
    """
1168
 
    
1169
844
    def decorator(func):
1170
845
        func._dbus_annotations = annotations
1171
846
        return func
1172
 
    
1173
847
    return decorator
1174
848
 
1175
849
 
1176
850
class DBusPropertyException(dbus.exceptions.DBusException):
1177
851
    """A base class for D-Bus property-related exceptions
1178
852
    """
1179
 
    pass
 
853
    def __unicode__(self):
 
854
        return unicode(str(self))
1180
855
 
1181
856
 
1182
857
class DBusPropertyAccessException(DBusPropertyException):
1191
866
    pass
1192
867
 
1193
868
 
1194
 
class DBusObjectWithAnnotations(dbus.service.Object):
1195
 
    """A D-Bus object with annotations.
 
869
class DBusObjectWithProperties(dbus.service.Object):
 
870
    """A D-Bus object with properties.
1196
871
    
1197
 
    Classes inheriting from this can use the dbus_annotations
1198
 
    decorator to add annotations to methods or signals.
 
872
    Classes inheriting from this can use the dbus_service_property
 
873
    decorator to expose methods as D-Bus properties.  It exposes the
 
874
    standard Get(), Set(), and GetAll() methods on the D-Bus.
1199
875
    """
1200
876
    
1201
877
    @staticmethod
1205
881
        If called like _is_dbus_thing("method") it returns a function
1206
882
        suitable for use as predicate to inspect.getmembers().
1207
883
        """
1208
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
884
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
1209
885
                                   False)
1210
886
    
1211
887
    def _get_all_dbus_things(self, thing):
1212
888
        """Returns a generator of (name, attribute) pairs
1213
889
        """
1214
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
890
        return ((getattr(athing.__get__(self), "_dbus_name",
 
891
                         name),
1215
892
                 athing.__get__(self))
1216
893
                for cls in self.__class__.__mro__
1217
894
                for name, athing in
1218
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
1219
 
    
1220
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1221
 
                         out_signature = "s",
1222
 
                         path_keyword = 'object_path',
1223
 
                         connection_keyword = 'connection')
1224
 
    def Introspect(self, object_path, connection):
1225
 
        """Overloading of standard D-Bus method.
1226
 
        
1227
 
        Inserts annotation tags on methods and signals.
1228
 
        """
1229
 
        xmlstring = dbus.service.Object.Introspect(self, object_path,
1230
 
                                                   connection)
1231
 
        try:
1232
 
            document = xml.dom.minidom.parseString(xmlstring)
1233
 
            
1234
 
            for if_tag in document.getElementsByTagName("interface"):
1235
 
                # Add annotation tags
1236
 
                for typ in ("method", "signal"):
1237
 
                    for tag in if_tag.getElementsByTagName(typ):
1238
 
                        annots = dict()
1239
 
                        for name, prop in (self.
1240
 
                                           _get_all_dbus_things(typ)):
1241
 
                            if (name == tag.getAttribute("name")
1242
 
                                and prop._dbus_interface
1243
 
                                == if_tag.getAttribute("name")):
1244
 
                                annots.update(getattr(
1245
 
                                    prop, "_dbus_annotations", {}))
1246
 
                        for name, value in annots.items():
1247
 
                            ann_tag = document.createElement(
1248
 
                                "annotation")
1249
 
                            ann_tag.setAttribute("name", name)
1250
 
                            ann_tag.setAttribute("value", value)
1251
 
                            tag.appendChild(ann_tag)
1252
 
                # Add interface annotation tags
1253
 
                for annotation, value in dict(
1254
 
                    itertools.chain.from_iterable(
1255
 
                        annotations().items()
1256
 
                        for name, annotations
1257
 
                        in self._get_all_dbus_things("interface")
1258
 
                        if name == if_tag.getAttribute("name")
1259
 
                        )).items():
1260
 
                    ann_tag = document.createElement("annotation")
1261
 
                    ann_tag.setAttribute("name", annotation)
1262
 
                    ann_tag.setAttribute("value", value)
1263
 
                    if_tag.appendChild(ann_tag)
1264
 
                # Fix argument name for the Introspect method itself
1265
 
                if (if_tag.getAttribute("name")
1266
 
                                == dbus.INTROSPECTABLE_IFACE):
1267
 
                    for cn in if_tag.getElementsByTagName("method"):
1268
 
                        if cn.getAttribute("name") == "Introspect":
1269
 
                            for arg in cn.getElementsByTagName("arg"):
1270
 
                                if (arg.getAttribute("direction")
1271
 
                                    == "out"):
1272
 
                                    arg.setAttribute("name",
1273
 
                                                     "xml_data")
1274
 
            xmlstring = document.toxml("utf-8")
1275
 
            document.unlink()
1276
 
        except (AttributeError, xml.dom.DOMException,
1277
 
                xml.parsers.expat.ExpatError) as error:
1278
 
            logger.error("Failed to override Introspection method",
1279
 
                         exc_info=error)
1280
 
        return xmlstring
1281
 
 
1282
 
 
1283
 
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1284
 
    """A D-Bus object with properties.
1285
 
    
1286
 
    Classes inheriting from this can use the dbus_service_property
1287
 
    decorator to expose methods as D-Bus properties.  It exposes the
1288
 
    standard Get(), Set(), and GetAll() methods on the D-Bus.
1289
 
    """
 
895
                inspect.getmembers(cls,
 
896
                                   self._is_dbus_thing(thing)))
1290
897
    
1291
898
    def _get_dbus_property(self, interface_name, property_name):
1292
899
        """Returns a bound method if one exists which is a D-Bus
1293
900
        property with the specified name and interface.
1294
901
        """
1295
 
        for cls in self.__class__.__mro__:
1296
 
            for name, value in inspect.getmembers(
1297
 
                    cls, self._is_dbus_thing("property")):
 
902
        for cls in  self.__class__.__mro__:
 
903
            for name, value in (inspect.getmembers
 
904
                                (cls,
 
905
                                 self._is_dbus_thing("property"))):
1298
906
                if (value._dbus_name == property_name
1299
907
                    and value._dbus_interface == interface_name):
1300
908
                    return value.__get__(self)
1301
909
        
1302
910
        # No such property
1303
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
1304
 
            self.dbus_object_path, interface_name, property_name))
1305
 
    
1306
 
    @classmethod
1307
 
    def _get_all_interface_names(cls):
1308
 
        """Get a sequence of all interfaces supported by an object"""
1309
 
        return (name for name in set(getattr(getattr(x, attr),
1310
 
                                             "_dbus_interface", None)
1311
 
                                     for x in (inspect.getmro(cls))
1312
 
                                     for attr in dir(x))
1313
 
                if name is not None)
1314
 
    
1315
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1316
 
                         in_signature="ss",
 
911
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
912
                                   + interface_name + "."
 
913
                                   + property_name)
 
914
    
 
915
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1317
916
                         out_signature="v")
1318
917
    def Get(self, interface_name, property_name):
1319
918
        """Standard D-Bus property Get() method, see D-Bus standard.
1338
937
            # signatures other than "ay".
1339
938
            if prop._dbus_signature != "ay":
1340
939
                raise ValueError("Byte arrays not supported for non-"
1341
 
                                 "'ay' signature {!r}"
 
940
                                 "'ay' signature {0!r}"
1342
941
                                 .format(prop._dbus_signature))
1343
942
            value = dbus.ByteArray(b''.join(chr(byte)
1344
943
                                            for byte in value))
1345
944
        prop(value)
1346
945
    
1347
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
1348
 
                         in_signature="s",
 
946
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
1349
947
                         out_signature="a{sv}")
1350
948
    def GetAll(self, interface_name):
1351
949
        """Standard D-Bus property GetAll() method, see D-Bus
1366
964
            if not hasattr(value, "variant_level"):
1367
965
                properties[name] = value
1368
966
                continue
1369
 
            properties[name] = type(value)(
1370
 
                value, variant_level = value.variant_level + 1)
 
967
            properties[name] = type(value)(value, variant_level=
 
968
                                           value.variant_level+1)
1371
969
        return dbus.Dictionary(properties, signature="sv")
1372
970
    
1373
 
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1374
 
    def PropertiesChanged(self, interface_name, changed_properties,
1375
 
                          invalidated_properties):
1376
 
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
1377
 
        standard.
1378
 
        """
1379
 
        pass
1380
 
    
1381
971
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1382
972
                         out_signature="s",
1383
973
                         path_keyword='object_path',
1387
977
        
1388
978
        Inserts property tags and interface annotation tags.
1389
979
        """
1390
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
1391
 
                                                         object_path,
1392
 
                                                         connection)
 
980
        xmlstring = dbus.service.Object.Introspect(self, object_path,
 
981
                                                   connection)
1393
982
        try:
1394
983
            document = xml.dom.minidom.parseString(xmlstring)
1395
 
            
1396
984
            def make_tag(document, name, prop):
1397
985
                e = document.createElement("property")
1398
986
                e.setAttribute("name", name)
1399
987
                e.setAttribute("type", prop._dbus_signature)
1400
988
                e.setAttribute("access", prop._dbus_access)
1401
989
                return e
1402
 
            
1403
990
            for if_tag in document.getElementsByTagName("interface"):
1404
991
                # Add property tags
1405
992
                for tag in (make_tag(document, name, prop)
1408
995
                            if prop._dbus_interface
1409
996
                            == if_tag.getAttribute("name")):
1410
997
                    if_tag.appendChild(tag)
1411
 
                # Add annotation tags for properties
1412
 
                for tag in if_tag.getElementsByTagName("property"):
1413
 
                    annots = dict()
1414
 
                    for name, prop in self._get_all_dbus_things(
1415
 
                            "property"):
1416
 
                        if (name == tag.getAttribute("name")
1417
 
                            and prop._dbus_interface
1418
 
                            == if_tag.getAttribute("name")):
1419
 
                            annots.update(getattr(
1420
 
                                prop, "_dbus_annotations", {}))
1421
 
                    for name, value in annots.items():
1422
 
                        ann_tag = document.createElement(
1423
 
                            "annotation")
1424
 
                        ann_tag.setAttribute("name", name)
1425
 
                        ann_tag.setAttribute("value", value)
1426
 
                        tag.appendChild(ann_tag)
 
998
                # Add annotation tags
 
999
                for typ in ("method", "signal", "property"):
 
1000
                    for tag in if_tag.getElementsByTagName(typ):
 
1001
                        annots = dict()
 
1002
                        for name, prop in (self.
 
1003
                                           _get_all_dbus_things(typ)):
 
1004
                            if (name == tag.getAttribute("name")
 
1005
                                and prop._dbus_interface
 
1006
                                == if_tag.getAttribute("name")):
 
1007
                                annots.update(getattr
 
1008
                                              (prop,
 
1009
                                               "_dbus_annotations",
 
1010
                                               {}))
 
1011
                        for name, value in annots.iteritems():
 
1012
                            ann_tag = document.createElement(
 
1013
                                "annotation")
 
1014
                            ann_tag.setAttribute("name", name)
 
1015
                            ann_tag.setAttribute("value", value)
 
1016
                            tag.appendChild(ann_tag)
 
1017
                # Add interface annotation tags
 
1018
                for annotation, value in dict(
 
1019
                    itertools.chain.from_iterable(
 
1020
                        annotations().iteritems()
 
1021
                        for name, annotations in
 
1022
                        self._get_all_dbus_things("interface")
 
1023
                        if name == if_tag.getAttribute("name")
 
1024
                        )).iteritems():
 
1025
                    ann_tag = document.createElement("annotation")
 
1026
                    ann_tag.setAttribute("name", annotation)
 
1027
                    ann_tag.setAttribute("value", value)
 
1028
                    if_tag.appendChild(ann_tag)
1427
1029
                # Add the names to the return values for the
1428
1030
                # "org.freedesktop.DBus.Properties" methods
1429
1031
                if (if_tag.getAttribute("name")
1447
1049
                         exc_info=error)
1448
1050
        return xmlstring
1449
1051
 
1450
 
try:
1451
 
    dbus.OBJECT_MANAGER_IFACE
1452
 
except AttributeError:
1453
 
    dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1454
 
 
1455
 
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1456
 
    """A D-Bus object with an ObjectManager.
1457
 
    
1458
 
    Classes inheriting from this exposes the standard
1459
 
    GetManagedObjects call and the InterfacesAdded and
1460
 
    InterfacesRemoved signals on the standard
1461
 
    "org.freedesktop.DBus.ObjectManager" interface.
1462
 
    
1463
 
    Note: No signals are sent automatically; they must be sent
1464
 
    manually.
1465
 
    """
1466
 
    @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1467
 
                         out_signature = "a{oa{sa{sv}}}")
1468
 
    def GetManagedObjects(self):
1469
 
        """This function must be overridden"""
1470
 
        raise NotImplementedError()
1471
 
    
1472
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1473
 
                         signature = "oa{sa{sv}}")
1474
 
    def InterfacesAdded(self, object_path, interfaces_and_properties):
1475
 
        pass
1476
 
    
1477
 
    @dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1478
 
    def InterfacesRemoved(self, object_path, interfaces):
1479
 
        pass
1480
 
    
1481
 
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1482
 
                         out_signature = "s",
1483
 
                         path_keyword = 'object_path',
1484
 
                         connection_keyword = 'connection')
1485
 
    def Introspect(self, object_path, connection):
1486
 
        """Overloading of standard D-Bus method.
1487
 
        
1488
 
        Override return argument name of GetManagedObjects to be
1489
 
        "objpath_interfaces_and_properties"
1490
 
        """
1491
 
        xmlstring = DBusObjectWithAnnotations.Introspect(self,
1492
 
                                                         object_path,
1493
 
                                                         connection)
1494
 
        try:
1495
 
            document = xml.dom.minidom.parseString(xmlstring)
1496
 
            
1497
 
            for if_tag in document.getElementsByTagName("interface"):
1498
 
                # Fix argument name for the GetManagedObjects method
1499
 
                if (if_tag.getAttribute("name")
1500
 
                                == dbus.OBJECT_MANAGER_IFACE):
1501
 
                    for cn in if_tag.getElementsByTagName("method"):
1502
 
                        if (cn.getAttribute("name")
1503
 
                            == "GetManagedObjects"):
1504
 
                            for arg in cn.getElementsByTagName("arg"):
1505
 
                                if (arg.getAttribute("direction")
1506
 
                                    == "out"):
1507
 
                                    arg.setAttribute(
1508
 
                                        "name",
1509
 
                                        "objpath_interfaces"
1510
 
                                        "_and_properties")
1511
 
            xmlstring = document.toxml("utf-8")
1512
 
            document.unlink()
1513
 
        except (AttributeError, xml.dom.DOMException,
1514
 
                xml.parsers.expat.ExpatError) as error:
1515
 
            logger.error("Failed to override Introspection method",
1516
 
                         exc_info = error)
1517
 
        return xmlstring
1518
1052
 
1519
1053
def datetime_to_dbus(dt, variant_level=0):
1520
1054
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1521
1055
    if dt is None:
1522
1056
        return dbus.String("", variant_level = variant_level)
1523
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1057
    return dbus.String(dt.isoformat(),
 
1058
                       variant_level=variant_level)
1524
1059
 
1525
1060
 
1526
1061
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1546
1081
    (from DBusObjectWithProperties) and interfaces (from the
1547
1082
    dbus_interface_annotations decorator).
1548
1083
    """
1549
 
    
1550
1084
    def wrapper(cls):
1551
1085
        for orig_interface_name, alt_interface_name in (
1552
 
                alt_interface_names.items()):
 
1086
            alt_interface_names.iteritems()):
1553
1087
            attr = {}
1554
1088
            interface_names = set()
1555
1089
            # Go though all attributes of the class
1557
1091
                # Ignore non-D-Bus attributes, and D-Bus attributes
1558
1092
                # with the wrong interface name
1559
1093
                if (not hasattr(attribute, "_dbus_interface")
1560
 
                    or not attribute._dbus_interface.startswith(
1561
 
                        orig_interface_name)):
 
1094
                    or not attribute._dbus_interface
 
1095
                    .startswith(orig_interface_name)):
1562
1096
                    continue
1563
1097
                # Create an alternate D-Bus interface name based on
1564
1098
                # the current name
1565
 
                alt_interface = attribute._dbus_interface.replace(
1566
 
                    orig_interface_name, alt_interface_name)
 
1099
                alt_interface = (attribute._dbus_interface
 
1100
                                 .replace(orig_interface_name,
 
1101
                                          alt_interface_name))
1567
1102
                interface_names.add(alt_interface)
1568
1103
                # Is this a D-Bus signal?
1569
1104
                if getattr(attribute, "_dbus_is_signal", False):
1570
1105
                    # Extract the original non-method undecorated
1571
1106
                    # function by black magic
1572
 
                    if sys.version_info.major == 2:
1573
 
                        nonmethod_func = (dict(
 
1107
                    nonmethod_func = (dict(
1574
1108
                            zip(attribute.func_code.co_freevars,
1575
 
                                attribute.__closure__))
1576
 
                                          ["func"].cell_contents)
1577
 
                    else:
1578
 
                        nonmethod_func = (dict(
1579
 
                            zip(attribute.__code__.co_freevars,
1580
 
                                attribute.__closure__))
1581
 
                                          ["func"].cell_contents)
 
1109
                                attribute.__closure__))["func"]
 
1110
                                      .cell_contents)
1582
1111
                    # Create a new, but exactly alike, function
1583
1112
                    # object, and decorate it to be a new D-Bus signal
1584
1113
                    # with the alternate D-Bus interface name
1585
 
                    new_function = copy_function(nonmethod_func)
1586
 
                    new_function = (dbus.service.signal(
1587
 
                        alt_interface,
1588
 
                        attribute._dbus_signature)(new_function))
 
1114
                    new_function = (dbus.service.signal
 
1115
                                    (alt_interface,
 
1116
                                     attribute._dbus_signature)
 
1117
                                    (types.FunctionType(
 
1118
                                nonmethod_func.func_code,
 
1119
                                nonmethod_func.func_globals,
 
1120
                                nonmethod_func.func_name,
 
1121
                                nonmethod_func.func_defaults,
 
1122
                                nonmethod_func.func_closure)))
1589
1123
                    # Copy annotations, if any
1590
1124
                    try:
1591
 
                        new_function._dbus_annotations = dict(
1592
 
                            attribute._dbus_annotations)
 
1125
                        new_function._dbus_annotations = (
 
1126
                            dict(attribute._dbus_annotations))
1593
1127
                    except AttributeError:
1594
1128
                        pass
1595
1129
                    # Define a creator of a function to call both the
1600
1134
                        """This function is a scope container to pass
1601
1135
                        func1 and func2 to the "call_both" function
1602
1136
                        outside of its arguments"""
1603
 
                        
1604
 
                        @functools.wraps(func2)
1605
1137
                        def call_both(*args, **kwargs):
1606
1138
                            """This function will emit two D-Bus
1607
1139
                            signals by calling func1 and func2"""
1608
1140
                            func1(*args, **kwargs)
1609
1141
                            func2(*args, **kwargs)
1610
 
                        # Make wrapper function look like a D-Bus signal
1611
 
                        for name, attr in inspect.getmembers(func2):
1612
 
                            if name.startswith("_dbus_"):
1613
 
                                setattr(call_both, name, attr)
1614
 
                        
1615
1142
                        return call_both
1616
1143
                    # Create the "call_both" function and add it to
1617
1144
                    # the class
1622
1149
                    # object.  Decorate it to be a new D-Bus method
1623
1150
                    # with the alternate D-Bus interface name.  Add it
1624
1151
                    # to the class.
1625
 
                    attr[attrname] = (
1626
 
                        dbus.service.method(
1627
 
                            alt_interface,
1628
 
                            attribute._dbus_in_signature,
1629
 
                            attribute._dbus_out_signature)
1630
 
                        (copy_function(attribute)))
 
1152
                    attr[attrname] = (dbus.service.method
 
1153
                                      (alt_interface,
 
1154
                                       attribute._dbus_in_signature,
 
1155
                                       attribute._dbus_out_signature)
 
1156
                                      (types.FunctionType
 
1157
                                       (attribute.func_code,
 
1158
                                        attribute.func_globals,
 
1159
                                        attribute.func_name,
 
1160
                                        attribute.func_defaults,
 
1161
                                        attribute.func_closure)))
1631
1162
                    # Copy annotations, if any
1632
1163
                    try:
1633
 
                        attr[attrname]._dbus_annotations = dict(
1634
 
                            attribute._dbus_annotations)
 
1164
                        attr[attrname]._dbus_annotations = (
 
1165
                            dict(attribute._dbus_annotations))
1635
1166
                    except AttributeError:
1636
1167
                        pass
1637
1168
                # Is this a D-Bus property?
1640
1171
                    # object, and decorate it to be a new D-Bus
1641
1172
                    # property with the alternate D-Bus interface
1642
1173
                    # name.  Add it to the class.
1643
 
                    attr[attrname] = (dbus_service_property(
1644
 
                        alt_interface, attribute._dbus_signature,
1645
 
                        attribute._dbus_access,
1646
 
                        attribute._dbus_get_args_options
1647
 
                        ["byte_arrays"])
1648
 
                                      (copy_function(attribute)))
 
1174
                    attr[attrname] = (dbus_service_property
 
1175
                                      (alt_interface,
 
1176
                                       attribute._dbus_signature,
 
1177
                                       attribute._dbus_access,
 
1178
                                       attribute
 
1179
                                       ._dbus_get_args_options
 
1180
                                       ["byte_arrays"])
 
1181
                                      (types.FunctionType
 
1182
                                       (attribute.func_code,
 
1183
                                        attribute.func_globals,
 
1184
                                        attribute.func_name,
 
1185
                                        attribute.func_defaults,
 
1186
                                        attribute.func_closure)))
1649
1187
                    # Copy annotations, if any
1650
1188
                    try:
1651
 
                        attr[attrname]._dbus_annotations = dict(
1652
 
                            attribute._dbus_annotations)
 
1189
                        attr[attrname]._dbus_annotations = (
 
1190
                            dict(attribute._dbus_annotations))
1653
1191
                    except AttributeError:
1654
1192
                        pass
1655
1193
                # Is this a D-Bus interface?
1658
1196
                    # object.  Decorate it to be a new D-Bus interface
1659
1197
                    # with the alternate D-Bus interface name.  Add it
1660
1198
                    # to the class.
1661
 
                    attr[attrname] = (
1662
 
                        dbus_interface_annotations(alt_interface)
1663
 
                        (copy_function(attribute)))
 
1199
                    attr[attrname] = (dbus_interface_annotations
 
1200
                                      (alt_interface)
 
1201
                                      (types.FunctionType
 
1202
                                       (attribute.func_code,
 
1203
                                        attribute.func_globals,
 
1204
                                        attribute.func_name,
 
1205
                                        attribute.func_defaults,
 
1206
                                        attribute.func_closure)))
1664
1207
            if deprecate:
1665
1208
                # Deprecate all alternate interfaces
1666
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1209
                iname="_AlternateDBusNames_interface_annotation{0}"
1667
1210
                for interface_name in interface_names:
1668
 
                    
1669
1211
                    @dbus_interface_annotations(interface_name)
1670
1212
                    def func(self):
1671
1213
                        return { "org.freedesktop.DBus.Deprecated":
1672
 
                                 "true" }
 
1214
                                     "true" }
1673
1215
                    # Find an unused name
1674
1216
                    for aname in (iname.format(i)
1675
1217
                                  for i in itertools.count()):
1679
1221
            if interface_names:
1680
1222
                # Replace the class with a new subclass of it with
1681
1223
                # methods, signals, etc. as created above.
1682
 
                if sys.version_info.major == 2:
1683
 
                    cls = type(b"{}Alternate".format(cls.__name__),
1684
 
                               (cls, ), attr)
1685
 
                else:
1686
 
                    cls = type("{}Alternate".format(cls.__name__),
1687
 
                               (cls, ), attr)
 
1224
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1225
                           (cls,), attr)
1688
1226
        return cls
1689
 
    
1690
1227
    return wrapper
1691
1228
 
1692
1229
 
1693
1230
@alternate_dbus_interfaces({"se.recompile.Mandos":
1694
 
                            "se.bsnet.fukt.Mandos"})
 
1231
                                "se.bsnet.fukt.Mandos"})
1695
1232
class ClientDBus(Client, DBusObjectWithProperties):
1696
1233
    """A Client class using D-Bus
1697
1234
    
1701
1238
    """
1702
1239
    
1703
1240
    runtime_expansions = (Client.runtime_expansions
1704
 
                          + ("dbus_object_path", ))
1705
 
    
1706
 
    _interface = "se.recompile.Mandos.Client"
 
1241
                          + ("dbus_object_path",))
1707
1242
    
1708
1243
    # dbus.service.Object doesn't use super(), so we can't either.
1709
1244
    
1712
1247
        Client.__init__(self, *args, **kwargs)
1713
1248
        # Only now, when this client is initialized, can it show up on
1714
1249
        # the D-Bus
1715
 
        client_object_name = str(self.name).translate(
 
1250
        client_object_name = unicode(self.name).translate(
1716
1251
            {ord("."): ord("_"),
1717
1252
             ord("-"): ord("_")})
1718
 
        self.dbus_object_path = dbus.ObjectPath(
1719
 
            "/clients/" + client_object_name)
 
1253
        self.dbus_object_path = (dbus.ObjectPath
 
1254
                                 ("/clients/" + client_object_name))
1720
1255
        DBusObjectWithProperties.__init__(self, self.bus,
1721
1256
                                          self.dbus_object_path)
1722
1257
    
1723
 
    def notifychangeproperty(transform_func, dbus_name,
1724
 
                             type_func=lambda x: x,
1725
 
                             variant_level=1,
1726
 
                             invalidate_only=False,
1727
 
                             _interface=_interface):
 
1258
    def notifychangeproperty(transform_func,
 
1259
                             dbus_name, type_func=lambda x: x,
 
1260
                             variant_level=1):
1728
1261
        """ Modify a variable so that it's a property which announces
1729
1262
        its changes to DBus.
1730
1263
        
1735
1268
                   to the D-Bus.  Default: no transform
1736
1269
        variant_level: D-Bus variant level.  Default: 1
1737
1270
        """
1738
 
        attrname = "_{}".format(dbus_name)
1739
 
        
 
1271
        attrname = "_{0}".format(dbus_name)
1740
1272
        def setter(self, value):
1741
1273
            if hasattr(self, "dbus_object_path"):
1742
1274
                if (not hasattr(self, attrname) or
1743
1275
                    type_func(getattr(self, attrname, None))
1744
1276
                    != type_func(value)):
1745
 
                    if invalidate_only:
1746
 
                        self.PropertiesChanged(
1747
 
                            _interface, dbus.Dictionary(),
1748
 
                            dbus.Array((dbus_name, )))
1749
 
                    else:
1750
 
                        dbus_value = transform_func(
1751
 
                            type_func(value),
1752
 
                            variant_level = variant_level)
1753
 
                        self.PropertyChanged(dbus.String(dbus_name),
1754
 
                                             dbus_value)
1755
 
                        self.PropertiesChanged(
1756
 
                            _interface,
1757
 
                            dbus.Dictionary({ dbus.String(dbus_name):
1758
 
                                              dbus_value }),
1759
 
                            dbus.Array())
 
1277
                    dbus_value = transform_func(type_func(value),
 
1278
                                                variant_level
 
1279
                                                =variant_level)
 
1280
                    self.PropertyChanged(dbus.String(dbus_name),
 
1281
                                         dbus_value)
1760
1282
            setattr(self, attrname, value)
1761
1283
        
1762
1284
        return property(lambda self: getattr(self, attrname), setter)
1768
1290
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1769
1291
    last_enabled = notifychangeproperty(datetime_to_dbus,
1770
1292
                                        "LastEnabled")
1771
 
    checker = notifychangeproperty(
1772
 
        dbus.Boolean, "CheckerRunning",
1773
 
        type_func = lambda checker: checker is not None)
 
1293
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1294
                                   type_func = lambda checker:
 
1295
                                       checker is not None)
1774
1296
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1775
1297
                                           "LastCheckedOK")
1776
1298
    last_checker_status = notifychangeproperty(dbus.Int16,
1779
1301
        datetime_to_dbus, "LastApprovalRequest")
1780
1302
    approved_by_default = notifychangeproperty(dbus.Boolean,
1781
1303
                                               "ApprovedByDefault")
1782
 
    approval_delay = notifychangeproperty(
1783
 
        dbus.UInt64, "ApprovalDelay",
1784
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1304
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1305
                                          "ApprovalDelay",
 
1306
                                          type_func =
 
1307
                                          timedelta_to_milliseconds)
1785
1308
    approval_duration = notifychangeproperty(
1786
1309
        dbus.UInt64, "ApprovalDuration",
1787
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1310
        type_func = timedelta_to_milliseconds)
1788
1311
    host = notifychangeproperty(dbus.String, "Host")
1789
 
    timeout = notifychangeproperty(
1790
 
        dbus.UInt64, "Timeout",
1791
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1312
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1313
                                   type_func =
 
1314
                                   timedelta_to_milliseconds)
1792
1315
    extended_timeout = notifychangeproperty(
1793
1316
        dbus.UInt64, "ExtendedTimeout",
1794
 
        type_func = lambda td: td.total_seconds() * 1000)
1795
 
    interval = notifychangeproperty(
1796
 
        dbus.UInt64, "Interval",
1797
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1317
        type_func = timedelta_to_milliseconds)
 
1318
    interval = notifychangeproperty(dbus.UInt64,
 
1319
                                    "Interval",
 
1320
                                    type_func =
 
1321
                                    timedelta_to_milliseconds)
1798
1322
    checker_command = notifychangeproperty(dbus.String, "Checker")
1799
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1800
 
                                  invalidate_only=True)
1801
1323
    
1802
1324
    del notifychangeproperty
1803
1325
    
1810
1332
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1811
1333
        Client.__del__(self, *args, **kwargs)
1812
1334
    
1813
 
    def checker_callback(self, source, condition,
1814
 
                         connection, command, *args, **kwargs):
1815
 
        ret = Client.checker_callback(self, source, condition,
1816
 
                                      connection, command, *args,
1817
 
                                      **kwargs)
1818
 
        exitstatus = self.last_checker_status
1819
 
        if exitstatus >= 0:
 
1335
    def checker_callback(self, pid, condition, command,
 
1336
                         *args, **kwargs):
 
1337
        self.checker_callback_tag = None
 
1338
        self.checker = None
 
1339
        if os.WIFEXITED(condition):
 
1340
            exitstatus = os.WEXITSTATUS(condition)
1820
1341
            # Emit D-Bus signal
1821
1342
            self.CheckerCompleted(dbus.Int16(exitstatus),
1822
 
                                  # This is specific to GNU libC
1823
 
                                  dbus.Int64(exitstatus << 8),
 
1343
                                  dbus.Int64(condition),
1824
1344
                                  dbus.String(command))
1825
1345
        else:
1826
1346
            # Emit D-Bus signal
1827
1347
            self.CheckerCompleted(dbus.Int16(-1),
1828
 
                                  dbus.Int64(
1829
 
                                      # This is specific to GNU libC
1830
 
                                      (exitstatus << 8)
1831
 
                                      | self.last_checker_signal),
 
1348
                                  dbus.Int64(condition),
1832
1349
                                  dbus.String(command))
1833
 
        return ret
 
1350
        
 
1351
        return Client.checker_callback(self, pid, condition, command,
 
1352
                                       *args, **kwargs)
1834
1353
    
1835
1354
    def start_checker(self, *args, **kwargs):
1836
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1355
        old_checker = self.checker
 
1356
        if self.checker is not None:
 
1357
            old_checker_pid = self.checker.pid
 
1358
        else:
 
1359
            old_checker_pid = None
1837
1360
        r = Client.start_checker(self, *args, **kwargs)
1838
1361
        # Only if new checker process was started
1839
1362
        if (self.checker is not None
1848
1371
    
1849
1372
    def approve(self, value=True):
1850
1373
        self.approved = value
1851
 
        GLib.timeout_add(int(self.approval_duration.total_seconds()
1852
 
                             * 1000), self._reset_approved)
 
1374
        gobject.timeout_add(timedelta_to_milliseconds
 
1375
                            (self.approval_duration),
 
1376
                            self._reset_approved)
1853
1377
        self.send_changedstate()
1854
1378
    
1855
1379
    ## D-Bus methods, signals & properties
 
1380
    _interface = "se.recompile.Mandos.Client"
1856
1381
    
1857
1382
    ## Interfaces
1858
1383
    
 
1384
    @dbus_interface_annotations(_interface)
 
1385
    def _foo(self):
 
1386
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1387
                     "false"}
 
1388
    
1859
1389
    ## Signals
1860
1390
    
1861
1391
    # CheckerCompleted - signal
1871
1401
        pass
1872
1402
    
1873
1403
    # PropertyChanged - signal
1874
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1875
1404
    @dbus.service.signal(_interface, signature="sv")
1876
1405
    def PropertyChanged(self, property, value):
1877
1406
        "D-Bus signal"
1911
1440
        self.checked_ok()
1912
1441
    
1913
1442
    # Enable - method
1914
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1915
1443
    @dbus.service.method(_interface)
1916
1444
    def Enable(self):
1917
1445
        "D-Bus method"
1918
1446
        self.enable()
1919
1447
    
1920
1448
    # StartChecker - method
1921
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1922
1449
    @dbus.service.method(_interface)
1923
1450
    def StartChecker(self):
1924
1451
        "D-Bus method"
1925
1452
        self.start_checker()
1926
1453
    
1927
1454
    # Disable - method
1928
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1929
1455
    @dbus.service.method(_interface)
1930
1456
    def Disable(self):
1931
1457
        "D-Bus method"
1932
1458
        self.disable()
1933
1459
    
1934
1460
    # StopChecker - method
1935
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1936
1461
    @dbus.service.method(_interface)
1937
1462
    def StopChecker(self):
1938
1463
        self.stop_checker()
1945
1470
        return dbus.Boolean(bool(self.approvals_pending))
1946
1471
    
1947
1472
    # ApprovedByDefault - property
1948
 
    @dbus_service_property(_interface,
1949
 
                           signature="b",
 
1473
    @dbus_service_property(_interface, signature="b",
1950
1474
                           access="readwrite")
1951
1475
    def ApprovedByDefault_dbus_property(self, value=None):
1952
1476
        if value is None:       # get
1954
1478
        self.approved_by_default = bool(value)
1955
1479
    
1956
1480
    # ApprovalDelay - property
1957
 
    @dbus_service_property(_interface,
1958
 
                           signature="t",
 
1481
    @dbus_service_property(_interface, signature="t",
1959
1482
                           access="readwrite")
1960
1483
    def ApprovalDelay_dbus_property(self, value=None):
1961
1484
        if value is None:       # get
1962
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1963
 
                               * 1000)
 
1485
            return dbus.UInt64(self.approval_delay_milliseconds())
1964
1486
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1965
1487
    
1966
1488
    # ApprovalDuration - property
1967
 
    @dbus_service_property(_interface,
1968
 
                           signature="t",
 
1489
    @dbus_service_property(_interface, signature="t",
1969
1490
                           access="readwrite")
1970
1491
    def ApprovalDuration_dbus_property(self, value=None):
1971
1492
        if value is None:       # get
1972
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1973
 
                               * 1000)
 
1493
            return dbus.UInt64(timedelta_to_milliseconds(
 
1494
                    self.approval_duration))
1974
1495
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1975
1496
    
1976
1497
    # Name - property
1977
 
    @dbus_annotations(
1978
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1979
1498
    @dbus_service_property(_interface, signature="s", access="read")
1980
1499
    def Name_dbus_property(self):
1981
1500
        return dbus.String(self.name)
1982
1501
    
1983
1502
    # Fingerprint - property
1984
 
    @dbus_annotations(
1985
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1986
1503
    @dbus_service_property(_interface, signature="s", access="read")
1987
1504
    def Fingerprint_dbus_property(self):
1988
1505
        return dbus.String(self.fingerprint)
1989
1506
    
1990
1507
    # Host - property
1991
 
    @dbus_service_property(_interface,
1992
 
                           signature="s",
 
1508
    @dbus_service_property(_interface, signature="s",
1993
1509
                           access="readwrite")
1994
1510
    def Host_dbus_property(self, value=None):
1995
1511
        if value is None:       # get
1996
1512
            return dbus.String(self.host)
1997
 
        self.host = str(value)
 
1513
        self.host = unicode(value)
1998
1514
    
1999
1515
    # Created - property
2000
 
    @dbus_annotations(
2001
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2002
1516
    @dbus_service_property(_interface, signature="s", access="read")
2003
1517
    def Created_dbus_property(self):
2004
1518
        return datetime_to_dbus(self.created)
2009
1523
        return datetime_to_dbus(self.last_enabled)
2010
1524
    
2011
1525
    # Enabled - property
2012
 
    @dbus_service_property(_interface,
2013
 
                           signature="b",
 
1526
    @dbus_service_property(_interface, signature="b",
2014
1527
                           access="readwrite")
2015
1528
    def Enabled_dbus_property(self, value=None):
2016
1529
        if value is None:       # get
2021
1534
            self.disable()
2022
1535
    
2023
1536
    # LastCheckedOK - property
2024
 
    @dbus_service_property(_interface,
2025
 
                           signature="s",
 
1537
    @dbus_service_property(_interface, signature="s",
2026
1538
                           access="readwrite")
2027
1539
    def LastCheckedOK_dbus_property(self, value=None):
2028
1540
        if value is not None:
2031
1543
        return datetime_to_dbus(self.last_checked_ok)
2032
1544
    
2033
1545
    # LastCheckerStatus - property
2034
 
    @dbus_service_property(_interface, signature="n", access="read")
 
1546
    @dbus_service_property(_interface, signature="n",
 
1547
                           access="read")
2035
1548
    def LastCheckerStatus_dbus_property(self):
2036
1549
        return dbus.Int16(self.last_checker_status)
2037
1550
    
2046
1559
        return datetime_to_dbus(self.last_approval_request)
2047
1560
    
2048
1561
    # Timeout - property
2049
 
    @dbus_service_property(_interface,
2050
 
                           signature="t",
 
1562
    @dbus_service_property(_interface, signature="t",
2051
1563
                           access="readwrite")
2052
1564
    def Timeout_dbus_property(self, value=None):
2053
1565
        if value is None:       # get
2054
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1566
            return dbus.UInt64(self.timeout_milliseconds())
2055
1567
        old_timeout = self.timeout
2056
1568
        self.timeout = datetime.timedelta(0, 0, 0, value)
2057
1569
        # Reschedule disabling
2065
1577
                if (getattr(self, "disable_initiator_tag", None)
2066
1578
                    is None):
2067
1579
                    return
2068
 
                GLib.source_remove(self.disable_initiator_tag)
2069
 
                self.disable_initiator_tag = GLib.timeout_add(
2070
 
                    int((self.expires - now).total_seconds() * 1000),
2071
 
                    self.disable)
 
1580
                gobject.source_remove(self.disable_initiator_tag)
 
1581
                self.disable_initiator_tag = (
 
1582
                    gobject.timeout_add(
 
1583
                        timedelta_to_milliseconds(self.expires - now),
 
1584
                        self.disable))
2072
1585
    
2073
1586
    # ExtendedTimeout - property
2074
 
    @dbus_service_property(_interface,
2075
 
                           signature="t",
 
1587
    @dbus_service_property(_interface, signature="t",
2076
1588
                           access="readwrite")
2077
1589
    def ExtendedTimeout_dbus_property(self, value=None):
2078
1590
        if value is None:       # get
2079
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
2080
 
                               * 1000)
 
1591
            return dbus.UInt64(self.extended_timeout_milliseconds())
2081
1592
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2082
1593
    
2083
1594
    # Interval - property
2084
 
    @dbus_service_property(_interface,
2085
 
                           signature="t",
 
1595
    @dbus_service_property(_interface, signature="t",
2086
1596
                           access="readwrite")
2087
1597
    def Interval_dbus_property(self, value=None):
2088
1598
        if value is None:       # get
2089
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1599
            return dbus.UInt64(self.interval_milliseconds())
2090
1600
        self.interval = datetime.timedelta(0, 0, 0, value)
2091
1601
        if getattr(self, "checker_initiator_tag", None) is None:
2092
1602
            return
2093
1603
        if self.enabled:
2094
1604
            # Reschedule checker run
2095
 
            GLib.source_remove(self.checker_initiator_tag)
2096
 
            self.checker_initiator_tag = GLib.timeout_add(
2097
 
                value, self.start_checker)
2098
 
            self.start_checker() # Start one now, too
 
1605
            gobject.source_remove(self.checker_initiator_tag)
 
1606
            self.checker_initiator_tag = (gobject.timeout_add
 
1607
                                          (value, self.start_checker))
 
1608
            self.start_checker()    # Start one now, too
2099
1609
    
2100
1610
    # Checker - property
2101
 
    @dbus_service_property(_interface,
2102
 
                           signature="s",
 
1611
    @dbus_service_property(_interface, signature="s",
2103
1612
                           access="readwrite")
2104
1613
    def Checker_dbus_property(self, value=None):
2105
1614
        if value is None:       # get
2106
1615
            return dbus.String(self.checker_command)
2107
 
        self.checker_command = str(value)
 
1616
        self.checker_command = unicode(value)
2108
1617
    
2109
1618
    # CheckerRunning - property
2110
 
    @dbus_service_property(_interface,
2111
 
                           signature="b",
 
1619
    @dbus_service_property(_interface, signature="b",
2112
1620
                           access="readwrite")
2113
1621
    def CheckerRunning_dbus_property(self, value=None):
2114
1622
        if value is None:       # get
2119
1627
            self.stop_checker()
2120
1628
    
2121
1629
    # ObjectPath - property
2122
 
    @dbus_annotations(
2123
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2124
 
         "org.freedesktop.DBus.Deprecated": "true"})
2125
1630
    @dbus_service_property(_interface, signature="o", access="read")
2126
1631
    def ObjectPath_dbus_property(self):
2127
1632
        return self.dbus_object_path # is already a dbus.ObjectPath
2128
1633
    
2129
1634
    # Secret = property
2130
 
    @dbus_annotations(
2131
 
        {"org.freedesktop.DBus.Property.EmitsChangedSignal":
2132
 
         "invalidates"})
2133
 
    @dbus_service_property(_interface,
2134
 
                           signature="ay",
2135
 
                           access="write",
2136
 
                           byte_arrays=True)
 
1635
    @dbus_service_property(_interface, signature="ay",
 
1636
                           access="write", byte_arrays=True)
2137
1637
    def Secret_dbus_property(self, value):
2138
 
        self.secret = bytes(value)
 
1638
        self.secret = str(value)
2139
1639
    
2140
1640
    del _interface
2141
1641
 
2145
1645
        self._pipe = child_pipe
2146
1646
        self._pipe.send(('init', fpr, address))
2147
1647
        if not self._pipe.recv():
2148
 
            raise KeyError(fpr)
 
1648
            raise KeyError()
2149
1649
    
2150
1650
    def __getattribute__(self, name):
2151
1651
        if name == '_pipe':
2155
1655
        if data[0] == 'data':
2156
1656
            return data[1]
2157
1657
        if data[0] == 'function':
2158
 
            
2159
1658
            def func(*args, **kwargs):
2160
1659
                self._pipe.send(('funcall', name, args, kwargs))
2161
1660
                return self._pipe.recv()[1]
2162
 
            
2163
1661
            return func
2164
1662
    
2165
1663
    def __setattr__(self, name, value):
2177
1675
    def handle(self):
2178
1676
        with contextlib.closing(self.server.child_pipe) as child_pipe:
2179
1677
            logger.info("TCP connection from: %s",
2180
 
                        str(self.client_address))
 
1678
                        unicode(self.client_address))
2181
1679
            logger.debug("Pipe FD: %d",
2182
1680
                         self.server.child_pipe.fileno())
2183
1681
            
2184
 
            session = gnutls.ClientSession(self.request)
 
1682
            session = (gnutls.connection
 
1683
                       .ClientSession(self.request,
 
1684
                                      gnutls.connection
 
1685
                                      .X509Credentials()))
 
1686
            
 
1687
            # Note: gnutls.connection.X509Credentials is really a
 
1688
            # generic GnuTLS certificate credentials object so long as
 
1689
            # no X.509 keys are added to it.  Therefore, we can use it
 
1690
            # here despite using OpenPGP certificates.
2185
1691
            
2186
1692
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
2187
1693
            #                      "+AES-256-CBC", "+SHA1",
2191
1697
            priority = self.server.gnutls_priority
2192
1698
            if priority is None:
2193
1699
                priority = "NORMAL"
2194
 
            gnutls.priority_set_direct(session._c_object,
2195
 
                                       priority.encode("utf-8"),
2196
 
                                       None)
 
1700
            (gnutls.library.functions
 
1701
             .gnutls_priority_set_direct(session._c_object,
 
1702
                                         priority, None))
2197
1703
            
2198
1704
            # Start communication using the Mandos protocol
2199
1705
            # Get protocol number
2209
1715
            # Start GnuTLS connection
2210
1716
            try:
2211
1717
                session.handshake()
2212
 
            except gnutls.Error as error:
 
1718
            except gnutls.errors.GNUTLSError as error:
2213
1719
                logger.warning("Handshake failed: %s", error)
2214
1720
                # Do not run session.bye() here: the session is not
2215
1721
                # established.  Just abandon the request.
2219
1725
            approval_required = False
2220
1726
            try:
2221
1727
                try:
2222
 
                    fpr = self.fingerprint(
2223
 
                        self.peer_certificate(session))
2224
 
                except (TypeError, gnutls.Error) as error:
 
1728
                    fpr = self.fingerprint(self.peer_certificate
 
1729
                                           (session))
 
1730
                except (TypeError,
 
1731
                        gnutls.errors.GNUTLSError) as error:
2225
1732
                    logger.warning("Bad certificate: %s", error)
2226
1733
                    return
2227
1734
                logger.debug("Fingerprint: %s", fpr)
2240
1747
                while True:
2241
1748
                    if not client.enabled:
2242
1749
                        logger.info("Client %s is disabled",
2243
 
                                    client.name)
 
1750
                                       client.name)
2244
1751
                        if self.server.use_dbus:
2245
1752
                            # Emit D-Bus signal
2246
1753
                            client.Rejected("Disabled")
2255
1762
                        if self.server.use_dbus:
2256
1763
                            # Emit D-Bus signal
2257
1764
                            client.NeedApproval(
2258
 
                                client.approval_delay.total_seconds()
2259
 
                                * 1000, client.approved_by_default)
 
1765
                                client.approval_delay_milliseconds(),
 
1766
                                client.approved_by_default)
2260
1767
                    else:
2261
1768
                        logger.warning("Client %s was not approved",
2262
1769
                                       client.name)
2268
1775
                    #wait until timeout or approved
2269
1776
                    time = datetime.datetime.now()
2270
1777
                    client.changedstate.acquire()
2271
 
                    client.changedstate.wait(delay.total_seconds())
 
1778
                    client.changedstate.wait(
 
1779
                        float(timedelta_to_milliseconds(delay)
 
1780
                              / 1000))
2272
1781
                    client.changedstate.release()
2273
1782
                    time2 = datetime.datetime.now()
2274
1783
                    if (time2 - time) >= delay:
2285
1794
                    else:
2286
1795
                        delay -= time2 - time
2287
1796
                
2288
 
                try:
2289
 
                    session.send(client.secret)
2290
 
                except gnutls.Error as error:
2291
 
                    logger.warning("gnutls send failed",
2292
 
                                   exc_info = error)
2293
 
                    return
 
1797
                sent_size = 0
 
1798
                while sent_size < len(client.secret):
 
1799
                    try:
 
1800
                        sent = session.send(client.secret[sent_size:])
 
1801
                    except gnutls.errors.GNUTLSError as error:
 
1802
                        logger.warning("gnutls send failed",
 
1803
                                       exc_info=error)
 
1804
                        return
 
1805
                    logger.debug("Sent: %d, remaining: %d",
 
1806
                                 sent, len(client.secret)
 
1807
                                 - (sent_size + sent))
 
1808
                    sent_size += sent
2294
1809
                
2295
1810
                logger.info("Sending secret to %s", client.name)
2296
1811
                # bump the timeout using extended_timeout
2304
1819
                    client.approvals_pending -= 1
2305
1820
                try:
2306
1821
                    session.bye()
2307
 
                except gnutls.Error as error:
 
1822
                except gnutls.errors.GNUTLSError as error:
2308
1823
                    logger.warning("GnuTLS bye failed",
2309
1824
                                   exc_info=error)
2310
1825
    
2312
1827
    def peer_certificate(session):
2313
1828
        "Return the peer's OpenPGP certificate as a bytestring"
2314
1829
        # If not an OpenPGP certificate...
2315
 
        if (gnutls.certificate_type_get(session._c_object)
2316
 
            != gnutls.CRT_OPENPGP):
2317
 
            # ...return invalid data
2318
 
            return b""
 
1830
        if (gnutls.library.functions
 
1831
            .gnutls_certificate_type_get(session._c_object)
 
1832
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
1833
            # ...do the normal thing
 
1834
            return session.peer_certificate
2319
1835
        list_size = ctypes.c_uint(1)
2320
 
        cert_list = (gnutls.certificate_get_peers
 
1836
        cert_list = (gnutls.library.functions
 
1837
                     .gnutls_certificate_get_peers
2321
1838
                     (session._c_object, ctypes.byref(list_size)))
2322
1839
        if not bool(cert_list) and list_size.value != 0:
2323
 
            raise gnutls.Error("error getting peer certificate")
 
1840
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1841
                                            " certificate")
2324
1842
        if list_size.value == 0:
2325
1843
            return None
2326
1844
        cert = cert_list[0]
2330
1848
    def fingerprint(openpgp):
2331
1849
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
2332
1850
        # New GnuTLS "datum" with the OpenPGP public key
2333
 
        datum = gnutls.datum_t(
2334
 
            ctypes.cast(ctypes.c_char_p(openpgp),
2335
 
                        ctypes.POINTER(ctypes.c_ubyte)),
2336
 
            ctypes.c_uint(len(openpgp)))
 
1851
        datum = (gnutls.library.types
 
1852
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1853
                                             ctypes.POINTER
 
1854
                                             (ctypes.c_ubyte)),
 
1855
                                 ctypes.c_uint(len(openpgp))))
2337
1856
        # New empty GnuTLS certificate
2338
 
        crt = gnutls.openpgp_crt_t()
2339
 
        gnutls.openpgp_crt_init(ctypes.byref(crt))
 
1857
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
1858
        (gnutls.library.functions
 
1859
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
2340
1860
        # Import the OpenPGP public key into the certificate
2341
 
        gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2342
 
                                  gnutls.OPENPGP_FMT_RAW)
 
1861
        (gnutls.library.functions
 
1862
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1863
                                    gnutls.library.constants
 
1864
                                    .GNUTLS_OPENPGP_FMT_RAW))
2343
1865
        # Verify the self signature in the key
2344
1866
        crtverify = ctypes.c_uint()
2345
 
        gnutls.openpgp_crt_verify_self(crt, 0,
2346
 
                                       ctypes.byref(crtverify))
 
1867
        (gnutls.library.functions
 
1868
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1869
                                         ctypes.byref(crtverify)))
2347
1870
        if crtverify.value != 0:
2348
 
            gnutls.openpgp_crt_deinit(crt)
2349
 
            raise gnutls.CertificateSecurityError("Verify failed")
 
1871
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
1872
            raise (gnutls.errors.CertificateSecurityError
 
1873
                   ("Verify failed"))
2350
1874
        # New buffer for the fingerprint
2351
1875
        buf = ctypes.create_string_buffer(20)
2352
1876
        buf_len = ctypes.c_size_t()
2353
1877
        # Get the fingerprint from the certificate into the buffer
2354
 
        gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2355
 
                                           ctypes.byref(buf_len))
 
1878
        (gnutls.library.functions
 
1879
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1880
                                             ctypes.byref(buf_len)))
2356
1881
        # Deinit the certificate
2357
 
        gnutls.openpgp_crt_deinit(crt)
 
1882
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2358
1883
        # Convert the buffer to a Python bytestring
2359
1884
        fpr = ctypes.string_at(buf, buf_len.value)
2360
1885
        # Convert the bytestring to hexadecimal notation
2364
1889
 
2365
1890
class MultiprocessingMixIn(object):
2366
1891
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
2367
 
    
2368
1892
    def sub_process_main(self, request, address):
2369
1893
        try:
2370
1894
            self.finish_request(request, address)
2382
1906
 
2383
1907
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2384
1908
    """ adds a pipe to the MixIn """
2385
 
    
2386
1909
    def process_request(self, request, client_address):
2387
1910
        """Overrides and wraps the original process_request().
2388
1911
        
2409
1932
        interface:      None or a network interface name (string)
2410
1933
        use_ipv6:       Boolean; to use IPv6 or not
2411
1934
    """
2412
 
    
2413
1935
    def __init__(self, server_address, RequestHandlerClass,
2414
 
                 interface=None,
2415
 
                 use_ipv6=True,
2416
 
                 socketfd=None):
 
1936
                 interface=None, use_ipv6=True, socketfd=None):
2417
1937
        """If socketfd is set, use that file descriptor instead of
2418
1938
        creating a new one with socket.socket().
2419
1939
        """
2453
1973
        """This overrides the normal server_bind() function
2454
1974
        to bind to an interface if one was specified, and also NOT to
2455
1975
        bind to an address or port if they were not specified."""
2456
 
        global SO_BINDTODEVICE
2457
1976
        if self.interface is not None:
2458
1977
            if SO_BINDTODEVICE is None:
2459
 
                # Fall back to a hard-coded value which seems to be
2460
 
                # common enough.
2461
 
                logger.warning("SO_BINDTODEVICE not found, trying 25")
2462
 
                SO_BINDTODEVICE = 25
2463
 
            try:
2464
 
                self.socket.setsockopt(
2465
 
                    socket.SOL_SOCKET, SO_BINDTODEVICE,
2466
 
                    (self.interface + "\0").encode("utf-8"))
2467
 
            except socket.error as error:
2468
 
                if error.errno == errno.EPERM:
2469
 
                    logger.error("No permission to bind to"
2470
 
                                 " interface %s", self.interface)
2471
 
                elif error.errno == errno.ENOPROTOOPT:
2472
 
                    logger.error("SO_BINDTODEVICE not available;"
2473
 
                                 " cannot bind to interface %s",
2474
 
                                 self.interface)
2475
 
                elif error.errno == errno.ENODEV:
2476
 
                    logger.error("Interface %s does not exist,"
2477
 
                                 " cannot bind", self.interface)
2478
 
                else:
2479
 
                    raise
 
1978
                logger.error("SO_BINDTODEVICE does not exist;"
 
1979
                             " cannot bind to interface %s",
 
1980
                             self.interface)
 
1981
            else:
 
1982
                try:
 
1983
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1984
                                           SO_BINDTODEVICE,
 
1985
                                           str(self.interface + '\0'))
 
1986
                except socket.error as error:
 
1987
                    if error.errno == errno.EPERM:
 
1988
                        logger.error("No permission to bind to"
 
1989
                                     " interface %s", self.interface)
 
1990
                    elif error.errno == errno.ENOPROTOOPT:
 
1991
                        logger.error("SO_BINDTODEVICE not available;"
 
1992
                                     " cannot bind to interface %s",
 
1993
                                     self.interface)
 
1994
                    elif error.errno == errno.ENODEV:
 
1995
                        logger.error("Interface %s does not exist,"
 
1996
                                     " cannot bind", self.interface)
 
1997
                    else:
 
1998
                        raise
2480
1999
        # Only bind(2) the socket if we really need to.
2481
2000
        if self.server_address[0] or self.server_address[1]:
2482
2001
            if not self.server_address[0]:
2487
2006
                self.server_address = (any_address,
2488
2007
                                       self.server_address[1])
2489
2008
            elif not self.server_address[1]:
2490
 
                self.server_address = (self.server_address[0], 0)
 
2009
                self.server_address = (self.server_address[0],
 
2010
                                       0)
2491
2011
#                 if self.interface:
2492
2012
#                     self.server_address = (self.server_address[0],
2493
2013
#                                            0, # port
2505
2025
        gnutls_priority GnuTLS priority string
2506
2026
        use_dbus:       Boolean; to emit D-Bus signals or not
2507
2027
    
2508
 
    Assumes a GLib.MainLoop event loop.
 
2028
    Assumes a gobject.MainLoop event loop.
2509
2029
    """
2510
 
    
2511
2030
    def __init__(self, server_address, RequestHandlerClass,
2512
 
                 interface=None,
2513
 
                 use_ipv6=True,
2514
 
                 clients=None,
2515
 
                 gnutls_priority=None,
2516
 
                 use_dbus=True,
2517
 
                 socketfd=None):
 
2031
                 interface=None, use_ipv6=True, clients=None,
 
2032
                 gnutls_priority=None, use_dbus=True, socketfd=None):
2518
2033
        self.enabled = False
2519
2034
        self.clients = clients
2520
2035
        if self.clients is None:
2526
2041
                                interface = interface,
2527
2042
                                use_ipv6 = use_ipv6,
2528
2043
                                socketfd = socketfd)
2529
 
    
2530
2044
    def server_activate(self):
2531
2045
        if self.enabled:
2532
2046
            return socketserver.TCPServer.server_activate(self)
2536
2050
    
2537
2051
    def add_pipe(self, parent_pipe, proc):
2538
2052
        # Call "handle_ipc" for both data and EOF events
2539
 
        GLib.io_add_watch(
2540
 
            parent_pipe.fileno(),
2541
 
            GLib.IO_IN | GLib.IO_HUP,
2542
 
            functools.partial(self.handle_ipc,
2543
 
                              parent_pipe = parent_pipe,
2544
 
                              proc = proc))
 
2053
        gobject.io_add_watch(parent_pipe.fileno(),
 
2054
                             gobject.IO_IN | gobject.IO_HUP,
 
2055
                             functools.partial(self.handle_ipc,
 
2056
                                               parent_pipe =
 
2057
                                               parent_pipe,
 
2058
                                               proc = proc))
2545
2059
    
2546
 
    def handle_ipc(self, source, condition,
2547
 
                   parent_pipe=None,
2548
 
                   proc = None,
2549
 
                   client_object=None):
 
2060
    def handle_ipc(self, source, condition, parent_pipe=None,
 
2061
                   proc = None, client_object=None):
2550
2062
        # error, or the other end of multiprocessing.Pipe has closed
2551
 
        if condition & (GLib.IO_ERR | GLib.IO_HUP):
 
2063
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2552
2064
            # Wait for other process to exit
2553
2065
            proc.join()
2554
2066
            return False
2561
2073
            fpr = request[1]
2562
2074
            address = request[2]
2563
2075
            
2564
 
            for c in self.clients.values():
 
2076
            for c in self.clients.itervalues():
2565
2077
                if c.fingerprint == fpr:
2566
2078
                    client = c
2567
2079
                    break
2575
2087
                parent_pipe.send(False)
2576
2088
                return False
2577
2089
            
2578
 
            GLib.io_add_watch(
2579
 
                parent_pipe.fileno(),
2580
 
                GLib.IO_IN | GLib.IO_HUP,
2581
 
                functools.partial(self.handle_ipc,
2582
 
                                  parent_pipe = parent_pipe,
2583
 
                                  proc = proc,
2584
 
                                  client_object = client))
 
2090
            gobject.io_add_watch(parent_pipe.fileno(),
 
2091
                                 gobject.IO_IN | gobject.IO_HUP,
 
2092
                                 functools.partial(self.handle_ipc,
 
2093
                                                   parent_pipe =
 
2094
                                                   parent_pipe,
 
2095
                                                   proc = proc,
 
2096
                                                   client_object =
 
2097
                                                   client))
2585
2098
            parent_pipe.send(True)
2586
2099
            # remove the old hook in favor of the new above hook on
2587
2100
            # same fileno
2593
2106
            
2594
2107
            parent_pipe.send(('data', getattr(client_object,
2595
2108
                                              funcname)(*args,
2596
 
                                                        **kwargs)))
 
2109
                                                         **kwargs)))
2597
2110
        
2598
2111
        if command == 'getattr':
2599
2112
            attrname = request[1]
2600
 
            if isinstance(client_object.__getattribute__(attrname),
2601
 
                          collections.Callable):
2602
 
                parent_pipe.send(('function', ))
 
2113
            if callable(client_object.__getattribute__(attrname)):
 
2114
                parent_pipe.send(('function',))
2603
2115
            else:
2604
 
                parent_pipe.send((
2605
 
                    'data', client_object.__getattribute__(attrname)))
 
2116
                parent_pipe.send(('data', client_object
 
2117
                                  .__getattribute__(attrname)))
2606
2118
        
2607
2119
        if command == 'setattr':
2608
2120
            attrname = request[1]
2639
2151
    # avoid excessive use of external libraries.
2640
2152
    
2641
2153
    # New type for defining tokens, syntax, and semantics all-in-one
2642
 
    Token = collections.namedtuple("Token", (
2643
 
        "regexp",  # To match token; if "value" is not None, must have
2644
 
                   # a "group" containing digits
2645
 
        "value",   # datetime.timedelta or None
2646
 
        "followers"))           # Tokens valid after this token
 
2154
    Token = collections.namedtuple("Token",
 
2155
                                   ("regexp", # To match token; if
 
2156
                                              # "value" is not None,
 
2157
                                              # must have a "group"
 
2158
                                              # containing digits
 
2159
                                    "value",  # datetime.timedelta or
 
2160
                                              # None
 
2161
                                    "followers")) # Tokens valid after
 
2162
                                                  # this token
2647
2163
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2648
2164
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2649
2165
    token_end = Token(re.compile(r"$"), None, frozenset())
2650
2166
    token_second = Token(re.compile(r"(\d+)S"),
2651
2167
                         datetime.timedelta(seconds=1),
2652
 
                         frozenset((token_end, )))
 
2168
                         frozenset((token_end,)))
2653
2169
    token_minute = Token(re.compile(r"(\d+)M"),
2654
2170
                         datetime.timedelta(minutes=1),
2655
2171
                         frozenset((token_second, token_end)))
2671
2187
                       frozenset((token_month, token_end)))
2672
2188
    token_week = Token(re.compile(r"(\d+)W"),
2673
2189
                       datetime.timedelta(weeks=1),
2674
 
                       frozenset((token_end, )))
 
2190
                       frozenset((token_end,)))
2675
2191
    token_duration = Token(re.compile(r"P"), None,
2676
2192
                           frozenset((token_year, token_month,
2677
2193
                                      token_day, token_time,
2678
 
                                      token_week)))
 
2194
                                      token_week))),
2679
2195
    # Define starting values
2680
2196
    value = datetime.timedelta() # Value so far
2681
2197
    found_token = None
2682
 
    followers = frozenset((token_duration, )) # Following valid tokens
 
2198
    followers = frozenset(token_duration,) # Following valid tokens
2683
2199
    s = duration                # String left to parse
2684
2200
    # Loop until end token is found
2685
2201
    while found_token is not token_end:
2702
2218
                break
2703
2219
        else:
2704
2220
            # No currently valid tokens were found
2705
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
2706
 
                             .format(duration))
 
2221
            raise ValueError("Invalid RFC 3339 duration")
2707
2222
    # End token found
2708
2223
    return value
2709
2224
 
2733
2248
    timevalue = datetime.timedelta(0)
2734
2249
    for s in interval.split():
2735
2250
        try:
2736
 
            suffix = s[-1]
 
2251
            suffix = unicode(s[-1])
2737
2252
            value = int(s[:-1])
2738
2253
            if suffix == "d":
2739
2254
                delta = datetime.timedelta(value)
2746
2261
            elif suffix == "w":
2747
2262
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2748
2263
            else:
2749
 
                raise ValueError("Unknown suffix {!r}".format(suffix))
 
2264
                raise ValueError("Unknown suffix {0!r}"
 
2265
                                 .format(suffix))
2750
2266
        except IndexError as e:
2751
2267
            raise ValueError(*(e.args))
2752
2268
        timevalue += delta
2769
2285
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2770
2286
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2771
2287
            raise OSError(errno.ENODEV,
2772
 
                          "{} not a character device"
 
2288
                          "{0} not a character device"
2773
2289
                          .format(os.devnull))
2774
2290
        os.dup2(null, sys.stdin.fileno())
2775
2291
        os.dup2(null, sys.stdout.fileno())
2785
2301
    
2786
2302
    parser = argparse.ArgumentParser()
2787
2303
    parser.add_argument("-v", "--version", action="version",
2788
 
                        version = "%(prog)s {}".format(version),
 
2304
                        version = "%(prog)s {0}".format(version),
2789
2305
                        help="show version number and exit")
2790
2306
    parser.add_argument("-i", "--interface", metavar="IF",
2791
2307
                        help="Bind to interface IF")
2824
2340
                        help="Directory to save/restore state in")
2825
2341
    parser.add_argument("--foreground", action="store_true",
2826
2342
                        help="Run in foreground", default=None)
2827
 
    parser.add_argument("--no-zeroconf", action="store_false",
2828
 
                        dest="zeroconf", help="Do not use Zeroconf",
2829
 
                        default=None)
2830
2343
    
2831
2344
    options = parser.parse_args()
2832
2345
    
2841
2354
                        "port": "",
2842
2355
                        "debug": "False",
2843
2356
                        "priority":
2844
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2845
 
                        ":+SIGN-DSA-SHA256",
 
2357
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2846
2358
                        "servicename": "Mandos",
2847
2359
                        "use_dbus": "True",
2848
2360
                        "use_ipv6": "True",
2851
2363
                        "socket": "",
2852
2364
                        "statedir": "/var/lib/mandos",
2853
2365
                        "foreground": "False",
2854
 
                        "zeroconf": "True",
2855
 
                    }
 
2366
                        }
2856
2367
    
2857
2368
    # Parse config file for server-global settings
2858
2369
    server_config = configparser.SafeConfigParser(server_defaults)
2859
2370
    del server_defaults
2860
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2371
    server_config.read(os.path.join(options.configdir,
 
2372
                                    "mandos.conf"))
2861
2373
    # Convert the SafeConfigParser object to a dict
2862
2374
    server_settings = server_config.defaults()
2863
2375
    # Use the appropriate methods on the non-string config options
2881
2393
    # Override the settings from the config file with command line
2882
2394
    # options, if set.
2883
2395
    for option in ("interface", "address", "port", "debug",
2884
 
                   "priority", "servicename", "configdir", "use_dbus",
2885
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
2886
 
                   "socket", "foreground", "zeroconf"):
 
2396
                   "priority", "servicename", "configdir",
 
2397
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2398
                   "statedir", "socket", "foreground"):
2887
2399
        value = getattr(options, option)
2888
2400
        if value is not None:
2889
2401
            server_settings[option] = value
2890
2402
    del options
2891
2403
    # Force all strings to be unicode
2892
2404
    for option in server_settings.keys():
2893
 
        if isinstance(server_settings[option], bytes):
2894
 
            server_settings[option] = (server_settings[option]
2895
 
                                       .decode("utf-8"))
 
2405
        if type(server_settings[option]) is str:
 
2406
            server_settings[option] = unicode(server_settings[option])
2896
2407
    # Force all boolean options to be boolean
2897
2408
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2898
 
                   "foreground", "zeroconf"):
 
2409
                   "foreground"):
2899
2410
        server_settings[option] = bool(server_settings[option])
2900
2411
    # Debug implies foreground
2901
2412
    if server_settings["debug"]:
2904
2415
    
2905
2416
    ##################################################################
2906
2417
    
2907
 
    if (not server_settings["zeroconf"]
2908
 
        and not (server_settings["port"]
2909
 
                 or server_settings["socket"] != "")):
2910
 
        parser.error("Needs port or socket to work without Zeroconf")
2911
 
    
2912
2418
    # For convenience
2913
2419
    debug = server_settings["debug"]
2914
2420
    debuglevel = server_settings["debuglevel"]
2917
2423
    stored_state_path = os.path.join(server_settings["statedir"],
2918
2424
                                     stored_state_file)
2919
2425
    foreground = server_settings["foreground"]
2920
 
    zeroconf = server_settings["zeroconf"]
2921
2426
    
2922
2427
    if debug:
2923
2428
        initlogger(debug, logging.DEBUG)
2929
2434
            initlogger(debug, level)
2930
2435
    
2931
2436
    if server_settings["servicename"] != "Mandos":
2932
 
        syslogger.setFormatter(
2933
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
2934
 
                              ' %(levelname)s: %(message)s'.format(
2935
 
                                  server_settings["servicename"])))
 
2437
        syslogger.setFormatter(logging.Formatter
 
2438
                               ('Mandos ({0}) [%(process)d]:'
 
2439
                                ' %(levelname)s: %(message)s'
 
2440
                                .format(server_settings
 
2441
                                        ["servicename"])))
2936
2442
    
2937
2443
    # Parse config file with clients
2938
2444
    client_config = configparser.SafeConfigParser(Client
2943
2449
    global mandos_dbus_service
2944
2450
    mandos_dbus_service = None
2945
2451
    
2946
 
    socketfd = None
2947
 
    if server_settings["socket"] != "":
2948
 
        socketfd = server_settings["socket"]
2949
 
    tcp_server = MandosServer(
2950
 
        (server_settings["address"], server_settings["port"]),
2951
 
        ClientHandler,
2952
 
        interface=(server_settings["interface"] or None),
2953
 
        use_ipv6=use_ipv6,
2954
 
        gnutls_priority=server_settings["priority"],
2955
 
        use_dbus=use_dbus,
2956
 
        socketfd=socketfd)
 
2452
    tcp_server = MandosServer((server_settings["address"],
 
2453
                               server_settings["port"]),
 
2454
                              ClientHandler,
 
2455
                              interface=(server_settings["interface"]
 
2456
                                         or None),
 
2457
                              use_ipv6=use_ipv6,
 
2458
                              gnutls_priority=
 
2459
                              server_settings["priority"],
 
2460
                              use_dbus=use_dbus,
 
2461
                              socketfd=(server_settings["socket"]
 
2462
                                        or None))
2957
2463
    if not foreground:
2958
2464
        pidfilename = "/run/mandos.pid"
2959
2465
        if not os.path.isdir("/run/."):
2960
2466
            pidfilename = "/var/run/mandos.pid"
2961
2467
        pidfile = None
2962
2468
        try:
2963
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
2469
            pidfile = open(pidfilename, "w")
2964
2470
        except IOError as e:
2965
2471
            logger.error("Could not open file %r", pidfilename,
2966
2472
                         exc_info=e)
2967
2473
    
2968
 
    for name, group in (("_mandos", "_mandos"),
2969
 
                        ("mandos", "mandos"),
2970
 
                        ("nobody", "nogroup")):
 
2474
    for name in ("_mandos", "mandos", "nobody"):
2971
2475
        try:
2972
2476
            uid = pwd.getpwnam(name).pw_uid
2973
 
            gid = pwd.getpwnam(group).pw_gid
 
2477
            gid = pwd.getpwnam(name).pw_gid
2974
2478
            break
2975
2479
        except KeyError:
2976
2480
            continue
2980
2484
    try:
2981
2485
        os.setgid(gid)
2982
2486
        os.setuid(uid)
2983
 
        if debug:
2984
 
            logger.debug("Did setuid/setgid to {}:{}".format(uid,
2985
 
                                                             gid))
2986
2487
    except OSError as error:
2987
 
        logger.warning("Failed to setuid/setgid to {}:{}: {}"
2988
 
                       .format(uid, gid, os.strerror(error.errno)))
2989
2488
        if error.errno != errno.EPERM:
2990
2489
            raise
2991
2490
    
2994
2493
        
2995
2494
        # "Use a log level over 10 to enable all debugging options."
2996
2495
        # - GnuTLS manual
2997
 
        gnutls.global_set_log_level(11)
 
2496
        gnutls.library.functions.gnutls_global_set_log_level(11)
2998
2497
        
2999
 
        @gnutls.log_func
 
2498
        @gnutls.library.types.gnutls_log_func
3000
2499
        def debug_gnutls(level, string):
3001
2500
            logger.debug("GnuTLS: %s", string[:-1])
3002
2501
        
3003
 
        gnutls.global_set_log_function(debug_gnutls)
 
2502
        (gnutls.library.functions
 
2503
         .gnutls_global_set_log_function(debug_gnutls))
3004
2504
        
3005
2505
        # Redirect stdin so all checkers get /dev/null
3006
2506
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3013
2513
        # Close all input and output, do double fork, etc.
3014
2514
        daemon()
3015
2515
    
3016
 
    # multiprocessing will use threads, so before we use GLib we need
3017
 
    # to inform GLib that threads will be used.
3018
 
    GLib.threads_init()
 
2516
    # multiprocessing will use threads, so before we use gobject we
 
2517
    # need to inform gobject that threads will be used.
 
2518
    gobject.threads_init()
3019
2519
    
3020
2520
    global main_loop
3021
2521
    # From the Avahi example code
3022
2522
    DBusGMainLoop(set_as_default=True)
3023
 
    main_loop = GLib.MainLoop()
 
2523
    main_loop = gobject.MainLoop()
3024
2524
    bus = dbus.SystemBus()
3025
2525
    # End of Avahi example code
3026
2526
    if use_dbus:
3027
2527
        try:
3028
2528
            bus_name = dbus.service.BusName("se.recompile.Mandos",
3029
 
                                            bus,
3030
 
                                            do_not_queue=True)
3031
 
            old_bus_name = dbus.service.BusName(
3032
 
                "se.bsnet.fukt.Mandos", bus,
3033
 
                do_not_queue=True)
3034
 
        except dbus.exceptions.DBusException as e:
 
2529
                                            bus, do_not_queue=True)
 
2530
            old_bus_name = (dbus.service.BusName
 
2531
                            ("se.bsnet.fukt.Mandos", bus,
 
2532
                             do_not_queue=True))
 
2533
        except dbus.exceptions.NameExistsException as e:
3035
2534
            logger.error("Disabling D-Bus:", exc_info=e)
3036
2535
            use_dbus = False
3037
2536
            server_settings["use_dbus"] = False
3038
2537
            tcp_server.use_dbus = False
3039
 
    if zeroconf:
3040
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3041
 
        service = AvahiServiceToSyslog(
3042
 
            name = server_settings["servicename"],
3043
 
            servicetype = "_mandos._tcp",
3044
 
            protocol = protocol,
3045
 
            bus = bus)
3046
 
        if server_settings["interface"]:
3047
 
            service.interface = if_nametoindex(
3048
 
                server_settings["interface"].encode("utf-8"))
 
2538
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2539
    service = AvahiServiceToSyslog(name =
 
2540
                                   server_settings["servicename"],
 
2541
                                   servicetype = "_mandos._tcp",
 
2542
                                   protocol = protocol, bus = bus)
 
2543
    if server_settings["interface"]:
 
2544
        service.interface = (if_nametoindex
 
2545
                             (str(server_settings["interface"])))
3049
2546
    
3050
2547
    global multiprocessing_manager
3051
2548
    multiprocessing_manager = multiprocessing.Manager()
3070
2567
    if server_settings["restore"]:
3071
2568
        try:
3072
2569
            with open(stored_state_path, "rb") as stored_state:
3073
 
                if sys.version_info.major == 2:                
3074
 
                    clients_data, old_client_settings = pickle.load(
3075
 
                        stored_state)
3076
 
                else:
3077
 
                    bytes_clients_data, bytes_old_client_settings = (
3078
 
                        pickle.load(stored_state, encoding = "bytes"))
3079
 
                    ### Fix bytes to strings
3080
 
                    ## clients_data
3081
 
                    # .keys()
3082
 
                    clients_data = { (key.decode("utf-8")
3083
 
                                      if isinstance(key, bytes)
3084
 
                                      else key): value
3085
 
                                     for key, value in
3086
 
                                     bytes_clients_data.items() }
3087
 
                    del bytes_clients_data
3088
 
                    for key in clients_data:
3089
 
                        value = { (k.decode("utf-8")
3090
 
                                   if isinstance(k, bytes) else k): v
3091
 
                                  for k, v in
3092
 
                                  clients_data[key].items() }
3093
 
                        clients_data[key] = value
3094
 
                        # .client_structure
3095
 
                        value["client_structure"] = [
3096
 
                            (s.decode("utf-8")
3097
 
                             if isinstance(s, bytes)
3098
 
                             else s) for s in
3099
 
                            value["client_structure"] ]
3100
 
                        # .name & .host
3101
 
                        for k in ("name", "host"):
3102
 
                            if isinstance(value[k], bytes):
3103
 
                                value[k] = value[k].decode("utf-8")
3104
 
                    ## old_client_settings
3105
 
                    # .keys()
3106
 
                    old_client_settings = {
3107
 
                        (key.decode("utf-8")
3108
 
                         if isinstance(key, bytes)
3109
 
                         else key): value
3110
 
                        for key, value in
3111
 
                        bytes_old_client_settings.items() }
3112
 
                    del bytes_old_client_settings
3113
 
                    # .host
3114
 
                    for value in old_client_settings.values():
3115
 
                        if isinstance(value["host"], bytes):
3116
 
                            value["host"] = (value["host"]
3117
 
                                             .decode("utf-8"))
 
2570
                clients_data, old_client_settings = (pickle.load
 
2571
                                                     (stored_state))
3118
2572
            os.remove(stored_state_path)
3119
2573
        except IOError as e:
3120
2574
            if e.errno == errno.ENOENT:
3121
 
                logger.warning("Could not load persistent state:"
3122
 
                               " {}".format(os.strerror(e.errno)))
 
2575
                logger.warning("Could not load persistent state: {0}"
 
2576
                                .format(os.strerror(e.errno)))
3123
2577
            else:
3124
2578
                logger.critical("Could not load persistent state:",
3125
2579
                                exc_info=e)
3126
2580
                raise
3127
2581
        except EOFError as e:
3128
2582
            logger.warning("Could not load persistent state: "
3129
 
                           "EOFError:",
3130
 
                           exc_info=e)
 
2583
                           "EOFError:", exc_info=e)
3131
2584
    
3132
2585
    with PGPEngine() as pgp:
3133
 
        for client_name, client in clients_data.items():
 
2586
        for client_name, client in clients_data.iteritems():
3134
2587
            # Skip removed clients
3135
2588
            if client_name not in client_settings:
3136
2589
                continue
3145
2598
                    # For each value in new config, check if it
3146
2599
                    # differs from the old config value (Except for
3147
2600
                    # the "secret" attribute)
3148
 
                    if (name != "secret"
3149
 
                        and (value !=
3150
 
                             old_client_settings[client_name][name])):
 
2601
                    if (name != "secret" and
 
2602
                        value != old_client_settings[client_name]
 
2603
                        [name]):
3151
2604
                        client[name] = value
3152
2605
                except KeyError:
3153
2606
                    pass
3154
2607
            
3155
2608
            # Clients who has passed its expire date can still be
3156
 
            # enabled if its last checker was successful.  A Client
 
2609
            # enabled if its last checker was successful.  Clients
3157
2610
            # whose checker succeeded before we stored its state is
3158
2611
            # assumed to have successfully run all checkers during
3159
2612
            # downtime.
3161
2614
                if datetime.datetime.utcnow() >= client["expires"]:
3162
2615
                    if not client["last_checked_ok"]:
3163
2616
                        logger.warning(
3164
 
                            "disabling client {} - Client never "
3165
 
                            "performed a successful checker".format(
3166
 
                                client_name))
 
2617
                            "disabling client {0} - Client never "
 
2618
                            "performed a successful checker"
 
2619
                            .format(client_name))
3167
2620
                        client["enabled"] = False
3168
2621
                    elif client["last_checker_status"] != 0:
3169
2622
                        logger.warning(
3170
 
                            "disabling client {} - Client last"
3171
 
                            " checker failed with error code"
3172
 
                            " {}".format(
3173
 
                                client_name,
3174
 
                                client["last_checker_status"]))
 
2623
                            "disabling client {0} - Client "
 
2624
                            "last checker failed with error code {1}"
 
2625
                            .format(client_name,
 
2626
                                    client["last_checker_status"]))
3175
2627
                        client["enabled"] = False
3176
2628
                    else:
3177
 
                        client["expires"] = (
3178
 
                            datetime.datetime.utcnow()
3179
 
                            + client["timeout"])
 
2629
                        client["expires"] = (datetime.datetime
 
2630
                                             .utcnow()
 
2631
                                             + client["timeout"])
3180
2632
                        logger.debug("Last checker succeeded,"
3181
 
                                     " keeping {} enabled".format(
3182
 
                                         client_name))
 
2633
                                     " keeping {0} enabled"
 
2634
                                     .format(client_name))
3183
2635
            try:
3184
 
                client["secret"] = pgp.decrypt(
3185
 
                    client["encrypted_secret"],
3186
 
                    client_settings[client_name]["secret"])
 
2636
                client["secret"] = (
 
2637
                    pgp.decrypt(client["encrypted_secret"],
 
2638
                                client_settings[client_name]
 
2639
                                ["secret"]))
3187
2640
            except PGPError:
3188
2641
                # If decryption fails, we use secret from new settings
3189
 
                logger.debug("Failed to decrypt {} old secret".format(
3190
 
                    client_name))
3191
 
                client["secret"] = (client_settings[client_name]
3192
 
                                    ["secret"])
 
2642
                logger.debug("Failed to decrypt {0} old secret"
 
2643
                             .format(client_name))
 
2644
                client["secret"] = (
 
2645
                    client_settings[client_name]["secret"])
3193
2646
    
3194
2647
    # Add/remove clients based on new changes made to config
3195
2648
    for client_name in (set(old_client_settings)
3200
2653
        clients_data[client_name] = client_settings[client_name]
3201
2654
    
3202
2655
    # Create all client objects
3203
 
    for client_name, client in clients_data.items():
 
2656
    for client_name, client in clients_data.iteritems():
3204
2657
        tcp_server.clients[client_name] = client_class(
3205
 
            name = client_name,
3206
 
            settings = client,
 
2658
            name = client_name, settings = client,
3207
2659
            server_settings = server_settings)
3208
2660
    
3209
2661
    if not tcp_server.clients:
3211
2663
    
3212
2664
    if not foreground:
3213
2665
        if pidfile is not None:
3214
 
            pid = os.getpid()
3215
2666
            try:
3216
2667
                with pidfile:
3217
 
                    print(pid, file=pidfile)
 
2668
                    pid = os.getpid()
 
2669
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
3218
2670
            except IOError:
3219
2671
                logger.error("Could not write to file %r with PID %d",
3220
2672
                             pidfilename, pid)
3221
2673
        del pidfile
3222
2674
        del pidfilename
3223
2675
    
3224
 
    for termsig in (signal.SIGHUP, signal.SIGTERM):
3225
 
        GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3226
 
                             lambda: main_loop.quit() and False)
 
2676
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
 
2677
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3227
2678
    
3228
2679
    if use_dbus:
3229
 
        
3230
 
        @alternate_dbus_interfaces(
3231
 
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3232
 
        class MandosDBusService(DBusObjectWithObjectManager):
 
2680
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2681
                                        "se.bsnet.fukt.Mandos"})
 
2682
        class MandosDBusService(DBusObjectWithProperties):
3233
2683
            """A D-Bus proxy object"""
3234
 
            
3235
2684
            def __init__(self):
3236
2685
                dbus.service.Object.__init__(self, bus, "/")
3237
 
            
3238
2686
            _interface = "se.recompile.Mandos"
3239
2687
            
 
2688
            @dbus_interface_annotations(_interface)
 
2689
            def _foo(self):
 
2690
                return { "org.freedesktop.DBus.Property"
 
2691
                         ".EmitsChangedSignal":
 
2692
                             "false"}
 
2693
            
3240
2694
            @dbus.service.signal(_interface, signature="o")
3241
2695
            def ClientAdded(self, objpath):
3242
2696
                "D-Bus signal"
3247
2701
                "D-Bus signal"
3248
2702
                pass
3249
2703
            
3250
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3251
 
                               "true"})
3252
2704
            @dbus.service.signal(_interface, signature="os")
3253
2705
            def ClientRemoved(self, objpath, name):
3254
2706
                "D-Bus signal"
3255
2707
                pass
3256
2708
            
3257
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3258
 
                               "true"})
3259
2709
            @dbus.service.method(_interface, out_signature="ao")
3260
2710
            def GetAllClients(self):
3261
2711
                "D-Bus method"
3262
 
                return dbus.Array(c.dbus_object_path for c in
3263
 
                                  tcp_server.clients.values())
 
2712
                return dbus.Array(c.dbus_object_path
 
2713
                                  for c in
 
2714
                                  tcp_server.clients.itervalues())
3264
2715
            
3265
 
            @dbus_annotations({"org.freedesktop.DBus.Deprecated":
3266
 
                               "true"})
3267
2716
            @dbus.service.method(_interface,
3268
2717
                                 out_signature="a{oa{sv}}")
3269
2718
            def GetAllClientsWithProperties(self):
3270
2719
                "D-Bus method"
3271
2720
                return dbus.Dictionary(
3272
 
                    { c.dbus_object_path: c.GetAll(
3273
 
                        "se.recompile.Mandos.Client")
3274
 
                      for c in tcp_server.clients.values() },
 
2721
                    ((c.dbus_object_path, c.GetAll(""))
 
2722
                     for c in tcp_server.clients.itervalues()),
3275
2723
                    signature="oa{sv}")
3276
2724
            
3277
2725
            @dbus.service.method(_interface, in_signature="o")
3278
2726
            def RemoveClient(self, object_path):
3279
2727
                "D-Bus method"
3280
 
                for c in tcp_server.clients.values():
 
2728
                for c in tcp_server.clients.itervalues():
3281
2729
                    if c.dbus_object_path == object_path:
3282
2730
                        del tcp_server.clients[c.name]
3283
2731
                        c.remove_from_connection()
3284
 
                        # Don't signal the disabling
 
2732
                        # Don't signal anything except ClientRemoved
3285
2733
                        c.disable(quiet=True)
3286
 
                        # Emit D-Bus signal for removal
3287
 
                        self.client_removed_signal(c)
 
2734
                        # Emit D-Bus signal
 
2735
                        self.ClientRemoved(object_path, c.name)
3288
2736
                        return
3289
2737
                raise KeyError(object_path)
3290
2738
            
3291
2739
            del _interface
3292
 
            
3293
 
            @dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3294
 
                                 out_signature = "a{oa{sa{sv}}}")
3295
 
            def GetManagedObjects(self):
3296
 
                """D-Bus method"""
3297
 
                return dbus.Dictionary(
3298
 
                    { client.dbus_object_path:
3299
 
                      dbus.Dictionary(
3300
 
                          { interface: client.GetAll(interface)
3301
 
                            for interface in
3302
 
                                 client._get_all_interface_names()})
3303
 
                      for client in tcp_server.clients.values()})
3304
 
            
3305
 
            def client_added_signal(self, client):
3306
 
                """Send the new standard signal and the old signal"""
3307
 
                if use_dbus:
3308
 
                    # New standard signal
3309
 
                    self.InterfacesAdded(
3310
 
                        client.dbus_object_path,
3311
 
                        dbus.Dictionary(
3312
 
                            { interface: client.GetAll(interface)
3313
 
                              for interface in
3314
 
                              client._get_all_interface_names()}))
3315
 
                    # Old signal
3316
 
                    self.ClientAdded(client.dbus_object_path)
3317
 
            
3318
 
            def client_removed_signal(self, client):
3319
 
                """Send the new standard signal and the old signal"""
3320
 
                if use_dbus:
3321
 
                    # New standard signal
3322
 
                    self.InterfacesRemoved(
3323
 
                        client.dbus_object_path,
3324
 
                        client._get_all_interface_names())
3325
 
                    # Old signal
3326
 
                    self.ClientRemoved(client.dbus_object_path,
3327
 
                                       client.name)
3328
2740
        
3329
2741
        mandos_dbus_service = MandosDBusService()
3330
2742
    
3331
 
    # Save modules to variables to exempt the modules from being
3332
 
    # unloaded before the function registered with atexit() is run.
3333
 
    mp = multiprocessing
3334
 
    wn = wnull
3335
2743
    def cleanup():
3336
2744
        "Cleanup function; run on exit"
3337
 
        if zeroconf:
3338
 
            service.cleanup()
 
2745
        service.cleanup()
3339
2746
        
3340
 
        mp.active_children()
3341
 
        wn.close()
 
2747
        multiprocessing.active_children()
 
2748
        wnull.close()
3342
2749
        if not (tcp_server.clients or client_settings):
3343
2750
            return
3344
2751
        
3347
2754
        # removed/edited, old secret will thus be unrecovable.
3348
2755
        clients = {}
3349
2756
        with PGPEngine() as pgp:
3350
 
            for client in tcp_server.clients.values():
 
2757
            for client in tcp_server.clients.itervalues():
3351
2758
                key = client_settings[client.name]["secret"]
3352
2759
                client.encrypted_secret = pgp.encrypt(client.secret,
3353
2760
                                                      key)
3355
2762
                
3356
2763
                # A list of attributes that can not be pickled
3357
2764
                # + secret.
3358
 
                exclude = { "bus", "changedstate", "secret",
3359
 
                            "checker", "server_settings" }
3360
 
                for name, typ in inspect.getmembers(dbus.service
3361
 
                                                    .Object):
 
2765
                exclude = set(("bus", "changedstate", "secret",
 
2766
                               "checker", "server_settings"))
 
2767
                for name, typ in (inspect.getmembers
 
2768
                                  (dbus.service.Object)):
3362
2769
                    exclude.add(name)
3363
2770
                
3364
2771
                client_dict["encrypted_secret"] = (client
3371
2778
                del client_settings[client.name]["secret"]
3372
2779
        
3373
2780
        try:
3374
 
            with tempfile.NamedTemporaryFile(
3375
 
                    mode='wb',
3376
 
                    suffix=".pickle",
3377
 
                    prefix='clients-',
3378
 
                    dir=os.path.dirname(stored_state_path),
3379
 
                    delete=False) as stored_state:
3380
 
                pickle.dump((clients, client_settings), stored_state,
3381
 
                            protocol = 2)
3382
 
                tempname = stored_state.name
 
2781
            with (tempfile.NamedTemporaryFile
 
2782
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2783
                   dir=os.path.dirname(stored_state_path),
 
2784
                   delete=False)) as stored_state:
 
2785
                pickle.dump((clients, client_settings), stored_state)
 
2786
                tempname=stored_state.name
3383
2787
            os.rename(tempname, stored_state_path)
3384
2788
        except (IOError, OSError) as e:
3385
2789
            if not debug:
3388
2792
                except NameError:
3389
2793
                    pass
3390
2794
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3391
 
                logger.warning("Could not save persistent state: {}"
 
2795
                logger.warning("Could not save persistent state: {0}"
3392
2796
                               .format(os.strerror(e.errno)))
3393
2797
            else:
3394
2798
                logger.warning("Could not save persistent state:",
3400
2804
            name, client = tcp_server.clients.popitem()
3401
2805
            if use_dbus:
3402
2806
                client.remove_from_connection()
3403
 
            # Don't signal the disabling
 
2807
            # Don't signal anything except ClientRemoved
3404
2808
            client.disable(quiet=True)
3405
 
            # Emit D-Bus signal for removal
3406
2809
            if use_dbus:
3407
 
                mandos_dbus_service.client_removed_signal(client)
 
2810
                # Emit D-Bus signal
 
2811
                mandos_dbus_service.ClientRemoved(client
 
2812
                                                  .dbus_object_path,
 
2813
                                                  client.name)
3408
2814
        client_settings.clear()
3409
2815
    
3410
2816
    atexit.register(cleanup)
3411
2817
    
3412
 
    for client in tcp_server.clients.values():
 
2818
    for client in tcp_server.clients.itervalues():
3413
2819
        if use_dbus:
3414
 
            # Emit D-Bus signal for adding
3415
 
            mandos_dbus_service.client_added_signal(client)
 
2820
            # Emit D-Bus signal
 
2821
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
3416
2822
        # Need to initiate checking of clients
3417
2823
        if client.enabled:
3418
2824
            client.init_checker()
3421
2827
    tcp_server.server_activate()
3422
2828
    
3423
2829
    # Find out what port we got
3424
 
    if zeroconf:
3425
 
        service.port = tcp_server.socket.getsockname()[1]
 
2830
    service.port = tcp_server.socket.getsockname()[1]
3426
2831
    if use_ipv6:
3427
2832
        logger.info("Now listening on address %r, port %d,"
3428
2833
                    " flowinfo %d, scope_id %d",
3434
2839
    #service.interface = tcp_server.socket.getsockname()[3]
3435
2840
    
3436
2841
    try:
3437
 
        if zeroconf:
3438
 
            # From the Avahi example code
3439
 
            try:
3440
 
                service.activate()
3441
 
            except dbus.exceptions.DBusException as error:
3442
 
                logger.critical("D-Bus Exception", exc_info=error)
3443
 
                cleanup()
3444
 
                sys.exit(1)
3445
 
            # End of Avahi example code
 
2842
        # From the Avahi example code
 
2843
        try:
 
2844
            service.activate()
 
2845
        except dbus.exceptions.DBusException as error:
 
2846
            logger.critical("D-Bus Exception", exc_info=error)
 
2847
            cleanup()
 
2848
            sys.exit(1)
 
2849
        # End of Avahi example code
3446
2850
        
3447
 
        GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3448
 
                          lambda *args, **kwargs:
3449
 
                          (tcp_server.handle_request
3450
 
                           (*args[2:], **kwargs) or True))
 
2851
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
 
2852
                             lambda *args, **kwargs:
 
2853
                             (tcp_server.handle_request
 
2854
                              (*args[2:], **kwargs) or True))
3451
2855
        
3452
2856
        logger.debug("Starting main loop")
3453
2857
        main_loop.run()
3463
2867
    # Must run before the D-Bus bus name gets deregistered
3464
2868
    cleanup()
3465
2869
 
3466
 
 
3467
2870
if __name__ == '__main__':
3468
2871
    main()