/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-07-20 04:03:32 UTC
  • Revision ID: teddy@recompile.se-20150720040332-hw6s7nh14ju259z3
Update copyright year.

* debian/copyright (Copyright): Update copyright year.
* intro.xml (COPYRIGHT): - '' -
* mandos-clients.conf.xml (COPYRIGHT): - '' -
* mandos-ctl.xml (COPYRIGHT): - '' -
* mandos-keygen.xml (COPYRIGHT): - '' -
* mandos-monitor.xml (COPYRIGHT): - '' -
* mandos.conf.xml (COPYRIGHT): - '' -
* mandos.xml (COPYRIGHT): - '' -
* plugin-runner.c: - '' -
* plugin-runner.xml (COPYRIGHT): - '' -
* plugins.d/askpass-fifo.c: - '' -
* plugins.d/askpass-fifo.xml (COPYRIGHT): - '' -
* plugins.d/mandos-client.xml (COPYRIGHT): - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/password-prompt.xml (COPYRIGHT): - '' -
* plugins.d/plymouth.c: - '' -
* plugins.d/plymouth.xml (COPYRIGHT): - '' -
* plugins.d/splashy.c: - '' -
* plugins.d/splashy.xml (COPYRIGHT): - '' -
* plugins.d/usplash.c: - '' -
* plugins.d/usplash.xml (COPYRIGHT): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python
 
1
#!/usr/bin/python2.7
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2015 Teddy Hogeborn
 
15
# Copyright © 2008-2015 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
 
import SocketServer as socketserver
 
37
from future_builtins import *
 
38
 
 
39
try:
 
40
    import SocketServer as socketserver
 
41
except ImportError:
 
42
    import socketserver
38
43
import socket
39
44
import argparse
40
45
import datetime
45
50
import gnutls.library.functions
46
51
import gnutls.library.constants
47
52
import gnutls.library.types
48
 
import ConfigParser as configparser
 
53
try:
 
54
    import ConfigParser as configparser
 
55
except ImportError:
 
56
    import configparser
49
57
import sys
50
58
import re
51
59
import os
60
68
import struct
61
69
import fcntl
62
70
import functools
63
 
import cPickle as pickle
 
71
try:
 
72
    import cPickle as pickle
 
73
except ImportError:
 
74
    import pickle
64
75
import multiprocessing
65
76
import types
66
 
import hashlib
 
77
import binascii
 
78
import tempfile
 
79
import itertools
 
80
import collections
 
81
import codecs
67
82
 
68
83
import dbus
69
84
import dbus.service
70
 
import gobject
 
85
try:
 
86
    import gobject
 
87
except ImportError:
 
88
    from gi.repository import GObject as gobject
71
89
import avahi
72
90
from dbus.mainloop.glib import DBusGMainLoop
73
91
import ctypes
74
92
import ctypes.util
75
93
import xml.dom.minidom
76
94
import inspect
77
 
import Crypto.Cipher.AES
78
95
 
79
96
try:
80
97
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
84
101
    except ImportError:
85
102
        SO_BINDTODEVICE = None
86
103
 
87
 
 
88
 
version = "1.4.1"
89
 
 
90
 
stored_state_path = "/var/lib/mandos/clients.pickle"
91
 
 
92
 
#logger = logging.getLogger('mandos')
93
 
logger = logging.Logger('mandos')
94
 
syslogger = (logging.handlers.SysLogHandler
95
 
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
96
 
              address = str("/dev/log")))
97
 
syslogger.setFormatter(logging.Formatter
98
 
                       ('Mandos [%(process)d]: %(levelname)s:'
99
 
                        ' %(message)s'))
100
 
logger.addHandler(syslogger)
101
 
 
102
 
console = logging.StreamHandler()
103
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
104
 
                                       ' %(levelname)s:'
105
 
                                       ' %(message)s'))
106
 
logger.addHandler(console)
 
104
if sys.version_info.major == 2:
 
105
    str = unicode
 
106
 
 
107
version = "1.6.9"
 
108
stored_state_file = "clients.pickle"
 
109
 
 
110
logger = logging.getLogger()
 
111
syslogger = None
 
112
 
 
113
try:
 
114
    if_nametoindex = ctypes.cdll.LoadLibrary(
 
115
        ctypes.util.find_library("c")).if_nametoindex
 
116
except (OSError, AttributeError):
 
117
    
 
118
    def if_nametoindex(interface):
 
119
        "Get an interface index the hard way, i.e. using fcntl()"
 
120
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
121
        with contextlib.closing(socket.socket()) as s:
 
122
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
123
                                struct.pack(b"16s16x", interface))
 
124
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
125
        return interface_index
 
126
 
 
127
 
 
128
def initlogger(debug, level=logging.WARNING):
 
129
    """init logger and add loglevel"""
 
130
    
 
131
    global syslogger
 
132
    syslogger = (logging.handlers.SysLogHandler(
 
133
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
134
        address = "/dev/log"))
 
135
    syslogger.setFormatter(logging.Formatter
 
136
                           ('Mandos [%(process)d]: %(levelname)s:'
 
137
                            ' %(message)s'))
 
138
    logger.addHandler(syslogger)
 
139
    
 
140
    if debug:
 
141
        console = logging.StreamHandler()
 
142
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
143
                                               ' [%(process)d]:'
 
144
                                               ' %(levelname)s:'
 
145
                                               ' %(message)s'))
 
146
        logger.addHandler(console)
 
147
    logger.setLevel(level)
 
148
 
 
149
 
 
150
class PGPError(Exception):
 
151
    """Exception if encryption/decryption fails"""
 
152
    pass
 
153
 
 
154
 
 
155
class PGPEngine(object):
 
156
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
157
    
 
158
    def __init__(self):
 
159
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
160
        self.gnupgargs = ['--batch',
 
161
                          '--home', self.tempdir,
 
162
                          '--force-mdc',
 
163
                          '--quiet',
 
164
                          '--no-use-agent']
 
165
    
 
166
    def __enter__(self):
 
167
        return self
 
168
    
 
169
    def __exit__(self, exc_type, exc_value, traceback):
 
170
        self._cleanup()
 
171
        return False
 
172
    
 
173
    def __del__(self):
 
174
        self._cleanup()
 
175
    
 
176
    def _cleanup(self):
 
177
        if self.tempdir is not None:
 
178
            # Delete contents of tempdir
 
179
            for root, dirs, files in os.walk(self.tempdir,
 
180
                                             topdown = False):
 
181
                for filename in files:
 
182
                    os.remove(os.path.join(root, filename))
 
183
                for dirname in dirs:
 
184
                    os.rmdir(os.path.join(root, dirname))
 
185
            # Remove tempdir
 
186
            os.rmdir(self.tempdir)
 
187
            self.tempdir = None
 
188
    
 
189
    def password_encode(self, password):
 
190
        # Passphrase can not be empty and can not contain newlines or
 
191
        # NUL bytes.  So we prefix it and hex encode it.
 
192
        encoded = b"mandos" + binascii.hexlify(password)
 
193
        if len(encoded) > 2048:
 
194
            # GnuPG can't handle long passwords, so encode differently
 
195
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
196
                       .replace(b"\n", b"\\n")
 
197
                       .replace(b"\0", b"\\x00"))
 
198
        return encoded
 
199
    
 
200
    def encrypt(self, data, password):
 
201
        passphrase = self.password_encode(password)
 
202
        with tempfile.NamedTemporaryFile(
 
203
                dir=self.tempdir) as passfile:
 
204
            passfile.write(passphrase)
 
205
            passfile.flush()
 
206
            proc = subprocess.Popen(['gpg', '--symmetric',
 
207
                                     '--passphrase-file',
 
208
                                     passfile.name]
 
209
                                    + self.gnupgargs,
 
210
                                    stdin = subprocess.PIPE,
 
211
                                    stdout = subprocess.PIPE,
 
212
                                    stderr = subprocess.PIPE)
 
213
            ciphertext, err = proc.communicate(input = data)
 
214
        if proc.returncode != 0:
 
215
            raise PGPError(err)
 
216
        return ciphertext
 
217
    
 
218
    def decrypt(self, data, password):
 
219
        passphrase = self.password_encode(password)
 
220
        with tempfile.NamedTemporaryFile(
 
221
                dir = self.tempdir) as passfile:
 
222
            passfile.write(passphrase)
 
223
            passfile.flush()
 
224
            proc = subprocess.Popen(['gpg', '--decrypt',
 
225
                                     '--passphrase-file',
 
226
                                     passfile.name]
 
227
                                    + self.gnupgargs,
 
228
                                    stdin = subprocess.PIPE,
 
229
                                    stdout = subprocess.PIPE,
 
230
                                    stderr = subprocess.PIPE)
 
231
            decrypted_plaintext, err = proc.communicate(input = data)
 
232
        if proc.returncode != 0:
 
233
            raise PGPError(err)
 
234
        return decrypted_plaintext
 
235
 
107
236
 
108
237
class AvahiError(Exception):
109
238
    def __init__(self, value, *args, **kwargs):
110
239
        self.value = value
111
 
        super(AvahiError, self).__init__(value, *args, **kwargs)
112
 
    def __unicode__(self):
113
 
        return unicode(repr(self.value))
 
240
        return super(AvahiError, self).__init__(value, *args,
 
241
                                                **kwargs)
 
242
 
114
243
 
115
244
class AvahiServiceError(AvahiError):
116
245
    pass
117
246
 
 
247
 
118
248
class AvahiGroupError(AvahiError):
119
249
    pass
120
250
 
127
257
               Used to optionally bind to the specified interface.
128
258
    name: string; Example: 'Mandos'
129
259
    type: string; Example: '_mandos._tcp'.
130
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
 
260
     See <https://www.iana.org/assignments/service-names-port-numbers>
131
261
    port: integer; what port to announce
132
262
    TXT: list of strings; TXT record for the service
133
263
    domain: string; Domain to publish on, default to .local if empty.
139
269
    server: D-Bus Server
140
270
    bus: dbus.SystemBus()
141
271
    """
142
 
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
143
 
                 servicetype = None, port = None, TXT = None,
144
 
                 domain = "", host = "", max_renames = 32768,
145
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
272
    
 
273
    def __init__(self,
 
274
                 interface = avahi.IF_UNSPEC,
 
275
                 name = None,
 
276
                 servicetype = None,
 
277
                 port = None,
 
278
                 TXT = None,
 
279
                 domain = "",
 
280
                 host = "",
 
281
                 max_renames = 32768,
 
282
                 protocol = avahi.PROTO_UNSPEC,
 
283
                 bus = None):
146
284
        self.interface = interface
147
285
        self.name = name
148
286
        self.type = servicetype
157
295
        self.server = None
158
296
        self.bus = bus
159
297
        self.entry_group_state_changed_match = None
160
 
    def rename(self):
 
298
    
 
299
    def rename(self, remove=True):
161
300
        """Derived from the Avahi example code"""
162
301
        if self.rename_count >= self.max_renames:
163
302
            logger.critical("No suitable Zeroconf service name found"
164
303
                            " after %i retries, exiting.",
165
304
                            self.rename_count)
166
305
            raise AvahiServiceError("Too many renames")
167
 
        self.name = unicode(self.server
168
 
                            .GetAlternativeServiceName(self.name))
 
306
        self.name = str(
 
307
            self.server.GetAlternativeServiceName(self.name))
 
308
        self.rename_count += 1
169
309
        logger.info("Changing Zeroconf service name to %r ...",
170
310
                    self.name)
171
 
        syslogger.setFormatter(logging.Formatter
172
 
                               ('Mandos (%s) [%%(process)d]:'
173
 
                                ' %%(levelname)s: %%(message)s'
174
 
                                % self.name))
175
 
        self.remove()
 
311
        if remove:
 
312
            self.remove()
176
313
        try:
177
314
            self.add()
178
315
        except dbus.exceptions.DBusException as error:
179
 
            logger.critical("DBusException: %s", error)
180
 
            self.cleanup()
181
 
            os._exit(1)
182
 
        self.rename_count += 1
 
316
            if (error.get_dbus_name()
 
317
                == "org.freedesktop.Avahi.CollisionError"):
 
318
                logger.info("Local Zeroconf service name collision.")
 
319
                return self.rename(remove=False)
 
320
            else:
 
321
                logger.critical("D-Bus Exception", exc_info=error)
 
322
                self.cleanup()
 
323
                os._exit(1)
 
324
    
183
325
    def remove(self):
184
326
        """Derived from the Avahi example code"""
185
327
        if self.entry_group_state_changed_match is not None:
187
329
            self.entry_group_state_changed_match = None
188
330
        if self.group is not None:
189
331
            self.group.Reset()
 
332
    
190
333
    def add(self):
191
334
        """Derived from the Avahi example code"""
192
335
        self.remove()
197
340
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
198
341
        self.entry_group_state_changed_match = (
199
342
            self.group.connect_to_signal(
200
 
                'StateChanged', self .entry_group_state_changed))
 
343
                'StateChanged', self.entry_group_state_changed))
201
344
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
202
345
                     self.name, self.type)
203
346
        self.group.AddService(
209
352
            dbus.UInt16(self.port),
210
353
            avahi.string_array_to_txt_array(self.TXT))
211
354
        self.group.Commit()
 
355
    
212
356
    def entry_group_state_changed(self, state, error):
213
357
        """Derived from the Avahi example code"""
214
358
        logger.debug("Avahi entry group state change: %i", state)
220
364
            self.rename()
221
365
        elif state == avahi.ENTRY_GROUP_FAILURE:
222
366
            logger.critical("Avahi: Error in group state changed %s",
223
 
                            unicode(error))
224
 
            raise AvahiGroupError("State changed: %s"
225
 
                                  % unicode(error))
 
367
                            str(error))
 
368
            raise AvahiGroupError("State changed: {!s}".format(error))
 
369
    
226
370
    def cleanup(self):
227
371
        """Derived from the Avahi example code"""
228
372
        if self.group is not None:
229
373
            try:
230
374
                self.group.Free()
231
375
            except (dbus.exceptions.UnknownMethodException,
232
 
                    dbus.exceptions.DBusException) as e:
 
376
                    dbus.exceptions.DBusException):
233
377
                pass
234
378
            self.group = None
235
379
        self.remove()
 
380
    
236
381
    def server_state_changed(self, state, error=None):
237
382
        """Derived from the Avahi example code"""
238
383
        logger.debug("Avahi server state change: %i", state)
239
 
        bad_states = { avahi.SERVER_INVALID:
240
 
                           "Zeroconf server invalid",
241
 
                       avahi.SERVER_REGISTERING: None,
242
 
                       avahi.SERVER_COLLISION:
243
 
                           "Zeroconf server name collision",
244
 
                       avahi.SERVER_FAILURE:
245
 
                           "Zeroconf server failure" }
 
384
        bad_states = {
 
385
            avahi.SERVER_INVALID: "Zeroconf server invalid",
 
386
            avahi.SERVER_REGISTERING: None,
 
387
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
 
388
            avahi.SERVER_FAILURE: "Zeroconf server failure",
 
389
        }
246
390
        if state in bad_states:
247
391
            if bad_states[state] is not None:
248
392
                if error is None:
251
395
                    logger.error(bad_states[state] + ": %r", error)
252
396
            self.cleanup()
253
397
        elif state == avahi.SERVER_RUNNING:
254
 
            self.add()
 
398
            try:
 
399
                self.add()
 
400
            except dbus.exceptions.DBusException as error:
 
401
                if (error.get_dbus_name()
 
402
                    == "org.freedesktop.Avahi.CollisionError"):
 
403
                    logger.info("Local Zeroconf service name"
 
404
                                " collision.")
 
405
                    return self.rename(remove=False)
 
406
                else:
 
407
                    logger.critical("D-Bus Exception", exc_info=error)
 
408
                    self.cleanup()
 
409
                    os._exit(1)
255
410
        else:
256
411
            if error is None:
257
412
                logger.debug("Unknown state: %r", state)
258
413
            else:
259
414
                logger.debug("Unknown state: %r: %r", state, error)
 
415
    
260
416
    def activate(self):
261
417
        """Derived from the Avahi example code"""
262
418
        if self.server is None:
266
422
                                    follow_name_owner_changes=True),
267
423
                avahi.DBUS_INTERFACE_SERVER)
268
424
        self.server.connect_to_signal("StateChanged",
269
 
                                 self.server_state_changed)
 
425
                                      self.server_state_changed)
270
426
        self.server_state_changed(self.server.GetState())
271
427
 
272
428
 
273
 
def _timedelta_to_milliseconds(td):
274
 
    "Convert a datetime.timedelta() to milliseconds"
275
 
    return ((td.days * 24 * 60 * 60 * 1000)
276
 
            + (td.seconds * 1000)
277
 
            + (td.microseconds // 1000))
278
 
        
 
429
class AvahiServiceToSyslog(AvahiService):
 
430
    def rename(self, *args, **kwargs):
 
431
        """Add the new name to the syslog messages"""
 
432
        ret = AvahiService.rename(self, *args, **kwargs)
 
433
        syslogger.setFormatter(logging.Formatter(
 
434
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
 
435
            .format(self.name)))
 
436
        return ret
 
437
 
 
438
def call_pipe(connection,       # : multiprocessing.Connection
 
439
              func, *args, **kwargs):
 
440
    """This function is meant to be called by multiprocessing.Process
 
441
    
 
442
    This function runs func(*args, **kwargs), and writes the resulting
 
443
    return value on the provided multiprocessing.Connection.
 
444
    """
 
445
    connection.send(func(*args, **kwargs))
 
446
    connection.close()
 
447
 
279
448
class Client(object):
280
449
    """A representation of a client host served by this server.
281
450
    
282
451
    Attributes:
283
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
452
    approved:   bool(); 'None' if not yet approved/disapproved
284
453
    approval_delay: datetime.timedelta(); Time to wait for approval
285
454
    approval_duration: datetime.timedelta(); Duration of one approval
