/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 Teddy Hogeborn & Björn Påhlsson
 
14
# Copyright © 2008 Teddy Hogeborn
 
15
# Copyright © 2008 Björn Påhlsson
15
16
# 
16
17
# This program is free software: you can redistribute it and/or modify
17
18
# it under the terms of the GNU General Public License as published by
30
31
# Contact the authors at <mandos@fukt.bsnet.se>.
31
32
# 
32
33
 
33
 
from __future__ import division
 
34
from __future__ import division, with_statement, absolute_import
34
35
 
35
36
import SocketServer
36
37
import socket
37
 
import select
38
38
from optparse import OptionParser
39
39
import datetime
40
40
import errno
56
56
import logging
57
57
import logging.handlers
58
58
import pwd
 
59
from contextlib import closing
59
60
 
60
61
import dbus
 
62
import dbus.service
61
63
import gobject
62
64
import avahi
63
65
from dbus.mainloop.glib import DBusGMainLoop
64
66
import ctypes
 
67
import ctypes.util
65
68
 
66
 
version = "1.0"
 
69
version = "1.0.2"
67
70
 
68
71
logger = logging.Logger('mandos')
69
 
syslogger = logging.handlers.SysLogHandler\
70
 
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
71
 
             address = "/dev/log")
72
 
syslogger.setFormatter(logging.Formatter\
73
 
                        ('Mandos: %(levelname)s: %(message)s'))
 
72
syslogger = (logging.handlers.SysLogHandler
 
73
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
74
              address = "/dev/log"))
 
75
syslogger.setFormatter(logging.Formatter
 
76
                       ('Mandos: %(levelname)s: %(message)s'))
74
77
logger.addHandler(syslogger)
75
78
 
76
79
console = logging.StreamHandler()
81
84
class AvahiError(Exception):
82
85
    def __init__(self, value):
83
86
        self.value = value
 
87
        super(AvahiError, self).__init__()
84
88
    def __str__(self):
85
89
        return repr(self.value)
86
90
 
108
112
                  a sensible number of times
109
113
    """
110
114
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
111
 
                 type = None, port = None, TXT = None, domain = "",
112
 
                 host = "", max_renames = 32768):
 
115
                 servicetype = None, port = None, TXT = None,
 
116
                 domain = "", host = "", max_renames = 32768):
113
117
        self.interface = interface
114
118
        self.name = name
115
 
        self.type = type
 
119
        self.type = servicetype
116
120
        self.port = port
117
 
        if TXT is None:
118
 
            self.TXT = []
119
 
        else:
120
 
            self.TXT = TXT
 
121
        self.TXT = TXT if TXT is not None else []
121
122
        self.domain = domain
122
123
        self.host = host
123
124
        self.rename_count = 0
127
128
        if self.rename_count >= self.max_renames:
128
129
            logger.critical(u"No suitable Zeroconf service name found"
129
130
                            u" after %i retries, exiting.",
130
 
                            rename_count)
 
131
                            self.rename_count)
131
132
            raise AvahiServiceError("Too many renames")
132
133
        self.name = server.GetAlternativeServiceName(self.name)
133
134
        logger.info(u"Changing Zeroconf service name to %r ...",
134
135
                    str(self.name))
135
 
        syslogger.setFormatter(logging.Formatter\
 
136
        syslogger.setFormatter(logging.Formatter
136
137
                               ('Mandos (%s): %%(levelname)s:'
137
 
                               ' %%(message)s' % self.name))
 
138
                                ' %%(message)s' % self.name))
138
139
        self.remove()
139
140
        self.add()
140
141
        self.rename_count += 1
146
147
        """Derived from the Avahi example code"""
147
148
        global group
148
149
        if group is None:
149
 
            group = dbus.Interface\
150
 
                    (bus.get_object(avahi.DBUS_NAME,
 
150
            group = dbus.Interface(bus.get_object
 
151
                                   (avahi.DBUS_NAME,
151
152
                                    server.EntryGroupNew()),
152
 
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
153
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
153
154
            group.connect_to_signal('StateChanged',
154
155
                                    entry_group_state_changed)
155
156
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
169
170
# End of Avahi example code
170
171
 
171
172
 
172
 
class Client(object):
 
173
class Client(dbus.service.Object):
173
174
    """A representation of a client host served by this server.
