/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2009-03-27 13:33:17 UTC
  • mfrom: (288.1.2 mandos-pipe-ipc)
  • Revision ID: teddy@fukt.bsnet.se-20090327133317-riwt5s5orrisozuj
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
14
# Copyright © 2008,2009 Teddy Hogeborn
33
33
 
34
34
from __future__ import division, with_statement, absolute_import
35
35
 
36
 
import SocketServer as socketserver
 
36
import SocketServer
37
37
import socket
38
38
import optparse
39
39
import datetime
44
44
import gnutls.library.functions
45
45
import gnutls.library.constants
46
46
import gnutls.library.types
47
 
import ConfigParser as configparser
 
47
import ConfigParser
48
48
import sys
49
49
import re
50
50
import os
51
51
import signal
 
52
from sets import Set
52
53
import subprocess
53
54
import atexit
54
55
import stat
56
57
import logging.handlers
57
58
import pwd
58
59
from contextlib import closing
59
 
import struct
60
 
import fcntl
61
 
import functools
62
60
 
63
61
import dbus
64
62
import dbus.service
68
66
import ctypes
69
67
import ctypes.util
70
68
 
71
 
try:
72
 
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
73
 
except AttributeError:
74
 
    try:
75
 
        from IN import SO_BINDTODEVICE
76
 
    except ImportError:
77
 
        SO_BINDTODEVICE = None
78
 
 
79
 
 
80
69
version = "1.0.8"
81
70
 
82
 
logger = logging.Logger(u'mandos')
 
71
logger = logging.Logger('mandos')
83
72
syslogger = (logging.handlers.SysLogHandler
84
73
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
85
74
              address = "/dev/log"))
86
75
syslogger.setFormatter(logging.Formatter
87
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
88
 
                        u' %(message)s'))
 
76
                       ('Mandos [%(process)d]: %(levelname)s:'
 
77
                        ' %(message)s'))
89
78
logger.addHandler(syslogger)
90
79
 
91
80
console = logging.StreamHandler()
92
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
93
 
                                       u' %(levelname)s:'
94
 
                                       u' %(message)s'))
 
81
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
82
                                       ' %(levelname)s: %(message)s'))
95
83
logger.addHandler(console)
96
84
 
97
85
class AvahiError(Exception):
110
98
 
111
99
class AvahiService(object):
112
100
    """An Avahi (Zeroconf) service.
113
 
    
114
101
    Attributes:
115
102
    interface: integer; avahi.IF_UNSPEC or an interface index.
116
103
               Used to optionally bind to the specified interface.
117
 
    name: string; Example: u'Mandos'
118
 
    type: string; Example: u'_mandos._tcp'.
 
104
    name: string; Example: 'Mandos'
 
105
    type: string; Example: '_mandos._tcp'.
119
106
                  See <http://www.dns-sd.org/ServiceTypes.html>
120
107
    port: integer; what port to announce
121
108
    TXT: list of strings; TXT record for the service
124
111
    max_renames: integer; maximum number of renames
125
112
    rename_count: integer; counter so we only rename after collisions
126
113
                  a sensible number of times
127
 
    group: D-Bus Entry Group
128
 
    server: D-Bus Server
129
 
    bus: dbus.SystemBus()
130
114
    """
131
115
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
132
116
                 servicetype = None, port = None, TXT = None,
133
 
                 domain = u"", host = u"", max_renames = 32768,
134
 
                 protocol = avahi.PROTO_UNSPEC, bus = None):
 
117
                 domain = "", host = "", max_renames = 32768,
 
118
                 protocol = avahi.PROTO_UNSPEC):
135
119
        self.interface = interface
136
120
        self.name = name
137
121
        self.type = servicetype
142
126
        self.rename_count = 0
143
127
        self.max_renames = max_renames
144
128
        self.protocol = protocol
145
 
        self.group = None       # our entry group
146
 
        self.server = None
147
 
        self.bus = bus
148
129
    def rename(self):
149
130
        """Derived from the Avahi example code"""
150
131
        if self.rename_count >= self.max_renames:
152
133
                            u" after %i retries, exiting.",
153
134
                            self.rename_count)
154
135
            raise AvahiServiceError(u"Too many renames")
155
 
        self.name = self.server.GetAlternativeServiceName(self.name)
 
136
        self.name = server.GetAlternativeServiceName(self.name)
156
137
        logger.info(u"Changing Zeroconf service name to %r ...",
157
 
                    unicode(self.name))
 
138
                    str(self.name))
158
139
        syslogger.setFormatter(logging.Formatter
159
 
                               (u'Mandos (%s) [%%(process)d]:'
160
 
                                u' %%(levelname)s: %%(message)s'
 
140
                               ('Mandos (%s) [%%(process)d]:'
 
141
                                ' %%(levelname)s: %%(message)s'
161
142
                                % self.name))
162
143
        self.remove()
163
144
        self.add()
164
145
        self.rename_count += 1
165
146
    def remove(self):
166
147
        """Derived from the Avahi example code"""
167
 
        if self.group is not None:
168
 
            self.group.Reset()
 
148
        if group is not None:
 
149
            group.Reset()
169
150
    def add(self):
170
151
        """Derived from the Avahi example code"""
171
 
        if self.group is None:
172
 
            self.group = dbus.Interface(
173
 
                self.bus.get_object(avahi.DBUS_NAME,
174
 
                                    self.server.EntryGroupNew()),
175
 
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
176
 
            self.group.connect_to_signal('StateChanged',
177
 
                                         self.entry_group_state_changed)
 
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)
178
160
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
179
 
                     self.name, self.type)
180
 
        self.group.AddService(
181
 
            self.interface,
182
 
            self.protocol,
183
 
            dbus.UInt32(0),     # flags
184
 
            self.name, self.type,
185
 
            self.domain, self.host,
186
 
            dbus.UInt16(self.port),
187
 
            avahi.string_array_to_txt_array(self.TXT))
188
 
        self.group.Commit()
189
 
    def entry_group_state_changed(self, state, error):
190
 
        """Derived from the Avahi example code"""
191
 
        logger.debug(u"Avahi state change: %i", state)
192
 
        
193
 
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
194
 
            logger.debug(u"Zeroconf service established.")
195
 
        elif state == avahi.ENTRY_GROUP_COLLISION:
196
 
            logger.warning(u"Zeroconf service name collision.")
197
 
            self.rename()
198
 
        elif state == avahi.ENTRY_GROUP_FAILURE:
199
 
            logger.critical(u"Avahi: Error in group state changed %s",
200
 
                            unicode(error))
201
 
            raise AvahiGroupError(u"State changed: %s"
202
 
                                  % unicode(error))
203
 
    def cleanup(self):
204
 
        """Derived from the Avahi example code"""
205
 
        if self.group is not None:
206
 
            self.group.Free()
207
 
            self.group = None
208
 
    def server_state_changed(self, state):
209
 
        """Derived from the Avahi example code"""
210
 
        if state == avahi.SERVER_COLLISION:
211
 
            logger.error(u"Zeroconf server name collision")
212
 
            self.remove()
213
 
        elif state == avahi.SERVER_RUNNING:
214
 
            self.add()
215
 
    def activate(self):
216
 
        """Derived from the Avahi example code"""
217
 
        if self.server is None:
218
 
            self.server = dbus.Interface(
219
 
                self.bus.get_object(avahi.DBUS_NAME,
220
 
                                    avahi.DBUS_PATH_SERVER),
221
 
                avahi.DBUS_INTERFACE_SERVER)
222
 
        self.server.connect_to_signal(u"StateChanged",
223
 
                                 self.server_state_changed)
224
 
        self.server_state_changed(self.server.GetState())
