/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 at bsnet
  • Date: 2011-11-12 18:14:55 UTC
  • mto: This revision was merged to the branch mainline in revision 522.
  • Revision ID: teddy@fukt.bsnet.se-20111112181455-8m6z4qrrib33bl2c
* plugins.d/mandos-client.c (SYNOPSIS, OPTIONS): Document
                                                 "--network-hook-dir"
                                                 option.

Show diffs side-by-side

added added

removed removed

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