174
175
    Attributes:
175
176
    name:      string; from the config file, used in log messages
177
178
                 uniquely identify the client
178
179
    secret:    bytestring; sent verbatim (over TLS) to client
179
180
    host:      string; available for use by the checker command
180
 
    created:   datetime.datetime(); object creation, not client host
181
 
    last_checked_ok: datetime.datetime() or None if not yet checked OK
 
181
    created:   datetime.datetime(); (UTC) object creation
 
182
    started:   datetime.datetime(); (UTC) last started
 
183
    last_checked_ok: datetime.datetime(); (UTC) or None
182
184
    timeout:   datetime.timedelta(); How long from last_checked_ok
183
185
                                     until this client is invalid
184
186
    interval:  datetime.timedelta(); How often to start a new checker
200
202
    _interval_milliseconds: - '' -
201
203
    """
202
204
    def _set_timeout(self, timeout):
203
 
        "Setter function for 'timeout' attribute"
 
205
        "Setter function for the 'timeout' attribute"
204
206
        self._timeout = timeout
205
207
        self._timeout_milliseconds = ((self.timeout.days
206
208
                                       * 24 * 60 * 60 * 1000)
207
209
                                      + (self.timeout.seconds * 1000)
208
210
                                      + (self.timeout.microseconds
209
211
                                         // 1000))
210
 
    timeout = property(lambda self: self._timeout,
211
 
                       _set_timeout)
 
212
        # Emit D-Bus signal
 
213
        self.TimeoutChanged(self._timeout_milliseconds)
 
214
    timeout = property(lambda self: self._timeout, _set_timeout)
212
215
    del _set_timeout
 
216
    
213
217
    def _set_interval(self, interval):
214
 
        "Setter function for 'interval' attribute"
 
218
        "Setter function for the 'interval' attribute"
215
219
        self._interval = interval
216
220
        self._interval_milliseconds = ((self.interval.days
217
221
                                        * 24 * 60 * 60 * 1000)
219
223
                                          * 1000)
220
224
                                       + (self.interval.microseconds
221
225
                                          // 1000))
222
 
    interval = property(lambda self: self._interval,
223
 
                        _set_interval)
 
226
        # Emit D-Bus signal
 
227
        self.IntervalChanged(self._interval_milliseconds)
 
228
    interval = property(lambda self: self._interval, _set_interval)
224
229
    del _set_interval
225
 
    def __init__(self, name = None, stop_hook=None, config={}):
 
230
    
 
231
    def __init__(self, name = None, stop_hook=None, config=None):
226
232
        """Note: the 'checker' key in 'config' sets the
227
233
        'checker_command' attribute and *not* the 'checker'
228
234
        attribute."""
 
235
        dbus.service.Object.__init__(self, bus,
 
236
                                     "/Mandos/clients/%s"
 
237
                                     % name.replace(".", "_"))
 
238
        if config is None:
 
239
            config = {}
229
240
        self.name = name
230
241
        logger.debug(u"Creating client %r", self.name)
231
242
        # Uppercase and remove spaces from fingerprint for later
232
243
        # comparison purposes with return value from the fingerprint()
233
244
        # function
234
 
        self.fingerprint = config["fingerprint"].upper()\
235
 
                           .replace(u" ", u"")
 
245
        self.fingerprint = (config["fingerprint"].upper()
 
246
                            .replace(u" ", u""))
236
247
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
237
248
        if "secret" in config:
238
249
            self.secret = config["secret"].decode(u"base64")
239
250
        elif "secfile" in config:
240
 
            sf = open(config["secfile"])
241
 
            self.secret = sf.read()
242
 
            sf.close()
 
251
            with closing(open(os.path.expanduser
 
252
                              (os.path.expandvars
 
253
                               (config["secfile"])))) as secfile:
 
254
                self.secret = secfile.read()
243
255
        else:
244
256
            raise TypeError(u"No secret or secfile for client %s"
245
257
                            % self.name)
246
258
        self.host = config.get("host", "")
247
 
        self.created = datetime.datetime.now()
 
259
        self.created = datetime.datetime.utcnow()
 
260
        self.started = None
248
261
        self.last_checked_ok = None
249
262
        self.timeout = string_to_delta(config["timeout"])
250
263
        self.interval = string_to_delta(config["interval"])
254
267
        self.stop_initiator_tag = None
255
268
        self.checker_callback_tag = None
256
269
        self.check_command = config["checker"]
 
270
    
257
271
    def start(self):
258
272
        """Start this client's checker and timeout hooks"""
 
