/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

Change "fukt.bsnet.se" to "recompile.se" throughout.

* README: - '' -
* debian/control: - '' -
* debian/copyright: - '' -
* debian/mandos-client.README.Debian: - '' - and some rewriting.
* debian/mandos.README.Debian: - '' -
* debian/watch: Change "fukt.bsnet.se" to "recompile.se".
* init.d-mandos: - '' -
* intro.xml: - '' -
* mandos: - '' -
* mandos-clients.conf.xml: - '' -
* mandos-ctl: - '' -
* mandos-ctl.xml: - '' -
* mandos-keygen: - '' -
* mandos-keygen.xml: - '' -
* mandos-monitor: - '' -
* mandos-monitor.xml: - '' -
* mandos.conf.xml: - '' -
* mandos.lsm: - '' -
* mandos.xml: - '' -
* plugin-runner.c: - '' -
* plugin-runner.xml: - '' -
* plugins.d/askpass-fifo.c: - '' -
* plugins.d/askpass-fifo.xml: - '' -
* plugins.d/mandos-client.c: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/password-prompt.xml: - '' -
* plugins.d/plymouth.c: - '' -
* plugins.d/plymouth.xml: - '' -
* plugins.d/splashy.c: - '' -
* plugins.d/splashy.xml: - '' -
* plugins.d/usplash.c: - '' -
* plugins.d/usplash.xml: - '' -

Show diffs side-by-side

added added

removed removed

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