/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-12 18:33:24 UTC
  • Revision ID: teddy@recompile.se-20120512183324-5kbaq316kyj329jk
* mandos (Client.start_checker): Remove undocumented support for "%%s"
                                 in the clients.conf "checker" option.
  (main): Use new .errno attribute of OSError.

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