273
        self.started = datetime.datetime.utcnow()
259
274
        # Schedule a new checker to be started an 'interval' from now,
260
275
        # and every interval from then on.
261
 
        self.checker_initiator_tag = gobject.timeout_add\
262
 
                                     (self._interval_milliseconds,
263
 
                                      self.start_checker)
 
276
        self.checker_initiator_tag = (gobject.timeout_add
 
277
                                      (self._interval_milliseconds,
 
278
                                       self.start_checker))
264
279
        # Also start a new checker *right now*.
265
280
        self.start_checker()
266
281
        # Schedule a stop() when 'timeout' has passed
267
 
        self.stop_initiator_tag = gobject.timeout_add\
268
 
                                  (self._timeout_milliseconds,
269
 
                                   self.stop)
 
282
        self.stop_initiator_tag = (gobject.timeout_add
 
283
                                   (self._timeout_milliseconds,
 
284
                                    self.stop))
 
285
        # Emit D-Bus signal
 
286
        self.StateChanged(True)
 
287
    
270
288
    def stop(self):
271
 
        """Stop this client.
272
 
        The possibility that a client might be restarted is left open,
273
 
        but not currently used."""
274
 
        # If this client doesn't have a secret, it is already stopped.
275
 
        if hasattr(self, "secret") and self.secret:
 
289
        """Stop this client."""
 
290
        if getattr(self, "started", None) is not None:
276
291
            logger.info(u"Stopping client %s", self.name)
277
 
            self.secret = None
278
292
        else:
279
293
            return False
280
294
        if getattr(self, "stop_initiator_tag", False):
286
300
        self.stop_checker()
287
301
        if self.stop_hook:
288
302
            self.stop_hook(self)
 
303
        self.started = None
 
304
        # Emit D-Bus signal
 
305
        self.StateChanged(False)
289
306
        # Do not run this again if called by a gobject.timeout_add
290
307
        return False
 
308
    
291
309
    def __del__(self):
292
310
        self.stop_hook = None
293
311
        self.stop()
 
312
    
294
313
    def checker_callback(self, pid, condition):
295
314
        """The checker has completed, so take appropriate actions."""
296
 
        now = datetime.datetime.now()
297
315
        self.checker_callback_tag = None
298
316
        self.checker = None
299
 
        if os.WIFEXITED(condition) \
300
 
               and (os.WEXITSTATUS(condition) == 0):
 
317
        if (os.WIFEXITED(condition) 
 
318
            and (os.WEXITSTATUS(condition) == 0)):
301
319
            logger.info(u"Checker for %(name)s succeeded",
302
320
                        vars(self))
303
 
            self.last_checked_ok = now
304
 
            gobject.source_remove(self.stop_initiator_tag)
305
 
            self.stop_initiator_tag = gobject.timeout_add\
306
 
                                      (self._timeout_milliseconds,
307
 
                                       self.stop)
 
321
            # Emit D-Bus signal
 
322
            self.CheckerCompleted(True)
 
323
            self.bump_timeout()
308
324
        elif not os.WIFEXITED(condition):
309
325
            logger.warning(u"Checker for %(name)s crashed?",
310
326
                           vars(self))
 
