/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-01-18 00:18:50 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090118001850-pvg8xjwmbyt23fom
* debian/rules (install-indep): Removed "--no-start" from
                                dh_installinit.

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