/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

* initramfs-tools-hook: Bug fix: Add "--userid" and "--groupid" to
                        start of "plugin-runner.conf" file instead of
                        appending, to allow any preexisting options to
                        override.
* plugin-runner.conf: Improved wording.

Show diffs side-by-side

added added

removed removed

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