327
            # Emit D-Bus signal
 
328
            self.CheckerCompleted(False)
311
329
        else:
312
330
            logger.info(u"Checker for %(name)s failed",
313
331
                        vars(self))
 
332
            # Emit D-Bus signal
 
333
            self.CheckerCompleted(False)
 
334
    
 
335
    def bump_timeout(self):
 
336
        """Bump up the timeout for this client.
 
337
        This should only be called when the client has been seen,
 
338
        alive and well.
 
339
        """
 
340
        self.last_checked_ok = datetime.datetime.utcnow()
 
341
        gobject.source_remove(self.stop_initiator_tag)
 
342
        self.stop_initiator_tag = (gobject.timeout_add
 
343
                                   (self._timeout_milliseconds,
 
344
                                    self.stop))
 
345
    
314
346
    def start_checker(self):
315
347
        """Start a new checker subprocess if one is not running.
316
348
        If a checker already exists, leave it running and do
348
380
                self.checker = subprocess.Popen(command,
349
381
                                                close_fds=True,
350
382
                                                shell=True, cwd="/")
351
 
                self.checker_callback_tag = gobject.child_watch_add\
352
 
                                            (self.checker.pid,
353
 
                                             self.checker_callback)
 
383
                self.checker_callback_tag = (gobject.child_watch_add
 
384
                                             (self.checker.pid,
 
385
                                              self.checker_callback))
 
386
                # Emit D-Bus signal
 
387
                self.CheckerStarted(command)
354
388
            except OSError, error:
355
389
                logger.error(u"Failed to start subprocess: %s",
356
390
                             error)
357
391
        # Re-run this periodically if run by gobject.timeout_add
358
392
        return True
 
393
    
359
394
    def stop_checker(self):
360
395
        """Force the checker process, if any, to stop."""
361
396
        if self.checker_callback_tag:
373
408
            if error.errno != errno.ESRCH: # No such process
374
409
                raise
375
410
        self.checker = None
 
411
    
376
412
    def still_valid(self):
377
413
        """Has the timeout not yet passed for this client?"""
378
 
        now = datetime.datetime.now()
 
414
        if not self.started:
 
415
            return False
 
416
        now = datetime.datetime.utcnow()
379
417
        if self.last_checked_ok is None:
380
418
            return now < (self.created + self.timeout)
381
419
        else:
382
420
            return now < (self.last_checked_ok + self.timeout)
 
421
    
 
422
    ## D-Bus methods & signals
 
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
 
439
    
 
440
    # CheckerCompleted - signal
 
441
    @dbus.service.signal(_interface, signature="b")
 
442
    def CheckerCompleted(self, success):
 
443
        "D-Bus signal"
 
444
        pass
 
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
    
 
452
    # CheckerStarted - signal
 
453
    @dbus.service.signal(_interface, signature="s")
 
454
    def CheckerStarted(self, command):
 
455
        "D-Bus signal"
 
456
        pass
 
457
    
 
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
 
509
    
 
510
    # SetChecker - method
 
511
    @dbus.service.method(_interface, in_signature="s")
 
512
    def SetChecker(self, checker):
 
513
        "D-Bus setter method"
 
514
        self.checker_command = checker
 
515
    
 
516
    # SetHost - method
 
517
    @dbus.service.method(_interface, in_signature="s")
 
518
    def SetHost(self, host):
 
519
        "D-Bus setter method"
 
520
        self.host = host
 
521
    
 
522
    # SetInterval - method
 
523
    @dbus.service.method(_interface, in_signature="t")
 
524
    def SetInterval(self, milliseconds):
 
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)
 
531
    
 
532
    # SetSecret - method
 
533
    @dbus.service.method(_interface, in_signature="ay",
 
534
                         byte_arrays=True)
 
535
    def SetSecret(self, secret):
 
536
        "D-Bus setter method"
 
537
        self.secret = str(secret)
 
538
    
 
539
    # Start - method
 
540
    Start = dbus.service.method(_interface)(start)
 
541
    Start.__name__ = "Start"
 
542
    
 
543
    # StartChecker - method
 
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"
 
561
    
 
562
    # StopChecker - method
 
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
 
573
    del _interface
383
574
 
384
575
 
385
576
def peer_certificate(session):
386
577
    "Return the peer's OpenPGP certificate as a bytestring"
387
578
    # If not an OpenPGP certificate...
388
 
    if gnutls.library.functions.gnutls_certificate_type_get\
389
 
            (session._c_object) \
390
 
           != gnutls.library.constants.GNUTLS_CRT_OPENPGP:
 
579
    if (gnutls.library.functions
 
580
        .gnutls_certificate_type_get(session._c_object)
 
581
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
391
582
        # ...do the normal thing
392
583
        return session.peer_certificate
393
584
    list_size = ctypes.c_uint()
394
 
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
395
 
        (session._c_object, ctypes.byref(list_size))
 
585
    cert_list = (gnutls.library.functions
 
586
                 .gnutls_certificate_get_peers
 
587
                 (session._c_object, ctypes.byref(list_size)))
396
588
    if list_size.value == 0:
397
589
        return None
398
590
    cert = cert_list[0]
402
594
def fingerprint(openpgp):
403
595
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
404
596
    # New GnuTLS "datum" with the OpenPGP public key
405
 
    datum = gnutls.library.types.gnutls_datum_t\
406
 
        (ctypes.cast(ctypes.c_char_p(openpgp),
407
 
                     ctypes.POINTER(ctypes.c_ubyte)),
408
 
         ctypes.c_uint(len(openpgp)))
 
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))))
409
602
    # New empty GnuTLS certificate
410
603
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
411
 
    gnutls.library.functions.gnutls_openpgp_crt_init\
412
 
        (ctypes.byref(crt))
 
604
    (gnutls.library.functions
 
605
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
413
606
    # Import the OpenPGP public key into the certificate
414
 
    gnutls.library.functions.gnutls_openpgp_crt_import\
415
 
                    (crt, ctypes.byref(datum),
416
 
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
607
    (gnutls.library.functions
 
608
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
609
                                gnutls.library.constants
 
610
                                .GNUTLS_OPENPGP_FMT_RAW))
417
611
    # Verify the self signature in the key
418
 
    crtverify = ctypes.c_uint();
419
 
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
420
 
        (crt, 0, ctypes.byref(crtverify))
 
612
    crtverify = ctypes.c_uint()
 
613
    (gnutls.library.functions
 
614
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
421
615
    if crtverify.value != 0:
422
616
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
423
617
        raise gnutls.errors.CertificateSecurityError("Verify failed")
424
618
    # New buffer for the fingerprint
425
 
    buffer = ctypes.create_string_buffer(20)
426
 
    buffer_length = ctypes.c_size_t()
 
619
    buf = ctypes.create_string_buffer(20)
 
620
    buf_len = ctypes.c_size_t()
427
621
    # Get the fingerprint from the certificate into the buffer
428
 
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
429
 
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
 
622
    (gnutls.library.functions
 
623
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
624
                                         ctypes.byref(buf_len)))
430
625
    # Deinit the certificate
431
626
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
432
627
    # Convert the buffer to a Python bytestring
433
 
    fpr = ctypes.string_at(buffer, buffer_length.value)
 
628
    fpr = ctypes.string_at(buf, buf_len.value)
434
629
    # Convert the bytestring to hexadecimal notation
435
630
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
436
631
    return hex_fpr
437
632
 
438
633
 
439
 
class tcp_handler(SocketServer.BaseRequestHandler, object):
 
634
class TCP_handler(SocketServer.BaseRequestHandler, object):
440
635
    """A TCP request handler class.
