/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

Merge from pipe IPC branch.

* mandos (AvahiService.rename, main): Include PID in log messages when
                                      using a different service name.
  (Client.ReceivedSecret, Client.Rejected): New D-Bus signals.
  (TCP_handler.handle): Send IPC to parent process.
  (ForkingMixInWithPipe): New mixin class.
  (IPv6_TCPServer): Inherit from ForkingMixInWithPipe instead of
                    SocketServer.ForkingMixIn.
  (IPv6_TCPServer.handle_ipc): New method.
  (main/mandos_server): Renamed to "mandos_dbus_service" and made
                        global.
  (main/MandosServer): Renamed to "MandosDBusService".
  (main/MandosDBusService.ClientNotFound): New D-Bus signal.

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.8"
 
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
76
                       ('Mandos [%(process)d]: %(levelname)s:'
95
77
                        ' %(message)s'))
97
79
 
98
80
console = logging.StreamHandler()
99
81
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
100
 
                                       ' %(levelname)s:'
101
 
                                       ' %(message)s'))
 
82
                                       ' %(levelname)s: %(message)s'))
102
83
logger.addHandler(console)
103
84
 
104
85
class AvahiError(Exception):
117
98
 
118
99
class AvahiService(object):
119
100
    """An Avahi (Zeroconf) service.
120
 
    
121
101
    Attributes:
122
102
    interface: integer; avahi.IF_UNSPEC or an interface index.
123
103
               Used to optionally bind to the specified interface.
131
111
    max_renames: integer; maximum number of renames
132
112
    rename_count: integer; counter so we only rename after collisions
133
113
                  a sensible number of times
134
 
    group: D-Bus Entry Group
135
 
    server: D-Bus Server
136
 
    bus: dbus.SystemBus()
137
114
    """
138
115
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
139
116
                 servicetype = None, port = None, TXT = None,
140
117
                 domain = "", host = "", max_renames = 32768,
141
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
118
                 protocol = avahi.PROTO_UNSPEC):
142
119
        self.interface = interface
143
120
        self.name = name
144
121
        self.type = servicetype
149
126
        self.rename_count = 0
150
127
        self.max_renames = max_renames
151
128
        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
129
    def rename(self):
157
130
        """Derived from the Avahi example code"""
158
131
        if self.rename_count >= self.max_renames:
159
 
            logger.critical("No suitable Zeroconf service name found"
160
 
                            " after %i retries, exiting.",
 
132
            logger.critical(u"No suitable Zeroconf service name found"
 
133
                            u" after %i retries, exiting.",
161
134
                            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)
 
135
            raise AvahiServiceError(u"Too many renames")
 
136
        self.name = server.GetAlternativeServiceName(self.name)
 
137
        logger.info(u"Changing Zeroconf service name to %r ...",
 
138
                    str(self.name))
167
139
        syslogger.setFormatter(logging.Formatter
168
140
                               ('Mandos (%s) [%%(process)d]:'
169
141
                                ' %%(levelname)s: %%(message)s'
170
142
                                % self.name))
171
143
        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)
 
144
        self.add()
178
145
        self.rename_count += 1
179
146
    def remove(self):
180
147
        """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()
 
148
        if group is not None:
 
149
            group.Reset()
186
150
    def add(self):
187
151
        """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):
 
152
        global group
 
153
        if group is None:
 
154
            group = dbus.Interface(bus.get_object
 
155
                                   (avahi.DBUS_NAME,
 
156
                                    server.EntryGroupNew()),
 
157
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
158
            group.connect_to_signal('StateChanged',
 
159
                                    entry_group_state_changed)
 
160
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
161
                     service.name, service.type)
 
162
        group.AddService(
 
163
                self.interface,         # interface
 
164
                self.protocol,          # protocol
 
165
                dbus.UInt32(0),         # flags
 
166
                self.name, self.type,
 
167
                self.domain, self.host,
 
168
                dbus.UInt16(self.port),
 
169
                avahi.string_array_to_txt_array(self.TXT))
 
170
        group.Commit()
 
171
 
 
172
# From the Avahi example code:
 
173
group = None                            # our entry group
 
174
# End of Avahi example code
 
175
 
 
176
 
 
177
def _datetime_to_dbus(dt, variant_level=0):
 
178
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
179
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
180
 
 
181
 
 
182
class Client(dbus.service.Object):
276
183
    """A representation of a client host served by this server.
277
 
    
278
184
    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
 
185
    name:       string; from the config file, used in log messages and
 
186
                        D-Bus identifiers
 
187
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
188
                 uniquely identify the client
 
189
    secret:     bytestring; sent verbatim (over TLS) to client
 
190
    host:       string; available for use by the checker command
 
191
    created:    datetime.datetime(); (UTC) object creation
 
192
    last_enabled: datetime.datetime(); (UTC)
 
193
    enabled:    bool()
 
194
    last_checked_ok: datetime.datetime(); (UTC) or None
 
195
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
196
                                      until this client is invalid
 
197
    interval:   datetime.timedelta(); How often to start a new checker
 
198
    disable_hook:  If set, called by disable() as disable_hook(self)
282
199
    checker:    subprocess.Popen(); a running checker process used
283
200
                                    to see if the client lives.
284
201
                                    '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
 
202
    checker_initiator_tag: a gobject event source tag, or None
 
203
    disable_initiator_tag:    - '' -
 
204
    checker_callback_tag:  - '' -
 
205
    checker_command: string; External command which is run to check if
 
206
                     client lives.  %() expansions are done at
288
207
                     runtime with vars(self) as dict, so that for
289
208
                     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
209
    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
 
210
    use_dbus: bool(); Whether to provide D-Bus interface and signals
 
211
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
312
212
    """
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
213
    def timeout_milliseconds(self):
320
214
        "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)    
 
215
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
 
216
                + (self.timeout.seconds * 1000)
 
