/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: 2016-03-23 07:11:22 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 343.
  • Revision ID: teddy@recompile.se-20160323071122-55srtjdizr21rr7f
Use HTTPS in home page links

Since we have a real certificate now, change all links to the home
page to use HTTPS.

* README: Use HTTPS in home page links
* debian/control (Source: mandos/Homepage): - '' -
* debian/copyright (Source): - '' -
* intro.xml (SEE ALSO): - '' -
* mandos.lsm (Primary-site): - '' -

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