/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: 2012-05-06 17:37:23 UTC
  • Revision ID: teddy@recompile.se-20120506173723-znhgx61gpqp1rfor
* mandos (main.cleanup): Use tempfile.NamedTemporaryFile() instead of
                         tempfile.mkstemp().

Show diffs side-by-side

added added

removed removed

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