/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 © 2007-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
55
55
import stat
56
56
import logging
57
57
import logging.handlers
 
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
63
66
import ctypes
 
67
import ctypes.util
64
68
 
65
 
version = "1.0"
 
69
version = "1.0.2"
66
70
 
67
71
logger = logging.Logger('mandos')
68
 
syslogger = logging.handlers.SysLogHandler\
69
 
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
70
 
             address = "/dev/log")
71
 
syslogger.setFormatter(logging.Formatter\
72
 
                        ('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'))
73
77
logger.addHandler(syslogger)
74
78
 
75
79
console = logging.StreamHandler()
80
84
class AvahiError(Exception):
81
85
    def __init__(self, value):
82
86
        self.value = value
 
87
        super(AvahiError, self).__init__()
83
88
    def __str__(self):
84
89
        return repr(self.value)
85
90
 
107
112
                  a sensible number of times
108
113
    """
109
114
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
110
 
                 type = None, port = None, TXT = None, domain = "",
111
 
                 host = "", max_renames = 32768):
 
115
                 servicetype = None, port = None, TXT = None,
 
116
                 domain = "", host = "", max_renames = 32768):
112
117
        self.interface = interface
113
118
        self.name = name
114
 
        self.type = type
 
119
        self.type = servicetype
115
120
        self.port = port
116
 
        if TXT is None:
117
 
            self.TXT = []
118
 
        else:
119
 
            self.TXT = TXT
 
121
        self.TXT = TXT if TXT is not None else []
120
122
        self.domain = domain
121
123
        self.host = host
122
124
        self.rename_count = 0
126
128
        if self.rename_count >= self.max_renames:
127
129
            logger.critical(u"No suitable Zeroconf service name found"
128
130
                            u" after %i retries, exiting.",
129
 
                            rename_count)
 
131
                            self.rename_count)
130
132
            raise AvahiServiceError("Too many renames")
131
133
        self.name = server.GetAlternativeServiceName(self.name)
132
134
        logger.info(u"Changing Zeroconf service name to %r ...",
133
135
                    str(self.name))
134
 
        syslogger.setFormatter(logging.Formatter\
 
136
        syslogger.setFormatter(logging.Formatter
135
137
                               ('Mandos (%s): %%(levelname)s:'
136
 
                               ' %%(message)s' % self.name))
 
138
                                ' %%(message)s' % self.name))
137
139
        self.remove()
138
140
        self.add()
139
141
        self.rename_count += 1
145
147
        """Derived from the Avahi example code"""
146
148
        global group
147
149
        if group is None:
148
 
            group = dbus.Interface\
149
 
                    (bus.get_object(avahi.DBUS_NAME,
 
150
            group = dbus.Interface(bus.get_object
 
151
                                   (avahi.DBUS_NAME,
150
152
                                    server.EntryGroupNew()),
151
 
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
153
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
152
154
            group.connect_to_signal('StateChanged',
153
155
                                    entry_group_state_changed)
154
156
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
168
170
# End of Avahi example code
169
171
 
170
172
 
171
 
class Client(object):
 
173
class Client(dbus.service.Object):
172
174
    """A representation of a client host served by this server.
173
175
    Attributes:
174
176
    name:      string; from the config file, used in log messages
176
178
                 uniquely identify the client
177
179
    secret:    bytestring; sent verbatim (over TLS) to client
178
180
    host:      string; available for use by the checker command
179
 
    created:   datetime.datetime(); object creation, not client host
180
 
    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
181
184
    timeout:   datetime.timedelta(); How long from last_checked_ok
182
185
                                     until this client is invalid
183
186
    interval:  datetime.timedelta(); How often to start a new checker
199
202
    _interval_milliseconds: - '' -