286
455
    checker:    subprocess.Popen(); a running checker process used
304
473
    interval:   datetime.timedelta(); How often to start a new checker
305
474
    last_approval_request: datetime.datetime(); (UTC) or None
306
475
    last_checked_ok: datetime.datetime(); (UTC) or None
307
 
    Last_checker_status: integer between 0 and 255 reflecting exit status
308
 
                         of last checker. -1 reflect crashed checker.
309
 
    last_enabled: datetime.datetime(); (UTC)
 
476
    last_checker_status: integer between 0 and 255 reflecting exit
 
477
                         status of last checker. -1 reflects crashed
 
478
                         checker, -2 means no checker completed yet.
 
479
    last_checker_signal: The signal which killed the last checker, if
 
480
                         last_checker_status is -1
 
481
    last_enabled: datetime.datetime(); (UTC) or None
310
482
    name:       string; from the config file, used in log messages and
311
483
                        D-Bus identifiers
312
484
    secret:     bytestring; sent verbatim (over TLS) to client
313
485
    timeout:    datetime.timedelta(); How long from last_checked_ok
314
486
                                      until this client is disabled
315
 
    extended_timeout:   extra long timeout when password has been sent
 
487
    extended_timeout:   extra long timeout when secret has been sent
316
488
    runtime_expansions: Allowed attributes for runtime expansion.
317
489
    expires:    datetime.datetime(); time (UTC) when a client will be
318
490
                disabled, or None
 
491
    server_settings: The server_settings dict from main()
319
492
    """
320
493
    
321
494
    runtime_expansions = ("approval_delay", "approval_duration",
322
 
                          "created", "enabled", "fingerprint",
323
 
                          "host", "interval", "last_checked_ok",
 
495
                          "created", "enabled", "expires",
 
496
                          "fingerprint", "host", "interval",
 
497
                          "last_approval_request", "last_checked_ok",
324
498
                          "last_enabled", "name", "timeout")
325
 
    
326
 
    def timeout_milliseconds(self):
327
 
        "Return the 'timeout' attribute in milliseconds"
328
 
        return _timedelta_to_milliseconds(self.timeout)
329
 
    
330
 
    def extended_timeout_milliseconds(self):
331
 
        "Return the 'extended_timeout' attribute in milliseconds"
332
 
        return _timedelta_to_milliseconds(self.extended_timeout)
333
 
    
334
 
    def interval_milliseconds(self):
335
 
        "Return the 'interval' attribute in milliseconds"
336
 
        return _timedelta_to_milliseconds(self.interval)
337
 
    
338
 
    def approval_delay_milliseconds(self):
339
 
        return _timedelta_to_milliseconds(self.approval_delay)
340
 
    
341
 
    def __init__(self, name = None, config=None):
342
 
        """Note: the 'checker' key in 'config' sets the
343
 
        'checker_command' attribute and *not* the 'checker'
344
 
        attribute."""
 
499
    client_defaults = {
 
500
        "timeout": "PT5M",
 
501
        "extended_timeout": "PT15M",
 
502
        "interval": "PT2M",
 
503
        "checker": "fping -q -- %%(host)s",
 
504
        "host": "",
 
505
        "approval_delay": "PT0S",
 
506
        "approval_duration": "PT1S",
 
507
        "approved_by_default": "True",
 
508
        "enabled": "True",
 
509
    }
 
510
    
 
511
    @staticmethod
 
512
    def config_parser(config):
 
513
        """Construct a new dict of client settings of this form:
 
514
        { client_name: {setting_name: value, ...}, ...}
 
515
        with exceptions for any special settings as defined above.
 
516
        NOTE: Must be a pure function. Must return the same result
 
517
        value given the same arguments.
 
518
        """
 
519
        settings = {}
 
520
        for client_name in config.sections():
 
521
            section = dict(config.items(client_name))
 
522
            client = settings[client_name] = {}
 
523
            
 
524
            client["host"] = section["host"]
 
525
            # Reformat values from string types to Python types
 
526
            client["approved_by_default"] = config.getboolean(
 
527
                client_name, "approved_by_default")
 
528
            client["enabled"] = config.getboolean(client_name,
 
529
                                                  "enabled")
 
530
            
 
531
            # Uppercase and remove spaces from fingerprint for later
 
532
            # comparison purposes with return value from the
 
533
            # fingerprint() function
 
534
            client["fingerprint"] = (section["fingerprint"].upper()
 
535
                                     .replace(" ", ""))
 
536
            if "secret" in section:
 
537
                client["secret"] = section["secret"].decode("base64")
 
538
            elif "secfile" in section:
 
539
                with open(os.path.expanduser(os.path.expandvars
 
540
                                             (section["secfile"])),
 
541
                          "rb") as secfile:
 
542
                    client["secret"] = secfile.read()
 
543
            else:
 
544
                raise TypeError("No secret or secfile for section {}"
 
545
                                .format(section))
 
546
            client["timeout"] = string_to_delta(section["timeout"])
 
547
            client["extended_timeout"] = string_to_delta(
 
548
                section["extended_timeout"])
 
549
            client["interval"] = string_to_delta(section["interval"])
 
550
            client["approval_delay"] = string_to_delta(
 
551
                section["approval_delay"])
 
552
            client["approval_duration"] = string_to_delta(
 
553
                section["approval_duration"])
 
554
            client["checker_command"] = section["checker"]
 
555
            client["last_approval_request"] = None
 
556
            client["last_checked_ok"] = None
 
557
            client["last_checker_status"] = -2
 
558
        
 
559
        return settings
 
560
    
 
561
    def __init__(self, settings, name = None, server_settings=None):
345
562
        self.name = name
346
 
        if config is None:
347
 
            config = {}
 
563
        if server_settings is None:
 
564
            server_settings = {}
 
565
        self.server_settings = server_settings
 
566
        # adding all client settings
 
567
        for setting, value in settings.items():
 
568
            setattr(self, setting, value)
 
569
        
 
570
        if self.enabled:
 
571
            if not hasattr(self, "last_enabled"):
 
572
                self.last_enabled = datetime.datetime.utcnow()
 
573
            if not hasattr(self, "expires"):
 
574
                self.expires = (datetime.datetime.utcnow()
 
575
                                + self.timeout)
 
576
        else:
 
577
            self.last_enabled = None
 
578
            self.expires = None
 
579
        
348
580
        logger.debug("Creating client %r", self.name)
349
 
        # Uppercase and remove spaces from fingerprint for later
350
 
        # comparison purposes with return value from the fingerprint()
351
 
        # function
352
 
        self.fingerprint = (config["fingerprint"].upper()
353
 
                            .replace(" ", ""))
354
581
        logger.debug("  Fingerprint: %s", self.fingerprint)
355
 
        if "secret" in config:
356
 
            self.secret = config["secret"].decode("base64")
357
 
        elif "secfile" in config:
358
 
            with open(os.path.expanduser(os.path.expandvars
359
 
                                         (config["secfile"])),
360
 
                      "rb") as secfile:
361
 
                self.secret = secfile.read()
362
 
        else:
363
 
            raise TypeError("No secret or secfile for client %s"
364
 
                            % self.name)
365
 
        self.host = config.get("host", "")
366
 
        self.created = datetime.datetime.utcnow()
367
 
        self.enabled = True
368
 
        self.last_approval_request = None
369
 
        self.last_enabled = datetime.datetime.utcnow()
370
 
        self.last_checked_ok = None
371
 
        self.last_checker_status = 0
372
 
        self.timeout = string_to_delta(config["timeout"])
373
 
        self.extended_timeout = string_to_delta(config
374
 
                                                ["extended_timeout"])
375
 
        self.interval = string_to_delta(config["interval"])
 
582
        self.created = settings.get("created",
 
583
                                    datetime.datetime.utcnow())
 
584
        
 
585
        # attributes specific for this server instance
376
586
        self.checker = None
377
587
        self.checker_initiator_tag = None
378
588
        self.disable_initiator_tag = None
379
 
        self.expires = datetime.datetime.utcnow() + self.timeout
380
589
        self.checker_callback_tag = None
381
 
        self.checker_command = config["checker"]
382
590
        self.current_checker_command = None
383
 
        self._approved = None
384
 
        self.approved_by_default = config.get("approved_by_default",
385
 
                                              True)
 
591
        self.approved = None
386
592
        self.approvals_pending = 0
387
 
        self.approval_delay = string_to_delta(
388
 
            config["approval_delay"])
389
 
        self.approval_duration = string_to_delta(
390
 
            config["approval_duration"])
391
 
        self.changedstate = (multiprocessing_manager
392
 
                             .Condition(multiprocessing_manager
393
 
                                        .Lock()))
394
 
        self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
 
593
        self.changedstate = multiprocessing_manager.Condition(
 
594
            multiprocessing_manager.Lock())
 
595
        self.client_structure = [attr
 
596
                                 for attr in self.__dict__.iterkeys()
 
597
                                 if not attr.startswith("_")]
395
598
        self.client_structure.append("client_structure")
396
 
 
397
 
 
398
 
        for name, t in inspect.getmembers(type(self),
399
 
                                          lambda obj: isinstance(obj, property)):
 
599
        
 
600
        for name, t in inspect.getmembers(
 
601
                type(self), lambda obj: isinstance(obj, property)):
400
602
            if not name.startswith("_"):
401
603
                self.client_structure.append(name)
402
604
    
403
 
    
 
605
    # Send notice to process children that client state has changed
404
606
    def send_changedstate(self):
405
 
        self.changedstate.acquire()
406
 
        self.changedstate.notify_all()
407
 
        self.changedstate.release()
 
607
        with self.changedstate:
 
608
            self.changedstate.notify_all()
408
609
    
409
610
    def enable(self):
410
611
        """Start this client's checker and timeout hooks"""
411
612
        if getattr(self, "enabled", False):
412
613
            # Already enabled
413
614
            return
414
 
        self.send_changedstate()
415
615
        self.expires = datetime.datetime.utcnow() + self.timeout
416
616
        self.enabled = True
417
617
        self.last_enabled = datetime.datetime.utcnow()
418
618
        self.init_checker()
 
619
        self.send_changedstate()
419
620
    
420
621
    def disable(self, quiet=True):
421
622
        """Disable this client."""
422
623
        if not getattr(self, "enabled", False):
423
624
            return False
424
625
        if not quiet:
425
 
            self.send_changedstate()
426
 
        if not quiet:
427
626
            logger.info("Disabling client %s", self.name)
428
 
        if getattr(self, "disable_initiator_tag", False):
 
627
        if getattr(self, "disable_initiator_tag", None) is not None:
429
628
            gobject.source_remove(self.disable_initiator_tag)
430
629
            self.disable_initiator_tag = None
431
630
        self.expires = None
432
 
        if getattr(self, "checker_initiator_tag", False):
 
631
        if getattr(self, "checker_initiator_tag", None) is not None:
433
632
            gobject.source_remove(self.checker_initiator_tag)
434
633
            self.checker_initiator_tag = None
435
634
        self.stop_checker()
436
635
        self.enabled = False
 
636
        if not quiet:
 
637
            self.send_changedstate()
437
638
        # Do not run this again if called by a gobject.timeout_add
438
639
        return False
439
640
    
440
641
    def __del__(self):
441
642
        self.disable()
442
 
 
 
643
    
443
644
    def init_checker(self):
444
645
        # Schedule a new checker to be started an 'interval' from now,
445
646
        # and every interval from then on.
446
 
        self.checker_initiator_tag = (gobject.timeout_add
447
 
                                      (self.interval_milliseconds(),
448
 
                                       self.start_checker))
 
647
        if self.checker_initiator_tag is not None:
 
648
            gobject.source_remove(self.checker_initiator_tag)
 
649
        self.checker_initiator_tag = gobject.timeout_add(
 
650
            int(self.interval.total_seconds() * 1000),
 
651
            self.start_checker)
449
652
        # Schedule a disable() when 'timeout' has passed
450
 
        self.disable_initiator_tag = (gobject.timeout_add
451
 
                                   (self.timeout_milliseconds(),
452
 
                                    self.disable))
 
653
        if self.disable_initiator_tag is not None:
 
654
            gobject.source_remove(self.disable_initiator_tag)
 
655
        self.disable_initiator_tag = gobject.timeout_add(
 
656
            int(self.timeout.total_seconds() * 1000), self.disable)
453
657
        # Also start a new checker *right now*.
454
658
        self.start_checker()
455
 
 
456
 
        
457
 
    def checker_callback(self, pid, condition, command):
 
659
    
 
660
    def checker_callback(self, source, condition, connection,
 
661
                         command):
458
662
        """The checker has completed, so take appropriate actions."""
459
663
        self.checker_callback_tag = None
460
664
        self.checker = None
461
 
        if os.WIFEXITED(condition):
462
 
            self.last_checker_status =  os.WEXITSTATUS(condition)
 
665
        # Read return code from connection (see call_pipe)
 
666
        returncode = connection.recv()
 
667
        connection.close()
 
668
        
 
669
        if returncode >= 0:
 
670
            self.last_checker_status = returncode
 
671
            self.last_checker_signal = None
463
672
            if self.last_checker_status == 0:
464
673
                logger.info("Checker for %(name)s succeeded",
465
674
                            vars(self))
466
675
                self.checked_ok()
467
676
            else:
468
 
                logger.info("Checker for %(name)s failed",
469
 
                            vars(self))
 
677
                logger.info("Checker for %(name)s failed", vars(self))
470
678
        else:
471
679
            self.last_checker_status = -1
 
680
            self.last_checker_signal = -returncode
472
681
            logger.warning("Checker for %(name)s crashed?",
473
682
                           vars(self))
474
 
    
475
 
    def checked_ok(self, timeout=None):
476
 
        """Bump up the timeout for this client.
477
 
        
478
 
        This should only be called when the client has been seen,
479
 
        alive and well.
480
 
        """
 
683
        return False
 
684
    
 
685
    def checked_ok(self):
 
686
        """Assert that the client has been seen, alive and well."""
 
687
        self.last_checked_ok = datetime.datetime.utcnow()
 
688
        self.last_checker_status = 0
 
689
        self.last_checker_signal = None
 
690
        self.bump_timeout()
 
691
    
 
692
    def bump_timeout(self, timeout=None):
 
693
        """Bump up the timeout for this client."""
481
694
        if timeout is None:
482
695
            timeout = self.timeout
483
 
        self.last_checked_ok = datetime.datetime.utcnow()
484
696
        if self.disable_initiator_tag is not None:
485
697
            gobject.source_remove(self.disable_initiator_tag)
 
698
            self.disable_initiator_tag = None
486
699
        if getattr(self, "enabled", False):
487
 
            self.disable_initiator_tag = (gobject.timeout_add
488
 
                                          (_timedelta_to_milliseconds
489
 
                                           (timeout), self.disable))
 
700
            self.disable_initiator_tag = gobject.timeout_add(
 
701
                int(timeout.total_seconds() * 1000), self.disable)
490
702
            self.expires = datetime.datetime.utcnow() + timeout
491
703
    
492
704
    def need_approval(self):
498
710
        If a checker already exists, leave it running and do