441
636
    Instantiated by IPv6_TCPServer for each request to handle it.
442
637
    Note: This will run in its own forked process."""
443
638
    
444
639
    def handle(self):
445
640
        logger.info(u"TCP connection from: %s",
446
 
                     unicode(self.client_address))
447
 
        session = gnutls.connection.ClientSession\
448
 
                  (self.request, gnutls.connection.X509Credentials())
 
641
                    unicode(self.client_address))
 
642
        session = (gnutls.connection
 
643
                   .ClientSession(self.request,
 
644
                                  gnutls.connection
 
645
                                  .X509Credentials()))
449
646
        
450
647
        line = self.request.makefile().readline()
451
648
        logger.debug(u"Protocol version: %r", line)
464
661
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
465
662
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
466
663
        #                "+DHE-DSS"))
467
 
        priority = "NORMAL"             # Fallback default, since this
468
 
                                        # MUST be set.
469
 
        if self.server.settings["priority"]:
470
 
            priority = self.server.settings["priority"]
471
 
        gnutls.library.functions.gnutls_priority_set_direct\
472
 
            (session._c_object, priority, None);
 
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))
473
669
        
474
670
        try:
475
671
            session.handshake()
485
681
            session.bye()
486
682
            return
487
683
        logger.debug(u"Fingerprint: %s", fpr)
488
 
        client = None
489
684
        for c in self.server.clients:
490
685
            if c.fingerprint == fpr:
491
686
                client = c
492
687
                break
493
 
        if not client:
 
688
        else:
494
689
            logger.warning(u"Client not found for fingerprint: %s",
495
690
                           fpr)
496
691
            session.bye()
503
698
                           vars(client))
504
699
            session.bye()
505
700
            return
 
701
        ## This won't work here, since we're in a fork.
 
702
        # client.bump_timeout()
506
703
        sent_size = 0
507
704
        while sent_size < len(client.secret):
508
705
            sent = session.send(client.secret[sent_size:])
513
710
        session.bye()
514
711
 
515
712
 
516
 
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
 
713
class IPv6_TCPServer(SocketServer.ForkingMixIn,
 
714
                     SocketServer.TCPServer, object):
517
715
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
518
716
    Attributes:
519
717
        settings:       Server settings
529
727
            self.clients = kwargs["clients"]
530
728
            del kwargs["clients"]
531
729
        self.enabled = False
532
 
        return super(type(self), self).__init__(*args, **kwargs)
 
730
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
533
731
    def server_bind(self):
534
732
        """This overrides the normal server_bind() function