200
203
    """
201
204
    def _set_timeout(self, timeout):
202
 
        "Setter function for 'timeout' attribute"
 
205
        "Setter function for the 'timeout' attribute"
203
206
        self._timeout = timeout
204
207
        self._timeout_milliseconds = ((self.timeout.days
205
208
                                       * 24 * 60 * 60 * 1000)
206
209
                                      + (self.timeout.seconds * 1000)
207
210
                                      + (self.timeout.microseconds
208
211
                                         // 1000))
209
 
    timeout = property(lambda self: self._timeout,
210
 
                       _set_timeout)
 
212
        # Emit D-Bus signal
 
213
        self.TimeoutChanged(self._timeout_milliseconds)
 
214
    timeout = property(lambda self: self._timeout, _set_timeout)
211
215
    del _set_timeout
 
216
    
212
217
    def _set_interval(self, interval):
213
 
        "Setter function for 'interval' attribute"
 
218
        "Setter function for the 'interval' attribute"
214
219
        self._interval = interval
215
220
        self._interval_milliseconds = ((self.interval.days
216
221
                                        * 24 * 60 * 60 * 1000)
218
223
                                          * 1000)
219
224
                                       + (self.interval.microseconds
220
225
                                          // 1000))
221
 
    interval = property(lambda self: self._interval,
222
 
                        _set_interval)
 
226
        # Emit D-Bus signal
 
227
        self.IntervalChanged(self._interval_milliseconds)
 
228
    interval = property(lambda self: self._interval, _set_interval)
223
229
    del _set_interval
224
 
    def __init__(self, name = None, stop_hook=None, config={}):
 
230
    
 
231
    def __init__(self, name = None, stop_hook=None, config=None):
225
232
        """Note: the 'checker' key in 'config' sets the
226
233
        'checker_command' attribute and *not* the 'checker'
227
234
        attribute."""
 
235
        dbus.service.Object.__init__(self, bus,
 
236
                                     "/Mandos/clients/%s"
 
237
                                     % name.replace(".", "_"))
 
238
        if config is None:
 
239
            config = {}
228
240
        self.name = name
229
241
        logger.debug(u"Creating client %r", self.name)
230
242
        # Uppercase and remove spaces from fingerprint for later
231
243
        # comparison purposes with return value from the fingerprint()
232
244
        # function
233
 
        self.fingerprint = config["fingerprint"].upper()\
234
 
                           .replace(u" ", u"")
 
245
        self.fingerprint = (config["fingerprint"].upper()
 
246
                            .replace(u" ", u""))
235
247
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
236
248
        if "secret" in config:
237
249
            self.secret = config["secret"].decode(u"base64")
238
250
        elif "secfile" in config:
239
 
            sf = open(config["secfile"])
240
 
            self.secret = sf.read()
241
 
            sf.close()
 
251
            with closing(open(os.path.expanduser
 
252
                              (os.path.expandvars
 
253
                               (config["secfile"])))) as secfile:
 
254
                self.secret = secfile.read()
242
255
        else:
243
256
            raise TypeError(u"No secret or secfile for client %s"
244
257
                            % self.name)
245
258
        self.host = config.get("host", "")
246
 
        self.created = datetime.datetime.now()
 
259
        self.created = datetime.datetime.utcnow()
 
260
        self.started = None
247
261
        self.last_checked_ok = None
248
262
        self.timeout = string_to_delta(config["timeout"])
249
263
        self.interval = string_to_delta(config["interval"])
253
267
        self.stop_initiator_tag = None
254
268
        self.checker_callback_tag = None
255
269
        self.check_command = config["checker"]
 
270
    
256
271
    def start(self):
257
272
        """Start this client's checker and timeout hooks"""
 
273
        self.started = datetime.datetime.utcnow()
258
274
        # Schedule a new checker to be started an 'interval' from now,
259
275
        # and every interval from then on.
260
 
        self.checker_initiator_tag = gobject.timeout_add\
261
 
                                     (self._interval_milliseconds,
262
 
                                      self.start_checker)
 
276
        self.checker_initiator_tag = (gobject.timeout_add
 
277
                                      (self._interval_milliseconds,
 
278
                                       self.start_checker))
263
279
        # Also start a new checker *right now*.
264
280
        self.start_checker()
265
281
        # Schedule a stop() when 'timeout' has passed
266
 
        self.stop_initiator_tag = gobject.timeout_add\