225
 
 
226
 
 
227
 
class Client(object):
 
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):
228
183
    """A representation of a client host served by this server.
229
 
    
230
184
    Attributes:
231
185
    name:       string; from the config file, used in log messages and
232
186
                        D-Bus identifiers
253
207
                     runtime with vars(self) as dict, so that for
254
208
                     instance %(name)s can be used in the command.
255
209
    current_checker_command: string; current running checker_command
 
210
    use_dbus: bool(); Whether to provide D-Bus interface and signals
 
211
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
256
212
    """
257
 
    
258
 
    @staticmethod
259
 
    def _datetime_to_milliseconds(dt):
260
 
        "Convert a datetime.datetime() to milliseconds"
261
 
        return ((dt.days * 24 * 60 * 60 * 1000)
262
 
                + (dt.seconds * 1000)
263
 
                + (dt.microseconds // 1000))
264
 
    
265
213
    def timeout_milliseconds(self):
266
214
        "Return the 'timeout' attribute in milliseconds"
267
 
        return self._datetime_to_milliseconds(self.timeout)
 
215
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
 
216
                + (self.timeout.seconds * 1000)
 
217
                + (self.timeout.microseconds // 1000))
268
218
    
269
219
    def interval_milliseconds(self):
270
220
        "Return the 'interval' attribute in milliseconds"
271
 
        return self._datetime_to_milliseconds(self.interval)
 
221
        return ((self.interval.days * 24 * 60 * 60 * 1000)
 
222
                + (self.interval.seconds * 1000)
 
223
                + (self.interval.microseconds // 1000))
272
224
    
273
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
225
    def __init__(self, name = None, disable_hook=None, config=None,
 
226
                 use_dbus=True):
274
227
        """Note: the 'checker' key in 'config' sets the
275
228
        'checker_command' attribute and *not* the 'checker'
276
229
        attribute."""
278
231
        if config is None:
279
232
            config = {}
280
233
        logger.debug(u"Creating client %r", self.name)
 
234
        self.use_dbus = False   # During __init__
281
235
        # Uppercase and remove spaces from fingerprint for later
282
236
        # comparison purposes with return value from the fingerprint()
283
237
        # function
284
 
        self.fingerprint = (config[u"fingerprint"].upper()
 
238
        self.fingerprint = (config["fingerprint"].upper()
285
239
                            .replace(u" ", u""))
286
240
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
287
 
        if u"secret" in config:
288
 
            self.secret = config[u"secret"].decode(u"base64")
289
 
        elif u"secfile" in config:
 
241
        if "secret" in config:
 
242
            self.secret = config["secret"].decode(u"base64")
 
243
        elif "secfile" in config:
290
244
            with closing(open(os.path.expanduser
291
245
                              (os.path.expandvars
292
 
                               (config[u"secfile"])))) as secfile:
 
246
                               (config["secfile"])))) as secfile:
293
247
                self.secret = secfile.read()
294
248
        else:
295
249
            raise TypeError(u"No secret or secfile for client %s"
296
250
                            % self.name)
297
 
        self.host = config.get(u"host", u"")
 
251
        self.host = config.get("host", "")
298
252
        self.created = datetime.datetime.utcnow()
299
253
        self.enabled = False
300
254
        self.last_enabled = None
301
255
        self.last_checked_ok = None
302
 
        self.timeout = string_to_delta(config[u"timeout"])
303
 
        self.interval = string_to_delta(config[u"interval"])
 
256
        self.timeout = string_to_delta(config["timeout"])
 
257
        self.interval = string_to_delta(config["interval"])
304
258
        self.disable_hook = disable_hook
305
259
        self.checker = None
306
260
        self.checker_initiator_tag = None
307
261
        self.disable_initiator_tag = None
308
262
        self.checker_callback_tag = None
309
 
        self.checker_command = config[u"checker"]
 
263
        self.checker_command = config["checker"]
310
264
        self.current_checker_command = None
311
265
        self.last_connect = None
 
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)
312
275
    
313
276
    def enable(self):
314
277
        """Start this client's checker and timeout hooks"""
315
 
        if getattr(self, u"enabled", False):
316
 
            # Already enabled
317
 
            return
318
278
        self.last_enabled = datetime.datetime.utcnow()
319
279
        # Schedule a new checker to be started an 'interval' from now,
320
280
        # and every interval from then on.
328
288
                                   (self.timeout_milliseconds(),
329
289
                                    self.disable))
330
290
        self.enabled = True
 
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)))
331
298
    
332
299
    def disable(self):
333
300
        """Disable this client."""
334
301
        if not getattr(self, "enabled", False):
335
302
            return False
336
303
        logger.info(u"Disabling client %s", self.name)
337
 
        if getattr(self, u"disable_initiator_tag", False):
 
304
        if getattr(self, "disable_initiator_tag", False):
338
305
            gobject.source_remove(self.disable_initiator_tag)
339
306
            self.disable_initiator_tag = None
340
 
        if getattr(self, u"checker_initiator_tag", False):
 
307
        if getattr(self, "checker_initiator_tag", False):
341
308
            gobject.source_remove(self.checker_initiator_tag)
342
309
            self.checker_initiator_tag = None
343
310
        self.stop_checker()
344
311
        if self.disable_hook:
345
312
            self.disable_hook(self)
346
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))
347
318
        # Do not run this again if called by a gobject.timeout_add
348
319
        return False
349
320
    
355
326
        """The checker has completed, so take appropriate actions."""
356
327
        self.checker_callback_tag = None
357
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))
358
333
        if os.WIFEXITED(condition):
359
334
            exitstatus = os.WEXITSTATUS(condition)
360
335
            if exitstatus == 0:
364
339
            else:
365
340
                logger.info(u"Checker for %(name)s failed",
366
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))
367
347
        else:
368
348
            logger.warning(u"Checker for %(name)s crashed?",
369
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))
370
355
    
371
356
    def checked_ok(self):
372
357
        """Bump up the timeout for this client.
373
 
        
374
358
        This should only be called when the client has been seen,
375
359
        alive and well.
376
360
        """
379
363
        self.disable_initiator_tag = (gobject.timeout_add
380
364
                                      (self.timeout_milliseconds(),
381
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)))
382
372
    
383
373
    def start_checker(self):
384
374
        """Start a new checker subprocess if one is not running.
385
 
        
386
375
        If a checker already exists, leave it running and do
387
376
        nothing."""
388
377
        # The reason for not killing a running checker is that if we
398
387
        if self.checker is not None:
399
388
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
400
389
            if pid:
401
 
                logger.warning(u"Checker was a zombie")
 
390
                logger.warning("Checker was a zombie")
402
391
                gobject.source_remove(self.checker_callback_tag)
403
392
                self.checker_callback(pid, status,
404
393
                                      self.current_checker_command)
409
398
                command = self.checker_command % self.host
410
399
            except TypeError:
411
400
                # Escape attributes for the shell