535
733
        to bind to an interface if one was specified, and also NOT to
564
762
#                                            if_nametoindex
565
763
#                                            (self.settings
566
764
#                                             ["interface"]))
567
 
            return super(type(self), self).server_bind()
 
765
            return super(IPv6_TCPServer, self).server_bind()
568
766
    def server_activate(self):
569
767
        if self.enabled:
570
 
            return super(type(self), self).server_activate()
 
768
            return super(IPv6_TCPServer, self).server_activate()
571
769
    def enable(self):
572
770
        self.enabled = True
573
771
 
591
789
    timevalue = datetime.timedelta(0)
592
790
    for s in interval.split():
593
791
        try:
594
 
            suffix=unicode(s[-1])
595
 
            value=int(s[:-1])
 
792
            suffix = unicode(s[-1])
 
793
            value = int(s[:-1])
596
794
            if suffix == u"d":
597
795
                delta = datetime.timedelta(value)
598
796
            elif suffix == u"s":
638
836
    """Call the C function if_nametoindex(), or equivalent"""
639
837
    global if_nametoindex
640
838
    try:
641
 
        if "ctypes.util" not in sys.modules:
642
 
            import ctypes.util
643
 
        if_nametoindex = ctypes.cdll.LoadLibrary\
644
 
            (ctypes.util.find_library("c")).if_nametoindex
 
839
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
840
                          (ctypes.util.find_library("c"))
 
841
                          .if_nametoindex)
645
842
    except (OSError, AttributeError):
646
843
        if "struct" not in sys.modules:
647
844
            import struct
650
847
        def if_nametoindex(interface):
651
848
            "Get an interface index the hard way, i.e. using fcntl()"
652
849
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
653
 
            s = socket.socket()
