/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos-ctl (print_clients): Bug fix: Don't show "Extended Timeout"
                              as milliseconds.

Show diffs side-by-side

added added

removed removed

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