412
 
                escaped_attrs = dict((key,
413
 
                                      re.escape(unicode(str(val),
414
 
                                                        errors=
415
 
                                                        u'replace')))
 
401
                escaped_attrs = dict((key, re.escape(str(val)))
416
402
                                     for key, val in
417
403
                                     vars(self).iteritems())
418
404
                try:
421
407
                    logger.error(u'Could not format string "%s":'
422
408
                                 u' %s', self.checker_command, error)
423
409
                    return True # Try again later
424
 
            self.current_checker_command = command
 
410
                self.current_checker_command = command
425
411
            try:
426
412
                logger.info(u"Starting checker %r for %s",
427
413
                            command, self.name)
431
417
                # always replaced by /dev/null.)
432
418
                self.checker = subprocess.Popen(command,
433
419
                                                close_fds=True,
434
 
                                                shell=True, cwd=u"/")
 
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))
435
427
                self.checker_callback_tag = (gobject.child_watch_add
436
428
                                             (self.checker.pid,
437
429
                                              self.checker_callback,
453
445
        if self.checker_callback_tag:
454
446
            gobject.source_remove(self.checker_callback_tag)
455
447
            self.checker_callback_tag = None
456
 
        if getattr(self, u"checker", None) is None:
 
448
        if getattr(self, "checker", None) is None:
457
449
            return
458
450
        logger.debug(u"Stopping checker for %(name)s", vars(self))
459
451
        try:
465
457
            if error.errno != errno.ESRCH: # No such process
466
458
                raise
467
459
        self.checker = None
 
460
        if self.use_dbus:
 
461
            self.PropertyChanged(dbus.String(u"checker_running"),
 
462
                                 dbus.Boolean(False, variant_level=1))
468
463
    
469
464
    def still_valid(self):
470
465
        """Has the timeout not yet passed for this client?"""
471
 
        if not getattr(self, u"enabled", False):
 
466
        if not getattr(self, "enabled", False):
472
467
            return False
473
468
        now = datetime.datetime.utcnow()
474
469
        if self.last_checked_ok is None:
475
470
            return now < (self.created + self.timeout)
476
471
        else:
477
472
            return now < (self.last_checked_ok + self.timeout)
478
 
 
479
 
 
480
 
class ClientDBus(Client, dbus.service.Object):
481
 
    """A Client class using D-Bus
482
 
    
483
 
    Attributes:
484
 
    dbus_object_path: dbus.ObjectPath
485
 
    bus: dbus.SystemBus()
486
 
    """
487
 
    # dbus.service.Object doesn't use super(), so we can't either.
488
 
    
489
 
    def __init__(self, bus = None, *args, **kwargs):
490
 
        self.bus = bus
491
 
        Client.__init__(self, *args, **kwargs)
492
 
        # Only now, when this client is initialized, can it show up on
493
 
        # the D-Bus
494
 
        self.dbus_object_path = (dbus.ObjectPath
495
 
                                 (u"/clients/"
496
 
                                  + self.name.replace(u".", u"_")))
497
 
        dbus.service.Object.__init__(self, self.bus,
498
 
                                     self.dbus_object_path)
499
 
    
500
 
    @staticmethod
501
 
    def _datetime_to_dbus(dt, variant_level=0):
502
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
503
 
        return dbus.String(dt.isoformat(),
504
 
                           variant_level=variant_level)
505
 
    
506
 
    def enable(self):
507
 
        oldstate = getattr(self, u"enabled", False)
508
 
        r = Client.enable(self)
509
 
        if oldstate != self.enabled:
510
 
            # Emit D-Bus signals
511
 
            self.PropertyChanged(dbus.String(u"enabled"),
512
 
                                 dbus.Boolean(True, variant_level=1))
513
 
            self.PropertyChanged(
514
 
                dbus.String(u"last_enabled"),
515
 
                self._datetime_to_dbus(self.last_enabled,
516
 
                                       variant_level=1))
517
 
        return r
518
 
    
519
 
    def disable(self, signal = True):
520
 
        oldstate = getattr(self, u"enabled", False)
521
 
        r = Client.disable(self)
522
 
        if signal and oldstate != self.enabled:
523
 
            # Emit D-Bus signal
524
 
            self.PropertyChanged(dbus.String(u"enabled"),
525
 
                                 dbus.Boolean(False, variant_level=1))
526
 
        return r
527
 
    
528
 
    def __del__(self, *args, **kwargs):
529
 
        try:
530
 
            self.remove_from_connection()
531
 
        except LookupError:
532
 
            pass
533
 
        if hasattr(dbus.service.Object, u"__del__"):
534
 
            dbus.service.Object.__del__(self, *args, **kwargs)
535
 
        Client.__del__(self, *args, **kwargs)
536
 
    
537
 
    def checker_callback(self, pid, condition, command,
538
 
                         *args, **kwargs):
539
 
        self.checker_callback_tag = None
540
 
        self.checker = None
541
 
        # Emit D-Bus signal
542
 
        self.PropertyChanged(dbus.String(u"checker_running"),
543
 
                             dbus.Boolean(False, variant_level=1))
544
 
        if os.WIFEXITED(condition):
545
 
            exitstatus = os.WEXITSTATUS(condition)
546
 
            # Emit D-Bus signal
547
 
            self.CheckerCompleted(dbus.Int16(exitstatus),
548
 
                                  dbus.Int64(condition),
549
 
                                  dbus.String(command))
550
 
        else:
551
 
            # Emit D-Bus signal
552
 
            self.CheckerCompleted(dbus.Int16(-1),
553
 
                                  dbus.Int64(condition),
554
 
                                  dbus.String(command))
555
 
        
556
 
        return Client.checker_callback(self, pid, condition, command,
557
 
                                       *args, **kwargs)
558
 
    
559
 
    def checked_ok(self, *args, **kwargs):
560
 
        r = Client.checked_ok(self, *args, **kwargs)
561
 
        # Emit D-Bus signal
562
 
        self.PropertyChanged(
563
 
            dbus.String(u"last_checked_ok"),
564
 
            (self._datetime_to_dbus(self.last_checked_ok,
565
 
                                    variant_level=1)))
566
 
        return r
567
 
    
568
 
    def start_checker(self, *args, **kwargs):
569
 
        old_checker = self.checker
570
 
        if self.checker is not None:
571
 
            old_checker_pid = self.checker.pid
572
 
        else:
573
 
            old_checker_pid = None
574
 
        r = Client.start_checker(self, *args, **kwargs)
575
 
        # Only if new checker process was started
576
 
        if (self.checker is not None
577
 
            and old_checker_pid != self.checker.pid):
578
 
            # Emit D-Bus signal
579
 
            self.CheckerStarted(self.current_checker_command)
580
 
            self.PropertyChanged(
581
 
                dbus.String(u"checker_running"),
582
 
                dbus.Boolean(True, variant_level=1))
583
 
        return r
584
 
    
585
 
    def stop_checker(self, *args, **kwargs):
586
 
        old_checker = getattr(self, u"checker", None)
587
 
        r = Client.stop_checker(self, *args, **kwargs)
588
 
        if (old_checker is not None
589
 
            and getattr(self, u"checker", None) is None):
590
 
            self.PropertyChanged(dbus.String(u"checker_running"),
591
 
                                 dbus.Boolean(False, variant_level=1))
592
 
        return r
593
473
    
594
474
    ## D-Bus methods & signals
595
475
    _interface = u"se.bsnet.fukt.Mandos.Client"
596
476
    
597
477
    # CheckedOK - method
598
 
    @dbus.service.method(_interface)
599
 
    def CheckedOK(self):
600
 
        return self.checked_ok()
 
478
    CheckedOK = dbus.service.method(_interface)(checked_ok)
 
479
    CheckedOK.__name__ = "CheckedOK"
601
480
    
602
481
    # CheckerCompleted - signal
603
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
482
    @dbus.service.signal(_interface, signature="nxs")
604
483
    def CheckerCompleted(self, exitcode, waitstatus, command):
605
484
        "D-Bus signal"
606
485
        pass
607
486
    
608
487
    # CheckerStarted - signal
609
 
    @dbus.service.signal(_interface, signature=u"s")
 
488
    @dbus.service.signal(_interface, signature="s")
610
489
    def CheckerStarted(self, command):
611
490
        "D-Bus signal"
612
491
        pass
613
492
    
614
493
    # GetAllProperties - method
615
 
    @dbus.service.method(_interface, out_signature=u"a{sv}")
 
494
    @dbus.service.method(_interface, out_signature="a{sv}")
616
495
    def GetAllProperties(self):
617
496
        "D-Bus method"
618
497
        return dbus.Dictionary({
619
 
                dbus.String(u"name"):
 
498
                dbus.String("name"):
620
499
                    dbus.String(self.name, variant_level=1),
621
 
                dbus.String(u"fingerprint"):
 
500
                dbus.String("fingerprint"):
622
501
                    dbus.String(self.fingerprint, variant_level=1),
623
 
                dbus.String(u"host"):
 
502
                dbus.String("host"):
624
503
                    dbus.String(self.host, variant_level=1),
625
 
                dbus.String(u"created"):
626
 
                    self._datetime_to_dbus(self.created,
627
 
                                           variant_level=1),
628
 
                dbus.String(u"last_enabled"):
629
 
                    (self._datetime_to_dbus(self.last_enabled,
630
 
                                            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)
631
509
                     if self.last_enabled is not None
632
510
                     else dbus.Boolean(False, variant_level=1)),
633
 
                dbus.String(u"enabled"):
 
511
                dbus.String("enabled"):
634
512
                    dbus.Boolean(self.enabled, variant_level=1),
635
 
                dbus.String(u"last_checked_ok"):
636
 
                    (self._datetime_to_dbus(self.last_checked_ok,
637
 
                                            variant_level=1)
 
513
                dbus.String("last_checked_ok"):
 
514
                    (_datetime_to_dbus(self.last_checked_ok,
 
515
                                       variant_level=1)
638
516
                     if self.last_checked_ok is not None
639
517
                     else dbus.Boolean (False, variant_level=1)),
640
 
                dbus.String(u"timeout"):
 
518
                dbus.String("timeout"):
641
519
                    dbus.UInt64(self.timeout_milliseconds(),
642
520
                                variant_level=1),
643
 
                dbus.String(u"interval"):
 
521
                dbus.String("interval"):
644
522
                    dbus.UInt64(self.interval_milliseconds(),
645
523
                                variant_level=1),
646
 
                dbus.String(u"checker"):
 
524
                dbus.String("checker"):
647
525
                    dbus.String(self.checker_command,
648
526
                                variant_level=1),
649
 
                dbus.String(u"checker_running"):
 
527
                dbus.String("checker_running"):
650
528
                    dbus.Boolean(self.checker is not None,
651
529
                                 variant_level=1),
652
 
                dbus.String(u"object_path"):
 
530
                dbus.String("object_path"):
653
531
                    dbus.ObjectPath(self.dbus_object_path,
654
532
                                    variant_level=1)
655
 
                }, signature=u"sv")
 
533
                }, signature="sv")
656
534
    
657
535
    # IsStillValid - method
658
 
    @dbus.service.method(_interface, out_signature=u"b")
659
 
    def IsStillValid(self):
660
 
        return self.still_valid()
 
536
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
 
537
                    (still_valid))
 