654
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
655
 
                                struct.pack("16s16x", interface))
656
 
            s.close()
 
850
            with closing(socket.socket()) as s:
 
851
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
852
                                    struct.pack("16s16x", interface))
657
853
            interface_index = struct.unpack("I", ifreq[16:20])[0]
658
854
            return interface_index
659
855
    return if_nametoindex(interface)
683
879
 
684
880
 
685
881
def main():
686
 
    global main_loop_started
687
 
    main_loop_started = False
688
 
    
689
882
    parser = OptionParser(version = "%%prog %s" % version)
690
883
    parser.add_option("-i", "--interface", type="string",
691
884
                      metavar="IF", help="Bind to interface IF")
706
899
                      default="/etc/mandos", metavar="DIR",
707
900
                      help="Directory to search for configuration"
708
901
                      " files")
709
 
    (options, args) = parser.parse_args()
 
902
    options = parser.parse_args()[0]
710
903
    
711
904
    if options.check:
712
905
        import doctest
730
923
    # Convert the SafeConfigParser object to a dict
731
924
    server_settings = server_config.defaults()
732
925
    # Use getboolean on the boolean config option
733
 
    server_settings["debug"] = server_config.getboolean\
734
 
                               ("DEFAULT", "debug")
 
926
    server_settings["debug"] = (server_config.getboolean
 
927
                                ("DEFAULT", "debug"))
735
928
    del server_config
736
929
    
737
930
    # Override the settings from the config file with command line
751
944
        console.setLevel(logging.WARNING)
752
945
    
753
946
    if server_settings["servicename"] != "Mandos":
754
 
        syslogger.setFormatter(logging.Formatter\
 
947
        syslogger.setFormatter(logging.Formatter
755
948
                               ('Mandos (%s): %%(levelname)s:'
756
949
                                ' %%(message)s'
757
950
                                % server_settings["servicename"]))
769
962
    clients = Set()
770
963
    tcp_server = IPv6_TCPServer((server_settings["address"],
771
964
                                 server_settings["port"]),
772
 
                                tcp_handler,
 
965
                                TCP_handler,
773
966
                                settings=server_settings,
774
967
                                clients=clients)
775
968
    pidfilename = "/var/run/mandos.pid"
803
996
    
804
997
    global service
805
998
    service = AvahiService(name = server_settings["servicename"],
806
 
                           type = "_mandos._tcp", );
 
999
                           servicetype = "_mandos._tcp", )
807
1000
    if server_settings["interface"]:
808
 
        service.interface = if_nametoindex\
809
 
                            (server_settings["interface"])
 
1001
        service.interface = (if_nametoindex
 
1002
                             (server_settings["interface"]))
810
1003
    
811
1004
    global main_loop
812
1005
    global bus
819
1012
                                           avahi.DBUS_PATH_SERVER),
820
1013
                            avahi.DBUS_INTERFACE_SERVER)
821
1014
    # End of Avahi example code
 
1015
    bus_name = dbus.service.BusName(u"org.mandos-system.Mandos", bus)
822
1016
    
823
1017
    def remove_from_clients(client):
824
1018
        clients.remove(client)
852
1046
        pidfile.write(str(pid) + "\n")
853
1047
        pidfile.close()
854
1048
        del pidfile
855
 
    except IOError, err:
 
1049
    except IOError:
856
1050
        logger.error(u"Could not write to file %r with PID %d",
857
1051
                     pidfilename, pid)
858
1052
    except NameError:
906
1100
        
907
1101
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
908
1102
                             lambda *args, **kwargs:
909
 
                             tcp_server.handle_request\
910
 
                             (*args[2:], **kwargs) or True)
 
1103
                             (tcp_server.handle_request
 
1104
                              (*args[2:], **kwargs) or True))
911
1105
        
912
1106
        logger.debug(u"Starting main loop")
913
 
        main_loop_started = True
914
1107
        main_loop.run()
915
1108
    except AvahiError, error:
916
1109
        logger.critical(u"AvahiError: %s" + unicode(error))