/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* debian/mandos-client.postinst: Converted to Bourne shell.  Also
                                 minor message change.
* debian/mandos-client.postrm: Minor message change.
* debian/mandos.postinst: Converted to Bourne shell.  Also minor
                          message change.
* debian/mandos.prerm: Minor message change.

Show diffs side-by-side

added added

removed removed

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