538
    IsStillValid.__name__ = "IsStillValid"
661
539
    
662
540
    # PropertyChanged - signal
663
 
    @dbus.service.signal(_interface, signature=u"sv")
 
541
    @dbus.service.signal(_interface, signature="sv")
664
542
    def PropertyChanged(self, property, value):
665
543
        "D-Bus signal"
666
544
        pass
678
556
        pass
679
557
    
680
558
    # SetChecker - method
681
 
    @dbus.service.method(_interface, in_signature=u"s")
 
559
    @dbus.service.method(_interface, in_signature="s")
682
560
    def SetChecker(self, checker):
683
561
        "D-Bus setter method"
684
562
        self.checker_command = checker
688
566
                                         variant_level=1))
689
567
    
690
568
    # SetHost - method
691
 
    @dbus.service.method(_interface, in_signature=u"s")
 
569
    @dbus.service.method(_interface, in_signature="s")
692
570
    def SetHost(self, host):
693
571
        "D-Bus setter method"
694
572
        self.host = host
697
575
                             dbus.String(self.host, variant_level=1))
698
576
    
699
577
    # SetInterval - method
700
 
    @dbus.service.method(_interface, in_signature=u"t")
 
578
    @dbus.service.method(_interface, in_signature="t")
701
579
    def SetInterval(self, milliseconds):
702
580
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
703
581
        # Emit D-Bus signal
706
584
                                          variant_level=1)))
707
585
    
708
586
    # SetSecret - method
709
 
    @dbus.service.method(_interface, in_signature=u"ay",
 
587
    @dbus.service.method(_interface, in_signature="ay",
710
588
                         byte_arrays=True)
711
589
    def SetSecret(self, secret):
712
590
        "D-Bus setter method"
713
591
        self.secret = str(secret)
714
592
    
715
593
    # SetTimeout - method
716
 
    @dbus.service.method(_interface, in_signature=u"t")
 
594
    @dbus.service.method(_interface, in_signature="t")
717
595
    def SetTimeout(self, milliseconds):
718
596
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
719
597
        # Emit D-Bus signal
722
600
                                          variant_level=1)))
723
601
    
724
602
    # Enable - method
725
 
    @dbus.service.method(_interface)
726
 
    def Enable(self):
727
 
        "D-Bus method"
728
 
        self.enable()
 
603
    Enable = dbus.service.method(_interface)(enable)
 
604
    Enable.__name__ = "Enable"
729
605
    
730
606
    # StartChecker - method
731
607
    @dbus.service.method(_interface)
740
616
        self.disable()
741
617
    
742
618
    # StopChecker - method
743
 
    @dbus.service.method(_interface)
744
 
    def StopChecker(self):
745
 
        self.stop_checker()
 
619
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
620
    StopChecker.__name__ = "StopChecker"
746
621
    
747
622
    del _interface
748
623
 
749
624
 
750
 
class ClientHandler(socketserver.BaseRequestHandler, object):
751
 
    """A class to handle client connections.
752
 
    
753
 
    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.
754
689
    Note: This will run in its own forked process."""
755
690
    
756
691
    def handle(self):
758
693
                    unicode(self.client_address))
759
694
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
760
695
        # Open IPC pipe to parent process
761
 
        with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
 
696
        with closing(os.fdopen(self.server.pipe[1], "w", 1)) as ipc:
762
697
            session = (gnutls.connection
763
698
                       .ClientSession(self.request,
764
699
                                      gnutls.connection
778
713
            # no X.509 keys are added to it.  Therefore, we can use it
779
714
            # here despite using OpenPGP certificates.
780
715
            
781
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
782
 
            #                      u"+AES-256-CBC", u"+SHA1",
783
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
784
 
            #                      u"+DHE-DSS"))
 
716
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
717
            #                     "+AES-256-CBC", "+SHA1",
 
718
            #                     "+COMP-NULL", "+CTYPE-OPENPGP",
 
719
            #                     "+DHE-DSS"))
785
720
            # Use a fallback default, since this MUST be set.
786
 
            priority = self.server.gnutls_priority
787
 
            if priority is None:
788
 
                priority = u"NORMAL"
 
721
            priority = self.server.settings.get("priority", "NORMAL")
789
722
            (gnutls.library.functions
790
723
             .gnutls_priority_set_direct(session._c_object,
791
724
                                         priority, None))
799
732
                return
800
733
            logger.debug(u"Handshake succeeded")
801
734
            try:
802
 
                fpr = self.fingerprint(self.peer_certificate(session))
 
735
                fpr = fingerprint(peer_certificate(session))
803
736
            except (TypeError, gnutls.errors.GNUTLSError), error:
804
737
                logger.warning(u"Bad certificate: %s", error)
805
738
                session.bye()
811
744
                    client = c
812
745
                    break
813
746
            else:
814
 
                ipc.write(u"NOTFOUND %s\n" % fpr)
 
747
                logger.warning(u"Client not found for fingerprint: %s",
 
748
                               fpr)
 
749
                ipc.write("NOTFOUND %s\n" % fpr)
815
750
                session.bye()
816
751
                return
817
752
            # Have to check if client.still_valid(), since it is
818
753
            # possible that the client timed out while establishing
819
754
            # the GnuTLS session.
820
755
            if not client.still_valid():
821
 
                ipc.write(u"INVALID %s\n" % client.name)
 
756
                logger.warning(u"Client %(name)s is invalid",
 
757
                               vars(client))
 
758
                ipc.write("INVALID %s\n" % client.name)
822
759
                session.bye()
823
760
                return
824
 
            ipc.write(u"SENDING %s\n" % client.name)
 
761
            ipc.write("SENDING %s\n" % client.name)
825
762
            sent_size = 0
826
763
            while sent_size < len(client.secret):
827
764
                sent = session.send(client.secret[sent_size:])
830
767
                             - (sent_size + sent))
831
768
                sent_size += sent
832
769
            session.bye()
833
 
    
834
 
    @staticmethod
835
 
    def peer_certificate(session):
836
 
        "Return the peer's OpenPGP certificate as a bytestring"
837
 
        # If not an OpenPGP certificate...
838
 
        if (gnutls.library.functions
839
 
            .gnutls_certificate_type_get(session._c_object)
840
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
841
 
            # ...do the normal thing
842
 
            return session.peer_certificate
843
 
        list_size = ctypes.c_uint(1)
844
 
        cert_list = (gnutls.library.functions
845
 
                     .gnutls_certificate_get_peers
846
 
                     (session._c_object, ctypes.byref(list_size)))
847
 
        if not bool(cert_list) and list_size.value != 0:
848
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
849
 
                                            u" certificate")
850
 
        if list_size.value == 0:
851
 
            return None
852
 
        cert = cert_list[0]
853
 
        return ctypes.string_at(cert.data, cert.size)
854
 
    
855
 
    @staticmethod
856
 
    def fingerprint(openpgp):
857
 
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
858
 
        # New GnuTLS "datum" with the OpenPGP public key
859
 
        datum = (gnutls.library.types
860
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
861
 
                                             ctypes.POINTER
862
 
                                             (ctypes.c_ubyte)),
863
 
                                 ctypes.c_uint(len(openpgp))))
864
 
        # New empty GnuTLS certificate
865
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
866
 
        (gnutls.library.functions
867
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
868
 
        # Import the OpenPGP public key into the certificate
869
 
        (gnutls.library.functions
870
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
871
 
                                    gnutls.library.constants
872
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
873
 
        # Verify the self signature in the key
874
 
        crtverify = ctypes.c_uint()
875
 
        (gnutls.library.functions
876
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
877
 
                                         ctypes.byref(crtverify)))
878
 
        if crtverify.value != 0:
879
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
880
 
            raise (gnutls.errors.CertificateSecurityError
881
 
                   (u"Verify failed"))
882
 
        # New buffer for the fingerprint
883
 
        buf = ctypes.create_string_buffer(20)
884
 
        buf_len = ctypes.c_size_t()
885
 
        # Get the fingerprint from the certificate into the buffer
886
 
        (gnutls.library.functions
887
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
888
 
                                             ctypes.byref(buf_len)))
889
 
        # Deinit the certificate
890
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
891
 
        # Convert the buffer to a Python bytestring
892
 
        fpr = ctypes.string_at(buf, buf_len.value)
893
 
        # Convert the bytestring to hexadecimal notation
894
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
895
 
        return hex_fpr
896
 
 
897
 
 
898
 
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
899
 
    """Like socketserver.ForkingMixIn, but also pass a pipe."""
 
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
    """
900
776
    def process_request(self, request, client_address):
901
 
        """Overrides and wraps the original process_request().
902
 
        
 
777
        """This overrides and wraps the original process_request().
903
778
        This function creates a new pipe in self.pipe 
904
779
        """
905
780
        self.pipe = os.pipe()
906
781
        super(ForkingMixInWithPipe,
907
782
              self).process_request(request, client_address)
908
783
        os.close(self.pipe[1])  # close write end
909
 
        self.add_pipe(self.pipe[0])
910
 
    def add_pipe(self, pipe):
 
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):
911
789
        """Dummy function; override as necessary"""
912
 
        os.close(pipe)
 
790
        os.close(source)
 
791
        return False
913
792
 
914
793
 
915
794
class IPv6_TCPServer(ForkingMixInWithPipe,
916
 
                     socketserver.TCPServer, object):
 
795
                     SocketServer.TCPServer, object):
917
796
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
918
 
    
919
797
    Attributes:
 
798
        settings:       Server settings
 
799
        clients:        Set() of Client objects
920
800
        enabled:        Boolean; whether this server is activated yet
921
 
        interface:      None or a network interface name (string)
922
 
        use_ipv6:       Boolean; to use IPv6 or not
923
801
    """
924
 
    def __init__(self, server_address, RequestHandlerClass,
925
 
                 interface=None, use_ipv6=True):
926
 
        self.interface = interface
927
 
        if use_ipv6:
928
 
            self.address_family = socket.AF_INET6
929
 
        socketserver.TCPServer.__init__(self, server_address,
930
 
                                        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)
931
816
    def server_bind(self):
932
817
        """This overrides the normal server_bind() function
933
818
        to bind to an interface if one was specified, and also NOT to
934
819
        bind to an address or port if they were not specified."""
935
 
        if self.interface is not None:
936
 
            if SO_BINDTODEVICE is None:
937
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
938
 
                             u" cannot bind to interface %s",
939
 
                             self.interface)
940
 
            else:
941
 
                try:
942
 
                    self.socket.setsockopt(socket.SOL_SOCKET,
943
 
                                           SO_BINDTODEVICE,
944
 
                                           str(self.interface
945
 
                                               + u'\0'))
946
 
                except socket.error, error:
947
 
                    if error[0] == errno.EPERM:
948
 
                        logger.error(u"No permission to"
949
 
                                     u" bind to interface %s",
950
 
                                     self.interface)
951
 
                    elif error[0] == errno.ENOPROTOOPT:
952
 
                        logger.error(u"SO_BINDTODEVICE not available;"
953
 
                                     u" cannot bind to interface %s",
954
 
                                     self.interface)
955
 
                    else:
956
 
                        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
957
834
        # Only bind(2) the socket if we really need to.
958
835
        if self.server_address[0] or self.server_address[1]:
959
836
            if not self.server_address[0]:
960
837
                if self.address_family == socket.AF_INET6:
961
 
                    any_address = u"::" # in6addr_any
 
838
                    any_address = "::" # in6addr_any
962
839
                else:
963
840
                    any_address = socket.INADDR_ANY
964
841
                self.server_address = (any_address,
966
843
            elif not self.server_address[1]:
967
844
                self.server_address = (self.server_address[0],
968
845
                                       0)
969
 
#                 if self.interface:
 
846
#                 if self.settings["interface"]:
970
847
#                     self.server_address = (self.server_address[0],
971
848
#                                            0, # port
972
849
#                                            0, # flowinfo
973
850
#                                            if_nametoindex
974
 
#                                            (self.interface))
975
 
            return socketserver.TCPServer.server_bind(self)
976
 
 
977
 
 
978
 
class MandosServer(IPv6_TCPServer):
979
 
    """Mandos server.
980
 
    
981
 
    Attributes:
982
 
        clients:        set of Client objects
