/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

* plugins.d/mandos-client.c (runnable_hook): Bug fix: stat using the
                                             full path.
  (mail): Take new "--network-hook-dir" option.

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