217
                + (self.timeout.microseconds // 1000))
326
218
    
327
219
    def interval_milliseconds(self):
328
220
        "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):
 
221
        return ((self.interval.days * 24 * 60 * 60 * 1000)
 
222
                + (self.interval.seconds * 1000)
 
223
                + (self.interval.microseconds // 1000))
 
224
    
 
225
    def __init__(self, name = None, disable_hook=None, config=None,
 
226
                 use_dbus=True):
335
227
        """Note: the 'checker' key in 'config' sets the
336
228
        'checker_command' attribute and *not* the 'checker'
337
229
        attribute."""
338
230
        self.name = name
339
231
        if config is None:
340
232
            config = {}
341
 
        logger.debug("Creating client %r", self.name)
 
233
        logger.debug(u"Creating client %r", self.name)
 
234
        self.use_dbus = False   # During __init__
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
264
        self.current_checker_command = None
376
265
        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()
 
266
        # Only now, when this client is initialized, can it show up on
 
267
        # the D-Bus
 
268
        self.use_dbus = use_dbus
 
269
        if self.use_dbus:
 
270
            self.dbus_object_path = (dbus.ObjectPath
 
271
                                     ("/clients/"
 
272
                                      + self.name.replace(".", "_")))
 
273
            dbus.service.Object.__init__(self, bus,
 
274
                                         self.dbus_object_path)
393
275
    
394
276
    def enable(self):
395
277
        """Start this client's checker and timeout hooks"""
396
 
        if getattr(self, "enabled", False):
397
 
            # Already enabled
398
 
            return
399
 
        self.send_changedstate()
 
278
        self.last_enabled = datetime.datetime.utcnow()
400
279
        # Schedule a new checker to be started an 'interval' from now,
401
280
        # and every interval from then on.
402
281
        self.checker_initiator_tag = (gobject.timeout_add
403
282
                                      (self.interval_milliseconds(),
404
283
                                       self.start_checker))
 
284
        # Also start a new checker *right now*.
 
285
        self.start_checker()
405
286
        # Schedule a disable() when 'timeout' has passed
406
 
        self.expires = datetime.datetime.utcnow() + self.timeout
407
287
        self.disable_initiator_tag = (gobject.timeout_add
408
288
                                   (self.timeout_milliseconds(),
409
289
                                    self.disable))
410
290
        self.enabled = True
411
 
        self.last_enabled = datetime.datetime.utcnow()
412
 
        # Also start a new checker *right now*.
413
 
        self.start_checker()
 
291
        if self.use_dbus:
 
292
            # Emit D-Bus signals
 
293
            self.PropertyChanged(dbus.String(u"enabled"),
 
294
                                 dbus.Boolean(True, variant_level=1))
 
295
            self.PropertyChanged(dbus.String(u"last_enabled"),
 
296
                                 (_datetime_to_dbus(self.last_enabled,
 
297
                                                    variant_level=1)))
414
298
    
415
 
    def disable(self, quiet=True):
 
299
    def disable(self):
416
300
        """Disable this client."""
417
301
        if not getattr(self, "enabled", False):
418
302
            return False
419
 
        if not quiet:
420
 
            self.send_changedstate()
421
 
        if not quiet:
422
 
            logger.info("Disabling client %s", self.name)
 
303
        logger.info(u"Disabling client %s", self.name)
423
304
        if getattr(self, "disable_initiator_tag", False):
424
305
            gobject.source_remove(self.disable_initiator_tag)
425
306
            self.disable_initiator_tag = None
426
 
        self.expires = None
427
307
        if getattr(self, "checker_initiator_tag", False):
428
308
            gobject.source_remove(self.checker_initiator_tag)
429
309
            self.checker_initiator_tag = None
431
311
        if self.disable_hook:
432
312
            self.disable_hook(self)
433
313
        self.enabled = False
 
314
        if self.use_dbus:
 
315
            # Emit D-Bus signal
 
316
            self.PropertyChanged(dbus.String(u"enabled"),
 
317
                                 dbus.Boolean(False, variant_level=1))
434
318
        # Do not run this again if called by a gobject.timeout_add
435
319
        return False
436
320
    
442
326
        """The checker has completed, so take appropriate actions."""
443
327
        self.checker_callback_tag = None
444
328
        self.checker = None
 
329
        if self.use_dbus:
 
330
            # Emit D-Bus signal
 
331
            self.PropertyChanged(dbus.String(u"checker_running"),
 
332
                                 dbus.Boolean(False, variant_level=1))
445
333
        if os.WIFEXITED(condition):
446
334
            exitstatus = os.WEXITSTATUS(condition)
447
335
            if exitstatus == 0:
448
 
                logger.info("Checker for %(name)s succeeded",
 
336
                logger.info(u"Checker for %(name)s succeeded",
449
337
                            vars(self))
450
338
                self.checked_ok()
451
339
            else:
452
 
                logger.info("Checker for %(name)s failed",
 
340
                logger.info(u"Checker for %(name)s failed",
453
341
                            vars(self))
 
342
            if self.use_dbus:
 
343
                # Emit D-Bus signal
 
344
                self.CheckerCompleted(dbus.Int16(exitstatus),
 
345
                                      dbus.Int64(condition),
 
346
                                      dbus.String(command))
454
347
        else:
455
 
            logger.warning("Checker for %(name)s crashed?",
 
348
            logger.warning(u"Checker for %(name)s crashed?",
456
349
                           vars(self))
 
350
            if self.use_dbus:
 
351
                # Emit D-Bus signal
 
352
                self.CheckerCompleted(dbus.Int16(-1),
 
353
                                      dbus.Int64(condition),
 
354
                                      dbus.String(command))
457
355
    
458
 
    def checked_ok(self, timeout=None):
 
356
    def checked_ok(self):
459
357
        """Bump up the timeout for this client.
460
 
        
461
358
        This should only be called when the client has been seen,
462
359
        alive and well.
463
360
        """
464
 
        if timeout is None:
465
 
            timeout = self.timeout
466
361
        self.last_checked_ok = datetime.datetime.utcnow()
467
362
        gobject.source_remove(self.disable_initiator_tag)
468
 
        self.expires = datetime.datetime.utcnow() + timeout
469
363
        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()
 
364
                                      (self.timeout_milliseconds(),
 
365
                                       self.disable))
 
366
        if self.use_dbus:
 
367
            # Emit D-Bus signal
 
368
            self.PropertyChanged(
 
369
                dbus.String(u"last_checked_ok"),
 
370
                (_datetime_to_dbus(self.last_checked_ok,
 
371
                                   variant_level=1)))
475
372
    
476
373
    def start_checker(self):
477
374
        """Start a new checker subprocess if one is not running.
478
 
        
479
375
        If a checker already exists, leave it running and do
480
376
        nothing."""
481
377
        # The reason for not killing a running checker is that if we
484
380
        # client would inevitably timeout, since no checker would get
485
381
        # a chance to run to completion.  If we instead leave running
486
382
        # 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.
 
383
        # than 'timeout' for the client to be declared invalid, which
 
384
        # is as it should be.
489
385
        
490
386
        # If a checker exists, make sure it is not a zombie
491
 
        try:
 
387
        if self.checker is not None:
492
388
            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
389
            if pid:
499
390
                logger.warning("Checker was a zombie")
500
391
                gobject.source_remove(self.checker_callback_tag)
507
398
                command = self.checker_command % self.host
508
399
            except TypeError:
509
400
                # 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
 
                
 
401
                escaped_attrs = dict((key, re.escape(str(val)))
 
402
                                     for key, val in
 
403
                                     vars(self).iteritems())
518
404
                try:
519
405
                    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)
 
406
                except TypeError, error:
 
407
                    logger.error(u'Could not format string "%s":'
 
408
                                 u' %s', self.checker_command, error)
523
409
                    return True # Try again later
524
 
            self.current_checker_command = command
 
410
                self.current_checker_command = command
525
411
            try:
526
 
                logger.info("Starting checker %r for %s",
 
412
                logger.info(u"Starting checker %r for %s",
527
413
                            command, self.name)
528
414
                # We don't need to redirect stdout and stderr, since
529
415
                # in normal mode, that is already done by daemon(),
532
418
                self.checker = subprocess.Popen(command,
533
419
                                                close_fds=True,
534
420
                                                shell=True, cwd="/")
 
421
                if self.use_dbus:
 
422
                    # Emit D-Bus signal
 
423
                    self.CheckerStarted(command)
 
424
                    self.PropertyChanged(
 
425
                        dbus.String("checker_running"),
 
426
                        dbus.Boolean(True, variant_level=1))
535
427
                self.checker_callback_tag = (gobject.child_watch_add
536
428
                                             (self.checker.pid,
537
429
                                              self.checker_callback,
542
434
                if pid:
543
435
                    gobject.source_remove(self.checker_callback_tag)
544
436
                    self.checker_callback(pid, status, command)
545
 
            except OSError as error:
546
 
                logger.error("Failed to start subprocess: %s",
 
437
            except OSError, error:
 
438
                logger.error(u"Failed to start subprocess: %s",
547
439
                             error)
548
440
        # Re-run this periodically if run by gobject.timeout_add
549
441
        return True
555
447
            self.checker_callback_tag = None
556
448
        if getattr(self, "checker", None) is None:
557
449
            return
558
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
450
        logger.debug(u"Stopping checker for %(name)s", vars(self))
559
451
        try:
560
452
            os.kill(self.checker.pid, signal.SIGTERM)
561
 
            #time.sleep(0.5)
 
453
            #os.sleep(0.5)
562
454
            #if self.checker.poll() is None:
563
455
            #    os.kill(self.checker.pid, signal.SIGKILL)
564
 
        except OSError as error:
 
456
        except OSError, error:
565
457
            if error.errno != errno.ESRCH: # No such process
566
458
                raise
567
459
        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
 
        real_value = [None,]
902
 
        def setter(self, value):
903
 
            old_value = real_value[0]
904
 
            real_value[0] = value
905
 
            if hasattr(self, "dbus_object_path"):
906
 
                if type_func(old_value) != type_func(real_value[0]):
907
 
                    dbus_value = transform_func(type_func
908
 
                                                (real_value[0]),
909
 
                                                variant_level)
910
 
                    self.PropertyChanged(dbus.String(dbus_name),
911
 
                                         dbus_value)
912
 
        
913
 
        return property(lambda self: real_value[0], 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
 
460
        if self.use_dbus:
 
461
            self.PropertyChanged(dbus.String(u"checker_running"),
 
462
                                 dbus.Boolean(False, variant_level=1))
 
463
    
 
464
    def still_valid(self):
 
465
        """Has the timeout not yet passed for this client?"""
 
466
        if not getattr(self, "enabled", False):
 
467
            return False
 
468
        now = datetime.datetime.utcnow()
 
469
        if self.last_checked_ok is None:
 
470
            return now < (self.created + self.timeout)
 
471
        else:
 
472
            return now < (self.last_checked_ok + self.timeout)
 
473
    
 
474
    ## D-Bus methods & signals
 
475
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
476
    
 
477
    # CheckedOK - method
 
478
    CheckedOK = dbus.service.method(_interface)(checked_ok)
 
479
    CheckedOK.__name__ = "CheckedOK"
1012
480
    
1013
481
    # CheckerCompleted - signal
1014
482
    @dbus.service.signal(_interface, signature="nxs")
1022
490
        "D-Bus signal"
1023
491
        pass
1024
492
    
 
493
    # GetAllProperties - method
 
494
    @dbus.service.method(_interface, out_signature="a{sv}")
 
495
    def GetAllProperties(self):
 
496
        "D-Bus method"
 
497
        return dbus.Dictionary({
 
498
                dbus.String("name"):
 
499
                    dbus.String(self.name, variant_level=1),
 
500
                dbus.String("fingerprint"):
 
501
                    dbus.String(self.fingerprint, variant_level=1),
 
502
                dbus.String("host"):
 
503
                    dbus.String(self.host, variant_level=1),
 
504
                dbus.String("created"):
 
505
                    _datetime_to_dbus(self.created, variant_level=1),
 
506
                dbus.String("last_enabled"):
 
507
                    (_datetime_to_dbus(self.last_enabled,
 
508
                                       variant_level=1)
 
509
                     if self.last_enabled is not None
 
510
                     else dbus.Boolean(False, variant_level=1)),
 
511
                dbus.String("enabled"):
 
512
                    dbus.Boolean(self.enabled, variant_level=1),
 
513
                dbus.String("last_checked_ok"):
 
514
                    (_datetime_to_dbus(self.last_checked_ok,
 
515
                                       variant_level=1)
 
516
                     if self.last_checked_ok is not None
 
517
                     else dbus.Boolean (False, variant_level=1)),
 
518
                dbus.String("timeout"):
 
519
                    dbus.UInt64(self.timeout_milliseconds(),
 
520
                                variant_level=1),
 
521
                dbus.String("interval"):
 
522
                    dbus.UInt64(self.interval_milliseconds(),
 
523
                                variant_level=1),
 
524
                dbus.String("checker"):
 
525
                    dbus.String(self.checker_command,
 
526
                                variant_level=1),
 
527
                dbus.String("checker_running"):
 
528
                    dbus.Boolean(self.checker is not None,
 
529
                                 variant_level=1),
 
530
                dbus.String("object_path"):
 
531
                    dbus.ObjectPath(self.dbus_object_path,
 
532
                                    variant_level=1)
 
533
                }, signature="sv")
 
534
    
 
535
    # IsStillValid - method
 
536
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
 
537
                    (still_valid))
 
538
    IsStillValid.__name__ = "IsStillValid"
 
539
    
1025
540
    # PropertyChanged - signal
1026
541
    @dbus.service.signal(_interface, signature="sv")
1027
542
    def PropertyChanged(self, property, value):
1028
543
        "D-Bus signal"
1029
544
        pass
1030
545
    
1031
 
    # GotSecret - signal
 
546
    # ReceivedSecret - signal
1032
547
    @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
 
        """
 
548
    def ReceivedSecret(self):
 
549
        "D-Bus signal"
1038
550
        pass
1039
551
    
1040
552
    # Rejected - signal
1041
 
    @dbus.service.signal(_interface, signature="s")
1042
 
    def Rejected(self, reason):
 
553
    @dbus.service.signal(_interface)
 
554
    def Rejected(self):
1043
555
        "D-Bus signal"
1044
556
        pass
1045
557
    
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()
 
558
    # SetChecker - method
 
559
    @dbus.service.method(_interface, in_signature="s")
 
560
    def SetChecker(self, checker):
 
561
        "D-Bus setter method"
 
562
        self.checker_command = checker
 
563
        # Emit D-Bus signal
 
564
        self.PropertyChanged(dbus.String(u"checker"),
 
565
                             dbus.String(self.checker_command,
 
566
                                         variant_level=1))
 
567
    
 
568
    # SetHost - method
 
569
    @dbus.service.method(_interface, in_signature="s")
 
570
    def SetHost(self, host):
 
571
        "D-Bus setter method"
 
572
        self.host = host
 
573
        # Emit D-Bus signal
 
574
        self.PropertyChanged(dbus.String(u"host"),
 
575
                             dbus.String(self.host, variant_level=1))
 
576
    
 
577
    # SetInterval - method
 
578
    @dbus.service.method(_interface, in_signature="t")
 
579
    def SetInterval(self, milliseconds):
 
580
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
 
581
        # Emit D-Bus signal
 
582
        self.PropertyChanged(dbus.String(u"interval"),
 
583
                             (dbus.UInt64(self.interval_milliseconds(),
 
584
                                          variant_level=1)))
 
585
    
 
586
    # SetSecret - method
 
587
    @dbus.service.method(_interface, in_signature="ay",
 
588
                         byte_arrays=True)
 
589
    def SetSecret(self, secret):
 
590
        "D-Bus setter method"
 
591
        self.secret = str(secret)
 
592
    
 
593
    # SetTimeout - method
 
594
    @dbus.service.method(_interface, in_signature="t")
 
595
    def SetTimeout(self, milliseconds):
 
596
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
 
597
        # Emit D-Bus signal
 
598
        self.PropertyChanged(dbus.String(u"timeout"),
 
599
                             (dbus.UInt64(self.timeout_milliseconds(),
 
600
                                          variant_level=1)))
1063
601
    
1064
602
    # Enable - method
1065
 
    @dbus.service.method(_interface)
1066
 
    def Enable(self):
1067
 
        "D-Bus method"
1068
 
        self.enable()
 
603
    Enable = dbus.service.method(_interface)(enable)
 
604
    Enable.__name__ = "Enable"
1069
605
    
1070
606
    # StartChecker - method
1071
607
    @dbus.service.method(_interface)
1080
616
        self.disable()
1081
617
    
1082
618
    # 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)
 
619
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
620
    StopChecker.__name__ = "StopChecker"
1258
621
    
1259
622
    del _interface
1260
623
 
1261
624
 
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.
 
625
def peer_certificate(session):
 
626
    "Return the peer's OpenPGP certificate as a bytestring"
 
627
    # If not an OpenPGP certificate...
 
628
    if (gnutls.library.functions
 
629
        .gnutls_certificate_type_get(session._c_object)
 
630
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
631
        # ...do the normal thing
 
632
        return session.peer_certificate
 
633
    list_size = ctypes.c_uint(1)
 
634
    cert_list = (gnutls.library.functions
 
635
                 .gnutls_certificate_get_peers
 
636
                 (session._c_object, ctypes.byref(list_size)))
 
637
    if not bool(cert_list) and list_size.value != 0:
 
638
        raise gnutls.errors.GNUTLSError("error getting peer"
 
639
                                        " certificate")
 
640
    if list_size.value == 0:
 
641
        return None
 
642
    cert = cert_list[0]
 
643
    return ctypes.string_at(cert.data, cert.size)
 
644
 
 
645
 
 
646
def fingerprint(openpgp):
 
647
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
 
648
    # New GnuTLS "datum" with the OpenPGP public key
 
649
    datum = (gnutls.library.types
 
650
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
651
                                         ctypes.POINTER
 
652
                                         (ctypes.c_ubyte)),
 
653
                             ctypes.c_uint(len(openpgp))))
 
654
    # New empty GnuTLS certificate
 
655
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
656
    (gnutls.library.functions
 
657
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
658
    # Import the OpenPGP public key into the certificate
 
659
    (gnutls.library.functions
 
660
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
661
                                gnutls.library.constants
 
662
                                .GNUTLS_OPENPGP_FMT_RAW))
 
663
    # Verify the self signature in the key
 
664
    crtverify = ctypes.c_uint()
 
665
    (gnutls.library.functions
 
666
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
 
667
    if crtverify.value != 0:
 
668
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
669
        raise gnutls.errors.CertificateSecurityError("Verify failed")
 
670
    # New buffer for the fingerprint
 
671
    buf = ctypes.create_string_buffer(20)
 
672
    buf_len = ctypes.c_size_t()
 
673
    # Get the fingerprint from the certificate into the buffer
 
674
    (gnutls.library.functions
 
675
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
676
                                         ctypes.byref(buf_len)))
 
677
    # Deinit the certificate
 
678
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
679
    # Convert the buffer to a Python bytestring
 
680
    fpr = ctypes.string_at(buf, buf_len.value)
 
681
    # Convert the bytestring to hexadecimal notation
 
682
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
683
    return hex_fpr
 
684
 
 
685
 
 
686
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
687
    """A TCP request handler class.
 
688
    Instantiated by IPv6_TCPServer for each request to handle it.
1294
689
    Note: This will run in its own forked process."""
1295
690
    
1296
691
    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
 
            
 
692
        logger.info(u"TCP connection from: %s",
 
693
                    unicode(self.client_address))
 
694
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
 
695
        # Open IPC pipe to parent process
 
696
        with closing(os.fdopen(self.server.pipe[1], "w", 1)) as ipc:
1303
697
            session = (gnutls.connection
1304
698
                       .ClientSession(self.request,
1305
699
                                      gnutls.connection
1306
700
                                      .X509Credentials()))
1307
701
            
 
702
            line = self.request.makefile().readline()
 
703
            logger.debug(u"Protocol version: %r", line)
 
704
            try:
 
705
                if int(line.strip().split()[0]) > 1:
 
706
                    raise RuntimeError
 
707
            except (ValueError, IndexError, RuntimeError), error:
 
708
                logger.error(u"Unknown protocol version: %s", error)
 
709
                return
 
710
            
1308
711
            # Note: gnutls.connection.X509Credentials is really a
1309
712
            # generic GnuTLS certificate credentials object so long as
1310
713
            # no X.509 keys are added to it.  Therefore, we can use it
1311
714
            # here despite using OpenPGP certificates.
1312
715
            
1313
716
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1314
 
            #                      "+AES-256-CBC", "+SHA1",
1315
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1316
 
            #                      "+DHE-DSS"))
 
717
            #                     "+AES-256-CBC", "+SHA1",
 
718
            #                     "+COMP-NULL", "+CTYPE-OPENPGP",
 
719
            #                     "+DHE-DSS"))
1317
720
            # Use a fallback default, since this MUST be set.
1318
 
            priority = self.server.gnutls_priority
1319
 
            if priority is None:
1320
 
                priority = "NORMAL"
 
721
            priority = self.server.settings.get("priority", "NORMAL")
1321
722
            (gnutls.library.functions
1322
723
             .gnutls_priority_set_direct(session._c_object,
1323
724
                                         priority, None))
1324
725
            
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
726
            try:
1338
727
                session.handshake()
1339
 
            except gnutls.errors.GNUTLSError as error:
1340
 
                logger.warning("Handshake failed: %s", error)
 
728
            except gnutls.errors.GNUTLSError, error:
 
729
                logger.warning(u"Handshake failed: %s", error)
1341
730
                # Do not run session.bye() here: the session is not
1342
731
                # established.  Just abandon the request.
1343
732
                return
1344
 
            logger.debug("Handshake succeeded")
1345
 
            
1346
 
            approval_required = False
 
733
            logger.debug(u"Handshake succeeded")
1347
734
            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 """
 
735
                fpr = fingerprint(peer_certificate(session))
 
736
            except (TypeError, gnutls.errors.GNUTLSError), error:
 
737
                logger.warning(u"Bad certificate: %s", error)
 
738
                session.bye()
 
739
                return
 
740
            logger.debug(u"Fingerprint: %s", fpr)
 
741
            
 
742
            for c in self.server.clients:
 
743
                if c.fingerprint == fpr:
 
744
                    client = c
 
745
                    break
 
746
            else:
 
747
                logger.warning(u"Client not found for fingerprint: %s",
 
748
                               fpr)
 
749
                ipc.write("NOTFOUND %s\n" % fpr)
 
750
                session.bye()
 
751
                return
 
752
            # Have to check if client.still_valid(), since it is
 
753
            # possible that the client timed out while establishing
 
754
            # the GnuTLS session.
 
755
            if not client.still_valid():
 
756
                logger.warning(u"Client %(name)s is invalid",
 
757
                               vars(client))
 
758
                ipc.write("INVALID %s\n" % client.name)
 
759
                session.bye()
 
760
                return
 
761
            ipc.write("SENDING %s\n" % client.name)
 
762
            sent_size = 0
 
763
            while sent_size < len(client.secret):
 
764
                sent = session.send(client.secret[sent_size:])
 
765
                logger.debug(u"Sent: %d, remaining: %d",
 
766
                             sent, len(client.secret)
 
767
                             - (sent_size + sent))
 
768
                sent_size += sent
 
769
            session.bye()
 
770
 
 
771
 
 
772
class ForkingMixInWithPipe(SocketServer.ForkingMixIn, object):
 
773
    """Like SocketServer.ForkingMixIn, but also pass a pipe.
 
774
    Assumes a gobject.MainLoop event loop.
 
775
    """
1528
776
    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
 
777
        """This overrides and wraps the original process_request().
 
778
        This function creates a new pipe in self.pipe 
1532
779
        """
1533
 
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1534
 
        
1535
 
        super(MultiprocessingMixInWithPipe,
 
780
        self.pipe = os.pipe()
 
781
        super(ForkingMixInWithPipe,
1536
782
              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):
 
783
        os.close(self.pipe[1])  # close write end
 
784
        # Call "handle_ipc" for both data and EOF events
 
785
        gobject.io_add_watch(self.pipe[0],
 
786
                             gobject.IO_IN | gobject.IO_HUP,
 
787
                             self.handle_ipc)
 
788
    def handle_ipc(source, condition):
1541
789
        """Dummy function; override as necessary"""
1542
 
        raise NotImplementedError
1543
 
 
1544
 
 
1545
 
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1546
 
                     socketserver.TCPServer, object):
 
790
        os.close(source)
 
791
        return False
 
792
 
 
793
 
 
794
class IPv6_TCPServer(ForkingMixInWithPipe,
 
795
                     SocketServer.TCPServer, object):
1547
796
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1548
 
    
1549
797
    Attributes:
 
798
        settings:       Server settings
 
799
        clients:        Set() of Client objects
1550
800
        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
801
    """
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)
 
802
    address_family = socket.AF_INET6
 
803
    def __init__(self, *args, **kwargs):
 
804
        if "settings" in kwargs:
 
805
            self.settings = kwargs["settings"]
 
806
            del kwargs["settings"]
 
807
        if "clients" in kwargs:
 
808
            self.clients = kwargs["clients"]
 
809
            del kwargs["clients"]
 
810
        if "use_ipv6" in kwargs:
 
811
            if not kwargs["use_ipv6"]:
 
812
                self.address_family = socket.AF_INET
 
813
            del kwargs["use_ipv6"]
 
814
        self.enabled = False
 
815
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
1561
816
    def server_bind(self):
1562
817
        """This overrides the normal server_bind() function
1563
818
        to bind to an interface if one was specified, and also NOT to
1564
819
        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
 
820
        if self.settings["interface"]:
 
821
            # 25 is from /usr/include/asm-i486/socket.h
 
822
            SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
 
823
            try:
 
824
                self.socket.setsockopt(socket.SOL_SOCKET,
 
825
                                       SO_BINDTODEVICE,
 
826
                                       self.settings["interface"])
 
827
            except socket.error, error:
 
828
                if error[0] == errno.EPERM:
 
829
                    logger.error(u"No permission to"
 
830
                                 u" bind to interface %s",
 
831
                                 self.settings["interface"])
 
832
                else:
 
833
                    raise
1587
834
        # Only bind(2) the socket if we really need to.
1588
835
        if self.server_address[0] or self.server_address[1]:
1589
836
            if not self.server_address[0]:
1596
843
            elif not self.server_address[1]:
1597
844
                self.server_address = (self.server_address[0],
1598
845
                                       0)
1599
 
#                 if self.interface:
 
846
#                 if self.settings["interface"]:
1600
847
#                     self.server_address = (self.server_address[0],
1601
848
#                                            0, # port
1602
849
#                                            0, # flowinfo
1603
850
#                                            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)
 
851
#                                            (self.settings
 
852
#                                             ["interface"]))
 
853
            return super(IPv6_TCPServer, self).server_bind()
1631
854
    def server_activate(self):
1632
855
        if self.enabled:
1633
 
            return socketserver.TCPServer.server_activate(self)
 
856
            return super(IPv6_TCPServer, self).server_activate()
1634
857
    def enable(self):
1635
858
        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):
 
859
    def handle_ipc(self, source, condition, file_objects={}):
1646
860
        condition_names = {
1647
 
            gobject.IO_IN: "IN",   # There is data to read.
 
861
            gobject.IO_IN: "IN", # There is data to read.
1648
862
            gobject.IO_OUT: "OUT", # Data can be written (without
1649
 
                                    # blocking).
 
863
                                   # blocking).
1650
864
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1651
865
            gobject.IO_ERR: "ERR", # Error condition.
1652
866
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1653
 
                                    # broken, usually for pipes and
1654
 
                                    # sockets).
 
867
                                   # broken, usually for pipes and
 
868
                                   # sockets).
1655
869
            }
1656
870
        conditions_string = ' | '.join(name
1657
871
                                       for cond, name in
1658
872
                                       condition_names.iteritems()
1659
873
                                       if cond & condition)
1660
 
        # error or the other end of multiprocessing.Pipe has closed
1661
 
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
874
        logger.debug("Handling IPC: FD = %d, condition = %s", source,
 
875
                     conditions_string)
 
876
        
 
877
        # Turn the pipe file descriptor into a Python file object
 
878
        if source not in file_objects:
 
879
            file_objects[source] = os.fdopen(source, "r", 1)
 
880
        
 
881
        # Read a line from the file object
 
882
        cmdline = file_objects[source].readline()
 
883
        if not cmdline:             # Empty line means end of file
 
884
            # close the IPC pipe
 
885
            file_objects[source].close()
 
886
            del file_objects[source]
 
887
            
 
888
            # Stop calling this function
1662
889
            return False
1663
890
        
1664
 
        # Read a request from the child
1665
 
        request = parent_pipe.recv()
1666
 
        command = request[0]
 
891
        logger.debug("IPC command: %r\n" % cmdline)
1667
892
        
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
 
893
        # Parse and act on command
 
894
        cmd, args = cmdline.split(None, 1)
 
895
        if cmd == "NOTFOUND":
 
896
            if self.settings["use_dbus"]:
 
897
                # Emit D-Bus signal
 
898
                mandos_dbus_service.ClientNotFound(args)
 
899
        elif cmd == "INVALID":
 
900
            if self.settings["use_dbus"]:
 
901
                for client in self.clients:
 
902
                    if client.name == args:
 
903
                        # Emit D-Bus signal
 
904
                        client.Rejected()
 
905
                        break
 
906
        elif cmd == "SENDING":
 
907
            for client in self.clients:
 
908
                if client.name == args:
 
909
                    client.checked_ok()
 
910
                    if self.settings["use_dbus"]:
 
911
                        # Emit D-Bus signal
 
912
                        client.ReceivedSecret()
1675
913
                    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
 
        
 
914
        else:
 
915
            logger.error("Unknown IPC command: %r", cmdline)
 
916
        
 
917
        # Keep calling this function
1719
918
        return True
1720
919
 
1721
920
 
1730
929
    datetime.timedelta(0, 3600)
1731
930
    >>> string_to_delta('24h')
1732
931
    datetime.timedelta(1)
1733
 
    >>> string_to_delta('1w')
 
932
    >>> string_to_delta(u'1w')
1734
933
    datetime.timedelta(7)
1735
934
    >>> string_to_delta('5m 30s')
1736
935
    datetime.timedelta(0, 330)
1740
939
        try:
1741
940
            suffix = unicode(s[-1])
1742
941
            value = int(s[:-1])
1743
 
            if suffix == "d":
 
942
            if suffix == u"d":
1744
943
                delta = datetime.timedelta(value)
1745
 
            elif suffix == "s":
 
944
            elif suffix == u"s":
1746
945
                delta = datetime.timedelta(0, value)
1747
 
            elif suffix == "m":
 
946
            elif suffix == u"m":
1748
947
                delta = datetime.timedelta(0, 0, 0, 0, value)
1749
 
            elif suffix == "h":
 
948
            elif suffix == u"h":
1750
949
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1751
 
            elif suffix == "w":
 
950
            elif suffix == u"w":
1752
951
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1753
952
            else:
1754
 
                raise ValueError("Unknown suffix %r" % suffix)
1755
 
        except (ValueError, IndexError) as e:
1756
 
            raise ValueError(*(e.args))
 
953
                raise ValueError
 
954
        except (ValueError, IndexError):
 
955
            raise ValueError
1757
956
        timevalue += delta
1758
957
    return timevalue
1759
958
 
1760
959
 
 
960
def server_state_changed(state):
 
961
    """Derived from the Avahi example code"""
 
962
    if state == avahi.SERVER_COLLISION:
 
963
        logger.error(u"Zeroconf server name collision")
 
964
        service.remove()
 
965
    elif state == avahi.SERVER_RUNNING:
 
966
        service.add()
 
967
 
 
968
 
 
969
def entry_group_state_changed(state, error):
 
970
    """Derived from the Avahi example code"""
 
971
    logger.debug(u"Avahi state change: %i", state)
 
972
    
 
973
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
 
974
        logger.debug(u"Zeroconf service established.")
 
975
    elif state == avahi.ENTRY_GROUP_COLLISION:
 
976
        logger.warning(u"Zeroconf service name collision.")
 
977
        service.rename()
 
978
    elif state == avahi.ENTRY_GROUP_FAILURE:
 
979
        logger.critical(u"Avahi: Error in group state changed %s",
 
980
                        unicode(error))
 
981
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
 
982
 
1761
983
def if_nametoindex(interface):
1762
 
    """Call the C function if_nametoindex(), or equivalent
1763
 
    
1764
 
    Note: This function cannot accept a unicode string."""
 
984
    """Call the C function if_nametoindex(), or equivalent"""
1765
985
    global if_nametoindex
1766
986
    try:
1767
987
        if_nametoindex = (ctypes.cdll.LoadLibrary
1768
988
                          (ctypes.util.find_library("c"))
1769
989
                          .if_nametoindex)
1770
990
    except (OSError, AttributeError):
1771
 
        logger.warning("Doing if_nametoindex the hard way")
 
991
        if "struct" not in sys.modules:
 
992
            import struct
 
993
        if "fcntl" not in sys.modules:
 
994
            import fcntl
1772
995
        def if_nametoindex(interface):
1773
996
            "Get an interface index the hard way, i.e. using fcntl()"
1774
997
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1775
 
            with contextlib.closing(socket.socket()) as s:
 
998
            with closing(socket.socket()) as s:
1776
999
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1777
 
                                    struct.pack(str("16s16x"),
1778
 
                                                interface))
1779
 
            interface_index = struct.unpack(str("I"),
1780
 
                                            ifreq[16:20])[0]
 
1000
                                    struct.pack("16s16x", interface))
 
1001
            interface_index = struct.unpack("I", ifreq[16:20])[0]
1781
1002
            return interface_index
1782
1003
    return if_nametoindex(interface)
1783
1004
 
1784
1005
 
1785
1006
def daemon(nochdir = False, noclose = False):
1786
1007
    """See daemon(3).  Standard BSD Unix function.
1787
 
    
1788
1008
    This should really exist as os.daemon, but it doesn't (yet)."""
1789
1009
    if os.fork():
1790
1010
        sys.exit()
1798
1018
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1799
1019
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1800
1020
            raise OSError(errno.ENODEV,
1801
 
                          "%s not a character device"
1802
 
                          % os.path.devnull)
 
1021
                          "/dev/null not a character device")
1803
1022
        os.dup2(null, sys.stdin.fileno())
1804
1023
        os.dup2(null, sys.stdout.fileno())
1805
1024
        os.dup2(null, sys.stderr.fileno())
1809
1028
 
1810
1029
def main():
1811
1030
    
1812
 
    ##################################################################
 
1031
    ######################################################################
1813
1032
    # Parsing of options, both command line and config file
1814
1033
    
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()
 
1034
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
1035
    parser.add_option("-i", "--interface", type="string",
 
1036
                      metavar="IF", help="Bind to interface IF")
 
1037
    parser.add_option("-a", "--address", type="string",
 
1038
                      help="Address to listen for requests on")
 
1039
    parser.add_option("-p", "--port", type="int",
 
1040
                      help="Port number to receive requests on")
 
1041
    parser.add_option("--check", action="store_true",
 
1042
                      help="Run self-test")
 
1043
    parser.add_option("--debug", action="store_true",
 
1044
                      help="Debug mode; run in foreground and log to"
 
1045
                      " terminal")
 
1046
    parser.add_option("--priority", type="string", help="GnuTLS"
 
1047
                      " priority string (see GnuTLS documentation)")
 
1048
    parser.add_option("--servicename", type="string", metavar="NAME",
 
1049
                      help="Zeroconf service name")
 
1050
    parser.add_option("--configdir", type="string",
 
1051
                      default="/etc/mandos", metavar="DIR",
 
1052
                      help="Directory to search for configuration"
 
1053
                      " files")
 
1054
    parser.add_option("--no-dbus", action="store_false",
 
1055
                      dest="use_dbus",
 
1056
                      help="Do not provide D-Bus system bus"
 
1057
                      " interface")
 
1058
    parser.add_option("--no-ipv6", action="store_false",
 
1059
                      dest="use_ipv6", help="Do not use IPv6")
 
1060
    options = parser.parse_args()[0]
1846
1061
    
1847
1062
    if options.check:
1848
1063
        import doctest
1859
1074
                        "servicename": "Mandos",
1860
1075
                        "use_dbus": "True",
1861
1076
                        "use_ipv6": "True",
1862
 
                        "debuglevel": "",
1863
1077
                        }
1864
1078
    
1865
1079
    # Parse config file for server-global settings
1866
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
1080
    server_config = ConfigParser.SafeConfigParser(server_defaults)
1867
1081
    del server_defaults
1868
 
    server_config.read(os.path.join(options.configdir,
1869
 
                                    "mandos.conf"))
 
1082
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
1870
1083
    # Convert the SafeConfigParser object to a dict
1871
1084
    server_settings = server_config.defaults()
1872
1085
    # 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)
 
1086
    server_settings["debug"] = server_config.getboolean("DEFAULT",
 
1087
                                                        "debug")
 
1088
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
 
1089
                                                           "use_dbus")
 
1090
    server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
 
1091
                                                           "use_ipv6")
1876
1092
    if server_settings["port"]:
1877
1093
        server_settings["port"] = server_config.getint("DEFAULT",
1878
1094
                                                       "port")
1882
1098
    # options, if set.
1883
1099
    for option in ("interface", "address", "port", "debug",
1884
1100
                   "priority", "servicename", "configdir",
1885
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
1101
                   "use_dbus", "use_ipv6"):
1886
1102
        value = getattr(options, option)
1887
1103
        if value is not None:
1888
1104
            server_settings[option] = value
1889
1105
    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
1106
    # Now we have our good server settings in "server_settings"
1895
1107
    
1896
1108
    ##################################################################
1897
1109
    
1898
1110
    # For convenience
1899
1111
    debug = server_settings["debug"]
1900
 
    debuglevel = server_settings["debuglevel"]
1901
1112
    use_dbus = server_settings["use_dbus"]
1902
1113
    use_ipv6 = server_settings["use_ipv6"]
1903
1114
    
 
1115
    if not debug:
 
1116
        syslogger.setLevel(logging.WARNING)
 
1117
        console.setLevel(logging.WARNING)
 
1118
    
1904
1119
    if server_settings["servicename"] != "Mandos":
1905
1120
        syslogger.setFormatter(logging.Formatter
1906
1121
                               ('Mandos (%s) [%%(process)d]:'
1908
1123
                                % server_settings["servicename"]))
1909
1124
    
1910
1125
    # Parse config file with clients
1911
 
    client_defaults = { "timeout": "5m",
1912
 
                        "extended_timeout": "15m",
1913
 
                        "interval": "2m",
 
1126
    client_defaults = { "timeout": "1h",
 
1127
                        "interval": "5m",
1914
1128
                        "checker": "fping -q -- %%(host)s",
1915
1129
                        "host": "",
1916
 
                        "approval_delay": "0s",
1917
 
                        "approval_duration": "1s",
1918
1130
                        }
1919
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
1131
    client_config = ConfigParser.SafeConfigParser(client_defaults)
1920
1132
    client_config.read(os.path.join(server_settings["configdir"],
1921
1133
                                    "clients.conf"))
1922
 
    
 
1134
 
1923
1135
    global mandos_dbus_service
1924
1136
    mandos_dbus_service = None
1925
1137
    
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)
 
1138
    clients = Set()
 
1139
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
1140
                                 server_settings["port"]),
 