983
 
        gnutls_priority GnuTLS priority string
984
 
        use_dbus:       Boolean; to emit D-Bus signals or not
985
 
        clients:        set of Client objects
986
 
        gnutls_priority GnuTLS priority string
987
 
        use_dbus:       Boolean; to emit D-Bus signals or not
988
 
    
989
 
    Assumes a gobject.MainLoop event loop.
990
 
    """
991
 
    def __init__(self, server_address, RequestHandlerClass,
992
 
                 interface=None, use_ipv6=True, clients=None,
993
 
                 gnutls_priority=None, use_dbus=True):
994
 
        self.enabled = False
995
 
        self.clients = clients
996
 
        if self.clients is None:
997
 
            self.clients = set()
998
 
        self.use_dbus = use_dbus
999
 
        self.gnutls_priority = gnutls_priority
1000
 
        IPv6_TCPServer.__init__(self, server_address,
1001
 
                                RequestHandlerClass,
1002
 
                                interface = interface,
1003
 
                                use_ipv6 = use_ipv6)
 
851
#                                            (self.settings
 
852
#                                             ["interface"]))
 
853
            return super(IPv6_TCPServer, self).server_bind()
1004
854
    def server_activate(self):
1005
855
        if self.enabled:
1006
 
            return socketserver.TCPServer.server_activate(self)
 
856
            return super(IPv6_TCPServer, self).server_activate()
1007
857
    def enable(self):
1008
858
        self.enabled = True
1009
 
    def add_pipe(self, pipe):
1010
 
        # Call "handle_ipc" for both data and EOF events
1011
 
        gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1012
 
                             self.handle_ipc)
1013
859
    def handle_ipc(self, source, condition, file_objects={}):
1014
860
        condition_names = {
1015
 
            gobject.IO_IN: u"IN",   # There is data to read.
1016
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
1017
 
                                    # blocking).
1018
 
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
1019
 
            gobject.IO_ERR: u"ERR", # Error condition.
1020
 
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
1021
 
                                    # broken, usually for pipes and
1022
 
                                    # sockets).
 
861
            gobject.IO_IN: "IN", # There is data to read.
 
862
            gobject.IO_OUT: "OUT", # Data can be written (without
 
863
                                   # blocking).
 
864
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
865
            gobject.IO_ERR: "ERR", # Error condition.
 
866
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
867
                                   # broken, usually for pipes and
 
868
                                   # sockets).
1023
869
            }
1024
870
        conditions_string = ' | '.join(name
1025
871
                                       for cond, name in
1026
872
                                       condition_names.iteritems()
1027
873
                                       if cond & condition)
1028
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
 
874
        logger.debug("Handling IPC: FD = %d, condition = %s", source,
1029
875
                     conditions_string)
1030
876
        
1031
877
        # Turn the pipe file descriptor into a Python file object
1032
878
        if source not in file_objects:
1033
 
            file_objects[source] = os.fdopen(source, u"r", 1)
 
879
            file_objects[source] = os.fdopen(source, "r", 1)
1034
880
        
1035
881
        # Read a line from the file object
1036
882
        cmdline = file_objects[source].readline()
1042
888
            # Stop calling this function
1043
889
            return False
1044
890
        
1045
 
        logger.debug(u"IPC command: %r", cmdline)
 
891
        logger.debug("IPC command: %r\n" % cmdline)
1046
892
        
1047
893
        # Parse and act on command
1048
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1049
 
        
1050
 
        if cmd == u"NOTFOUND":
1051
 
            logger.warning(u"Client not found for fingerprint: %s",
1052
 
                           args)
1053
 
            if self.use_dbus:
 
894
        cmd, args = cmdline.split(None, 1)
 
895
        if cmd == "NOTFOUND":
 
896
            if self.settings["use_dbus"]:
1054
897
                # Emit D-Bus signal
1055
898
                mandos_dbus_service.ClientNotFound(args)
1056
 
        elif cmd == u"INVALID":
1057
 
            for client in self.clients:
1058
 
                if client.name == args:
1059
 
                    logger.warning(u"Client %s is invalid", args)
1060
 
                    if self.use_dbus:
 
899
        elif cmd == "INVALID":
 
900
            if self.settings["use_dbus"]:
 
901
                for client in self.clients:
 
902
                    if client.name == args:
1061
903
                        # Emit D-Bus signal
1062
904
                        client.Rejected()
1063
 
                    break
1064
 
            else:
1065
 
                logger.error(u"Unknown client %s is invalid", args)
1066
 
        elif cmd == u"SENDING":
 
905
                        break
 
906
        elif cmd == "SENDING":
1067
907
            for client in self.clients:
1068
908
                if client.name == args:
1069
 
                    logger.info(u"Sending secret to %s", client.name)
1070
909
                    client.checked_ok()
1071
 
                    if self.use_dbus:
 
910
                    if self.settings["use_dbus"]:
1072
911
                        # Emit D-Bus signal
1073
912
                        client.ReceivedSecret()
1074
913
                    break
1075
 
            else:
1076
 
                logger.error(u"Sending secret to unknown client %s",
1077
 
                             args)
1078
914
        else:
1079
 
            logger.error(u"Unknown IPC command: %r", cmdline)
 
915
            logger.error("Unknown IPC command: %r", cmdline)
1080
916
        
1081
917
        # Keep calling this function
1082
918
        return True
1085
921
def string_to_delta(interval):
1086
922
    """Parse a string and return a datetime.timedelta
1087
923
    
1088
 
    >>> string_to_delta(u'7d')
 
924
    >>> string_to_delta('7d')
1089
925
    datetime.timedelta(7)
1090
 
    >>> string_to_delta(u'60s')
 
926
    >>> string_to_delta('60s')
1091
927
    datetime.timedelta(0, 60)
1092
 
    >>> string_to_delta(u'60m')
 
928
    >>> string_to_delta('60m')
1093
929
    datetime.timedelta(0, 3600)
1094
 
    >>> string_to_delta(u'24h')
 
930
    >>> string_to_delta('24h')
1095
931
    datetime.timedelta(1)
1096
932
    >>> string_to_delta(u'1w')
1097
933
    datetime.timedelta(7)
1098
 
    >>> string_to_delta(u'5m 30s')
 
934
    >>> string_to_delta('5m 30s')
1099
935
    datetime.timedelta(0, 330)
1100
936
    """
1101
937
    timevalue = datetime.timedelta(0)
1121
957
    return timevalue
1122
958
 
1123
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
 
1124
983
def if_nametoindex(interface):
1125
 
    """Call the C function if_nametoindex(), or equivalent
1126
 
    
1127
 
    Note: This function cannot accept a unicode string."""
 
984
    """Call the C function if_nametoindex(), or equivalent"""
1128
985
    global if_nametoindex
1129
986
    try:
1130
987
        if_nametoindex = (ctypes.cdll.LoadLibrary
1131
 
                          (ctypes.util.find_library(u"c"))
 
988
                          (ctypes.util.find_library("c"))
1132
989
                          .if_nametoindex)
1133
990
    except (OSError, AttributeError):
1134
 
        logger.warning(u"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
1135
995
        def if_nametoindex(interface):
1136
996
            "Get an interface index the hard way, i.e. using fcntl()"
1137
997
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1138
998
            with closing(socket.socket()) as s:
1139
999
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1140
 
                                    struct.pack(str(u"16s16x"),
1141
 
                                                interface))
1142
 
            interface_index = struct.unpack(str(u"I"),
1143
 
                                            ifreq[16:20])[0]
 
1000
                                    struct.pack("16s16x", interface))
 
1001
            interface_index = struct.unpack("I", ifreq[16:20])[0]
1144
1002
            return interface_index
1145
1003
    return if_nametoindex(interface)
1146
1004
 
1147
1005
 
1148
1006
def daemon(nochdir = False, noclose = False):
1149
1007
    """See daemon(3).  Standard BSD Unix function.