267
 
                                  (self._timeout_milliseconds,
268
 
                                   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
    
269
288
    def stop(self):
270
 
        """Stop this client.
271
 
        The possibility that a client might be restarted is left open,
272
 
        but not currently used."""
273
 
        # If this client doesn't have a secret, it is already stopped.
274
 
        if hasattr(self, "secret") and self.secret:
 
289
        """Stop this client."""
 
290
        if getattr(self, "started", None) is not None:
275
291
            logger.info(u"Stopping client %s", self.name)
276
 
            self.secret = None
277
292
        else:
278
293
            return False
279
294
        if getattr(self, "stop_initiator_tag", False):
285
300
        self.stop_checker()
286
301
        if self.stop_hook:
287
302
            self.stop_hook(self)
 
303
        self.started = None
 
304
        # Emit D-Bus signal
 
305
        self.StateChanged(False)
288
306
        # Do not run this again if called by a gobject.timeout_add
289
307
        return False
 
308
    
290
309
    def __del__(self):
291
310
        self.stop_hook = None
292
311
        self.stop()
 
312
    
293
313
    def checker_callback(self, pid, condition):
294
314
        """The checker has completed, so take appropriate actions."""
295
 
        now = datetime.datetime.now()
296
315
        self.checker_callback_tag = None
297
316
        self.checker = None
298
 
        if os.WIFEXITED(condition) \
299
 
               and (os.WEXITSTATUS(condition) == 0):
 
317
        if (os.WIFEXITED(condition) 
 
318
            and (os.WEXITSTATUS(condition) == 0)):
300
319
            logger.info(u"Checker for %(name)s succeeded",
301
320
                        vars(self))
302
 
            self.last_checked_ok = now
303
 
            gobject.source_remove(self.stop_initiator_tag)
304
 
            self.stop_initiator_tag = gobject.timeout_add\
305
 
                                      (self._timeout_milliseconds,
306
 
                                       self.stop)
 
321
            # Emit D-Bus signal
 
322
            self.CheckerCompleted(True)
 
323
            self.bump_timeout()
307
324
        elif not os.WIFEXITED(condition):
308
325
            logger.warning(u"Checker for %(name)s crashed?",
309
326
                           vars(self))
 
327
            # Emit D-Bus signal
 
328
            self.CheckerCompleted(False)
310
329
        else:
311
330
            logger.info(u"Checker for %(name)s failed",
312
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
    
313
346
    def start_checker(self):
314
347
        """Start a new checker subprocess if one is not running.
315
348
        If a checker already exists, leave it running and do
347
380
                self.checker = subprocess.Popen(command,
348
381
                                                close_fds=True,
349
382
                                                shell=True, cwd="/")
350
 
                self.checker_callback_tag = gobject.child_watch_add\
351
 
                                            (self.checker.pid,
352
 
                                             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)
353
388
            except OSError, error:
354
389
                logger.error(u"Failed to start subprocess: %s",
355
390
                             error)
356
391
        # Re-run this periodically if run by gobject.timeout_add
357
392
        return True
 
393
    
358
394
    def stop_checker(self):
359
395
        """Force the checker process, if any, to stop."""
360
396
        if self.checker_callback_tag:
372
408
            if error.errno != errno.ESRCH: # No such process
373
409
                raise
374
410
        self.checker = None
 
411
    
375
412
    def still_valid(self):
376
413
        """Has the timeout not yet passed for this client?"""
377
 
        now = datetime.datetime.now()
 
414
        if not self.started:
 
415
            return False
 
416
        now = datetime.datetime.utcnow()
378
417
        if self.last_checked_ok is None:
379
418
            return now < (self.created + self.timeout)
380
419
        else:
381
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
382
574
 
383
575
 
384
576
def peer_certificate(session):
385
577
    "Return the peer's OpenPGP certificate as a bytestring"
386
578
    # If not an OpenPGP certificate...
387
 
    if gnutls.library.functions.gnutls_certificate_type_get\
388
 
            (session._c_object) \
389
 
           != 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):
390
582
        # ...do the normal thing
391
583
        return session.peer_certificate
392
584
    list_size = ctypes.c_uint()
393
 
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
394
 
        (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)))
395
588
    if list_size.value == 0:
396
589
        return None
397
590
    cert = cert_list[0]
401
594
def fingerprint(openpgp):
402
595
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
403
596
    # New GnuTLS "datum" with the OpenPGP public key
404
 
    datum = gnutls.library.types.gnutls_datum_t\
405
 
        (ctypes.cast(ctypes.c_char_p(openpgp),
406
 
                     ctypes.POINTER(ctypes.c_ubyte)),
407
 
         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))))
408
602
    # New empty GnuTLS certificate
409
603
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
410
 
    gnutls.library.functions.gnutls_openpgp_crt_init\
411
 
        (ctypes.byref(crt))
 
604
    (gnutls.library.functions
 
605
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
412
606
    # Import the OpenPGP public key into the certificate
413
 
    gnutls.library.functions.gnutls_openpgp_crt_import\
414
 
                    (crt, ctypes.byref(datum),
415
 
                     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))
416
611
    # Verify the self signature in the key
417
 
    crtverify = ctypes.c_uint();
418
 
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
419
 
        (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)))
420
615
    if crtverify.value != 0:
421
616
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
422
617
        raise gnutls.errors.CertificateSecurityError("Verify failed")
423
618
    # New buffer for the fingerprint
424
 
    buffer = ctypes.create_string_buffer(20)
425
 
    buffer_length = ctypes.c_size_t()
 
619
    buf = ctypes.create_string_buffer(20)
 
620
    buf_len = ctypes.c_size_t()
426
621
    # Get the fingerprint from the certificate into the buffer
427
 
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
428
 
        (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)))
429
625
    # Deinit the certificate
430
626
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
431
627
    # Convert the buffer to a Python bytestring
432
 
    fpr = ctypes.string_at(buffer, buffer_length.value)
 
628
    fpr = ctypes.string_at(buf, buf_len.value)
433
629
    # Convert the bytestring to hexadecimal notation
434
630
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
435
631
    return hex_fpr
436
632
 
437
633
 
438
 
class tcp_handler(SocketServer.BaseRequestHandler, object):
 
634
class TCP_handler(SocketServer.BaseRequestHandler, object):
439
635
    """A TCP request handler class.
440
636
    Instantiated by IPv6_TCPServer for each request to handle it.
441
637
    Note: This will run in its own forked process."""
442
638
    
443
639
    def handle(self):
444
640
        logger.info(u"TCP connection from: %s",
445
 
                     unicode(self.client_address))
446
 
        session = gnutls.connection.ClientSession\
447
 
                  (self.request, gnutls.connection.X509Credentials())
 
641
                    unicode(self.client_address))
 
642
        session = (gnutls.connection
 
643
                   .ClientSession(self.request,
 
644
                                  gnutls.connection
 
645
                                  .X509Credentials()))
448
646
        
449
647
        line = self.request.makefile().readline()
450
648
        logger.debug(u"Protocol version: %r", line)
463
661
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
464
662
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
465
663
        #                "+DHE-DSS"))
466
 
        priority = "NORMAL"             # Fallback default, since this
467
 
                                        # MUST be set.
468
 
        if self.server.settings["priority"]:
469
 
            priority = self.server.settings["priority"]
470
 
        gnutls.library.functions.gnutls_priority_set_direct\
471
 
            (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))
472
669
        
473
670
        try:
474
671
            session.handshake()
484
681
            session.bye()
485
682
            return
486
683
        logger.debug(u"Fingerprint: %s", fpr)
487
 
        client = None
488
684
        for c in self.server.clients:
489
685
            if c.fingerprint == fpr:
490
686
                client = c
491
687
                break
492
 
        if not client:
 
688
        else:
493
689
            logger.warning(u"Client not found for fingerprint: %s",
494
690
                           fpr)
495
691
            session.bye()
502
698
                           vars(client))
503
699
            session.bye()
504
700
            return
 
701
        ## This won't work here, since we're in a fork.
 
702
        # client.bump_timeout()
505
703
        sent_size = 0
506
704
        while sent_size < len(client.secret):
507
705
            sent = session.send(client.secret[sent_size:])
512
710
        session.bye()
513
711
 
514
712
 
515
 
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
 
713
class IPv6_TCPServer(SocketServer.ForkingMixIn,
 
714
                     SocketServer.TCPServer, object):
516
715
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
517
716
    Attributes:
518
717
        settings:       Server settings
519
718
        clients:        Set() of Client objects
 
719
        enabled:        Boolean; whether this server is activated yet
520
720
    """
521
721
    address_family = socket.AF_INET6
522
722
    def __init__(self, *args, **kwargs):
526
726
        if "clients" in kwargs:
527
727
            self.clients = kwargs["clients"]
528
728
            del kwargs["clients"]
529
 
        return super(type(self), self).__init__(*args, **kwargs)
 
729
        self.enabled = False
 
730
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
530
731
    def server_bind(self):
531
732
        """This overrides the normal server_bind() function
532
733
        to bind to an interface if one was specified, and also NOT to
561
762
#                                            if_nametoindex
562
763
#                                            (self.settings
563
764
#                                             ["interface"]))
564
 
            return super(type(self), self).server_bind()
 
765
            return super(IPv6_TCPServer, self).server_bind()
 
766
    def server_activate(self):
 
767
        if self.enabled:
 
768
            return super(IPv6_TCPServer, self).server_activate()
 
769
    def enable(self):
 
770
        self.enabled = True
565
771
 
566
772
 
567
773
def string_to_delta(interval):
583
789
    timevalue = datetime.timedelta(0)
584
790
    for s in interval.split():
585
791
        try:
586
 
            suffix=unicode(s[-1])
587
 
            value=int(s[:-1])
 
792
            suffix = unicode(s[-1])
 
793
            value = int(s[:-1])
588
794
            if suffix == u"d":
589
795
                delta = datetime.timedelta(value)
590
796
            elif suffix == u"s":
630
836
    """Call the C function if_nametoindex(), or equivalent"""
631
837
    global if_nametoindex
632
838
    try:
633
 
        if "ctypes.util" not in sys.modules:
634
 
            import ctypes.util
635
 
        if_nametoindex = ctypes.cdll.LoadLibrary\
636
 
            (ctypes.util.find_library("c")).if_nametoindex
 
839
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
840
                          (ctypes.util.find_library("c"))
 
841
                          .if_nametoindex)
637
842
    except (OSError, AttributeError):
638
843
        if "struct" not in sys.modules:
639
844
            import struct
642
847
        def if_nametoindex(interface):
643
848
            "Get an interface index the hard way, i.e. using fcntl()"
644
849
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
645
 
            s = socket.socket()
646
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
647
 
                                struct.pack("16s16x", interface))
648
 
            s.close()
 
850
            with closing(socket.socket()) as s:
 
851
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
852
                                    struct.pack("16s16x", interface))
649
853
            interface_index = struct.unpack("I", ifreq[16:20])[0]
650
854
            return interface_index
651
855
    return if_nametoindex(interface)
675
879
 
676
880
 
677
881
def main():
678
 
    global main_loop_started
679
 
    main_loop_started = False
680
 
    
681
882
    parser = OptionParser(version = "%%prog %s" % version)
682
883
    parser.add_option("-i", "--interface", type="string",
683
884
                      metavar="IF", help="Bind to interface IF")
698
899
                      default="/etc/mandos", metavar="DIR",
699
900
                      help="Directory to search for configuration"
700
901
                      " files")
701
 
    (options, args) = parser.parse_args()
 
902
    options = parser.parse_args()[0]
702
903
    
703
904
    if options.check:
704
905
        import doctest
722
923
    # Convert the SafeConfigParser object to a dict
723
924
    server_settings = server_config.defaults()
724
925
    # Use getboolean on the boolean config option
725
 
    server_settings["debug"] = server_config.getboolean\
726
 
                               ("DEFAULT", "debug")
 
926
    server_settings["debug"] = (server_config.getboolean
 
927
                                ("DEFAULT", "debug"))
727
928
    del server_config
728
929
    
729
930
    # Override the settings from the config file with command line
743
944
        console.setLevel(logging.WARNING)
744
945
    
745
946
    if server_settings["servicename"] != "Mandos":
746
 
        syslogger.setFormatter(logging.Formatter\
 
947
        syslogger.setFormatter(logging.Formatter
747
948
                               ('Mandos (%s): %%(levelname)s:'
748
949
                                ' %%(message)s'
749
950
                                % server_settings["servicename"]))
758
959
    client_config.read(os.path.join(server_settings["configdir"],
759
960
                                    "clients.conf"))
760
961
    
 
962
    clients = Set()
 
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"
 
969
    try:
 
970
        pidfile = open(pidfilename, "w")
 
971
    except IOError, error:
 
972
        logger.error("Could not open file %r", pidfilename)
 
973
    
 
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)
 
992
        os.setgid(gid)
 
993
    except OSError, error:
 
994
        if error[0] != errno.EPERM:
 
995
            raise error
 
996
    
761
997
    global service
762
998
    service = AvahiService(name = server_settings["servicename"],
763
 
                           type = "_mandos._tcp", );
 
999
                           servicetype = "_mandos._tcp", )
764
1000
    if server_settings["interface"]:
765
 
        service.interface = if_nametoindex\
766
 
                            (server_settings["interface"])
 
1001
        service.interface = (if_nametoindex
 
1002
                             (server_settings["interface"]))
767
1003
    
768
1004
    global main_loop
769
1005
    global bus
776
1012
                                           avahi.DBUS_PATH_SERVER),
777
1013
                            avahi.DBUS_INTERFACE_SERVER)
778
1014
    # End of Avahi example code
 
1015
    bus_name = dbus.service.BusName(u"org.mandos-system.Mandos", bus)
779
1016
    
780
 
    clients = Set()
781
1017
    def remove_from_clients(client):
782
1018
        clients.remove(client)
783
1019
        if not clients:
805
1041
        # Close all input and output, do double fork, etc.
806
1042
        daemon()
807
1043
    
808
 
    pidfilename = "/var/run/mandos/mandos.pid"
809
 
    pid = os.getpid()
810
1044
    try:
811
 
        pidfile = open(pidfilename, "w")
 
1045
        pid = os.getpid()
812
1046
        pidfile.write(str(pid) + "\n")
813
1047
        pidfile.close()
814
1048
        del pidfile
815
 
    except IOError, err:
816
 
        logger.error(u"Could not write %s file with PID %d",
817
 
                     pidfilename, os.getpid())
 
1049
    except IOError:
 
1050
        logger.error(u"Could not write to file %r with PID %d",
 
1051
                     pidfilename, pid)
 
1052
    except NameError:
 
1053
        # "pidfile" was never created
 
1054
        pass
 
1055
    del pidfilename
818
1056
    
819
1057
    def cleanup():
820
1058
        "Cleanup function; run on exit"
840
1078
    for client in clients:
841
1079
        client.start()
842
1080
    
843
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
844
 
                                 server_settings["port"]),
845
 
                                tcp_handler,
846
 
                                settings=server_settings,
847
 
                                clients=clients)
 
1081
    tcp_server.enable()
 
1082
    tcp_server.server_activate()
 
1083
    
848
1084
    # Find out what port we got
849
1085
    service.port = tcp_server.socket.getsockname()[1]
850
1086
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
864
1100
        
865
1101
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
866
1102
                             lambda *args, **kwargs:
867
 
                             tcp_server.handle_request\
868
 
                             (*args[2:], **kwargs) or True)
 
1103
                             (tcp_server.handle_request
 
1104
                              (*args[2:], **kwargs) or True))
869
1105
        
870
1106
        logger.debug(u"Starting main loop")
871
 
        main_loop_started = True
872
1107
        main_loop.run()
873
1108
    except AvahiError, error:
874
1109
        logger.critical(u"AvahiError: %s" + unicode(error))