/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-07 19:13:15 UTC
  • Revision ID: teddy@recompile.se-20120507191315-tbe55n4u1uq3l7ft
* mandos: Use all new builtins.
* mandos-ctl: - '' -
* mandos-monitor: - '' -

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