/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: 2012-01-08 10:19:33 UTC
  • Revision ID: teddy@recompile.se-20120108101933-xbtodqgepxax8hn1
Tags: version-1.5.2-1
* Makefile (version): Changed to "1.5.2".
* NEWS (Version 1.5.2): New entry.
* debian/changelog (1.5.2-1): - '' -

Show diffs side-by-side

added added

removed removed

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