499
711
        nothing."""
500
712
        # The reason for not killing a running checker is that if we
501
 
        # did that, then if a checker (for some reason) started
502
 
        # running slowly and taking more than 'interval' time, the
503
 
        # client would inevitably timeout, since no checker would get
504
 
        # a chance to run to completion.  If we instead leave running
 
713
        # did that, and if a checker (for some reason) started running
 
714
        # slowly and taking more than 'interval' time, then the client
 
715
        # would inevitably timeout, since no checker would get a
 
716
        # chance to run to completion.  If we instead leave running
505
717
        # checkers alone, the checker would have to take more time
506
718
        # than 'timeout' for the client to be disabled, which is as it
507
719
        # should be.
508
720
        
509
 
        # If a checker exists, make sure it is not a zombie
510
 
        try:
511
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
512
 
        except (AttributeError, OSError) as error:
513
 
            if (isinstance(error, OSError)
514
 
                and error.errno != errno.ECHILD):
515
 
                raise error
516
 
        else:
517
 
            if pid:
518
 
                logger.warning("Checker was a zombie")
519
 
                gobject.source_remove(self.checker_callback_tag)
520
 
                self.checker_callback(pid, status,
521
 
                                      self.current_checker_command)
 
721
        if self.checker is not None and not self.checker.is_alive():
 
722
            logger.warning("Checker was not alive; joining")
 
723
            self.checker.join()
 
724
            self.checker = None
522
725
        # Start a new checker if needed
523
726
        if self.checker is None:
 
727
            # Escape attributes for the shell
 
728
            escaped_attrs = {
 
729
                attr: re.escape(str(getattr(self, attr)))
 
730
                for attr in self.runtime_expansions }
524
731
            try:
525
 
                # In case checker_command has exactly one % operator
526
 
                command = self.checker_command % self.host
527
 
            except TypeError:
528
 
                # Escape attributes for the shell
529
 
                escaped_attrs = dict(
530
 
                    (attr,
531
 
                     re.escape(unicode(str(getattr(self, attr, "")),
532
 
                                       errors=
533
 
                                       'replace')))
534
 
                    for attr in
535
 
                    self.runtime_expansions)
536
 
                
537
 
                try:
538
 
                    command = self.checker_command % escaped_attrs
539
 
                except TypeError as error:
540
 
                    logger.error('Could not format string "%s":'
541
 
                                 ' %s', self.checker_command, error)
542
 
                    return True # Try again later
 
732
                command = self.checker_command % escaped_attrs
 
733
            except TypeError as error:
 
734
                logger.error('Could not format string "%s"',
 
735
                             self.checker_command,
 
736
                             exc_info=error)
 
737
                return True     # Try again later
543
738
            self.current_checker_command = command
544
 
            try:
545
 
                logger.info("Starting checker %r for %s",
546
 
                            command, self.name)
547
 
                # We don't need to redirect stdout and stderr, since
548
 
                # in normal mode, that is already done by daemon(),
549
 
                # and in debug mode we don't want to.  (Stdin is
550
 
                # always replaced by /dev/null.)
551
 
                self.checker = subprocess.Popen(command,
552
 
                                                close_fds=True,
553
 
                                                shell=True, cwd="/")
554
 
                self.checker_callback_tag = (gobject.child_watch_add
555
 
                                             (self.checker.pid,
556
 
                                              self.checker_callback,
557
 
                                              data=command))
558
 
                # The checker may have completed before the gobject
559
 
                # watch was added.  Check for this.
560
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
561
 
                if pid:
562
 
                    gobject.source_remove(self.checker_callback_tag)
563
 
                    self.checker_callback(pid, status, command)
564
 
            except OSError as error:
565
 
                logger.error("Failed to start subprocess: %s",
566
 
                             error)
 
739
            logger.info("Starting checker %r for %s", command,
 
740
                        self.name)
 
741
            # We don't need to redirect stdout and stderr, since
 
742
            # in normal mode, that is already done by daemon(),
 
743
            # and in debug mode we don't want to.  (Stdin is
 
744
            # always replaced by /dev/null.)
 
745
            # The exception is when not debugging but nevertheless
 
746
            # running in the foreground; use the previously
 
747
            # created wnull.
 
748
            popen_args = { "close_fds": True,
 
749
                           "shell": True,
 
750
                           "cwd": "/" }
 
751
            if (not self.server_settings["debug"]
 
752
                and self.server_settings["foreground"]):
 
753
                popen_args.update({"stdout": wnull,
 
754
                                   "stderr": wnull })
 
755
            pipe = multiprocessing.Pipe(duplex = False)
 
756
            self.checker = multiprocessing.Process(
 
757
                target = call_pipe,
 
758
                args = (pipe[1], subprocess.call, command),
 
759
                kwargs = popen_args)
 
760
            self.checker.start()
 
761
            self.checker_callback_tag = gobject.io_add_watch(
 
762
                pipe[0].fileno(), gobject.IO_IN,
 
763
                self.checker_callback, pipe[0], command)
567
764
        # Re-run this periodically if run by gobject.timeout_add
568
765
        return True
569
766
    
575
772
        if getattr(self, "checker", None) is None:
576
773
            return
577
774
        logger.debug("Stopping checker for %(name)s", vars(self))
578
 
        try:
579
 
            os.kill(self.checker.pid, signal.SIGTERM)
580
 
            #time.sleep(0.5)
581
 
            #if self.checker.poll() is None:
582
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
583
 
        except OSError as error:
584
 
            if error.errno != errno.ESRCH: # No such process
585
 
                raise
 
775
        self.checker.terminate()
586
776
        self.checker = None
587
777
 
588
 
    # Encrypts a client secret and stores it in a varible encrypted_secret
589
 
    def encrypt_secret(self, key):
590
 
        # Encryption-key need to be specific size, so we hash inputed key
591
 
        hasheng = hashlib.sha256()
592
 
        hasheng.update(key)
593
 
        encryptionkey = hasheng.digest()
594
 
 
595
 
        # Create validation hash so we know at decryption if it was sucessful
596
 
        hasheng = hashlib.sha256()
597
 
        hasheng.update(self.secret)
598
 
        validationhash = hasheng.digest()
599
 
 
600
 
        # Encrypt secret
601
 
        iv = os.urandom(Crypto.Cipher.AES.block_size)
602
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
603
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
604
 
        ciphertext = ciphereng.encrypt(validationhash+self.secret)
605
 
        self.encrypted_secret = (ciphertext, iv)
606
 
 
607
 
    # Decrypt a encrypted client secret
608
 
    def decrypt_secret(self, key):
609
 
        # Decryption-key need to be specific size, so we hash inputed key
610
 
        hasheng = hashlib.sha256()
611
 
        hasheng.update(key)
612
 
        encryptionkey = hasheng.digest()
613
 
 
614
 
        # Decrypt encrypted secret
615
 
        ciphertext, iv = self.encrypted_secret
616
 
        ciphereng = Crypto.Cipher.AES.new(encryptionkey,
617
 
                                        Crypto.Cipher.AES.MODE_CFB, iv)
618
 
        plain = ciphereng.decrypt(ciphertext)
619
 
 
620
 
        # Validate decrypted secret to know if it was succesful
621
 
        hasheng = hashlib.sha256()
622
 
        validationhash = plain[:hasheng.digest_size]
623
 
        secret = plain[hasheng.digest_size:]
624
 
        hasheng.update(secret)
625
 
 
626
 
        # if validation fails, we use key as new secret. Otherwhise, we use
627
 
        # the decrypted secret
628
 
        if hasheng.digest() == validationhash:
629
 
            self.secret = secret
630
 
        else:
631
 
            self.secret = key
632
 
        del self.encrypted_secret
633
 
 
634
 
 
635
 
def dbus_service_property(dbus_interface, signature="v",
636
 
                          access="readwrite", byte_arrays=False):
 
778
 
 
779
def dbus_service_property(dbus_interface,
 
780
                          signature="v",
 
781
                          access="readwrite",
 
782
                          byte_arrays=False):
637
783
    """Decorators for marking methods of a DBusObjectWithProperties to
638
784
    become properties on the D-Bus.
639
785
    
648
794
    # "Set" method, so we fail early here:
649
795
    if byte_arrays and signature != "ay":
650
796
        raise ValueError("Byte arrays not supported for non-'ay'"
651
 
                         " signature %r" % signature)
 
797
                         " signature {!r}".format(signature))
 
798
    
652
799
    def decorator(func):
653
800
        func._dbus_is_property = True
654
801
        func._dbus_interface = dbus_interface
659
806
            func._dbus_name = func._dbus_name[:-14]
660
807
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
661
808
        return func
 
809
    
 
810
    return decorator
 
811
 
 
812
 
 
813
def dbus_interface_annotations(dbus_interface):
 
814
    """Decorator for marking functions returning interface annotations
 
815
    
 
816
    Usage:
 
817
    
 
818
    @dbus_interface_annotations("org.example.Interface")
 
819
    def _foo(self):  # Function name does not matter
 
820
        return {"org.freedesktop.DBus.Deprecated": "true",
 
821
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
822
                    "false"}
 
823
    """
 
824
    
 
825
    def decorator(func):
 
826
        func._dbus_is_interface = True
 
827
        func._dbus_interface = dbus_interface
 
828
        func._dbus_name = dbus_interface
 
829
        return func
 
830
    
 
831
    return decorator
 
832
 
 
833
 
 
834
def dbus_annotations(annotations):
 
835
    """Decorator to annotate D-Bus methods, signals or properties
 
836
    Usage:
 
837
    
 
838
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
 
839
                       "org.freedesktop.DBus.Property."
 
840
                       "EmitsChangedSignal": "false"})
 
841
    @dbus_service_property("org.example.Interface", signature="b",
 
842
                           access="r")
 
843
    def Property_dbus_property(self):
 
844
        return dbus.Boolean(False)
 
845
    """
 
846
    
 
847
    def decorator(func):
 
848
        func._dbus_annotations = annotations
 
849
        return func
 
850
    
662
851
    return decorator
663
852
 
664
853
 
665
854
class DBusPropertyException(dbus.exceptions.DBusException):
666
855
    """A base class for D-Bus property-related exceptions
667
856
    """
668
 
    def __unicode__(self):
669
 
        return unicode(str(self))
 
857
    pass
670
858
 
671
859
 
672
860
class DBusPropertyAccessException(DBusPropertyException):
690
878
    """
691
879
    
692
880
    @staticmethod
693
 
    def _is_dbus_property(obj):
694
 
        return getattr(obj, "_dbus_is_property", False)
 
881
    def _is_dbus_thing(thing):
 
882
        """Returns a function testing if an attribute is a D-Bus thing
 
883
        
 
884
        If called like _is_dbus_thing("method") it returns a function
 
885
        suitable for use as predicate to inspect.getmembers().
 
886
        """
 
887
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
888
                                   False)
695
889
    
696
 
    def _get_all_dbus_properties(self):
 
890
    def _get_all_dbus_things(self, thing):
697
891
        """Returns a generator of (name, attribute) pairs
698
892
        """
699
 
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
893
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
894
                 athing.__get__(self))
700
895
                for cls in self.__class__.__mro__
701
 
                for name, prop in
702
 
                inspect.getmembers(cls, self._is_dbus_property))
 
896
                for name, athing in
 
897
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
703
898
    
704
899
    def _get_dbus_property(self, interface_name, property_name):
705
900
        """Returns a bound method if one exists which is a D-Bus
706
901
        property with the specified name and interface.
707
902
        """
708
 
        for cls in  self.__class__.__mro__:
709
 
            for name, value in (inspect.getmembers
710
 
                                (cls, self._is_dbus_property)):
 
903
        for cls in self.__class__.__mro__:
 
904
            for name, value in inspect.getmembers(
 
905
                    cls, self._is_dbus_thing("property")):
711
906
                if (value._dbus_name == property_name
712
907
                    and value._dbus_interface == interface_name):
713
908
                    return value.__get__(self)
714
909
        
715
910
        # No such property
716
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
717
 
                                   + interface_name + "."
718
 
                                   + property_name)
 
911
        raise DBusPropertyNotFound("{}:{}.{}".format(
 
912
            self.dbus_object_path, interface_name, property_name))
719
913
    
720
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
914
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
915
                         in_signature="ss",
721
916
                         out_signature="v")
722
917
    def Get(self, interface_name, property_name):
723
918
        """Standard D-Bus property Get() method, see D-Bus standard.
741
936
            # The byte_arrays option is not supported yet on
742
937
            # signatures other than "ay".
743
938
            if prop._dbus_signature != "ay":
744
 
                raise ValueError
745
 
            value = dbus.ByteArray(''.join(unichr(byte)
746
 
                                           for byte in value))
 
939
                raise ValueError("Byte arrays not supported for non-"
 
940
                                 "'ay' signature {!r}"
 
941
                                 .format(prop._dbus_signature))
 
942
            value = dbus.ByteArray(b''.join(chr(byte)
 
943
                                            for byte in value))
747
944
        prop(value)
748
945
    
749
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
946
    @dbus.service.method(dbus.PROPERTIES_IFACE,
 
947
                         in_signature="s",
750
948
                         out_signature="a{sv}")
751
949
    def GetAll(self, interface_name):
752
950
        """Standard D-Bus property GetAll() method, see D-Bus
754
952
        
755
953
        Note: Will not include properties with access="write".
756
954
        """
757
 
        all = {}
758
 
        for name, prop in self._get_all_dbus_properties():
 
955
        properties = {}
 
956
        for name, prop in self._get_all_dbus_things("property"):
759
957
            if (interface_name
760
958
                and interface_name != prop._dbus_interface):
761
959
                # Interface non-empty but did not match
765
963
                continue
766
964
            value = prop()
767
965
            if not hasattr(value, "variant_level"):
768
 
                all[name] = value
 
966
                properties[name] = value
769
967
                continue
770
 
            all[name] = type(value)(value, variant_level=
771
 
                                    value.variant_level+1)
772
 
        return dbus.Dictionary(all, signature="sv")
 
968
            properties[name] = type(value)(
 
969
                value, variant_level = value.variant_level + 1)
 
970
        return dbus.Dictionary(properties, signature="sv")
 
971
    
 
972
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
 
973
    def PropertiesChanged(self, interface_name, changed_properties,
 
974
                          invalidated_properties):
 
975
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
 
976
        standard.
 
977
        """
 
978
        pass
773
979
    
774
980
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
775
981
                         out_signature="s",
776
982
                         path_keyword='object_path',
777
983
                         connection_keyword='connection')
778
984
    def Introspect(self, object_path, connection):
779
 
        """Standard D-Bus method, overloaded to insert property tags.
 
985
        """Overloading of standard D-Bus method.
 
986
        
 
987
        Inserts property tags and interface annotation tags.
780
988
        """
781
989
        xmlstring = dbus.service.Object.Introspect(self, object_path,
782
990
                                                   connection)
783
991
        try:
784
992
            document = xml.dom.minidom.parseString(xmlstring)
 
993
            
785
994
            def make_tag(document, name, prop):
786
995
                e = document.createElement("property")
787
996
                e.setAttribute("name", name)
788
997
                e.setAttribute("type", prop._dbus_signature)
789
998
                e.setAttribute("access", prop._dbus_access)
790
999
                return e
 
1000
            
791
1001
            for if_tag in document.getElementsByTagName("interface"):
 
1002
                # Add property tags
792
1003
                for tag in (make_tag(document, name, prop)
793
1004
                            for name, prop
794
 
                            in self._get_all_dbus_properties()
 
1005
                            in self._get_all_dbus_things("property")
795
1006
                            if prop._dbus_interface
796
1007
                            == if_tag.getAttribute("name")):
797
1008
                    if_tag.appendChild(tag)
 
1009
                # Add annotation tags
 
1010
                for typ in ("method", "signal", "property"):
 
1011
                    for tag in if_tag.getElementsByTagName(typ):
 
1012
                        annots = dict()
 
1013
                        for name, prop in (self.
 
1014
                                           _get_all_dbus_things(typ)):
 
1015
                            if (name == tag.getAttribute("name")
 
1016
                                and prop._dbus_interface
 
1017
                                == if_tag.getAttribute("name")):
 
1018
                                annots.update(getattr(
 
1019
                                    prop, "_dbus_annotations", {}))
 
1020
                        for name, value in annots.items():
 
1021
                            ann_tag = document.createElement(
 
1022
                                "annotation")
 
1023
                            ann_tag.setAttribute("name", name)
 
1024
                            ann_tag.setAttribute("value", value)
 
1025
                            tag.appendChild(ann_tag)
 
1026
                # Add interface annotation tags
 
1027
                for annotation, value in dict(
 
1028
                    itertools.chain.from_iterable(
 
1029
                        annotations().items()
 
1030
                        for name, annotations
 
1031
                        in self._get_all_dbus_things("interface")
 
1032
                        if name == if_tag.getAttribute("name")
 
1033
                        )).items():
 
1034
                    ann_tag = document.createElement("annotation")
 
1035
                    ann_tag.setAttribute("name", annotation)
 
1036
                    ann_tag.setAttribute("value", value)
 
1037
                    if_tag.appendChild(ann_tag)
798
1038
                # Add the names to the return values for the
799
1039
                # "org.freedesktop.DBus.Properties" methods
800
1040
                if (if_tag.getAttribute("name")
815
1055
        except (AttributeError, xml.dom.DOMException,
816
1056
                xml.parsers.expat.ExpatError) as error:
817
1057
            logger.error("Failed to override Introspection method",
818
 
                         error)
 
1058
                         exc_info=error)
819
1059
        return xmlstring
820
1060
 
821
1061
 
822
 
def datetime_to_dbus (dt, variant_level=0):
 
1062
def datetime_to_dbus(dt, variant_level=0):
823
1063
    """Convert a UTC datetime.datetime() to a D-Bus type."""
824
1064
    if dt is None:
825
1065
        return dbus.String("", variant_level = variant_level)
826
 
    return dbus.String(dt.isoformat(),
827
 
                       variant_level=variant_level)
828
 
 
829
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
830
 
                                  .__metaclass__):
831
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
832
 
    will add additional D-Bus attributes matching a certain pattern.
 
1066
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1067
 
 
1068
 
 
1069
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
 
1070
    """A class decorator; applied to a subclass of
 
1071
    dbus.service.Object, it will add alternate D-Bus attributes with
 
1072
    interface names according to the "alt_interface_names" mapping.
 
1073
    Usage:
 
1074
    
 
1075
    @alternate_dbus_interfaces({"org.example.Interface":
 
1076
                                    "net.example.AlternateInterface"})
 
1077
    class SampleDBusObject(dbus.service.Object):
 
1078
        @dbus.service.method("org.example.Interface")
 
1079
        def SampleDBusMethod():
 
1080
            pass
 
1081
    
 
1082
    The above "SampleDBusMethod" on "SampleDBusObject" will be
 
1083
    reachable via two interfaces: "org.example.Interface" and
 
1084
    "net.example.AlternateInterface", the latter of which will have
 
1085
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
 
1086
    "true", unless "deprecate" is passed with a False value.
 
1087
    
 
1088
    This works for methods and signals, and also for D-Bus properties
 
1089
    (from DBusObjectWithProperties) and interfaces (from the
 
1090
    dbus_interface_annotations decorator).
833
1091
    """
834
 
    def __new__(mcs, name, bases, attr):
835
 
        # Go through all the base classes which could have D-Bus
836
 
        # methods, signals, or properties in them
837
 
        for base in (b for b in bases
838
 
                     if issubclass(b, dbus.service.Object)):
839
 
            # Go though all attributes of the base class
840
 
            for attrname, attribute in inspect.getmembers(base):
 
1092
    
 
1093
    def wrapper(cls):
 
1094
        for orig_interface_name, alt_interface_name in (
 
1095
                alt_interface_names.items()):
 
1096
            attr = {}
 
1097
            interface_names = set()
 
1098
            # Go though all attributes of the class
 
1099
            for attrname, attribute in inspect.getmembers(cls):
841
1100
                # Ignore non-D-Bus attributes, and D-Bus attributes
842
1101
                # with the wrong interface name
843
1102
                if (not hasattr(attribute, "_dbus_interface")
844
 
                    or not attribute._dbus_interface
845
 
                    .startswith("se.recompile.Mandos")):
 
1103
                    or not attribute._dbus_interface.startswith(
 
1104
                        orig_interface_name)):
846
1105
                    continue
847
1106
                # Create an alternate D-Bus interface name based on
848
1107
                # the current name
849
 
                alt_interface = (attribute._dbus_interface
850
 
                                 .replace("se.recompile.Mandos",
851
 
                                          "se.bsnet.fukt.Mandos"))
 