1141
                                TCP_handler,
 
1142
                                settings=server_settings,
 
1143
                                clients=clients, use_ipv6=use_ipv6)
 
1144
    pidfilename = "/var/run/mandos.pid"
 
1145
    try:
 
1146
        pidfile = open(pidfilename, "w")
 
1147
    except IOError:
 
1148
        logger.error("Could not open file %r", pidfilename)
1941
1149
    
1942
1150
    try:
1943
1151
        uid = pwd.getpwnam("_mandos").pw_uid
1949
1157
        except KeyError:
1950
1158
            try:
1951
1159
                uid = pwd.getpwnam("nobody").pw_uid
1952
 
                gid = pwd.getpwnam("nobody").pw_gid
 
1160
                gid = pwd.getpwnam("nogroup").pw_gid
1953
1161
            except KeyError:
1954
1162
                uid = 65534
1955
1163
                gid = 65534
1956
1164
    try:
1957
1165
        os.setgid(gid)
1958
1166
        os.setuid(uid)
1959
 
    except OSError as error:
 
1167
    except OSError, error:
1960
1168
        if error[0] != errno.EPERM:
1961
1169
            raise error
1962
1170
    
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)
1970
 
    
 
1171
    # Enable all possible GnuTLS debugging
1971
1172
    if debug:
1972
 
        # Enable all possible GnuTLS debugging
1973
 
        
1974
1173
        # "Use a log level over 10 to enable all debugging options."
1975
1174
        # - GnuTLS manual
1976
1175
        gnutls.library.functions.gnutls_global_set_log_level(11)
1981
1180
        
1982
1181
        (gnutls.library.functions
1983
1182
         .gnutls_global_set_log_function(debug_gnutls))
1984
 
        
 
1183
    
 
1184
    global service
 
1185
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
1186
    service = AvahiService(name = server_settings["servicename"],
 
1187
                           servicetype = "_mandos._tcp",
 
1188
                           protocol = protocol)
 
1189
    if server_settings["interface"]:
 
1190
        service.interface = (if_nametoindex
 
1191
                             (server_settings["interface"]))
 
1192
    
 
1193
    global main_loop
 
1194
    global bus
 
1195
    global server
 
1196
    # From the Avahi example code
 
1197
    DBusGMainLoop(set_as_default=True )
 
1198
    main_loop = gobject.MainLoop()
 
1199
    bus = dbus.SystemBus()
 
1200
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
1201
                                           avahi.DBUS_PATH_SERVER),
 
1202
                            avahi.DBUS_INTERFACE_SERVER)
 
1203
    # End of Avahi example code
 
1204
    if use_dbus:
 
1205
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
 
1206
    
 
1207
    clients.update(Set(Client(name = section,
 
1208
                              config
 
1209
                              = dict(client_config.items(section)),
 
1210
                              use_dbus = use_dbus)
 
1211
                       for section in client_config.sections()))
 
1212
    if not clients:
 
1213
        logger.warning(u"No clients defined")
 
1214
    
 
1215
    if debug:
1985
1216
        # Redirect stdin so all checkers get /dev/null
1986
1217
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1987
1218
        os.dup2(null, sys.stdin.fileno())
1990
1221
    else:
1991
1222
        # No console logging
1992
1223
        logger.removeHandler(console)
1993
 
    
1994
 
    # Need to fork before connecting to D-Bus
1995
 
    if not debug:
1996
1224
        # Close all input and output, do double fork, etc.
1997
1225
        daemon()
1998
1226
    
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")
 
1227
    try:
 
1228
        with closing(pidfile):
 
1229
            pid = os.getpid()
 
1230
            pidfile.write(str(pid) + "\n")
 
1231
        del pidfile
 
1232
    except IOError:
 
1233
        logger.error(u"Could not write to file %r with PID %d",
 
1234
                     pidfilename, pid)
 
1235
    except NameError:
 
1236
        # "pidfile" was never created
 
1237
        pass
 
1238
    del pidfilename
 
1239
    
 
1240
    def cleanup():
 
1241
        "Cleanup function; run on exit"
 
1242
        global group
 
1243
        # From the Avahi example code
 
1244
        if not group is None:
 
1245
            group.Free()
 
1246
            group = None
 
1247
        # End of Avahi example code
2051
1248
        
 
1249
        while clients:
 
1250
            client = clients.pop()
 
1251
            client.disable_hook = None
 
1252
            client.disable()
 
1253
    
 
1254
    atexit.register(cleanup)
 
1255
    
2052
1256
    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
1257
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2067
 
    
2068
1258
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2069
1259
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2070
1260
    
2073
1263
            """A D-Bus proxy object"""
2074
1264
            def __init__(self):
2075
1265
                dbus.service.Object.__init__(self, bus, "/")
2076
 
            _interface = "se.recompile.Mandos"
 
1266
            _interface = u"se.bsnet.fukt.Mandos"
2077
1267
            
2078
 
            @dbus.service.signal(_interface, signature="o")
2079
 
            def ClientAdded(self, objpath):
 
1268
            @dbus.service.signal(_interface, signature="oa{sv}")
 
1269
            def ClientAdded(self, objpath, properties):
2080
1270
                "D-Bus signal"
2081
1271
                pass
2082
1272
            
2083
 
            @dbus.service.signal(_interface, signature="ss")
2084
 
            def ClientNotFound(self, fingerprint, address):
 
1273
            @dbus.service.signal(_interface, signature="s")
 
1274
            def ClientNotFound(self, fingerprint):
2085
1275
                "D-Bus signal"
2086
1276
                pass
2087
1277
            
2093
1283
            @dbus.service.method(_interface, out_signature="ao")
2094
1284
            def GetAllClients(self):
2095
1285
                "D-Bus method"
2096
 
                return dbus.Array(c.dbus_object_path
2097
 
                                  for c in tcp_server.clients)
 
1286
                return dbus.Array(c.dbus_object_path for c in clients)
2098
1287
            
2099
 
            @dbus.service.method(_interface,
2100
 
                                 out_signature="a{oa{sv}}")
 
1288
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
2101
1289
            def GetAllClientsWithProperties(self):
2102
1290
                "D-Bus method"
2103
1291
                return dbus.Dictionary(
2104
 
                    ((c.dbus_object_path, c.GetAll(""))
2105
 
                     for c in tcp_server.clients),
 
1292
                    ((c.dbus_object_path, c.GetAllProperties())
 
1293
                     for c in clients),
2106
1294
                    signature="oa{sv}")
