/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

Reorder TODO entries

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