1108
                alt_interface = attribute._dbus_interface.replace(
 
1109
                    orig_interface_name, alt_interface_name)
 
1110
                interface_names.add(alt_interface)
852
1111
                # Is this a D-Bus signal?
853
1112
                if getattr(attribute, "_dbus_is_signal", False):
854
 
                    # Extract the original non-method function by
855
 
                    # black magic
856
 
                    nonmethod_func = (dict(
 
1113
                    if sys.version_info.major == 2:
 
1114
                        # Extract the original non-method undecorated
 
1115
                        # function by black magic
 
1116
                        nonmethod_func = (dict(
857
1117
                            zip(attribute.func_code.co_freevars,
858
 
                                attribute.__closure__))["func"]
859
 
                                      .cell_contents)
 
1118
                                attribute.__closure__))
 
1119
                                          ["func"].cell_contents)
 
1120
                    else:
 
1121
                        nonmethod_func = attribute
860
1122
                    # Create a new, but exactly alike, function
861
1123
                    # object, and decorate it to be a new D-Bus signal
862
1124
                    # with the alternate D-Bus interface name
863
 
                    new_function = (dbus.service.signal
864
 
                                    (alt_interface,
865
 
                                     attribute._dbus_signature)
866
 
                                    (types.FunctionType(
867
 
                                nonmethod_func.func_code,
868
 
                                nonmethod_func.func_globals,
869
 
                                nonmethod_func.func_name,
870
 
                                nonmethod_func.func_defaults,
871
 
                                nonmethod_func.func_closure)))
 
1125
                    if sys.version_info.major == 2:
 
1126
                        new_function = types.FunctionType(
 
1127
                            nonmethod_func.func_code,
 
1128
                            nonmethod_func.func_globals,
 
1129
                            nonmethod_func.func_name,
 
1130
                            nonmethod_func.func_defaults,
 
1131
                            nonmethod_func.func_closure)
 
1132
                    else:
 
1133
                        new_function = types.FunctionType(
 
1134
                            nonmethod_func.__code__,
 
1135
                            nonmethod_func.__globals__,
 
1136
                            nonmethod_func.__name__,
 
1137
                            nonmethod_func.__defaults__,
 
1138
                            nonmethod_func.__closure__)
 
1139
                    new_function = (dbus.service.signal(
 
1140
                        alt_interface,
 
1141
                        attribute._dbus_signature)(new_function))
 
1142
                    # Copy annotations, if any
 
1143
                    try:
 
1144
                        new_function._dbus_annotations = dict(
 
1145
                            attribute._dbus_annotations)
 
1146
                    except AttributeError:
 
1147
                        pass
872
1148
                    # Define a creator of a function to call both the
873
 
                    # old and new functions, so both the old and new
874
 
                    # signals gets sent when the function is called
 
1149
                    # original and alternate functions, so both the
 
1150
                    # original and alternate signals gets sent when
 
1151
                    # the function is called
875
1152
                    def fixscope(func1, func2):
876
1153
                        """This function is a scope container to pass
877
1154
                        func1 and func2 to the "call_both" function
878
1155
                        outside of its arguments"""
 
1156
                        
879
1157
                        def call_both(*args, **kwargs):
880
1158
                            """This function will emit two D-Bus
881
1159
                            signals by calling func1 and func2"""
882
1160
                            func1(*args, **kwargs)
883
1161
                            func2(*args, **kwargs)
 
1162
                        
884
1163
                        return call_both
885
1164
                    # Create the "call_both" function and add it to
886
1165
                    # the class
887
 
                    attr[attrname] = fixscope(attribute,
888
 
                                              new_function)
 
1166
                    attr[attrname] = fixscope(attribute, new_function)
889
1167
                # Is this a D-Bus method?
890
1168
                elif getattr(attribute, "_dbus_is_method", False):
891
1169
                    # Create a new, but exactly alike, function
892
1170
                    # object.  Decorate it to be a new D-Bus method
893
1171
                    # with the alternate D-Bus interface name.  Add it
894
1172
                    # to the class.
895
 
                    attr[attrname] = (dbus.service.method
896
 
                                      (alt_interface,
897
 
                                       attribute._dbus_in_signature,
898
 
                                       attribute._dbus_out_signature)
899
 
                                      (types.FunctionType
900
 
                                       (attribute.func_code,
901
 
                                        attribute.func_globals,
902
 
                                        attribute.func_name,
903
 
                                        attribute.func_defaults,
904
 
                                        attribute.func_closure)))
 
1173
                    attr[attrname] = (
 
1174
                        dbus.service.method(
 
1175
                            alt_interface,
 
1176
                            attribute._dbus_in_signature,
 
1177
                            attribute._dbus_out_signature)
 
1178
                        (types.FunctionType(attribute.func_code,
 
1179
                                            attribute.func_globals,
 
1180
                                            attribute.func_name,
 
1181
                                            attribute.func_defaults,
 
1182
                                            attribute.func_closure)))
 
1183
                    # Copy annotations, if any
 
1184
                    try:
 
1185
                        attr[attrname]._dbus_annotations = dict(
 
1186
                            attribute._dbus_annotations)
 
1187
                    except AttributeError:
 
1188
                        pass
905
1189
                # Is this a D-Bus property?
906
1190
                elif getattr(attribute, "_dbus_is_property", False):
907
1191
                    # Create a new, but exactly alike, function
908
1192
                    # object, and decorate it to be a new D-Bus
909
1193
                    # property with the alternate D-Bus interface
910
1194
                    # name.  Add it to the class.
911
 
                    attr[attrname] = (dbus_service_property
912
 
                                      (alt_interface,
913
 
                                       attribute._dbus_signature,
914
 
                                       attribute._dbus_access,
915
 
                                       attribute
916
 
                                       ._dbus_get_args_options
917
 
                                       ["byte_arrays"])
918
 
                                      (types.FunctionType
919
 
                                       (attribute.func_code,
920
 
                                        attribute.func_globals,
921
 
                                        attribute.func_name,
922
 
                                        attribute.func_defaults,
923
 
                                        attribute.func_closure)))
924
 
        return type.__new__(mcs, name, bases, attr)
925
 
 
 
1195
                    attr[attrname] = (dbus_service_property(
 
1196
                        alt_interface, attribute._dbus_signature,
 
1197
                        attribute._dbus_access,
 
1198
                        attribute._dbus_get_args_options
 
1199
                        ["byte_arrays"])
 
1200
                                      (types.FunctionType(
 
1201
                                          attribute.func_code,
 
1202
                                          attribute.func_globals,
 
1203
                                          attribute.func_name,
 
1204
                                          attribute.func_defaults,
 
1205
                                          attribute.func_closure)))
 
1206
                    # Copy annotations, if any
 
1207
                    try:
 
1208
                        attr[attrname]._dbus_annotations = dict(
 
1209
                            attribute._dbus_annotations)
 
1210
                    except AttributeError:
 
1211
                        pass
 
1212
                # Is this a D-Bus interface?
 
1213
                elif getattr(attribute, "_dbus_is_interface", False):
 
1214
                    # Create a new, but exactly alike, function
 
1215
                    # object.  Decorate it to be a new D-Bus interface
 
1216
                    # with the alternate D-Bus interface name.  Add it
 
1217
                    # to the class.
 
1218
                    attr[attrname] = (
 
1219
                        dbus_interface_annotations(alt_interface)
 
1220
                        (types.FunctionType(attribute.func_code,
 
1221
                                            attribute.func_globals,
 
1222
                                            attribute.func_name,
 
1223
                                            attribute.func_defaults,
 
1224
                                            attribute.func_closure)))
 
1225
            if deprecate:
 
1226
                # Deprecate all alternate interfaces
 
1227
                iname="_AlternateDBusNames_interface_annotation{}"
 
1228
                for interface_name in interface_names:
 
1229
                    
 
1230
                    @dbus_interface_annotations(interface_name)
 
1231
                    def func(self):
 
1232
                        return { "org.freedesktop.DBus.Deprecated":
 
1233
                                 "true" }
 
1234
                    # Find an unused name
 
1235
                    for aname in (iname.format(i)
 
1236
                                  for i in itertools.count()):
 
1237
                        if aname not in attr:
 
1238
                            attr[aname] = func
 
1239
                            break
 
1240
            if interface_names:
 
1241
                # Replace the class with a new subclass of it with
 
1242
                # methods, signals, etc. as created above.
 
1243
                cls = type(b"{}Alternate".format(cls.__name__),
 
1244
                           (cls, ), attr)
 
1245
        return cls
 
1246
    
 
1247
    return wrapper
 
1248
 
 
1249
 
 
1250
@alternate_dbus_interfaces({"se.recompile.Mandos":
 
1251
                            "se.bsnet.fukt.Mandos"})
926
1252
class ClientDBus(Client, DBusObjectWithProperties):
927
1253
    """A Client class using D-Bus
928
1254
    
932
1258
    """
933
1259
    
934
1260
    runtime_expansions = (Client.runtime_expansions
935
 
                          + ("dbus_object_path",))
 
1261
                          + ("dbus_object_path", ))
 
1262
    
 
1263
    _interface = "se.recompile.Mandos.Client"
936
1264
    
937
1265
    # dbus.service.Object doesn't use super(), so we can't either.
938
1266
    
939
1267
    def __init__(self, bus = None, *args, **kwargs):
940
1268
        self.bus = bus
941
1269
        Client.__init__(self, *args, **kwargs)
942
 
 
943
 
        self._approvals_pending = 0
944
1270
        # Only now, when this client is initialized, can it show up on
945
1271
        # the D-Bus
946
 
        client_object_name = unicode(self.name).translate(
 
1272
        client_object_name = str(self.name).translate(
947
1273
            {ord("."): ord("_"),
948
1274
             ord("-"): ord("_")})
949
 
        self.dbus_object_path = (dbus.ObjectPath
950
 
                                 ("/clients/" + client_object_name))
 
1275
        self.dbus_object_path = dbus.ObjectPath(
 
1276
            "/clients/" + client_object_name)
951
1277
        DBusObjectWithProperties.__init__(self, self.bus,
952
1278
                                          self.dbus_object_path)
953
 
        
954
 
    def notifychangeproperty(transform_func,
955
 
                             dbus_name, type_func=lambda x: x,
956
 
                             variant_level=1):
 
1279
    
 
1280
    def notifychangeproperty(transform_func, dbus_name,
 
1281
                             type_func=lambda x: x,
 
1282
                             variant_level=1,
 
1283
                             invalidate_only=False,
 
1284
                             _interface=_interface):
957
1285
        """ Modify a variable so that it's a property which announces
958
1286
        its changes to DBus.
959
 
 
 
1287
        
960
1288
        transform_fun: Function that takes a value and a variant_level
961
1289
                       and transforms it to a D-Bus type.
962
1290
        dbus_name: D-Bus name of the variable
964
1292
                   to the D-Bus.  Default: no transform
965
1293
        variant_level: D-Bus variant level.  Default: 1
966
1294
        """
967
 
        attrname = "_{0}".format(dbus_name)
 
1295
        attrname = "_{}".format(dbus_name)
 
1296
        
968
1297
        def setter(self, value):
969
1298
            if hasattr(self, "dbus_object_path"):
970
1299
                if (not hasattr(self, attrname) or
971
1300
                    type_func(getattr(self, attrname, None))
972
1301
                    != type_func(value)):
973
 
                    dbus_value = transform_func(type_func(value),
974
 
                                                variant_level
975
 
                                                =variant_level)
976
 
                    self.PropertyChanged(dbus.String(dbus_name),
977
 
                                         dbus_value)
 
1302
                    if invalidate_only:
 
1303
                        self.PropertiesChanged(
 
1304
                            _interface, dbus.Dictionary(),
 
1305
                            dbus.Array((dbus_name, )))
 
1306
                    else:
 
1307
                        dbus_value = transform_func(
 
1308
                            type_func(value),
 
1309
                            variant_level = variant_level)
 
1310
                        self.PropertyChanged(dbus.String(dbus_name),
 
1311
                                             dbus_value)
 
1312
                        self.PropertiesChanged(
 
1313
                            _interface,
 
1314
                            dbus.Dictionary({ dbus.String(dbus_name):
 
1315
                                              dbus_value }),
 
1316
                            dbus.Array())
978
1317
            setattr(self, attrname, value)
979
1318
        
980
1319
        return property(lambda self: getattr(self, attrname), setter)
981
1320
    
982
 
    
983
1321
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
984
1322
    approvals_pending = notifychangeproperty(dbus.Boolean,
985
1323
                                             "ApprovalPending",
987
1325
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
988
1326
    last_enabled = notifychangeproperty(datetime_to_dbus,
989
1327
                                        "LastEnabled")
990
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
991
 
                                   type_func = lambda checker:
992
 
                                       checker is not None)
 
1328
    checker = notifychangeproperty(
 
1329
        dbus.Boolean, "CheckerRunning",
 
1330
        type_func = lambda checker: checker is not None)
993
1331
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
994
1332
                                           "LastCheckedOK")
 
1333
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1334
                                               "LastCheckerStatus")
995
1335
    last_approval_request = notifychangeproperty(
996
1336
        datetime_to_dbus, "LastApprovalRequest")
997
1337
    approved_by_default = notifychangeproperty(dbus.Boolean,
998
1338
                                               "ApprovedByDefault")
999
 
    approval_delay = notifychangeproperty(dbus.UInt16,
1000
 
                                          "ApprovalDelay",
1001
 
                                          type_func =
1002
 
                                          _timedelta_to_milliseconds)
 
1339
    approval_delay = notifychangeproperty(
 
1340
        dbus.UInt64, "ApprovalDelay",
 
1341
        type_func = lambda td: td.total_seconds() * 1000)
1003
1342
    approval_duration = notifychangeproperty(
1004
 
        dbus.UInt16, "ApprovalDuration",
1005
 
        type_func = _timedelta_to_milliseconds)
 
1343
        dbus.UInt64, "ApprovalDuration",
 
1344
        type_func = lambda td: td.total_seconds() * 1000)
1006
1345
    host = notifychangeproperty(dbus.String, "Host")
1007
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1008
 
                                   type_func =
1009
 
                                   _timedelta_to_milliseconds)
 
1346
    timeout = notifychangeproperty(
 
1347
        dbus.UInt64, "Timeout",
 
1348
        type_func = lambda td: td.total_seconds() * 1000)
1010
1349
    extended_timeout = notifychangeproperty(
1011
 
        dbus.UInt16, "ExtendedTimeout",
1012
 
        type_func = _timedelta_to_milliseconds)
1013
 
    interval = notifychangeproperty(dbus.UInt16,
1014
 
                                    "Interval",
1015
 
                                    type_func =
1016
 
                                    _timedelta_to_milliseconds)
 
1350
        dbus.UInt64, "ExtendedTimeout",
 
1351
        type_func = lambda td: td.total_seconds() * 1000)
 
1352
    interval = notifychangeproperty(
 
1353
        dbus.UInt64, "Interval",
 
1354
        type_func = lambda td: td.total_seconds() * 1000)
1017
1355
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1356
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
 
1357
                                  invalidate_only=True)
1018
1358
    
1019
1359
    del notifychangeproperty
1020
1360
    
1027
1367
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1028
1368
        Client.__del__(self, *args, **kwargs)
1029
1369
    
1030
 
    def checker_callback(self, pid, condition, command,
1031
 
                         *args, **kwargs):
1032
 
        self.checker_callback_tag = None
1033
 
        self.checker = None
1034
 
        if os.WIFEXITED(condition):
1035
 
            exitstatus = os.WEXITSTATUS(condition)
 
1370
    def checker_callback(self, source, condition,
 
1371
                         connection, command, *args, **kwargs):
 
1372
        ret = Client.checker_callback(self, source, condition,
 
1373
                                      connection, command, *args,
 
1374
                                      **kwargs)
 
1375
        exitstatus = self.last_checker_status
 
1376
        if exitstatus >= 0:
1036
1377
            # Emit D-Bus signal
1037
1378
            self.CheckerCompleted(dbus.Int16(exitstatus),
1038
 
                                  dbus.Int64(condition),
 
1379
                                  dbus.Int64(0),
1039
1380
                                  dbus.String(command))
1040
1381
        else:
1041
1382
            # Emit D-Bus signal
1042
1383
            self.CheckerCompleted(dbus.Int16(-1),
1043
 
                                  dbus.Int64(condition),
 
1384
                                  dbus.Int64(
 
1385
                                      self.last_checker_signal),
1044
1386
                                  dbus.String(command))
1045
 
        
1046
 
        return Client.checker_callback(self, pid, condition, command,
1047
 
                                       *args, **kwargs)
 
1387
        return ret
1048
1388
    
1049
1389
    def start_checker(self, *args, **kwargs):
1050
 
        old_checker = self.checker
1051
 
        if self.checker is not None:
1052
 
            old_checker_pid = self.checker.pid
1053
 
        else:
1054
 
            old_checker_pid = None
 
1390
        old_checker_pid = getattr(self.checker, "pid", None)
1055
1391
        r = Client.start_checker(self, *args, **kwargs)
1056
1392
        # Only if new checker process was started