1150
 
    
1151
1008
    This should really exist as os.daemon, but it doesn't (yet)."""
1152
1009
    if os.fork():
1153
1010
        sys.exit()
1154
1011
    os.setsid()
1155
1012
    if not nochdir:
1156
 
        os.chdir(u"/")
 
1013
        os.chdir("/")
1157
1014
    if os.fork():
1158
1015
        sys.exit()
1159
1016
    if not noclose:
1161
1018
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1162
1019
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1163
1020
            raise OSError(errno.ENODEV,
1164
 
                          u"/dev/null not a character device")
 
1021
                          "/dev/null not a character device")
1165
1022
        os.dup2(null, sys.stdin.fileno())
1166
1023
        os.dup2(null, sys.stdout.fileno())
1167
1024
        os.dup2(null, sys.stderr.fileno())
1175
1032
    # Parsing of options, both command line and config file
1176
1033
    
1177
1034
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1178
 
    parser.add_option("-i", u"--interface", type=u"string",
1179
 
                      metavar="IF", help=u"Bind to interface IF")
1180
 
    parser.add_option("-a", u"--address", type=u"string",
1181
 
                      help=u"Address to listen for requests on")
1182
 
    parser.add_option("-p", u"--port", type=u"int",
1183
 
                      help=u"Port number to receive requests on")
1184
 
    parser.add_option("--check", action=u"store_true",
1185
 
                      help=u"Run self-test")
1186
 
    parser.add_option("--debug", action=u"store_true",
1187
 
                      help=u"Debug mode; run in foreground and log to"
1188
 
                      u" terminal")
1189
 
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1190
 
                      u" priority string (see GnuTLS documentation)")
1191
 
    parser.add_option("--servicename", type=u"string",
1192
 
                      metavar=u"NAME", help=u"Zeroconf service name")
1193
 
    parser.add_option("--configdir", type=u"string",
1194
 
                      default=u"/etc/mandos", metavar=u"DIR",
1195
 
                      help=u"Directory to search for configuration"
1196
 
                      u" files")
1197
 
    parser.add_option("--no-dbus", action=u"store_false",
1198
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1199
 
                      u" system bus interface")
1200
 
    parser.add_option("--no-ipv6", action=u"store_false",
1201
 
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
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")
1202
1060
    options = parser.parse_args()[0]
1203
1061
    
1204
1062
    if options.check:
1207
1065
        sys.exit()
1208
1066
    
1209
1067
    # Default values for config file for server-global settings
1210
 
    server_defaults = { u"interface": u"",
1211
 
                        u"address": u"",
1212
 
                        u"port": u"",
1213
 
                        u"debug": u"False",
1214
 
                        u"priority":
1215
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1216
 
                        u"servicename": u"Mandos",
1217
 
                        u"use_dbus": u"True",
1218
 
                        u"use_ipv6": u"True",
 
1068
    server_defaults = { "interface": "",
 
1069
                        "address": "",
 
1070
                        "port": "",
 
1071
                        "debug": "False",
 
1072
                        "priority":
 
1073
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1074
                        "servicename": "Mandos",
 
1075
                        "use_dbus": "True",
 
1076
                        "use_ipv6": "True",
1219
1077
                        }
1220
1078
    
1221
1079
    # Parse config file for server-global settings
1222
 
    server_config = configparser.SafeConfigParser(server_defaults)
 
1080
    server_config = ConfigParser.SafeConfigParser(server_defaults)
1223
1081
    del server_defaults
1224
 
    server_config.read(os.path.join(options.configdir,
1225
 
                                    u"mandos.conf"))
 
1082
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
1226
1083
    # Convert the SafeConfigParser object to a dict
1227
1084
    server_settings = server_config.defaults()
1228
1085
    # Use the appropriate methods on the non-string config options
1229
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1230
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
1231
 
                                                           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")
1232
1092
    if server_settings["port"]:
1233
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
1234
 
                                                       u"port")
 
1093
        server_settings["port"] = server_config.getint("DEFAULT",
 
1094
                                                       "port")
1235
1095
    del server_config
1236
1096
    
1237
1097
    # Override the settings from the config file with command line
1238
1098
    # options, if set.
1239
 
    for option in (u"interface", u"address", u"port", u"debug",
1240
 
                   u"priority", u"servicename", u"configdir",
1241
 
                   u"use_dbus", u"use_ipv6"):
 
1099
    for option in ("interface", "address", "port", "debug",
 
1100
                   "priority", "servicename", "configdir",
 
1101
                   "use_dbus", "use_ipv6"):
1242
1102
        value = getattr(options, option)
1243
1103
        if value is not None:
1244
1104
            server_settings[option] = value
1245
1105
    del options
1246
 
    # Force all strings to be unicode
1247
 
    for option in server_settings.keys():
1248
 
        if type(server_settings[option]) is str:
1249
 
            server_settings[option] = unicode(server_settings[option])
1250
1106
    # Now we have our good server settings in "server_settings"
1251
1107
    
1252
1108
    ##################################################################
1253
1109
    
1254
1110
    # For convenience
1255
 
    debug = server_settings[u"debug"]
1256
 
    use_dbus = server_settings[u"use_dbus"]
1257
 
    use_ipv6 = server_settings[u"use_ipv6"]
 
1111
    debug = server_settings["debug"]
 
1112
    use_dbus = server_settings["use_dbus"]
 
1113
    use_ipv6 = server_settings["use_ipv6"]
1258
1114
    
1259
1115
    if not debug:
1260
1116
        syslogger.setLevel(logging.WARNING)
1261
1117
        console.setLevel(logging.WARNING)
1262
1118
    
1263
 
    if server_settings[u"servicename"] != u"Mandos":
 
1119
    if server_settings["servicename"] != "Mandos":
1264
1120
        syslogger.setFormatter(logging.Formatter
1265
 
                               (u'Mandos (%s) [%%(process)d]:'
1266
 
                                u' %%(levelname)s: %%(message)s'
1267
 
                                % server_settings[u"servicename"]))
 
1121
                               ('Mandos (%s) [%%(process)d]:'
 
1122
                                ' %%(levelname)s: %%(message)s'
 
1123
                                % server_settings["servicename"]))
1268
1124
    
1269
1125
    # Parse config file with clients
1270
 
    client_defaults = { u"timeout": u"1h",
1271
 
                        u"interval": u"5m",
1272
 
                        u"checker": u"fping -q -- %%(host)s",
1273
 
                        u"host": u"",
 
1126
    client_defaults = { "timeout": "1h",
 
1127
                        "interval": "5m",
 
1128
                        "checker": "fping -q -- %%(host)s",
 
1129
                        "host": "",
1274
1130
                        }
1275
 
    client_config = configparser.SafeConfigParser(client_defaults)
1276
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1277
 
                                    u"clients.conf"))
1278
 
    
 
1131
    client_config = ConfigParser.SafeConfigParser(client_defaults)
 
1132
    client_config.read(os.path.join(server_settings["configdir"],
 
1133
                                    "clients.conf"))
 
1134
 
1279
1135
    global mandos_dbus_service
1280
1136
    mandos_dbus_service = None
1281
1137
    
1282
 
    tcp_server = MandosServer((server_settings[u"address"],
1283
 
                               server_settings[u"port"]),
1284
 
                              ClientHandler,
1285
 
                              interface=server_settings[u"interface"],
1286
 
                              use_ipv6=use_ipv6,
1287
 
                              gnutls_priority=
1288
 
                              server_settings[u"priority"],
1289
 
                              use_dbus=use_dbus)