2107
1295
            
2108
1296
            @dbus.service.method(_interface, in_signature="o")
2109
1297
            def RemoveClient(self, object_path):
2110
1298
                "D-Bus method"
2111
 
                for c in tcp_server.clients:
 
1299
                for c in clients:
2112
1300
                    if c.dbus_object_path == object_path:
2113
 
                        tcp_server.clients.remove(c)
2114
 
                        c.remove_from_connection()
 
1301
                        clients.remove(c)
2115
1302
                        # Don't signal anything except ClientRemoved
2116
 
                        c.disable(quiet=True)
 
1303
                        c.use_dbus = False
 
1304
                        c.disable()
2117
1305
                        # Emit D-Bus signal
2118
1306
                        self.ClientRemoved(object_path, c.name)
2119
1307
                        return
2120
 
                raise KeyError(object_path)
 
1308
                raise KeyError
2121
1309
            
2122
1310
            del _interface
2123
1311
        
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:
 
1312
        mandos_dbus_service = MandosDBusService()
 
1313
    
 
1314
    for client in clients:
2148
1315
        if use_dbus:
2149
1316
            # Emit D-Bus signal
2150
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
 
1317
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
 
1318
                                            client.GetAllProperties())
2151
1319
        client.enable()
2152
1320
    
2153
1321
    tcp_server.enable()
2156
1324
    # Find out what port we got
2157
1325
    service.port = tcp_server.socket.getsockname()[1]
2158
1326
    if use_ipv6:
2159
 
        logger.info("Now listening on address %r, port %d,"
 
1327
        logger.info(u"Now listening on address %r, port %d,"
2160
1328
                    " flowinfo %d, scope_id %d"
2161
1329
                    % tcp_server.socket.getsockname())
2162
1330
    else:                       # IPv4
2163
 
        logger.info("Now listening on address %r, port %d"
 
1331
        logger.info(u"Now listening on address %r, port %d"
2164
1332
                    % tcp_server.socket.getsockname())
2165
1333
    
2166
1334
    #service.interface = tcp_server.socket.getsockname()[3]
2167
1335
    
2168
1336
    try:
2169
1337
        # From the Avahi example code
 
1338
        server.connect_to_signal("StateChanged", server_state_changed)
2170
1339
        try:
2171
 
            service.activate()
2172
 
        except dbus.exceptions.DBusException as error:
2173
 
            logger.critical("DBusException: %s", error)
2174
 
            cleanup()
 
1340
            server_state_changed(server.GetState())
 
1341
        except dbus.exceptions.DBusException, error:
 
1342
            logger.critical(u"DBusException: %s", error)
2175
1343
            sys.exit(1)
2176
1344
        # End of Avahi example code
2177
1345
        
2180
1348
                             (tcp_server.handle_request
2181
1349
                              (*args[2:], **kwargs) or True))
2182
1350
        
2183
 
        logger.debug("Starting main loop")
 
1351
        logger.debug(u"Starting main loop")
2184
1352
        main_loop.run()
2185
 
    except AvahiError as error:
2186
 
        logger.critical("AvahiError: %s", error)
2187
 
        cleanup()
 
1353
    except AvahiError, error:
 
1354
        logger.critical(u"AvahiError: %s", error)
2188
1355
        sys.exit(1)
2189
1356
    except KeyboardInterrupt:
2190
1357
        if debug:
2191
 
            print("", file=sys.stderr)
 
1358
            print >> sys.stderr
2192
1359
        logger.debug("Server received KeyboardInterrupt")
2193
1360
    logger.debug("Server exiting")
2194
 
    # Must run before the D-Bus bus name gets deregistered
2195
 
    cleanup()
2196
 
 
2197
1361
 
2198
1362
if __name__ == '__main__':
2199
1363
    main()