1057
1393
        if (self.checker is not None
1061
1397
        return r
1062
1398
    
1063
1399
    def _reset_approved(self):
1064
 
        self._approved = None
 
1400
        self.approved = None
1065
1401
        return False
1066
1402
    
1067
1403
    def approve(self, value=True):
 
1404
        self.approved = value
 
1405
        gobject.timeout_add(int(self.approval_duration.total_seconds()
 
1406
                                * 1000), self._reset_approved)
1068
1407
        self.send_changedstate()
1069
 
        self._approved = value
1070
 
        gobject.timeout_add(_timedelta_to_milliseconds
1071
 
                            (self.approval_duration),
1072
 
                            self._reset_approved)
1073
 
    
1074
1408
    
1075
1409
    ## D-Bus methods, signals & properties
1076
 
    _interface = "se.recompile.Mandos.Client"
 
1410
    
 
1411
    ## Interfaces
1077
1412
    
1078
1413
    ## Signals
1079
1414
    
1090
1425
        pass
1091
1426
    
1092
1427
    # PropertyChanged - signal
 
1428
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1093
1429
    @dbus.service.signal(_interface, signature="sv")
1094
1430
    def PropertyChanged(self, property, value):
1095
1431
        "D-Bus signal"
1159
1495
        return dbus.Boolean(bool(self.approvals_pending))
1160
1496
    
1161
1497
    # ApprovedByDefault - property
1162
 
    @dbus_service_property(_interface, signature="b",
 
1498
    @dbus_service_property(_interface,
 
1499
                           signature="b",
1163
1500
                           access="readwrite")
1164
1501
    def ApprovedByDefault_dbus_property(self, value=None):
1165
1502
        if value is None:       # get
1167
1504
        self.approved_by_default = bool(value)
1168
1505
    
1169
1506
    # ApprovalDelay - property
1170
 
    @dbus_service_property(_interface, signature="t",
 
1507
    @dbus_service_property(_interface,
 
1508
                           signature="t",
1171
1509
                           access="readwrite")
1172
1510
    def ApprovalDelay_dbus_property(self, value=None):
1173
1511
        if value is None:       # get
1174
 
            return dbus.UInt64(self.approval_delay_milliseconds())
 
1512
            return dbus.UInt64(self.approval_delay.total_seconds()
 
1513
                               * 1000)
1175
1514
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1176
1515
    
1177
1516
    # ApprovalDuration - property
1178
 
    @dbus_service_property(_interface, signature="t",
 
1517
    @dbus_service_property(_interface,
 
1518
                           signature="t",
1179
1519
                           access="readwrite")
1180
1520
    def ApprovalDuration_dbus_property(self, value=None):
1181
1521
        if value is None:       # get
1182
 
            return dbus.UInt64(_timedelta_to_milliseconds(
1183
 
                    self.approval_duration))
 
1522
            return dbus.UInt64(self.approval_duration.total_seconds()
 
1523
                               * 1000)
1184
1524
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1185
1525
    
1186
1526
    # Name - property
1194
1534
        return dbus.String(self.fingerprint)
1195
1535
    
1196
1536
    # Host - property
1197
 
    @dbus_service_property(_interface, signature="s",
 
1537
    @dbus_service_property(_interface,
 
1538
                           signature="s",
1198
1539
                           access="readwrite")
1199
1540
    def Host_dbus_property(self, value=None):
1200
1541
        if value is None:       # get
1201
1542
            return dbus.String(self.host)
1202
 
        self.host = value
 
1543
        self.host = str(value)
1203
1544
    
1204
1545
    # Created - property
1205
1546
    @dbus_service_property(_interface, signature="s", access="read")
1206
1547
    def Created_dbus_property(self):
1207
 
        return dbus.String(datetime_to_dbus(self.created))
 
1548
        return datetime_to_dbus(self.created)
1208
1549
    
1209
1550
    # LastEnabled - property
1210
1551
    @dbus_service_property(_interface, signature="s", access="read")
1212
1553
        return datetime_to_dbus(self.last_enabled)
1213
1554
    
1214
1555
    # Enabled - property
1215
 
    @dbus_service_property(_interface, signature="b",
 
1556
    @dbus_service_property(_interface,
 
1557
                           signature="b",
1216
1558
                           access="readwrite")
1217
1559
    def Enabled_dbus_property(self, value=None):
1218
1560
        if value is None:       # get
1223
1565
            self.disable()
1224
1566
    
1225
1567
    # LastCheckedOK - property
1226
 
    @dbus_service_property(_interface, signature="s",
 
1568
    @dbus_service_property(_interface,
 
1569
                           signature="s",
1227
1570
                           access="readwrite")
1228
1571
    def LastCheckedOK_dbus_property(self, value=None):
1229
1572
        if value is not None:
1231
1574
            return
1232
1575
        return datetime_to_dbus(self.last_checked_ok)
1233
1576
    
 
1577
    # LastCheckerStatus - property
 
1578
    @dbus_service_property(_interface, signature="n", access="read")
 
1579
    def LastCheckerStatus_dbus_property(self):
 
1580
        return dbus.Int16(self.last_checker_status)
 
1581
    
1234
1582
    # Expires - property
1235
1583
    @dbus_service_property(_interface, signature="s", access="read")
1236
1584
    def Expires_dbus_property(self):
1242
1590
        return datetime_to_dbus(self.last_approval_request)
1243
1591
    
1244
1592
    # Timeout - property
1245
 
    @dbus_service_property(_interface, signature="t",
 
1593
    @dbus_service_property(_interface,
 
1594
                           signature="t",
1246
1595
                           access="readwrite")
1247
1596
    def Timeout_dbus_property(self, value=None):
1248
1597
        if value is None:       # get
1249
 
            return dbus.UInt64(self.timeout_milliseconds())
 
1598
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1599
        old_timeout = self.timeout
1250
1600
        self.timeout = datetime.timedelta(0, 0, 0, value)
1251
 
        if getattr(self, "disable_initiator_tag", None) is None:
1252
 
            return
1253
 
        # Reschedule timeout
1254
 
        gobject.source_remove(self.disable_initiator_tag)
1255
 
        self.disable_initiator_tag = None
1256
 
        self.expires = None
1257
 
        time_to_die = _timedelta_to_milliseconds((self
1258
 
                                                  .last_checked_ok
1259
 
                                                  + self.timeout)
1260
 
                                                 - datetime.datetime
1261
 
                                                 .utcnow())
1262
 
        if time_to_die <= 0:
1263
 
            # The timeout has passed
1264
 
            self.disable()
1265
 
        else:
1266
 
            self.expires = (datetime.datetime.utcnow()
1267
 
                            + datetime.timedelta(milliseconds =
1268
 
                                                 time_to_die))
1269
 
            self.disable_initiator_tag = (gobject.timeout_add
1270
 
                                          (time_to_die, self.disable))
 
1601
        # Reschedule disabling
 
1602
        if self.enabled:
 
1603
            now = datetime.datetime.utcnow()
 
1604
            self.expires += self.timeout - old_timeout
 
1605
            if self.expires <= now:
 
1606
                # The timeout has passed
 
1607
                self.disable()
 
1608
            else:
 
1609
                if (getattr(self, "disable_initiator_tag", None)
 
1610
                    is None):
 
1611
                    return
 
1612
                gobject.source_remove(self.disable_initiator_tag)
 
1613
                self.disable_initiator_tag = gobject.timeout_add(
 
1614
                    int((self.expires - now).total_seconds() * 1000),
 
1615
                    self.disable)
1271
1616
    
1272
1617
    # ExtendedTimeout - property
1273
 
    @dbus_service_property(_interface, signature="t",
 
1618
    @dbus_service_property(_interface,
 
1619
                           signature="t",
1274
1620
                           access="readwrite")
1275
1621
    def ExtendedTimeout_dbus_property(self, value=None):
1276
1622
        if value is None:       # get
1277
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1623
            return dbus.UInt64(self.extended_timeout.total_seconds()
 
1624
                               * 1000)
1278
1625
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1279
1626
    
1280
1627
    # Interval - property
1281
 
    @dbus_service_property(_interface, signature="t",
 
1628
    @dbus_service_property(_interface,
 
1629
                           signature="t",
1282
1630
                           access="readwrite")
1283
1631
    def Interval_dbus_property(self, value=None):
1284
1632
        if value is None:       # get
1285
 
            return dbus.UInt64(self.interval_milliseconds())
 
1633
            return dbus.UInt64(self.interval.total_seconds() * 1000)
1286
1634
        self.interval = datetime.timedelta(0, 0, 0, value)
1287
1635
        if getattr(self, "checker_initiator_tag", None) is None:
1288
1636
            return
1289
 
        # Reschedule checker run
1290
 
        gobject.source_remove(self.checker_initiator_tag)
1291
 
        self.checker_initiator_tag = (gobject.timeout_add
1292
 
                                      (value, self.start_checker))
1293
 
        self.start_checker()    # Start one now, too
 
1637
        if self.enabled:
 
1638
            # Reschedule checker run
 
1639
            gobject.source_remove(self.checker_initiator_tag)
 
1640
            self.checker_initiator_tag = gobject.timeout_add(
 
1641
                value, self.start_checker)
 
1642
            self.start_checker() # Start one now, too
1294
1643
    
1295
1644
    # Checker - property
1296
 
    @dbus_service_property(_interface, signature="s",
 
1645
    @dbus_service_property(_interface,
 
1646
                           signature="s",
1297
1647
                           access="readwrite")
1298
1648
    def Checker_dbus_property(self, value=None):
1299
1649
        if value is None:       # get
1300
1650
            return dbus.String(self.checker_command)
1301
 
        self.checker_command = value
 
1651
        self.checker_command = str(value)
1302
1652
    
1303
1653
    # CheckerRunning - property
1304
 
    @dbus_service_property(_interface, signature="b",
 
1654
    @dbus_service_property(_interface,
 
1655
                           signature="b",
1305
1656
                           access="readwrite")
1306
1657
    def CheckerRunning_dbus_property(self, value=None):
1307
1658
        if value is None:       # get
1317
1668
        return self.dbus_object_path # is already a dbus.ObjectPath
1318
1669
    
1319
1670
    # Secret = property
1320
 
    @dbus_service_property(_interface, signature="ay",
1321
 
                           access="write", byte_arrays=True)
 
1671
    @dbus_service_property(_interface,
 
1672
                           signature="ay",
 
1673
                           access="write",
 
1674
                           byte_arrays=True)
1322
1675
    def Secret_dbus_property(self, value):
1323
 
        self.secret = str(value)
 
1676
        self.secret = bytes(value)
1324
1677
    
1325
1678
    del _interface
1326
1679
 
1330
1683
        self._pipe = child_pipe
1331
1684
        self._pipe.send(('init', fpr, address))
1332
1685
        if not self._pipe.recv():
1333
 
            raise KeyError()
 
1686
            raise KeyError(fpr)
1334
1687
    
1335
1688
    def __getattribute__(self, name):
1336
 
        if(name == '_pipe'):
 
1689
        if name == '_pipe':
1337
1690
            return super(ProxyClient, self).__getattribute__(name)
1338
1691
        self._pipe.send(('getattr', name))
1339
1692
        data = self._pipe.recv()
1340
1693
        if data[0] == 'data':
1341
1694
            return data[1]
1342
1695
        if data[0] == 'function':
 
1696
            
1343
1697
            def func(*args, **kwargs):
1344
1698
                self._pipe.send(('funcall', name, args, kwargs))
1345
1699
                return self._pipe.recv()[1]
 
1700
            
1346
1701
            return func
1347
1702
    
1348
1703
    def __setattr__(self, name, value):
1349
 
        if(name == '_pipe'):
 
1704
        if name == '_pipe':
1350
1705
            return super(ProxyClient, self).__setattr__(name, value)
1351
1706
        self._pipe.send(('setattr', name, value))
1352
1707
 
1353
 
class ClientDBusTransitional(ClientDBus):
1354
 
    __metaclass__ = AlternateDBusNamesMetaclass
1355
1708
 
1356
1709
class ClientHandler(socketserver.BaseRequestHandler, object):
1357
1710
    """A class to handle client connections.
1362
1715
    def handle(self):
1363
1716
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1364
1717
            logger.info("TCP connection from: %s",
1365
 
                        unicode(self.client_address))
 
1718
                        str(self.client_address))
1366
1719
            logger.debug("Pipe FD: %d",
1367
1720
                         self.server.child_pipe.fileno())
1368
1721
            
1369
 
            session = (gnutls.connection
1370
 
                       .ClientSession(self.request,
1371
 
                                      gnutls.connection
1372
 
                                      .X509Credentials()))
 
1722
            session = gnutls.connection.ClientSession(
 
1723
                self.request, gnutls.connection .X509Credentials())
1373
1724
            
1374
1725
            # Note: gnutls.connection.X509Credentials is really a
1375
1726
            # generic GnuTLS certificate credentials object so long as
1384
1735
            priority = self.server.gnutls_priority
1385
1736
            if priority is None:
1386
1737
                priority = "NORMAL"
1387
 
            (gnutls.library.functions
1388
 
             .gnutls_priority_set_direct(session._c_object,
1389
 
                                         priority, None))
 
1738
            gnutls.library.functions.gnutls_priority_set_direct(
 
1739
                session._c_object, priority, None)
1390
1740
            
1391
1741
            # Start communication using the Mandos protocol
1392
1742
            # Get protocol number
1394
1744
            logger.debug("Protocol version: %r", line)
1395
1745
            try:
1396
1746
                if int(line.strip().split()[0]) > 1:
1397
 
                    raise RuntimeError
 
1747
                    raise RuntimeError(line)
1398
1748
            except (ValueError, IndexError, RuntimeError) as error:
1399
1749
                logger.error("Unknown protocol version: %s", error)
1400
1750
                return
1412
1762
            approval_required = False
1413
1763
            try:
1414
1764
                try:
1415
 
                    fpr = self.fingerprint(self.peer_certificate
1416
 
                                           (session))
 
1765
                    fpr = self.fingerprint(
 
1766
                        self.peer_certificate(session))
1417
1767
                except (TypeError,
1418
1768
                        gnutls.errors.GNUTLSError) as error:
1419
1769
                    logger.warning("Bad certificate: %s", error)
1434
1784
                while True:
1435
1785
                    if not client.enabled:
1436
1786
                        logger.info("Client %s is disabled",
1437
 
                                       client.name)
 
1787
                                    client.name)
1438
1788
                        if self.server.use_dbus:
1439
1789
                            # Emit D-Bus signal
1440
1790
                            client.Rejected("Disabled")
1441
1791
                        return
1442
1792
                    
1443
 
                    if client._approved or not client.approval_delay:
 
1793
                    if client.approved or not client.approval_delay:
1444
1794
                        #We are approved or approval is disabled
1445
1795
                        break
1446
 
                    elif client._approved is None:
 
1796
                    elif client.approved is None:
1447
1797
                        logger.info("Client %s needs approval",
1448
1798
                                    client.name)
1449
1799
                        if self.server.use_dbus:
1450
1800
                            # Emit D-Bus signal
1451
1801
                            client.NeedApproval(
1452
 
                                client.approval_delay_milliseconds(),
1453
 
                                client.approved_by_default)
 
1802
                                client.approval_delay.total_seconds()
 
1803
                                * 1000, client.approved_by_default)
1454
1804
                    else:
1455
1805
                        logger.warning("Client %s was not approved",
1456
1806
                                       client.name)
1462
1812
                    #wait until timeout or approved
1463
1813
                    time = datetime.datetime.now()
1464
1814
                    client.changedstate.acquire()
1465
 
                    (client.changedstate.wait
1466
 
                     (float(client._timedelta_to_milliseconds(delay)
1467
 
                            / 1000)))
 
1815
                    client.changedstate.wait(delay.total_seconds())
1468
1816
                    client.changedstate.release()
1469
1817
                    time2 = datetime.datetime.now()
1470
1818
                    if (time2 - time) >= delay:
1486
1834
                    try:
1487
1835
                        sent = session.send(client.secret[sent_size:])
1488
1836
                    except gnutls.errors.GNUTLSError as error:
1489
 
                        logger.warning("gnutls send failed")
 
1837
                        logger.warning("gnutls send failed",
 
1838
                                       exc_info=error)
1490
1839
                        return
1491
 
                    logger.debug("Sent: %d, remaining: %d",
1492
 
                                 sent, len(client.secret)
1493
 
                                 - (sent_size + sent))
 
1840
                    logger.debug("Sent: %d, remaining: %d", sent,
 
1841
                                 len(client.secret) - (sent_size
 
1842
                                                       + sent))
1494
1843
                    sent_size += sent
1495
1844
                
1496
1845
                logger.info("Sending secret to %s", client.name)
1497
1846
                # bump the timeout using extended_timeout
1498
 
                client.checked_ok(client.extended_timeout)
 
1847
                client.bump_timeout(client.extended_timeout)
1499
1848
                if self.server.use_dbus:
1500
1849
                    # Emit D-Bus signal
1501
1850
                    client.GotSecret()
1506
1855
                try:
1507
1856
                    session.bye()
1508
1857
                except gnutls.errors.GNUTLSError as error:
1509
 
                    logger.warning("GnuTLS bye failed")
 
1858
                    logger.warning("GnuTLS bye failed",
 
1859
                                   exc_info=error)
1510
1860
    
1511
1861
    @staticmethod
1512
1862
    def peer_certificate(session):
1513
1863
        "Return the peer's OpenPGP certificate as a bytestring"
1514
1864
        # If not an OpenPGP certificate...
1515
 
        if (gnutls.library.functions
1516
 
            .gnutls_certificate_type_get(session._c_object)
 
1865
        if (gnutls.library.functions.gnutls_certificate_type_get(
 
1866
                session._c_object)
1517
1867
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1518
1868
            # ...do the normal thing
1519
1869
            return session.peer_certificate
1533
1883
    def fingerprint(openpgp):
1534
1884
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1535
1885
        # New GnuTLS "datum" with the OpenPGP public key
1536
 
        datum = (gnutls.library.types
1537
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1538
 
                                             ctypes.POINTER
1539
 
                                             (ctypes.c_ubyte)),
1540
 
                                 ctypes.c_uint(len(openpgp))))
 
1886
        datum = gnutls.library.types.gnutls_datum_t(
 
1887
            ctypes.cast(ctypes.c_char_p(openpgp),
 
1888
                        ctypes.POINTER(ctypes.c_ubyte)),
 
1889
            ctypes.c_uint(len(openpgp)))
1541
1890
        # New empty GnuTLS certificate
1542
1891
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1543
 
        (gnutls.library.functions
1544
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
1892
        gnutls.library.functions.gnutls_openpgp_crt_init(
 
1893
            ctypes.byref(crt))
1545
1894
        # Import the OpenPGP public key into the certificate
1546
 
        (gnutls.library.functions
1547
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1548
 
                                    gnutls.library.constants
1549
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
 
1895
        gnutls.library.functions.gnutls_openpgp_crt_import(
 
1896
            crt, ctypes.byref(datum),
 
1897
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1550
1898
        # Verify the self signature in the key
1551
1899
        crtverify = ctypes.c_uint()
1552
 
        (gnutls.library.functions
1553
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
1554
 
                                         ctypes.byref(crtverify)))
 
1900
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
 
1901
            crt, 0, ctypes.byref(crtverify))
1555
1902
        if crtverify.value != 0:
1556
1903
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1557
 
            raise (gnutls.errors.CertificateSecurityError
1558
 
                   ("Verify failed"))
 
1904
            raise gnutls.errors.CertificateSecurityError(
 
1905
                "Verify failed")
1559
1906
        # New buffer for the fingerprint
1560
1907
        buf = ctypes.create_string_buffer(20)
1561
1908
        buf_len = ctypes.c_size_t()
1562
1909
        # Get the fingerprint from the certificate into the buffer
1563
 
        (gnutls.library.functions
1564
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1565
 
                                             ctypes.byref(buf_len)))
 
1910
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
 
1911
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
1566
1912
        # Deinit the certificate
1567
1913
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1568
1914
        # Convert the buffer to a Python bytestring
1569
1915
        fpr = ctypes.string_at(buf, buf_len.value)
1570
1916
        # Convert the bytestring to hexadecimal notation
1571
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1917
        hex_fpr = binascii.hexlify(fpr).upper()
1572
1918
        return hex_fpr
1573
1919
 
1574
1920
 
1575
1921
class MultiprocessingMixIn(object):
1576
1922
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
 
1923
    
1577
1924
    def sub_process_main(self, request, address):
1578
1925
        try:
1579
1926
            self.finish_request(request, address)
1580
 
        except:
 
1927
        except Exception:
1581
1928
            self.handle_error(request, address)
1582
1929
        self.close_request(request)
1583
1930
    
1584
1931
    def process_request(self, request, address):
1585
1932
        """Start a new process to process the request."""
1586
1933
        proc = multiprocessing.Process(target = self.sub_process_main,
1587
 
                                       args = (request,
1588
 
                                               address))
 
1934
                                       args = (request, address))
1589
1935
        proc.start()
1590
1936
        return proc
1591
1937
 
1592
1938
 
1593
1939
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1594
1940
    """ adds a pipe to the MixIn """
 
1941
    
1595
1942
    def process_request(self, request, client_address):
1596
1943
        """Overrides and wraps the original process_request().
1597
1944
        
1606
1953
    
1607
1954
    def add_pipe(self, parent_pipe, proc):
1608
1955
        """Dummy function; override as necessary"""
1609
 
        raise NotImplementedError
 
1956
        raise NotImplementedError()
1610
1957
 
1611
1958
 
1612
1959
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1618
1965
        interface:      None or a network interface name (string)
1619
1966
        use_ipv6:       Boolean; to use IPv6 or not
1620
1967
    """
 
1968
    
1621
1969
    def __init__(self, server_address, RequestHandlerClass,
1622
 
                 interface=None, use_ipv6=True):
 
1970
                 interface=None,
 
1971
                 use_ipv6=True,
 
1972
                 socketfd=None):
 
1973
        """If socketfd is set, use that file descriptor instead of
 
1974
        creating a new one with socket.socket().
 
1975
        """
1623
1976
        self.interface = interface
1624
1977
        if use_ipv6:
1625
1978
            self.address_family = socket.AF_INET6
 
1979
        if socketfd is not None:
 
1980
            # Save the file descriptor
 
1981
            self.socketfd = socketfd
 
1982
            # Save the original socket.socket() function
 
1983
            self.socket_socket = socket.socket
 
1984
            # To implement --socket, we monkey patch socket.socket.
 
1985
            # 
 
1986
            # (When socketserver.TCPServer is a new-style class, we
 
1987
            # could make self.socket into a property instead of monkey
 
1988
            # patching socket.socket.)
 
1989
            # 
 
1990
            # Create a one-time-only replacement for socket.socket()
 
1991
            @functools.wraps(socket.socket)
 
1992
            def socket_wrapper(*args, **kwargs):
 
1993
                # Restore original function so subsequent calls are
 
1994
                # not affected.
 
1995
                socket.socket = self.socket_socket
 
1996
                del self.socket_socket
 
1997
                # This time only, return a new socket object from the
 
1998
                # saved file descriptor.
 
1999
                return socket.fromfd(self.socketfd, *args, **kwargs)
 
2000
            # Replace socket.socket() function with wrapper
 
2001
            socket.socket = socket_wrapper
 
2002
        # The socketserver.TCPServer.__init__ will call
 
2003
        # socket.socket(), which might be our replacement,
 
2004
        # socket_wrapper(), if socketfd was set.
1626
2005
        socketserver.TCPServer.__init__(self, server_address,
1627
2006
                                        RequestHandlerClass)
 
2007
    
1628
2008
    def server_bind(self):
1629
2009
        """This overrides the normal server_bind() function
1630
2010
        to bind to an interface if one was specified, and also NOT to
1636
2016
                             self.interface)
1637
2017
            else:
1638
2018
                try:
1639
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
1640
 
                                           SO_BINDTODEVICE,
1641
 
                                           str(self.interface
1642
 
                                               + '\0'))
 
2019
                    self.socket.setsockopt(
 
2020
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
 
2021
                        (self.interface + "\0").encode("utf-8"))
1643
2022
                except socket.error as error:
1644
 
                    if error[0] == errno.EPERM:
1645
 
                        logger.error("No permission to"
1646
 
                                     " bind to interface %s",
1647
 
                                     self.interface)
1648
 
                    elif error[0] == errno.ENOPROTOOPT:
 
2023
                    if error.errno == errno.EPERM:
 
2024
                        logger.error("No permission to bind to"
 
2025
                                     " interface %s", self.interface)
 
2026
                    elif error.errno == errno.ENOPROTOOPT:
1649
2027
                        logger.error("SO_BINDTODEVICE not available;"
1650
2028
                                     " cannot bind to interface %s",
1651
2029
                                     self.interface)
 
2030
                    elif error.errno == errno.ENODEV:
 
2031
                        logger.error("Interface %s does not exist,"
 
2032
                                     " cannot bind", self.interface)
1652
2033
                    else:
1653
2034
                        raise
1654
2035
        # Only bind(2) the socket if we really need to.
1657
2038
                if self.address_family == socket.AF_INET6:
1658
2039
                    any_address = "::" # in6addr_any
1659
2040
                else:
1660
 
                    any_address = socket.INADDR_ANY
 
2041
                    any_address = "0.0.0.0" # INADDR_ANY
1661
2042
                self.server_address = (any_address,
1662
2043
                                       self.server_address[1])
1663
2044
            elif not self.server_address[1]:
1664
 
                self.server_address = (self.server_address[0],
1665
 
                                       0)
 
2045
                self.server_address = (self.server_address[0], 0)
1666
2046
#                 if self.interface:
1667
2047
#                     self.server_address = (self.server_address[0],
1668
2048
#                                            0, # port
1682
2062
    
1683
2063
    Assumes a gobject.MainLoop event loop.
1684
2064
    """
 
2065
    
1685
2066
    def __init__(self, server_address, RequestHandlerClass,
1686
 
                 interface=None, use_ipv6=True, clients=None,
1687
 
                 gnutls_priority=None, use_dbus=True):
 
2067
                 interface=None,
 
2068
                 use_ipv6=True,
 
2069
                 clients=None,
 
2070
                 gnutls_priority=None,
 
2071
                 use_dbus=True,
 
2072
                 socketfd=None):
1688
2073
        self.enabled = False
1689
2074
        self.clients = clients
1690
2075
        if self.clients is None:
1694
2079
        IPv6_TCPServer.__init__(self, server_address,
1695
2080
                                RequestHandlerClass,
1696
2081
                                interface = interface,
1697
 
                                use_ipv6 = use_ipv6)
 
2082
                                use_ipv6 = use_ipv6,
 
2083
                                socketfd = socketfd)
 
2084
    
1698
2085
    def server_activate(self):
1699
2086
        if self.enabled:
1700
2087
            return socketserver.TCPServer.server_activate(self)
1704
2091
    
1705
2092
    def add_pipe(self, parent_pipe, proc):
1706
2093
        # Call "handle_ipc" for both data and EOF events
1707
 
        gobject.io_add_watch(parent_pipe.fileno(),
1708
 
                             gobject.IO_IN | gobject.IO_HUP,
1709
 
                             functools.partial(self.handle_ipc,
1710
 
                                               parent_pipe =
1711
 
                                               parent_pipe,
1712
 
                                               proc = proc))
 
2094
        gobject.io_add_watch(
 
2095
            parent_pipe.fileno(),
 
2096
            gobject.IO_IN | gobject.IO_HUP,
 
2097
            functools.partial(self.handle_ipc,
 
2098
                              parent_pipe = parent_pipe,
 
2099
                              proc = proc))
1713
2100
    
1714
 
    def handle_ipc(self, source, condition, parent_pipe=None,
1715
 
                   proc = None, client_object=None):
1716
 
        condition_names = {
1717
 
            gobject.IO_IN: "IN",   # There is data to read.
1718
 
            gobject.IO_OUT: "OUT", # Data can be written (without
1719
 
                                    # blocking).
1720
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1721
 
            gobject.IO_ERR: "ERR", # Error condition.
1722
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1723
 
                                    # broken, usually for pipes and
1724
 
                                    # sockets).
1725
 
            }
1726
 
        conditions_string = ' | '.join(name
1727
 
                                       for cond, name in
1728
 
                                       condition_names.iteritems()
1729
 
                                       if cond & condition)
 
2101
    def handle_ipc(self, source, condition,
 
2102
                   parent_pipe=None,
 
2103
                   proc = None,
 
2104
                   client_object=None):
1730
2105
        # error, or the other end of multiprocessing.Pipe has closed
1731
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
2106
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
1732
2107
            # Wait for other process to exit
1733
2108
            proc.join()
1734
2109
            return False
1755
2130
                parent_pipe.send(False)
1756
2131
                return False
1757
2132
            
1758
 
            gobject.io_add_watch(parent_pipe.fileno(),
1759
 
                                 gobject.IO_IN | gobject.IO_HUP,
1760
 
                                 functools.partial(self.handle_ipc,
1761
 
                                                   parent_pipe =
1762
 
                                                   parent_pipe,
1763
 
                                                   proc = proc,
1764
 
                                                   client_object =
1765
 
                                                   client))
 
2133
            gobject.io_add_watch(
 
2134
                parent_pipe.fileno(),
 
2135
                gobject.IO_IN | gobject.IO_HUP,
 
2136
                functools.partial(self.handle_ipc,
 
2137
                                  parent_pipe = parent_pipe,
 
2138
                                  proc = proc,
 
2139
                                  client_object = client))
1766
2140
            parent_pipe.send(True)
1767
2141
            # remove the old hook in favor of the new above hook on
1768
2142
            # same fileno
1774
2148
            
1775
2149
            parent_pipe.send(('data', getattr(client_object,
1776
2150
                                              funcname)(*args,
1777
 
                                                         **kwargs)))
 
2151
                                                        **kwargs)))
1778
2152
        
1779
2153
        if command == 'getattr':
1780
2154
            attrname = request[1]
1781
 
            if callable(client_object.__getattribute__(attrname)):
1782
 
                parent_pipe.send(('function',))
 
2155
            if isinstance(client_object.__getattribute__(attrname),
 
2156
                          collections.Callable):
 
2157
                parent_pipe.send(('function', ))
1783
2158
            else:
1784
 
                parent_pipe.send(('data', client_object
1785
 
                                  .__getattribute__(attrname)))
 
2159
                parent_pipe.send((
 
2160
                    'data', client_object.__getattribute__(attrname)))
1786
2161
        
1787
2162
        if command == 'setattr':
1788
2163
            attrname = request[1]
1792
2167
        return True
1793
2168
 
1794
2169
 
 
2170
def rfc3339_duration_to_delta(duration):
 
2171
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
 
2172
    
 
2173
    >>> rfc3339_duration_to_delta("P7D")
 
2174
    datetime.timedelta(7)
 
2175
    >>> rfc3339_duration_to_delta("PT60S")
 
2176
    datetime.timedelta(0, 60)
 
2177
    >>> rfc3339_duration_to_delta("PT60M")
 
2178
    datetime.timedelta(0, 3600)
 
2179
    >>> rfc3339_duration_to_delta("PT24H")
 
2180
    datetime.timedelta(1)
 
2181
    >>> rfc3339_duration_to_delta("P1W")
 
2182
    datetime.timedelta(7)
 
2183
    >>> rfc3339_duration_to_delta("PT5M30S")
 
2184
    datetime.timedelta(0, 330)
 
2185
    >>> rfc3339_duration_to_delta("P1DT3M20S")
 
2186
    datetime.timedelta(1, 200)
 
2187
    """
 
2188
    
 
2189
    # Parsing an RFC 3339 duration with regular expressions is not
 
2190
    # possible - there would have to be multiple places for the same
 
2191
    # values, like seconds.  The current code, while more esoteric, is
 
2192
    # cleaner without depending on a parsing library.  If Python had a
 
2193
    # built-in library for parsing we would use it, but we'd like to
 
2194
    # avoid excessive use of external libraries.
 
2195
    
 
2196
    # New type for defining tokens, syntax, and semantics all-in-one
 
2197
    Token = collections.namedtuple("Token", (
 
2198
        "regexp",  # To match token; if "value" is not None, must have
 
2199
                   # a "group" containing digits
 
2200
        "value",   # datetime.timedelta or None
 
2201
        "followers"))           # Tokens valid after this token
 
2202
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
 
2203
    # the "duration" ABNF definition in RFC 3339, Appendix A.
 
2204
    token_end = Token(re.compile(r"$"), None, frozenset())
 
2205
    token_second = Token(re.compile(r"(\d+)S"),
 
2206
                         datetime.timedelta(seconds=1),
 
2207
                         frozenset((token_end, )))
 
2208
    token_minute = Token(re.compile(r"(\d+)M"),
 
2209
                         datetime.timedelta(minutes=1),
 
2210
                         frozenset((token_second, token_end)))
 
2211
    token_hour = Token(re.compile(r"(\d+)H"),
 
2212
                       datetime.timedelta(hours=1),
 
2213
                       frozenset((token_minute, token_end)))
 
2214
    token_time = Token(re.compile(r"T"),
 
2215
                       None,
 
2216
                       frozenset((token_hour, token_minute,
 
2217
                                  token_second)))
 
2218
    token_day = Token(re.compile(r"(\d+)D"),
 
2219
                      datetime.timedelta(days=1),
 
2220
                      frozenset((token_time, token_end)))
 
2221
    token_month = Token(re.compile(r"(\d+)M"),
 
2222
                        datetime.timedelta(weeks=4),
 
2223
                        frozenset((token_day, token_end)))
 
2224
    token_year = Token(re.compile(r"(\d+)Y"),
 
2225
                       datetime.timedelta(weeks=52),
 
2226
                       frozenset((token_month, token_end)))
 
2227
    token_week = Token(re.compile(r"(\d+)W"),
 
2228
                       datetime.timedelta(weeks=1),
 
2229
                       frozenset((token_end, )))
 
2230
    token_duration = Token(re.compile(r"P"), None,
 
2231
                           frozenset((token_year, token_month,
 
2232
                                      token_day, token_time,
 
2233
                                      token_week)))
 
2234
    # Define starting values
 
2235
    value = datetime.timedelta() # Value so far
 
2236
    found_token = None
 
2237
    followers = frozenset((token_duration, )) # Following valid tokens
 
2238
    s = duration                # String left to parse
 
2239
    # Loop until end token is found
 
2240
    while found_token is not token_end:
 
2241
        # Search for any currently valid tokens
 
2242
        for token in followers:
 
2243
            match = token.regexp.match(s)
 
2244
            if match is not None:
 
2245
                # Token found
 
2246
                if token.value is not None:
 
2247
                    # Value found, parse digits
 
2248
                    factor = int(match.group(1), 10)
 
2249
                    # Add to value so far
 
2250
                    value += factor * token.value
 
2251
                # Strip token from string
 
2252
                s = token.regexp.sub("", s, 1)
 
2253
                # Go to found token
 
2254
                found_token = token
 
2255
                # Set valid next tokens
 
2256
                followers = found_token.followers
 
2257
                break
 
2258
        else:
 
2259
            # No currently valid tokens were found
 
2260
            raise ValueError("Invalid RFC 3339 duration: {!r}"
 
2261
                             .format(duration))
 
2262
    # End token found
 
2263
    return value
 
2264
 
 
2265
 
1795
2266
def string_to_delta(interval):
1796
2267
    """Parse a string and return a datetime.timedelta
1797
2268
    
1808
2279
    >>> string_to_delta('5m 30s')
1809
2280
    datetime.timedelta(0, 330)
1810
2281
    """
 
2282
    
 
2283
    try:
 
2284
        return rfc3339_duration_to_delta(interval)
 
2285
    except ValueError:
 
2286
        pass
 
2287
    
1811
2288
    timevalue = datetime.timedelta(0)
1812
2289
    for s in interval.split():
1813
2290
        try:
1814
 
            suffix = unicode(s[-1])
 
2291
            suffix = s[-1]
1815
2292
            value = int(s[:-1])
1816
2293
            if suffix == "d":
1817
2294
                delta = datetime.timedelta(value)
1824
2301
            elif suffix == "w":
1825
2302
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1826
2303
            else:
1827
 
                raise ValueError("Unknown suffix %r" % suffix)
1828
 
        except (ValueError, IndexError) as e:
 
2304
                raise ValueError("Unknown suffix {!r}".format(suffix))
 
2305
        except IndexError as e:
1829
2306
            raise ValueError(*(e.args))
1830
2307
        timevalue += delta
1831
2308
    return timevalue
1832
2309
 
1833
2310
 
1834
 
def if_nametoindex(interface):
1835
 
    """Call the C function if_nametoindex(), or equivalent
1836
 
    
1837
 
    Note: This function cannot accept a unicode string."""
1838
 
    global if_nametoindex
1839
 
    try:
1840
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1841
 
                          (ctypes.util.find_library("c"))
1842
 
                          .if_nametoindex)
1843
 
    except (OSError, AttributeError):
1844
 
        logger.warning("Doing if_nametoindex the hard way")
1845
 
        def if_nametoindex(interface):
1846
 
            "Get an interface index the hard way, i.e. using fcntl()"
1847
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1848
 
            with contextlib.closing(socket.socket()) as s:
1849
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1850
 
                                    struct.pack(str("16s16x"),
1851
 
                                                interface))
1852
 
            interface_index = struct.unpack(str("I"),
1853
 
                                            ifreq[16:20])[0]
1854
 
            return interface_index
1855
 
    return if_nametoindex(interface)
1856
 
 
1857
 
 
1858
2311
def daemon(nochdir = False, noclose = False):
1859
2312
    """See daemon(3).  Standard BSD Unix function.
1860
2313
    
1868
2321
        sys.exit()
1869
2322
    if not noclose:
1870
2323
        # Close all standard open file descriptors
1871
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2324
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1872
2325
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1873
2326
            raise OSError(errno.ENODEV,
1874
 
                          "%s not a character device"
1875
 
                          % os.path.devnull)
 
2327
                          "{} not a character device"
 
2328
                          .format(os.devnull))
1876
2329
        os.dup2(null, sys.stdin.fileno())
1877
2330
        os.dup2(null, sys.stdout.fileno())
1878
2331
        os.dup2(null, sys.stderr.fileno())
1887
2340
    
1888
2341
    parser = argparse.ArgumentParser()
1889
2342
    parser.add_argument("-v", "--version", action="version",
1890
 
                        version = "%%(prog)s %s" % version,
 
2343
                        version = "%(prog)s {}".format(version),
1891
2344
                        help="show version number and exit")
1892
2345
    parser.add_argument("-i", "--interface", metavar="IF",
1893
2346
                        help="Bind to interface IF")
1899
2352
                        help="Run self-test")
1900
2353
    parser.add_argument("--debug", action="store_true",
1901
2354
                        help="Debug mode; run in foreground and log"
1902
 
                        " to terminal")
 
2355
                        " to terminal", default=None)
1903
2356
    parser.add_argument("--debuglevel", metavar="LEVEL",
1904
2357
                        help="Debug level for stdout output")
1905
2358
    parser.add_argument("--priority", help="GnuTLS"
1912
2365
                        " files")
1913
2366
    parser.add_argument("--no-dbus", action="store_false",
1914
2367
                        dest="use_dbus", help="Do not provide D-Bus"
1915
 
                        " system bus interface")
 
2368
                        " system bus interface", default=None)
1916
2369
    parser.add_argument("--no-ipv6", action="store_false",
1917
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2370
                        dest="use_ipv6", help="Do not use IPv6",
 
2371
                        default=None)
1918
2372
    parser.add_argument("--no-restore", action="store_false",
1919
 
                        dest="restore", help="Do not restore old state",
1920
 
                        default=True)
1921
 
 
 
2373
                        dest="restore", help="Do not restore stored"
 
2374
                        " state", default=None)
 
2375
    parser.add_argument("--socket", type=int,
 
2376
                        help="Specify a file descriptor to a network"
 
2377
                        " socket to use instead of creating one")
 
2378
    parser.add_argument("--statedir", metavar="DIR",
 
2379
                        help="Directory to save/restore state in")
 
2380
    parser.add_argument("--foreground", action="store_true",
 
2381
                        help="Run in foreground", default=None)
 
2382
    parser.add_argument("--no-zeroconf", action="store_false",
 
2383
                        dest="zeroconf", help="Do not use Zeroconf",
 
2384
                        default=None)
 
2385
    
1922
2386
    options = parser.parse_args()
1923
2387
    
1924
2388
    if options.check:
1925
2389
        import doctest
1926
 
        doctest.testmod()
1927
 
        sys.exit()
 
2390
        fail_count, test_count = doctest.testmod()
 
2391
        sys.exit(os.EX_OK if fail_count == 0 else 1)
1928
2392
    
1929
2393
    # Default values for config file for server-global settings
1930
2394
    server_defaults = { "interface": "",
1932
2396
                        "port": "",
1933
2397
                        "debug": "False",
1934
2398
                        "priority":
1935
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2399
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
 
2400
                        ":+SIGN-DSA-SHA256",
1936
2401
                        "servicename": "Mandos",
1937
2402
                        "use_dbus": "True",
1938
2403
                        "use_ipv6": "True",
1939
2404
                        "debuglevel": "",
1940
 
                        }
 
2405
                        "restore": "True",
 
2406
                        "socket": "",
 
2407
                        "statedir": "/var/lib/mandos",
 
2408
                        "foreground": "False",
 
2409
                        "zeroconf": "True",
 
2410
                    }
1941
2411
    
1942
2412
    # Parse config file for server-global settings
1943
2413
    server_config = configparser.SafeConfigParser(server_defaults)
1944
2414
    del server_defaults
1945
 
    server_config.read(os.path.join(options.configdir,
1946
 
                                    "mandos.conf"))
 
2415
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
1947
2416
    # Convert the SafeConfigParser object to a dict
1948
2417
    server_settings = server_config.defaults()
1949
2418
    # Use the appropriate methods on the non-string config options
1950
 
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2419
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
1951
2420
        server_settings[option] = server_config.getboolean("DEFAULT",
1952
2421
                                                           option)
1953
2422
    if server_settings["port"]:
1954
2423
        server_settings["port"] = server_config.getint("DEFAULT",
1955
2424
                                                       "port")
 
2425
    if server_settings["socket"]:
 
2426
        server_settings["socket"] = server_config.getint("DEFAULT",
 
2427
                                                         "socket")
 
2428
        # Later, stdin will, and stdout and stderr might, be dup'ed
 
2429
        # over with an opened os.devnull.  But we don't want this to
 
2430
        # happen with a supplied network socket.
 
2431
        if 0 <= server_settings["socket"] <= 2:
 
2432
            server_settings["socket"] = os.dup(server_settings
 
2433
                                               ["socket"])
1956
2434
    del server_config
1957
2435
    
1958
2436
    # Override the settings from the config file with command line
1959
2437
    # options, if set.
1960
2438
    for option in ("interface", "address", "port", "debug",
1961
 
                   "priority", "servicename", "configdir",
1962
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore"):
 
2439
                   "priority", "servicename", "configdir", "use_dbus",
 
2440
                   "use_ipv6", "debuglevel", "restore", "statedir",
 
2441
                   "socket", "foreground", "zeroconf"):
1963
2442
        value = getattr(options, option)
1964
2443
        if value is not None:
1965
2444
            server_settings[option] = value
1966
2445
    del options
1967
2446
    # Force all strings to be unicode
1968
2447
    for option in server_settings.keys():
1969
 
        if type(server_settings[option]) is str:
1970
 
            server_settings[option] = unicode(server_settings[option])
 
2448
        if isinstance(server_settings[option], bytes):
 
2449
            server_settings[option] = (server_settings[option]
 
2450
                                       .decode("utf-8"))
 
2451
    # Force all boolean options to be boolean
 
2452
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2453
                   "foreground", "zeroconf"):
 
2454
        server_settings[option] = bool(server_settings[option])
 
2455
    # Debug implies foreground
 
2456
    if server_settings["debug"]:
 
2457
        server_settings["foreground"] = True
1971
2458
    # Now we have our good server settings in "server_settings"
1972
2459
    
1973
2460
    ##################################################################
1974
2461
    
 
2462
    if (not server_settings["zeroconf"]
 
2463
        and not (server_settings["port"]
 
2464
                 or server_settings["socket"] != "")):
 
2465
        parser.error("Needs port or socket to work without Zeroconf")
 
2466
    
1975
2467
    # For convenience
1976
2468
    debug = server_settings["debug"]
1977
2469
    debuglevel = server_settings["debuglevel"]
1978
2470
    use_dbus = server_settings["use_dbus"]
1979
2471
    use_ipv6 = server_settings["use_ipv6"]
 
2472
    stored_state_path = os.path.join(server_settings["statedir"],
 
2473
                                     stored_state_file)
 
2474
    foreground = server_settings["foreground"]
 
2475
    zeroconf = server_settings["zeroconf"]
 
2476
    
 
2477
    if debug:
 
2478
        initlogger(debug, logging.DEBUG)
 
2479
    else:
 
2480
        if not debuglevel:
 
2481
            initlogger(debug)
 
2482
        else:
 
2483
            level = getattr(logging, debuglevel.upper())
 
2484
            initlogger(debug, level)
1980
2485
    
1981
2486
    if server_settings["servicename"] != "Mandos":
1982
 
        syslogger.setFormatter(logging.Formatter
1983
 
                               ('Mandos (%s) [%%(process)d]:'
1984
 
                                ' %%(levelname)s: %%(message)s'
1985
 
                                % server_settings["servicename"]))
 
2487
        syslogger.setFormatter(
 
2488
            logging.Formatter('Mandos ({}) [%(process)d]:'
 
2489
                              ' %(levelname)s: %(message)s'.format(
 
2490
                                  server_settings["servicename"])))
1986
2491
    
1987
2492
    # Parse config file with clients
1988
 
    client_defaults = { "timeout": "5m",
1989
 
                        "extended_timeout": "15m",
1990
 
                        "interval": "2m",
1991
 
                        "checker": "fping -q -- %%(host)s",
1992
 
                        "host": "",
1993
 
                        "approval_delay": "0s",
1994
 
                        "approval_duration": "1s",
1995
 
                        }
1996
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2493
    client_config = configparser.SafeConfigParser(Client
 
2494
                                                  .client_defaults)
1997
2495
    client_config.read(os.path.join(server_settings["configdir"],
1998
2496
                                    "clients.conf"))
1999
2497
    
2000
2498
    global mandos_dbus_service
2001
2499
    mandos_dbus_service = None
2002
2500
    
2003
 
    tcp_server = MandosServer((server_settings["address"],
2004
 
                               server_settings["port"]),
2005
 
                              ClientHandler,
2006
 
                              interface=(server_settings["interface"]
2007
 
                                         or None),
2008
 
                              use_ipv6=use_ipv6,
2009
 
                              gnutls_priority=
2010
 
                              server_settings["priority"],
2011
 
                              use_dbus=use_dbus)
2012
 
    if not debug:
2013
 
        pidfilename = "/var/run/mandos.pid"
 
2501
    socketfd = None
 
2502
    if server_settings["socket"] != "":
 
2503
        socketfd = server_settings["socket"]
 
2504
    tcp_server = MandosServer(
 
2505
        (server_settings["address"], server_settings["port"]),
 
2506
        ClientHandler,
 
2507
        interface=(server_settings["interface"] or None),
 
2508
        use_ipv6=use_ipv6,
 
2509
        gnutls_priority=server_settings["priority"],
 
2510
        use_dbus=use_dbus,
 
2511
        socketfd=socketfd)
 
2512
    if not foreground:
 
2513
        pidfilename = "/run/mandos.pid"
 
2514
        if not os.path.isdir("/run/."):
 
2515
            pidfilename = "/var/run/mandos.pid"
 
2516
        pidfile = None
2014
2517
        try:
2015
 
            pidfile = open(pidfilename, "w")
2016
 
        except IOError:
2017
 
            logger.error("Could not open file %r", pidfilename)
 
2518
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
2519
        except IOError as e:
 
2520
            logger.error("Could not open file %r", pidfilename,
 
2521
                         exc_info=e)
2018
2522
    
2019
 
    try:
2020
 
        uid = pwd.getpwnam("_mandos").pw_uid
2021
 
        gid = pwd.getpwnam("_mandos").pw_gid
2022
 
    except KeyError:
 
2523
    for name in ("_mandos", "mandos", "nobody"):
2023
2524
        try:
2024
 
            uid = pwd.getpwnam("mandos").pw_uid
2025
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2525
            uid = pwd.getpwnam(name).pw_uid
 
2526
            gid = pwd.getpwnam(name).pw_gid
 
2527
            break
2026
2528
        except KeyError:
2027
 
            try:
2028
 
                uid = pwd.getpwnam("nobody").pw_uid
2029
 
                gid = pwd.getpwnam("nobody").pw_gid
2030
 
            except KeyError:
2031
 
                uid = 65534
2032
 
                gid = 65534
 
2529
            continue
 
2530
    else:
 
2531
        uid = 65534
 
2532
        gid = 65534
2033
2533
    try:
2034
2534
        os.setgid(gid)
2035
2535
        os.setuid(uid)
2036
2536
    except OSError as error:
2037
 
        if error[0] != errno.EPERM:
2038
 
            raise error
2039
 
    
2040
 
    if not debug and not debuglevel:
2041
 
        syslogger.setLevel(logging.WARNING)
2042
 
        console.setLevel(logging.WARNING)
2043
 
    if debuglevel:
2044
 
        level = getattr(logging, debuglevel.upper())
2045
 
        syslogger.setLevel(level)
2046
 
        console.setLevel(level)
 
2537
        if error.errno != errno.EPERM:
 
2538
            raise
2047
2539
    
2048
2540
    if debug:
2049
2541
        # Enable all possible GnuTLS debugging
2056
2548
        def debug_gnutls(level, string):
2057
2549
            logger.debug("GnuTLS: %s", string[:-1])
2058
2550
        
2059
 
        (gnutls.library.functions
2060
 
         .gnutls_global_set_log_function(debug_gnutls))
 
2551
        gnutls.library.functions.gnutls_global_set_log_function(
 
2552
            debug_gnutls)
2061
2553
        
2062
2554
        # Redirect stdin so all checkers get /dev/null
2063
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
2555
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2064
2556
        os.dup2(null, sys.stdin.fileno())
2065
2557
        if null > 2:
2066
2558
            os.close(null)
2067
 
    else:
2068
 
        # No console logging
2069
 
        logger.removeHandler(console)
2070
2559
    
2071
2560
    # Need to fork before connecting to D-Bus
2072
 
    if not debug:
 
2561
    if not foreground:
2073
2562
        # Close all input and output, do double fork, etc.
2074
2563
        daemon()
2075
2564
    
 
2565
    # multiprocessing will use threads, so before we use gobject we
 
2566
    # need to inform gobject that threads will be used.
 
2567
    gobject.threads_init()
 
2568
    
2076
2569
    global main_loop
2077
2570
    # From the Avahi example code
2078
 
    DBusGMainLoop(set_as_default=True )
 
2571
    DBusGMainLoop(set_as_default=True)
2079
2572
    main_loop = gobject.MainLoop()
2080
2573
    bus = dbus.SystemBus()
2081
2574
    # End of Avahi example code
2082
2575
    if use_dbus:
2083
2576
        try:
2084
2577
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2085
 
                                            bus, do_not_queue=True)
2086
 
            old_bus_name = (dbus.service.BusName
2087
 
                            ("se.bsnet.fukt.Mandos", bus,
2088
 
                             do_not_queue=True))
2089
 
        except dbus.exceptions.NameExistsException as e:
2090
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
2578
                                            bus,
 
2579
                                            do_not_queue=True)
 
2580
            old_bus_name = dbus.service.BusName(
 
2581
                "se.bsnet.fukt.Mandos", bus,
 
2582
                do_not_queue=True)
 
2583
        except dbus.exceptions.DBusException as e:
 
2584
            logger.error("Disabling D-Bus:", exc_info=e)
2091
2585
            use_dbus = False
2092
2586
            server_settings["use_dbus"] = False
2093
2587
            tcp_server.use_dbus = False
2094
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2095
 
    service = AvahiService(name = server_settings["servicename"],
2096
 
                           servicetype = "_mandos._tcp",
2097
 
                           protocol = protocol, bus = bus)
2098
 
    if server_settings["interface"]:
2099
 
        service.interface = (if_nametoindex
2100
 
                             (str(server_settings["interface"])))
 
2588
    if zeroconf:
 
2589
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2590
        service = AvahiServiceToSyslog(
 
2591
            name = server_settings["servicename"],
 
2592
            servicetype = "_mandos._tcp",
 
2593
            protocol = protocol,
 
2594
            bus = bus)
 
2595
        if server_settings["interface"]:
 
2596
            service.interface = if_nametoindex(
 
2597
                server_settings["interface"].encode("utf-8"))
2101
2598
    
2102
2599
    global multiprocessing_manager
2103
2600
    multiprocessing_manager = multiprocessing.Manager()
2104
2601
    
2105
2602
    client_class = Client
2106
2603
    if use_dbus:
2107
 
        client_class = functools.partial(ClientDBusTransitional,
2108
 
                                         bus = bus)
2109
 
    
2110
 
    special_settings = {
2111
 
        # Some settings need to be accessd by special methods;
2112
 
        # booleans need .getboolean(), etc.  Here is a list of them:
2113
 
        "approved_by_default":
2114
 
            lambda section:
2115
 
            client_config.getboolean(section, "approved_by_default"),
2116
 
        }
2117
 
    # Construct a new dict of client settings of this form:
2118
 
    # { client_name: {setting_name: value, ...}, ...}
2119
 
    # with exceptions for any special settings as defined above
2120
 
    client_settings = dict((clientname,
2121
 
                           dict((setting,
2122
 
                                 (value if setting not in special_settings
2123
 
                                  else special_settings[setting](clientname)))
2124
 
                                for setting, value in client_config.items(clientname)))
2125
 
                          for clientname in client_config.sections())
2126
 
    
 
2604
        client_class = functools.partial(ClientDBus, bus = bus)
 
2605
    
 
2606
    client_settings = Client.config_parser(client_config)
2127
2607
    old_client_settings = {}
2128
 
    clients_data = []
2129
 
 
 
2608
    clients_data = {}
 
2609
    
 
2610
    # This is used to redirect stdout and stderr for checker processes
 
2611
    global wnull
 
2612
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2613
    # Only used if server is running in foreground but not in debug
 
2614
    # mode
 
2615
    if debug or not foreground:
 
2616
        wnull.close()
 
2617
    
 
2618
    # Get client data and settings from last running state.
2130
2619
    if server_settings["restore"]:
2131
2620
        try:
2132
2621
            with open(stored_state_path, "rb") as stored_state:
2133
 
                clients_data, old_client_settings = pickle.load(stored_state)
 
2622
                clients_data, old_client_settings = pickle.load(
 
2623
                    stored_state)
2134
2624
            os.remove(stored_state_path)
2135
2625
        except IOError as e:
2136
 
            logger.warning("Could not load persistant state: {0}".format(e))
2137
 
            if e.errno != errno.ENOENT:
 
2626
            if e.errno == errno.ENOENT:
 
2627
                logger.warning("Could not load persistent state:"
 
2628
                               " {}".format(os.strerror(e.errno)))
 
2629
            else:
 
2630
                logger.critical("Could not load persistent state:",
 
2631
                                exc_info=e)
2138
2632
                raise
2139
 
 
2140
 
    for client in clients_data:
2141
 
        client_name = client["name"]
2142
 
        
2143
 
        # Decide which value to use after restoring saved state.
2144
 
        # We have three different values: Old config file,
2145
 
        # new config file, and saved state.
2146
 
        # New config value takes precedence if it differs from old
2147
 
        # config value, otherwise use saved state.
2148
 
        for name, value in client_settings[client_name].items():
 
2633
        except EOFError as e:
 
2634
            logger.warning("Could not load persistent state: "
 
2635
                           "EOFError:",
 
2636
                           exc_info=e)
 
2637
    
 
2638
    with PGPEngine() as pgp:
 
2639
        for client_name, client in clients_data.items():
 
2640
            # Skip removed clients
 
2641
            if client_name not in client_settings:
 
2642
                continue
 
2643
            
 
2644
            # Decide which value to use after restoring saved state.
 
2645
            # We have three different values: Old config file,
 
2646
            # new config file, and saved state.
 
2647
            # New config value takes precedence if it differs from old
 
2648
            # config value, otherwise use saved state.
 
2649
            for name, value in client_settings[client_name].items():
 
2650
                try:
 
2651
                    # For each value in new config, check if it
 
2652
                    # differs from the old config value (Except for
 
2653
                    # the "secret" attribute)
 
2654
                    if (name != "secret"
 
2655
                        and (value !=
 
2656
                             old_client_settings[client_name][name])):
 
2657
                        client[name] = value
 
2658
                except KeyError:
 
2659
                    pass
 
2660
            
 
2661
            # Clients who has passed its expire date can still be
 
2662
            # enabled if its last checker was successful.  A Client
 
2663
            # whose checker succeeded before we stored its state is
 
2664
            # assumed to have successfully run all checkers during
 
2665
            # downtime.
 
2666
            if client["enabled"]:
 
2667
                if datetime.datetime.utcnow() >= client["expires"]:
 
2668
                    if not client["last_checked_ok"]:
 
2669
                        logger.warning(
 
2670
                            "disabling client {} - Client never "
 
2671
                            "performed a successful checker".format(
 
2672
                                client_name))
 
2673
                        client["enabled"] = False
 
2674
                    elif client["last_checker_status"] != 0:
 
2675
                        logger.warning(
 
2676
                            "disabling client {} - Client last"
 
2677
                            " checker failed with error code"
 
2678
                            " {}".format(
 
2679
                                client_name,
 
2680
                                client["last_checker_status"]))
 
2681
                        client["enabled"] = False
 
2682
                    else:
 
2683
                        client["expires"] = (
 
2684
                            datetime.datetime.utcnow()
 
2685
                            + client["timeout"])
 
2686
                        logger.debug("Last checker succeeded,"
 
2687
                                     " keeping {} enabled".format(
 
2688
                                         client_name))
2149
2689
            try:
2150
 
                # For each value in new config, check if it differs
2151
 
                # from the old config value (Except for the "secret"
2152
 
                # attribute)
2153
 
                if name != "secret" and value != old_client_settings[client_name][name]:
2154
 
                    setattr(client, name, value)
2155
 
            except KeyError:
2156
 
                pass
2157
 
 
2158
 
        # Clients who has passed its expire date, can still be enabled if its
2159
 
        # last checker was sucessful. Clients who checkers failed before we
2160
 
        # stored it state is asumed to had failed checker during downtime.
2161
 
        if client["enabled"] and client["last_checked_ok"]:
2162
 
            if ((datetime.datetime.utcnow() - client["last_checked_ok"])
2163
 
                > client["interval"]):
2164
 
                if client["last_checker_status"] != 0:
2165
 
                    client["enabled"] = False
2166
 
                else:
2167
 
                    client["expires"] = datetime.datetime.utcnow() + client["timeout"]
2168
 
 
2169
 
        client["changedstate"] = (multiprocessing_manager
2170
 
                                  .Condition(multiprocessing_manager
2171
 
                                             .Lock()))
2172
 
        if use_dbus:
2173
 
            new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
2174
 
            tcp_server.clients[client_name] = new_client
2175
 
            new_client.bus = bus
2176
 
            for name, value in client.iteritems():
2177
 
                setattr(new_client, name, value)
2178
 
            client_object_name = unicode(client_name).translate(
2179
 
                {ord("."): ord("_"),
2180
 
                 ord("-"): ord("_")})
2181
 
            new_client.dbus_object_path = (dbus.ObjectPath
2182
 
                                     ("/clients/" + client_object_name))
2183
 
            DBusObjectWithProperties.__init__(new_client,
2184
 
                                              new_client.bus,
2185
 
                                              new_client.dbus_object_path)
2186
 
        else:
2187
 
            tcp_server.clients[client_name] = Client.__new__(Client)
2188
 
            for name, value in client.iteritems():
2189
 
                setattr(tcp_server.clients[client_name], name, value)
2190
 
                
2191
 
        tcp_server.clients[client_name].decrypt_secret(
2192
 
            client_settings[client_name]["secret"])            
2193
 
        
2194
 
    # Create/remove clients based on new changes made to config
2195
 
    for clientname in set(old_client_settings) - set(client_settings):
2196
 
        del tcp_server.clients[clientname]
2197
 
    for clientname in set(client_settings) - set(old_client_settings):
2198
 
        tcp_server.clients[clientname] = (client_class(name = clientname,
2199
 
                                                       config =
2200
 
                                                       client_settings
2201
 
                                                       [clientname]))
2202
 
    
2203
 
 
 
2690
                client["secret"] = pgp.decrypt(
 
2691
                    client["encrypted_secret"],
 
2692
                    client_settings[client_name]["secret"])
 
2693
            except PGPError:
 
2694
                # If decryption fails, we use secret from new settings
 
2695
                logger.debug("Failed to decrypt {} old secret".format(
 
2696
                    client_name))
 
2697
                client["secret"] = (client_settings[client_name]
 
2698
                                    ["secret"])
 
2699
    
 
2700
    # Add/remove clients based on new changes made to config
 
2701
    for client_name in (set(old_client_settings)
 
2702
                        - set(client_settings)):
 
2703
        del clients_data[client_name]
 
2704
    for client_name in (set(client_settings)
 
2705
                        - set(old_client_settings)):
 
2706
        clients_data[client_name] = client_settings[client_name]
 
2707
    
 
2708
    # Create all client objects
 
2709
    for client_name, client in clients_data.items():
 
2710
        tcp_server.clients[client_name] = client_class(
 
2711
            name = client_name,
 
2712
            settings = client,
 
2713
            server_settings = server_settings)
 
2714
    
2204
2715
    if not tcp_server.clients:
2205
2716
        logger.warning("No clients defined")
2206
 
        
2207
 
    if not debug:
2208
 
        try:
2209
 
            with pidfile:
2210
 
                pid = os.getpid()
2211
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
2212
 
            del pidfile
2213
 
        except IOError:
2214
 
            logger.error("Could not write to file %r with PID %d",
2215
 
                         pidfilename, pid)
2216
 
        except NameError:
2217
 
            # "pidfile" was never created
2218
 
            pass
 
2717
    
 
2718
    if not foreground:
 
2719
        if pidfile is not None:
 
2720
            pid = os.getpid()
 
2721
            try:
 
2722
                with pidfile:
 
2723
                    print(pid, file=pidfile)
 
2724
            except IOError:
 
2725
                logger.error("Could not write to file %r with PID %d",
 
2726
                             pidfilename, pid)
 
2727
        del pidfile
2219
2728
        del pidfilename
2220
 
        
2221
 
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2222
2729
    
2223
2730
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2224
2731
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2225
2732
    
2226
2733
    if use_dbus:
2227
 
        class MandosDBusService(dbus.service.Object):
 
2734
        
 
2735
        @alternate_dbus_interfaces(
 
2736
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
 
2737
        class MandosDBusService(DBusObjectWithProperties):
2228
2738
            """A D-Bus proxy object"""
 
2739
            
2229
2740
            def __init__(self):
2230
2741
                dbus.service.Object.__init__(self, bus, "/")
 
2742
            
2231
2743
            _interface = "se.recompile.Mandos"
2232
2744
            
 
2745
            @dbus_interface_annotations(_interface)
 
2746
            def _foo(self):
 
2747
                return {
 
2748
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
2749
                    "false" }
 
2750
            
2233
2751
            @dbus.service.signal(_interface, signature="o")
2234
2752
            def ClientAdded(self, objpath):
2235
2753
                "D-Bus signal"
2248
2766
            @dbus.service.method(_interface, out_signature="ao")
2249
2767
            def GetAllClients(self):
2250
2768
                "D-Bus method"
2251
 
                return dbus.Array(c.dbus_object_path
2252
 
                                  for c in
 
2769
                return dbus.Array(c.dbus_object_path for c in
2253
2770
                                  tcp_server.clients.itervalues())
2254
2771
            
2255
2772
            @dbus.service.method(_interface,
2257
2774
            def GetAllClientsWithProperties(self):
2258
2775
                "D-Bus method"
2259
2776
                return dbus.Dictionary(
2260
 
                    ((c.dbus_object_path, c.GetAll(""))
2261
 
                     for c in tcp_server.clients.itervalues()),
 
2777
                    { c.dbus_object_path: c.GetAll("")
 
2778
                      for c in tcp_server.clients.itervalues() },
2262
2779
                    signature="oa{sv}")
2263
2780
            
2264
2781
            @dbus.service.method(_interface, in_signature="o")
2277
2794
            
2278
2795
            del _interface
2279
2796
        
2280
 
        class MandosDBusServiceTransitional(MandosDBusService):
2281
 
            __metaclass__ = AlternateDBusNamesMetaclass
2282
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
2797
        mandos_dbus_service = MandosDBusService()
2283
2798
    
2284
2799
    def cleanup():
2285
2800
        "Cleanup function; run on exit"
2286
 
        service.cleanup()
 
2801
        if zeroconf:
 
2802
            service.cleanup()
2287
2803
        
2288
2804
        multiprocessing.active_children()
 
2805
        wnull.close()
2289
2806
        if not (tcp_server.clients or client_settings):
2290
2807
            return
2291
 
 
2292
 
        # Store client before exiting. Secrets are encrypted with key based
2293
 
        # on what config file has. If config file is removed/edited, old
2294
 
        # secret will thus be unrecovable.
2295
 
        clients = []
2296
 
        for client in tcp_server.clients.itervalues():
2297
 
            client.encrypt_secret(client_settings[client.name]["secret"])
2298
 
 
2299
 
            client_dict = {}
2300
 
 
2301
 
            # A list of attributes that will not be stored when shuting down.
2302
 
            exclude = set(("bus", "changedstate", "secret"))            
2303
 
            for name, typ in inspect.getmembers(dbus.service.Object):
2304
 
                exclude.add(name)
2305
 
                
2306
 
            client_dict["encrypted_secret"] = client.encrypted_secret
2307
 
            for attr in client.client_structure:
2308
 
                if attr not in exclude:
2309
 
                    client_dict[attr] = getattr(client, attr)
2310
 
 
2311
 
            clients.append(client_dict) 
2312
 
            del client_settings[client.name]["secret"]
2313
 
            
 
2808
        
 
2809
        # Store client before exiting. Secrets are encrypted with key
 
2810
        # based on what config file has. If config file is
 
2811
        # removed/edited, old secret will thus be unrecovable.
 
2812
        clients = {}
 
2813
        with PGPEngine() as pgp:
 
2814
            for client in tcp_server.clients.itervalues():
 
2815
                key = client_settings[client.name]["secret"]
 
2816
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2817
                                                      key)
 
2818
                client_dict = {}
 
2819
                
 
2820
                # A list of attributes that can not be pickled
 
2821
                # + secret.
 
2822
                exclude = { "bus", "changedstate", "secret",
 
2823
                            "checker", "server_settings" }
 
2824
                for name, typ in inspect.getmembers(dbus.service
 
2825
                                                    .Object):
 
2826
                    exclude.add(name)
 
2827
                
 
2828
                client_dict["encrypted_secret"] = (client
 
2829
                                                   .encrypted_secret)
 
2830
                for attr in client.client_structure:
 
2831
                    if attr not in exclude:
 
2832
                        client_dict[attr] = getattr(client, attr)
 
2833
                
 
2834
                clients[client.name] = client_dict
 
2835
                del client_settings[client.name]["secret"]
 
2836
        
2314
2837
        try:
2315
 
            with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
 
2838
            with tempfile.NamedTemporaryFile(
 
2839
                    mode='wb',
 
2840
                    suffix=".pickle",
 
2841
                    prefix='clients-',
 
2842
                    dir=os.path.dirname(stored_state_path),
 
2843
                    delete=False) as stored_state:
2316
2844
                pickle.dump((clients, client_settings), stored_state)
2317
 
        except IOError as e:
2318
 
            logger.warning("Could not save persistant state: {0}".format(e))
2319
 
            if e.errno != errno.ENOENT:
 
2845
                tempname = stored_state.name
 
2846
            os.rename(tempname, stored_state_path)
 
2847
        except (IOError, OSError) as e:
 
2848
            if not debug:
 
2849
                try:
 
2850
                    os.remove(tempname)
 
2851
                except NameError:
 
2852
                    pass
 
2853
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
 
2854
                logger.warning("Could not save persistent state: {}"
 
2855
                               .format(os.strerror(e.errno)))
 
2856
            else:
 
2857
                logger.warning("Could not save persistent state:",
 
2858
                               exc_info=e)
2320
2859
                raise
2321
 
 
 
2860
        
2322
2861
        # Delete all clients, and settings from config
2323
2862
        while tcp_server.clients:
2324
2863
            name, client = tcp_server.clients.popitem()
2328
2867
            client.disable(quiet=True)
2329
2868
            if use_dbus:
2330
2869
                # Emit D-Bus signal
2331
 
                mandos_dbus_service.ClientRemoved(client
2332
 
                                              .dbus_object_path,
2333
 
                                              client.name)
 
2870
                mandos_dbus_service.ClientRemoved(
 
2871
                    client.dbus_object_path, client.name)
2334
2872
        client_settings.clear()
2335
2873
    
2336
2874
    atexit.register(cleanup)
2342
2880
        # Need to initiate checking of clients
2343
2881
        if client.enabled:
2344
2882
            client.init_checker()
2345
 
 
2346
2883
    
2347
2884
    tcp_server.enable()
2348
2885
    tcp_server.server_activate()
2349
2886
    
2350
2887
    # Find out what port we got
2351
 
    service.port = tcp_server.socket.getsockname()[1]
 
2888
    if zeroconf:
 
2889
        service.port = tcp_server.socket.getsockname()[1]
2352
2890
    if use_ipv6:
2353
2891
        logger.info("Now listening on address %r, port %d,"
2354
 
                    " flowinfo %d, scope_id %d"
2355
 
                    % tcp_server.socket.getsockname())
 
2892
                    " flowinfo %d, scope_id %d",
 
2893
                    *tcp_server.socket.getsockname())
2356
2894
    else:                       # IPv4
2357
 
        logger.info("Now listening on address %r, port %d"
2358
 
                    % tcp_server.socket.getsockname())
 
2895
        logger.info("Now listening on address %r, port %d",
 
2896
                    *tcp_server.socket.getsockname())
2359
2897
    
2360
2898
    #service.interface = tcp_server.socket.getsockname()[3]
2361
2899
    
2362
2900
    try:
2363
 
        # From the Avahi example code
2364
 
        try:
2365
 
            service.activate()
2366
 
        except dbus.exceptions.DBusException as error:
2367
 
            logger.critical("DBusException: %s", error)
2368
 
            cleanup()
2369
 
            sys.exit(1)
2370
 
        # End of Avahi example code
 
2901
        if zeroconf:
 
2902
            # From the Avahi example code
 
2903
            try:
 
2904
                service.activate()
 
2905
            except dbus.exceptions.DBusException as error:
 
2906
                logger.critical("D-Bus Exception", exc_info=error)
 
2907
                cleanup()
 
2908
                sys.exit(1)
 
2909
            # End of Avahi example code
2371
2910
        
2372
2911
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2373
2912
                             lambda *args, **kwargs:
2377
2916
        logger.debug("Starting main loop")
2378
2917
        main_loop.run()
2379
2918
    except AvahiError as error:
2380
 
        logger.critical("AvahiError: %s", error)
 
2919
        logger.critical("Avahi Error", exc_info=error)
2381
2920
        cleanup()
2382
2921
        sys.exit(1)
2383
2922
    except KeyboardInterrupt: