/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
55
56
import logging
56
57
import logging.handlers
57
58
import pwd
 
59
from contextlib import closing
58
60
 
59
61
import dbus
 
62
import dbus.service
60
63
import gobject
61
64
import avahi
62
65
from dbus.mainloop.glib import DBusGMainLoop
66
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()
109
112
                  a sensible number of times
110
113
    """
111
114
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
112
 
                 servicetype = None, port = None, TXT = None, domain = "",
113
 
                 host = "", max_renames = 32768):
 
115
                 servicetype = None, port = None, TXT = None,
 
116
                 domain = "", host = "", max_renames = 32768):
114
117
        self.interface = interface
115
118
        self.name = name
116
119
        self.type = servicetype
117
120
        self.port = port
118
 
        if TXT is None:
119
 
            self.TXT = []
120
 
        else:
121
 
            self.TXT = TXT
 
121
        self.TXT = TXT if TXT is not None else []
122
122
        self.domain = domain
123
123
        self.host = host
124
124
        self.rename_count = 0
133
133
        self.name = server.GetAlternativeServiceName(self.name)
134
134
        logger.info(u"Changing Zeroconf service name to %r ...",
135
135
                    str(self.name))
136
 
        syslogger.setFormatter(logging.Formatter\
 
136
        syslogger.setFormatter(logging.Formatter
137
137
                               ('Mandos (%s): %%(levelname)s:'
138
 
                               ' %%(message)s' % self.name))
 
138
                                ' %%(message)s' % self.name))
139
139
        self.remove()
140
140
        self.add()
141
141
        self.rename_count += 1
147
147
        """Derived from the Avahi example code"""
148
148
        global group
149
149
        if group is None:
150
 
            group = dbus.Interface\
151
 
                    (bus.get_object(avahi.DBUS_NAME,
 
150
            group = dbus.Interface(bus.get_object
 
151
                                   (avahi.DBUS_NAME,
152
152
                                    server.EntryGroupNew()),
153
 
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
153
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
154
154
            group.connect_to_signal('StateChanged',
155
155
                                    entry_group_state_changed)
156
156
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
170
170
# End of Avahi example code
171
171
 
172
172
 
173
 
class Client(object):
 
173
class Client(dbus.service.Object):
174
174
    """A representation of a client host served by this server.
175
175
    Attributes:
176
176
    name:      string; from the config file, used in log messages
178
178
                 uniquely identify the client
179
179
    secret:    bytestring; sent verbatim (over TLS) to client
180
180
    host:      string; available for use by the checker command
181
 
    created:   datetime.datetime(); object creation, not client host
182
 
    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
183
184
    timeout:   datetime.timedelta(); How long from last_checked_ok
184
185
                                     until this client is invalid
185
186
    interval:  datetime.timedelta(); How often to start a new checker
201
202
    _interval_milliseconds: - '' -
202
203
    """
203
204
    def _set_timeout(self, timeout):
204
 
        "Setter function for 'timeout' attribute"
 
205
        "Setter function for the 'timeout' attribute"
205
206
        self._timeout = timeout
206
207
        self._timeout_milliseconds = ((self.timeout.days
207
208
                                       * 24 * 60 * 60 * 1000)
208
209
                                      + (self.timeout.seconds * 1000)
209
210
                                      + (self.timeout.microseconds
210
211
                                         // 1000))
211
 
    timeout = property(lambda self: self._timeout,
212
 
                       _set_timeout)
 
212
        # Emit D-Bus signal
 
213
        self.TimeoutChanged(self._timeout_milliseconds)
 
214
    timeout = property(lambda self: self._timeout, _set_timeout)
213
215
    del _set_timeout
 
216
    
214
217
    def _set_interval(self, interval):
215
 
        "Setter function for 'interval' attribute"
 
218
        "Setter function for the 'interval' attribute"
216
219
        self._interval = interval
217
220
        self._interval_milliseconds = ((self.interval.days
218
221
                                        * 24 * 60 * 60 * 1000)
220
223
                                          * 1000)
221
224
                                       + (self.interval.microseconds
222
225
                                          // 1000))
223
 
    interval = property(lambda self: self._interval,
224
 
                        _set_interval)
 
226
        # Emit D-Bus signal
 
227
        self.IntervalChanged(self._interval_milliseconds)
 
228
    interval = property(lambda self: self._interval, _set_interval)
225
229
    del _set_interval
 
230
    
226
231
    def __init__(self, name = None, stop_hook=None, config=None):
227
232
        """Note: the 'checker' key in 'config' sets the
228
233
        'checker_command' attribute and *not* the 'checker'
229
234
        attribute."""
 
235
        dbus.service.Object.__init__(self, bus,
 
236
                                     "/Mandos/clients/%s"
 
237
                                     % name.replace(".", "_"))
230
238
        if config is None:
231
239
            config = {}
232
240
        self.name = name
234
242
        # Uppercase and remove spaces from fingerprint for later
235
243
        # comparison purposes with return value from the fingerprint()
236
244
        # function
237
 
        self.fingerprint = config["fingerprint"].upper()\
238
 
                           .replace(u" ", u"")
 
245
        self.fingerprint = (config["fingerprint"].upper()
 
246
                            .replace(u" ", u""))
239
247
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
240
248
        if "secret" in config:
241
249
            self.secret = config["secret"].decode(u"base64")
242
250
        elif "secfile" in config:
243
 
            secfile = open(os.path.expanduser(os.path.expandvars
244
 
                                              (config["secfile"])))
245
 
            self.secret = secfile.read()
246
 
            secfile.close()
 
251
            with closing(open(os.path.expanduser
 
252
                              (os.path.expandvars
 
253
                               (config["secfile"])))) as secfile:
 
254
                self.secret = secfile.read()
247
255
        else:
248
256
            raise TypeError(u"No secret or secfile for client %s"
249
257
                            % self.name)
250
258
        self.host = config.get("host", "")
251
 
        self.created = datetime.datetime.now()
 
259
        self.created = datetime.datetime.utcnow()
 
260
        self.started = None
252
261
        self.last_checked_ok = None
253
262
        self.timeout = string_to_delta(config["timeout"])
254
263
        self.interval = string_to_delta(config["interval"])
258
267
        self.stop_initiator_tag = None
259
268
        self.checker_callback_tag = None
260
269
        self.check_command = config["checker"]
 
270
    
261
271
    def start(self):
262
272
        """Start this client's checker and timeout hooks"""
 
273
        self.started = datetime.datetime.utcnow()
263
274
        # Schedule a new checker to be started an 'interval' from now,
264
275
        # and every interval from then on.
265
 
        self.checker_initiator_tag = gobject.timeout_add\
266
 
                                     (self._interval_milliseconds,
267
 
                                      self.start_checker)
 
276
        self.checker_initiator_tag = (gobject.timeout_add
 
277
                                      (self._interval_milliseconds,
 
278
                                       self.start_checker))
268
279
        # Also start a new checker *right now*.
269
280
        self.start_checker()
270
281
        # Schedule a stop() when 'timeout' has passed
271
 
        self.stop_initiator_tag = gobject.timeout_add\
272
 
                                  (self._timeout_milliseconds,
273
 
                                   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
    
274
288
    def stop(self):
275
 
        """Stop this client.
276
 
        The possibility that a client might be restarted is left open,
277
 
        but not currently used."""
278
 
        # If this client doesn't have a secret, it is already stopped.
279
 
        if hasattr(self, "secret") and self.secret:
 
289
        """Stop this client."""
 
290
        if getattr(self, "started", None) is not None:
280
291
            logger.info(u"Stopping client %s", self.name)
281
 
            self.secret = None
282
292
        else:
283
293
            return False
284
294
        if getattr(self, "stop_initiator_tag", False):
290
300
        self.stop_checker()
291
301
        if self.stop_hook:
292
302
            self.stop_hook(self)
 
303
        self.started = None
 
304
        # Emit D-Bus signal
 
305
        self.StateChanged(False)
293
306
        # Do not run this again if called by a gobject.timeout_add
294
307
        return False
 
308
    
295
309
    def __del__(self):
296
310
        self.stop_hook = None
297
311
        self.stop()
 
312
    
298
313
    def checker_callback(self, pid, condition):
299
314
        """The checker has completed, so take appropriate actions."""
300
 
        now = datetime.datetime.now()
301
315
        self.checker_callback_tag = None
302
316
        self.checker = None
303
 
        if os.WIFEXITED(condition) \
304
 
               and (os.WEXITSTATUS(condition) == 0):
 
317
        if (os.WIFEXITED(condition) 
 
318
            and (os.WEXITSTATUS(condition) == 0)):
305
319
            logger.info(u"Checker for %(name)s succeeded",
306
320
                        vars(self))
307
 
            self.last_checked_ok = now
308
 
            gobject.source_remove(self.stop_initiator_tag)
309
 
            self.stop_initiator_tag = gobject.timeout_add\
310
 
                                      (self._timeout_milliseconds,
311
 
                                       self.stop)
 
321
            # Emit D-Bus signal
 
322
            self.CheckerCompleted(True)
 
323
            self.bump_timeout()
312
324
        elif not os.WIFEXITED(condition):
313
325
            logger.warning(u"Checker for %(name)s crashed?",
314
326
                           vars(self))
 
327
            # Emit D-Bus signal
 
328
            self.CheckerCompleted(False)
315
329
        else:
316
330
            logger.info(u"Checker for %(name)s failed",
317
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
    
318
346
    def start_checker(self):
319
347
        """Start a new checker subprocess if one is not running.
320
348
        If a checker already exists, leave it running and do
352
380
                self.checker = subprocess.Popen(command,
353
381
                                                close_fds=True,
354
382
                                                shell=True, cwd="/")
355
 
                self.checker_callback_tag = gobject.child_watch_add\
356
 
                                            (self.checker.pid,
357
 
                                             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)
358
388
            except OSError, error:
359
389
                logger.error(u"Failed to start subprocess: %s",
360
390
                             error)
361
391
        # Re-run this periodically if run by gobject.timeout_add
362
392
        return True
 
393
    
363
394
    def stop_checker(self):
364
395
        """Force the checker process, if any, to stop."""
365
396
        if self.checker_callback_tag:
377
408
            if error.errno != errno.ESRCH: # No such process
378
409
                raise
379
410
        self.checker = None
 
411
    
380
412
    def still_valid(self):
381
413
        """Has the timeout not yet passed for this client?"""
382
 
        now = datetime.datetime.now()
 
414
        if not self.started:
 
415
            return False
 
416
        now = datetime.datetime.utcnow()
383
417
        if self.last_checked_ok is None:
384
418
            return now < (self.created + self.timeout)
385
419
        else:
386
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
387
574
 
388
575
 
389
576
def peer_certificate(session):
390
577
    "Return the peer's OpenPGP certificate as a bytestring"
391
578
    # If not an OpenPGP certificate...
392
 
    if gnutls.library.functions.gnutls_certificate_type_get\
393
 
            (session._c_object) \
394
 
           != 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):
395
582
        # ...do the normal thing
396
583
        return session.peer_certificate
397
584
    list_size = ctypes.c_uint()
398
 
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
399
 
        (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)))
400
588
    if list_size.value == 0:
401
589
        return None
402
590
    cert = cert_list[0]
406
594
def fingerprint(openpgp):
407
595
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
408
596
    # New GnuTLS "datum" with the OpenPGP public key
409
 
    datum = gnutls.library.types.gnutls_datum_t\
410
 
        (ctypes.cast(ctypes.c_char_p(openpgp),
411
 
                     ctypes.POINTER(ctypes.c_ubyte)),
412
 
         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))))
413
602
    # New empty GnuTLS certificate
414
603
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
415
 
    gnutls.library.functions.gnutls_openpgp_crt_init\
416
 
        (ctypes.byref(crt))
 
604
    (gnutls.library.functions
 
605
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
417
606
    # Import the OpenPGP public key into the certificate
418
 
    gnutls.library.functions.gnutls_openpgp_crt_import\
419
 
                    (crt, ctypes.byref(datum),
420
 
                     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))
421
611
    # Verify the self signature in the key
422
612
    crtverify = ctypes.c_uint()
423
 
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
424
 
        (crt, 0, ctypes.byref(crtverify))
 
613
    (gnutls.library.functions
 
614
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
425
615
    if crtverify.value != 0:
426
616
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
427
617
        raise gnutls.errors.CertificateSecurityError("Verify failed")
429
619
    buf = ctypes.create_string_buffer(20)
430
620
    buf_len = ctypes.c_size_t()
431
621
    # Get the fingerprint from the certificate into the buffer
432
 
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
433
 
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
622
    (gnutls.library.functions
 
623
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
624
                                         ctypes.byref(buf_len)))
434
625
    # Deinit the certificate
435
626
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
436
627
    # Convert the buffer to a Python bytestring
447
638
    
448
639
    def handle(self):
449
640
        logger.info(u"TCP connection from: %s",
450
 
                     unicode(self.client_address))
451
 
        session = gnutls.connection.ClientSession\
452
 
                  (self.request, gnutls.connection.X509Credentials())
 
641
                    unicode(self.client_address))
 
642
        session = (gnutls.connection
 
643
                   .ClientSession(self.request,
 
644
                                  gnutls.connection
 
645
                                  .X509Credentials()))
453
646
        
454
647
        line = self.request.makefile().readline()
455
648
        logger.debug(u"Protocol version: %r", line)
468
661
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
469
662
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
470
663
        #                "+DHE-DSS"))
471
 
        priority = "NORMAL"             # Fallback default, since this
472
 
                                        # MUST be set.
473
 
        if self.server.settings["priority"]:
474
 
            priority = self.server.settings["priority"]
475
 
        gnutls.library.functions.gnutls_priority_set_direct\
476
 
            (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))
477
669
        
478
670
        try:
479
671
            session.handshake()
489
681
            session.bye()
490
682
            return
491
683
        logger.debug(u"Fingerprint: %s", fpr)
492
 
        client = None
493
684
        for c in self.server.clients:
494
685
            if c.fingerprint == fpr:
495
686
                client = c
496
687
                break
497
 
        if not client:
 
688
        else:
498
689
            logger.warning(u"Client not found for fingerprint: %s",
499
690
                           fpr)
500
691
            session.bye()
507
698
                           vars(client))
508
699
            session.bye()
509
700
            return
 
701
        ## This won't work here, since we're in a fork.
 
702
        # client.bump_timeout()
510
703
        sent_size = 0
511
704
        while sent_size < len(client.secret):
512
705
            sent = session.send(client.secret[sent_size:])
517
710
        session.bye()
518
711
 
519
712
 
520
 
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
 
713
class IPv6_TCPServer(SocketServer.ForkingMixIn,
 
714
                     SocketServer.TCPServer, object):
521
715
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
522
716
    Attributes:
523
717
        settings:       Server settings
642
836
    """Call the C function if_nametoindex(), or equivalent"""
643
837
    global if_nametoindex
644
838
    try:
645
 
        if_nametoindex = ctypes.cdll.LoadLibrary\
646
 
            (ctypes.util.find_library("c")).if_nametoindex
 
839
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
840
                          (ctypes.util.find_library("c"))
 
841
                          .if_nametoindex)
647
842
    except (OSError, AttributeError):
648
843
        if "struct" not in sys.modules:
649
844
            import struct
652
847
        def if_nametoindex(interface):
653
848
            "Get an interface index the hard way, i.e. using fcntl()"
654
849
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
655
 
            s = socket.socket()
656
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
657
 
                                struct.pack("16s16x", interface))
658
 
            s.close()
 
850
            with closing(socket.socket()) as s:
 
851
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
852
                                    struct.pack("16s16x", interface))
659
853
            interface_index = struct.unpack("I", ifreq[16:20])[0]
660
854
            return interface_index
661
855
    return if_nametoindex(interface)
729
923
    # Convert the SafeConfigParser object to a dict
730
924
    server_settings = server_config.defaults()
731
925
    # Use getboolean on the boolean config option
732
 
    server_settings["debug"] = server_config.getboolean\
733
 
                               ("DEFAULT", "debug")
 
926
    server_settings["debug"] = (server_config.getboolean
 
927
                                ("DEFAULT", "debug"))
734
928
    del server_config
735
929
    
736
930
    # Override the settings from the config file with command line
750
944
        console.setLevel(logging.WARNING)
751
945
    
752
946
    if server_settings["servicename"] != "Mandos":
753
 
        syslogger.setFormatter(logging.Formatter\
 
947
        syslogger.setFormatter(logging.Formatter
754
948
                               ('Mandos (%s): %%(levelname)s:'
755
949
                                ' %%(message)s'
756
950
                                % server_settings["servicename"]))
804
998
    service = AvahiService(name = server_settings["servicename"],
805
999
                           servicetype = "_mandos._tcp", )
806
1000
    if server_settings["interface"]:
807
 
        service.interface = if_nametoindex\
808
 
                            (server_settings["interface"])
 
1001
        service.interface = (if_nametoindex
 
1002
                             (server_settings["interface"]))
809
1003
    
810
1004
    global main_loop
811
1005
    global bus
818
1012
                                           avahi.DBUS_PATH_SERVER),
819
1013
                            avahi.DBUS_INTERFACE_SERVER)
820
1014
    # End of Avahi example code
 
1015
    bus_name = dbus.service.BusName(u"org.mandos-system.Mandos", bus)
821
1016
    
822
1017
    def remove_from_clients(client):
823
1018
        clients.remove(client)
905
1100
        
906
1101
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
907
1102
                             lambda *args, **kwargs:
908
 
                             tcp_server.handle_request\
909
 
                             (*args[2:], **kwargs) or True)
 
1103
                             (tcp_server.handle_request
 
1104
                              (*args[2:], **kwargs) or True))
910
1105
        
911
1106
        logger.debug(u"Starting main loop")
912
1107
        main_loop.run()