/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

merge

Show diffs side-by-side

added added

removed removed

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