1290
 
    pidfilename = u"/var/run/mandos.pid"
 
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"
1291
1145
    try:
1292
 
        pidfile = open(pidfilename, u"w")
 
1146
        pidfile = open(pidfilename, "w")
1293
1147
    except IOError:
1294
 
        logger.error(u"Could not open file %r", pidfilename)
 
1148
        logger.error("Could not open file %r", pidfilename)
1295
1149
    
1296
1150
    try:
1297
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1298
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
1151
        uid = pwd.getpwnam("_mandos").pw_uid
 
1152
        gid = pwd.getpwnam("_mandos").pw_gid
1299
1153
    except KeyError:
1300
1154
        try:
1301
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1302
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
1155
            uid = pwd.getpwnam("mandos").pw_uid
 
1156
            gid = pwd.getpwnam("mandos").pw_gid
1303
1157
        except KeyError:
1304
1158
            try:
1305
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1306
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1159
                uid = pwd.getpwnam("nobody").pw_uid
 
1160
                gid = pwd.getpwnam("nogroup").pw_gid
1307
1161
            except KeyError:
1308
1162
                uid = 65534
1309
1163
                gid = 65534
1322
1176
        
1323
1177
        @gnutls.library.types.gnutls_log_func
1324
1178
        def debug_gnutls(level, string):
1325
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
1179
            logger.debug("GnuTLS: %s", string[:-1])
1326
1180
        
1327
1181
        (gnutls.library.functions
1328
1182
         .gnutls_global_set_log_function(debug_gnutls))
1329
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
    
1330
1193
    global main_loop
 
1194
    global bus
 
1195
    global server
1331
1196
    # From the Avahi example code
1332
1197
    DBusGMainLoop(set_as_default=True )
1333
1198
    main_loop = gobject.MainLoop()
1334
1199
    bus = dbus.SystemBus()
 
1200
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
1201
                                           avahi.DBUS_PATH_SERVER),
 
1202
                            avahi.DBUS_INTERFACE_SERVER)
1335
1203
    # End of Avahi example code
1336
1204
    if use_dbus:
1337
1205
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1338
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1339
 
    service = AvahiService(name = server_settings[u"servicename"],
1340
 
                           servicetype = u"_mandos._tcp",
1341
 
                           protocol = protocol, bus = bus)
1342
 
    if server_settings["interface"]:
1343
 
        service.interface = (if_nametoindex
1344
 
                             (str(server_settings[u"interface"])))
1345
1206
    
1346
 
    client_class = Client
1347
 
    if use_dbus:
1348
 
        client_class = functools.partial(ClientDBus, bus = bus)
1349
 
    tcp_server.clients.update(set(
1350
 
            client_class(name = section,
1351
 
                         config= dict(client_config.items(section)))
1352
 
            for section in client_config.sections()))
1353
 
    if not tcp_server.clients:
 
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:
1354
1213
        logger.warning(u"No clients defined")
1355
1214
    
1356
1215
    if debug:
1380
1239
    
1381
1240
    def cleanup():
1382
1241
        "Cleanup function; run on exit"
1383
 
        service.cleanup()
 
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
1384
1248
        
1385
 
        while tcp_server.clients:
1386
 
            client = tcp_server.clients.pop()
 
1249
        while clients:
 
1250
            client = clients.pop()
1387
1251
            client.disable_hook = None
1388
1252
            client.disable()
1389
1253
    
1398
1262
        class MandosDBusService(dbus.service.Object):
1399
1263
            """A D-Bus proxy object"""
1400
1264
            def __init__(self):
1401
 
                dbus.service.Object.__init__(self, bus, u"/")
 
1265
                dbus.service.Object.__init__(self, bus, "/")
1402
1266
            _interface = u"se.bsnet.fukt.Mandos"
1403
1267
            
1404
 
            @dbus.service.signal(_interface, signature=u"oa{sv}")
 
1268
            @dbus.service.signal(_interface, signature="oa{sv}")
1405
1269
            def ClientAdded(self, objpath, properties):
1406
1270
                "D-Bus signal"
1407
1271
                pass
1408
1272
            
1409
 
            @dbus.service.signal(_interface, signature=u"s")
 
1273
            @dbus.service.signal(_interface, signature="s")
1410
1274
            def ClientNotFound(self, fingerprint):
1411
1275
                "D-Bus signal"
1412
1276
                pass
1413
1277
            
1414
 
            @dbus.service.signal(_interface, signature=u"os")
 
1278
            @dbus.service.signal(_interface, signature="os")
1415
1279
            def ClientRemoved(self, objpath, name):
1416
1280
                "D-Bus signal"
1417
1281
                pass
1418
1282
            
1419
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
1283
            @dbus.service.method(_interface, out_signature="ao")
1420
1284
            def GetAllClients(self):
1421
1285
                "D-Bus method"
1422
 
                return dbus.Array(c.dbus_object_path
1423
 
                                  for c in tcp_server.clients)
 
1286
                return dbus.Array(c.dbus_object_path for c in clients)
1424
1287
            
1425
 
            @dbus.service.method(_interface,
1426
 
                                 out_signature=u"a{oa{sv}}")
 
1288
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
1427
1289
            def GetAllClientsWithProperties(self):
1428
1290
                "D-Bus method"
1429
1291
                return dbus.Dictionary(
1430
1292
                    ((c.dbus_object_path, c.GetAllProperties())
1431
 
                     for c in tcp_server.clients),
1432
 
                    signature=u"oa{sv}")
 
1293
                     for c in clients),
 
1294
                    signature="oa{sv}")
1433
1295
            
1434
 
            @dbus.service.method(_interface, in_signature=u"o")
 
1296
            @dbus.service.method(_interface, in_signature="o")
1435
1297
            def RemoveClient(self, object_path):
1436
1298
                "D-Bus method"
1437
 
                for c in tcp_server.clients:
 
1299
                for c in clients:
1438
1300
                    if c.dbus_object_path == object_path:
1439
 
                        tcp_server.clients.remove(c)
1440
 
                        c.remove_from_connection()
 
1301
                        clients.remove(c)
1441
1302
                        # Don't signal anything except ClientRemoved
1442
 
                        c.disable(signal=False)
 
1303
                        c.use_dbus = False
 
1304
                        c.disable()
1443
1305
                        # Emit D-Bus signal
1444
1306
                        self.ClientRemoved(object_path, c.name)
1445
1307
                        return
1449
1311
        
1450
1312
        mandos_dbus_service = MandosDBusService()
1451
1313
    
1452
 
    for client in tcp_server.clients:
 
1314
    for client in clients:
1453
1315
        if use_dbus:
1454
1316
            # Emit D-Bus signal
1455
1317
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1473
1335
    
1474
1336
    try:
1475
1337
        # From the Avahi example code
 
1338
        server.connect_to_signal("StateChanged", server_state_changed)
1476
1339
        try:
1477
 
            service.activate()
 
1340
            server_state_changed(server.GetState())
1478
1341
        except dbus.exceptions.DBusException, error:
1479
1342
            logger.critical(u"DBusException: %s", error)
1480
1343
            sys.exit(1)
1493
1356
    except KeyboardInterrupt:
1494
1357
        if debug:
1495
1358
            print >> sys.stderr
1496
 
        logger.debug(u"Server received KeyboardInterrupt")
1497
 
    logger.debug(u"Server exiting")
 
1359
        logger.debug("Server received KeyboardInterrupt")
 
1360
    logger.debug("Server exiting")
1498
1361
 
1499
1362
if __name__ == '__main__':
1500
1363
    main()