/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2015-07-12 01:41:14 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 325.
  • Revision ID: teddy@recompile.se-20150712014114-qbala4mutkixxct3
Handle local Zeroconf service name collisions on startup, too.

* mandos (AvahiService.server_state_changed): Catch name collision
                                              error when adding
                                              server.

Show diffs side-by-side

added added

removed removed

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