/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

* mandos-keygen (password): Remove bashism "${PIPESTATUS}".

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