/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

  • Committer: Teddy Hogeborn
  • Date: 2008-08-22 00:16:20 UTC
  • mfrom: (24.1.57 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080822001620-vxpn1evy0t0kyvj0
* clients.conf ([DEFAULT]/checker): Update to new default value.

* mandos (Client.start_checker): Bug fix: OSError, not
                                 subprocess.OSError.
  (main): Use "fping -q -- %(host)s" instead of "fping -q --
          %%(host)s" as default value for "checker".  Always redirect
          stdin to be from /dev/null, even if in debug mode.

* mandos-clients.conf.xml (DESCRIPTION): Improved wording and refer to
                                         the EXPANSION section.
  (OPTIONS): Added synopsis and improved wording for "checker",
             "fingerprint", and "secret".  Refer to the RUNTIME
             EXPANSION section for the "checker" option.
  (EXAMPLE): Update to new default value for "checker".

* mandos-keygen (trap): Split lines and add "set +e".

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
15
 
# Copyright © 2008 Björn Påhlsson
 
14
# Copyright © 2007-2008 Teddy Hogeborn & Björn Påhlsson
16
15
# 
17
16
# This program is free software: you can redistribute it and/or modify
18
17
# it under the terms of the GNU General Public License as published by
25
24
#     GNU General Public License for more details.
26
25
# 
27
26
# You should have received a copy of the GNU General Public License
28
 
# along with this program.  If not, see
29
 
# <http://www.gnu.org/licenses/>.
 
27
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
30
28
# 
31
29
# Contact the authors at <mandos@fukt.bsnet.se>.
32
30
# 
33
31
 
34
 
from __future__ import division, with_statement, absolute_import
 
32
from __future__ import division
35
33
 
36
34
import SocketServer
37
35
import socket
 
36
import select
38
37
from optparse import OptionParser
39
38
import datetime
40
39
import errno
55
54
import stat
56
55
import logging
57
56
import logging.handlers
58
 
import pwd
59
 
from contextlib import closing
60
57
 
61
58
import dbus
62
 
import dbus.service
63
59
import gobject
64
60
import avahi
65
61
from dbus.mainloop.glib import DBusGMainLoop
66
62
import ctypes
67
 
import ctypes.util
68
63
 
69
 
version = "1.0.2"
 
64
version = "1.0"
70
65
 
71
66
logger = logging.Logger('mandos')
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'))
 
67
syslogger = logging.handlers.SysLogHandler\
 
68
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
69
             address = "/dev/log")
 
70
syslogger.setFormatter(logging.Formatter\
 
71
                        ('Mandos: %(levelname)s: %(message)s'))
77
72
logger.addHandler(syslogger)
78
73
 
79
74
console = logging.StreamHandler()
84
79
class AvahiError(Exception):
85
80
    def __init__(self, value):
86
81
        self.value = value
87
 
        super(AvahiError, self).__init__()
88
82
    def __str__(self):
89
83
        return repr(self.value)
90
84
 
112
106
                  a sensible number of times
113
107
    """
114
108
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
115
 
                 servicetype = None, port = None, TXT = None,
116
 
                 domain = "", host = "", max_renames = 32768):
 
109
                 type = None, port = None, TXT = None, domain = "",
 
110
                 host = "", max_renames = 32768):
117
111
        self.interface = interface
118
112
        self.name = name
119
 
        self.type = servicetype
 
113
        self.type = type
120
114
        self.port = port
121
 
        self.TXT = TXT if TXT is not None else []
 
115
        if TXT is None:
 
116
            self.TXT = []
 
117
        else:
 
118
            self.TXT = TXT
122
119
        self.domain = domain
123
120
        self.host = host
124
121
        self.rename_count = 0
126
123
    def rename(self):
127
124
        """Derived from the Avahi example code"""
128
125
        if self.rename_count >= self.max_renames:
129
 
            logger.critical(u"No suitable Zeroconf service name found"
130
 
                            u" after %i retries, exiting.",
131
 
                            self.rename_count)
 
126
            logger.critical(u"No suitable service name found after %i"
 
127
                            u" retries, exiting.", rename_count)
132
128
            raise AvahiServiceError("Too many renames")
133
129
        self.name = server.GetAlternativeServiceName(self.name)
134
 
        logger.info(u"Changing Zeroconf service name to %r ...",
135
 
                    str(self.name))
136
 
        syslogger.setFormatter(logging.Formatter
 
130
        logger.info(u"Changing name to %r ...", str(self.name))
 
131
        syslogger.setFormatter(logging.Formatter\
137
132
                               ('Mandos (%s): %%(levelname)s:'
138
 
                                ' %%(message)s' % self.name))
 
133
                               ' %%(message)s' % self.name))
139
134
        self.remove()
140
135
        self.add()
141
136
        self.rename_count += 1
147
142
        """Derived from the Avahi example code"""
148
143
        global group
149
144
        if group is None:
150
 
            group = dbus.Interface(bus.get_object
151
 
                                   (avahi.DBUS_NAME,
 
145
            group = dbus.Interface\
 
146
                    (bus.get_object(avahi.DBUS_NAME,
152
147
                                    server.EntryGroupNew()),
153
 
                                   avahi.DBUS_INTERFACE_ENTRY_GROUP)
 
148
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
154
149
            group.connect_to_signal('StateChanged',
155
150
                                    entry_group_state_changed)
156
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
151
        logger.debug(u"Adding service '%s' of type '%s' ...",
157
152
                     service.name, service.type)
158
153
        group.AddService(
159
154
                self.interface,         # interface
170
165
# End of Avahi example code
171
166
 
172
167
 
173
 
class Client(dbus.service.Object):
 
168
class Client(object):
174
169
    """A representation of a client host served by this server.
175
170
    Attributes:
176
171
    name:      string; from the config file, used in log messages
178
173
                 uniquely identify the client
179
174
    secret:    bytestring; sent verbatim (over TLS) to client
180
175
    host:      string; available for use by the checker command
181
 
    created:   datetime.datetime(); (UTC) object creation
182
 
    started:   datetime.datetime(); (UTC) last started
183
 
    last_checked_ok: datetime.datetime(); (UTC) or None
 
176
    created:   datetime.datetime(); object creation, not client host
 
177
    last_checked_ok: datetime.datetime() or None if not yet checked OK
184
178
    timeout:   datetime.timedelta(); How long from last_checked_ok
185
179
                                     until this client is invalid
186
180
    interval:  datetime.timedelta(); How often to start a new checker
202
196
    _interval_milliseconds: - '' -
203
197
    """
204
198
    def _set_timeout(self, timeout):
205
 
        "Setter function for the 'timeout' attribute"
 
199
        "Setter function for 'timeout' attribute"
206
200
        self._timeout = timeout
207
201
        self._timeout_milliseconds = ((self.timeout.days
208
202
                                       * 24 * 60 * 60 * 1000)
209
203
                                      + (self.timeout.seconds * 1000)
210
204
                                      + (self.timeout.microseconds
211
205
                                         // 1000))
212
 
        # Emit D-Bus signal
213
 
        self.TimeoutChanged(self._timeout_milliseconds)
214
 
    timeout = property(lambda self: self._timeout, _set_timeout)
 
206
    timeout = property(lambda self: self._timeout,
 
207
                       _set_timeout)
215
208
    del _set_timeout
216
 
    
217
209
    def _set_interval(self, interval):
218
 
        "Setter function for the 'interval' attribute"
 
210
        "Setter function for 'interval' attribute"
219
211
        self._interval = interval
220
212
        self._interval_milliseconds = ((self.interval.days
221
213
                                        * 24 * 60 * 60 * 1000)
223
215
                                          * 1000)
224
216
                                       + (self.interval.microseconds
225
217
                                          // 1000))
226
 
        # Emit D-Bus signal
227
 
        self.IntervalChanged(self._interval_milliseconds)
228
 
    interval = property(lambda self: self._interval, _set_interval)
 
218
    interval = property(lambda self: self._interval,
 
219
                        _set_interval)
229
220
    del _set_interval
230
 
    
231
 
    def __init__(self, name = None, stop_hook=None, config=None):
 
221
    def __init__(self, name = None, stop_hook=None, config={}):
232
222
        """Note: the 'checker' key in 'config' sets the
233
223
        'checker_command' attribute and *not* the 'checker'
234
224
        attribute."""
235
 
        dbus.service.Object.__init__(self, bus,
236
 
                                     "/Mandos/clients/%s"
237
 
                                     % name.replace(".", "_"))
238
 
        if config is None:
239
 
            config = {}
240
225
        self.name = name
241
226
        logger.debug(u"Creating client %r", self.name)
242
227
        # Uppercase and remove spaces from fingerprint for later
243
228
        # comparison purposes with return value from the fingerprint()
244
229
        # function
245
 
        self.fingerprint = (config["fingerprint"].upper()
246
 
                            .replace(u" ", u""))
 
230
        self.fingerprint = config["fingerprint"].upper()\
 
231
                           .replace(u" ", u"")
247
232
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
248
233
        if "secret" in config:
249
234
            self.secret = config["secret"].decode(u"base64")
250
235
        elif "secfile" in config:
251
 
            with closing(open(os.path.expanduser
252
 
                              (os.path.expandvars
253
 
                               (config["secfile"])))) as secfile:
254
 
                self.secret = secfile.read()
 
236
            sf = open(config["secfile"])
 
237
            self.secret = sf.read()
 
238
            sf.close()
255
239
        else:
256
240
            raise TypeError(u"No secret or secfile for client %s"
257
241
                            % self.name)
258
242
        self.host = config.get("host", "")
259
 
        self.created = datetime.datetime.utcnow()
260
 
        self.started = None
 
243
        self.created = datetime.datetime.now()
261
244
        self.last_checked_ok = None
262
245
        self.timeout = string_to_delta(config["timeout"])
263
246
        self.interval = string_to_delta(config["interval"])
267
250
        self.stop_initiator_tag = None
268
251
        self.checker_callback_tag = None
269
252
        self.check_command = config["checker"]
270
 
    
271
253
    def start(self):
272
254
        """Start this client's checker and timeout hooks"""
273
 
        self.started = datetime.datetime.utcnow()
274
255
        # Schedule a new checker to be started an 'interval' from now,
275
256
        # and every interval from then on.
276
 
        self.checker_initiator_tag = (gobject.timeout_add
277
 
                                      (self._interval_milliseconds,
278
 
                                       self.start_checker))
 
257
        self.checker_initiator_tag = gobject.timeout_add\
 
258
                                     (self._interval_milliseconds,
 
259
                                      self.start_checker)
279
260
        # Also start a new checker *right now*.
280
261
        self.start_checker()
281
262
        # Schedule a stop() when 'timeout' has passed
282
 
        self.stop_initiator_tag = (gobject.timeout_add
283
 
                                   (self._timeout_milliseconds,
284
 
                                    self.stop))
285
 
        # Emit D-Bus signal
286
 
        self.StateChanged(True)
287
 
    
 
263
        self.stop_initiator_tag = gobject.timeout_add\
 
264
                                  (self._timeout_milliseconds,
 
265
                                   self.stop)
288
266
    def stop(self):
289
 
        """Stop this client."""
290
 
        if getattr(self, "started", None) is not None:
 
267
        """Stop this client.
 
268
        The possibility that a client might be restarted is left open,
 
269
        but not currently used."""
 
270
        # If this client doesn't have a secret, it is already stopped.
 
271
        if hasattr(self, "secret") and self.secret:
291
272
            logger.info(u"Stopping client %s", self.name)
 
273
            self.secret = None
292
274
        else:
293
275
            return False
294
276
        if getattr(self, "stop_initiator_tag", False):
300
282
        self.stop_checker()
301
283
        if self.stop_hook:
302
284
            self.stop_hook(self)
303
 
        self.started = None
304
 
        # Emit D-Bus signal
305
 
        self.StateChanged(False)
306
285
        # Do not run this again if called by a gobject.timeout_add
307
286
        return False
308
 
    
309
287
    def __del__(self):
310
288
        self.stop_hook = None
311
289
        self.stop()
312
 
    
313
290
    def checker_callback(self, pid, condition):
314
291
        """The checker has completed, so take appropriate actions."""
 
292
        now = datetime.datetime.now()
315
293
        self.checker_callback_tag = None
316
294
        self.checker = None
317
 
        if (os.WIFEXITED(condition) 
318
 
            and (os.WEXITSTATUS(condition) == 0)):
 
295
        if os.WIFEXITED(condition) \
 
296
               and (os.WEXITSTATUS(condition) == 0):
319
297
            logger.info(u"Checker for %(name)s succeeded",
320
298
                        vars(self))
321
 
            # Emit D-Bus signal
322
 
            self.CheckerCompleted(True)
323
 
            self.bump_timeout()
 
299
            self.last_checked_ok = now
 
300
            gobject.source_remove(self.stop_initiator_tag)
 
301
            self.stop_initiator_tag = gobject.timeout_add\
 
302
                                      (self._timeout_milliseconds,
 
303
                                       self.stop)
324
304
        elif not os.WIFEXITED(condition):
325
305
            logger.warning(u"Checker for %(name)s crashed?",
326
306
                           vars(self))
327
 
            # Emit D-Bus signal
328
 
            self.CheckerCompleted(False)
329
307
        else:
330
308
            logger.info(u"Checker for %(name)s failed",
331
309
                        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
 
    
346
310
    def start_checker(self):
347
311
        """Start a new checker subprocess if one is not running.
348
312
        If a checker already exists, leave it running and do
380
344
                self.checker = subprocess.Popen(command,
381
345
                                                close_fds=True,
382
346
                                                shell=True, cwd="/")
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)
 
347
                self.checker_callback_tag = gobject.child_watch_add\
 
348
                                            (self.checker.pid,
 
349
                                             self.checker_callback)
388
350
            except OSError, error:
389
351
                logger.error(u"Failed to start subprocess: %s",
390
352
                             error)
391
353
        # Re-run this periodically if run by gobject.timeout_add
392
354
        return True
393
 
    
394
355
    def stop_checker(self):
395
356
        """Force the checker process, if any, to stop."""
396
357
        if self.checker_callback_tag:
408
369
            if error.errno != errno.ESRCH: # No such process
409
370
                raise
410
371
        self.checker = None
411
 
    
412
372
    def still_valid(self):
413
373
        """Has the timeout not yet passed for this client?"""
414
 
        if not self.started:
415
 
            return False
416
 
        now = datetime.datetime.utcnow()
 
374
        now = datetime.datetime.now()
417
375
        if self.last_checked_ok is None:
418
376
            return now < (self.created + self.timeout)
419
377
        else:
420
378
            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
574
379
 
575
380
 
576
381
def peer_certificate(session):
577
382
    "Return the peer's OpenPGP certificate as a bytestring"
578
383
    # If not an OpenPGP certificate...
579
 
    if (gnutls.library.functions
580
 
        .gnutls_certificate_type_get(session._c_object)
581
 
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
384
    if gnutls.library.functions.gnutls_certificate_type_get\
 
385
            (session._c_object) \
 
386
           != gnutls.library.constants.GNUTLS_CRT_OPENPGP:
582
387
        # ...do the normal thing
583
388
        return session.peer_certificate
584
389
    list_size = ctypes.c_uint()
585
 
    cert_list = (gnutls.library.functions
586
 
                 .gnutls_certificate_get_peers
587
 
                 (session._c_object, ctypes.byref(list_size)))
 
390
    cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
 
391
        (session._c_object, ctypes.byref(list_size))
588
392
    if list_size.value == 0:
589
393
        return None
590
394
    cert = cert_list[0]
594
398
def fingerprint(openpgp):
595
399
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
596
400
    # New GnuTLS "datum" with the OpenPGP public key
597
 
    datum = (gnutls.library.types
598
 
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
599
 
                                         ctypes.POINTER
600
 
                                         (ctypes.c_ubyte)),
601
 
                             ctypes.c_uint(len(openpgp))))
 
401
    datum = gnutls.library.types.gnutls_datum_t\
 
402
        (ctypes.cast(ctypes.c_char_p(openpgp),
 
403
                     ctypes.POINTER(ctypes.c_ubyte)),
 
404
         ctypes.c_uint(len(openpgp)))
602
405
    # New empty GnuTLS certificate
603
406
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
604
 
    (gnutls.library.functions
605
 
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
407
    gnutls.library.functions.gnutls_openpgp_crt_init\
 
408
        (ctypes.byref(crt))
606
409
    # Import the OpenPGP public key into the certificate
607
 
    (gnutls.library.functions
608
 
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
609
 
                                gnutls.library.constants
610
 
                                .GNUTLS_OPENPGP_FMT_RAW))
611
 
    # Verify the self signature in the key
612
 
    crtverify = ctypes.c_uint()
613
 
    (gnutls.library.functions
614
 
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
615
 
    if crtverify.value != 0:
616
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
617
 
        raise gnutls.errors.CertificateSecurityError("Verify failed")
 
410
    gnutls.library.functions.gnutls_openpgp_crt_import\
 
411
                    (crt, ctypes.byref(datum),
 
412
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
618
413
    # New buffer for the fingerprint
619
 
    buf = ctypes.create_string_buffer(20)
620
 
    buf_len = ctypes.c_size_t()
 
414
    buffer = ctypes.create_string_buffer(20)
 
415
    buffer_length = ctypes.c_size_t()
621
416
    # Get the fingerprint from the certificate into the buffer
622
 
    (gnutls.library.functions
623
 
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
624
 
                                         ctypes.byref(buf_len)))
 
417
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
 
418
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
625
419
    # Deinit the certificate
626
420
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
627
421
    # Convert the buffer to a Python bytestring
628
 
    fpr = ctypes.string_at(buf, buf_len.value)
 
422
    fpr = ctypes.string_at(buffer, buffer_length.value)
629
423
    # Convert the bytestring to hexadecimal notation
630
424
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
631
425
    return hex_fpr
632
426
 
633
427
 
634
 
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
428
class tcp_handler(SocketServer.BaseRequestHandler, object):
635
429
    """A TCP request handler class.
636
430
    Instantiated by IPv6_TCPServer for each request to handle it.
637
431
    Note: This will run in its own forked process."""
638
432
    
639
433
    def handle(self):
640
434
        logger.info(u"TCP connection from: %s",
641
 
                    unicode(self.client_address))
642
 
        session = (gnutls.connection
643
 
                   .ClientSession(self.request,
644
 
                                  gnutls.connection
645
 
                                  .X509Credentials()))
 
435
                     unicode(self.client_address))
 
436
        session = gnutls.connection.ClientSession\
 
437
                  (self.request, gnutls.connection.X509Credentials())
646
438
        
647
439
        line = self.request.makefile().readline()
648
440
        logger.debug(u"Protocol version: %r", line)
661
453
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
662
454
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
663
455
        #                "+DHE-DSS"))
664
 
        # Use a fallback default, since this MUST be set.
665
 
        priority = self.server.settings.get("priority", "NORMAL")
666
 
        (gnutls.library.functions
667
 
         .gnutls_priority_set_direct(session._c_object,
668
 
                                     priority, None))
 
456
        priority = "NORMAL"             # Fallback default, since this
 
457
                                        # MUST be set.
 
458
        if self.server.settings["priority"]:
 
459
            priority = self.server.settings["priority"]
 
460
        gnutls.library.functions.gnutls_priority_set_direct\
 
461
            (session._c_object, priority, None);
669
462
        
670
463
        try:
671
464
            session.handshake()
681
474
            session.bye()
682
475
            return
683
476
        logger.debug(u"Fingerprint: %s", fpr)
 
477
        client = None
684
478
        for c in self.server.clients:
685
479
            if c.fingerprint == fpr:
686
480
                client = c
687
481
                break
688
 
        else:
 
482
        if not client:
689
483
            logger.warning(u"Client not found for fingerprint: %s",
690
484
                           fpr)
691
485
            session.bye()
698
492
                           vars(client))
699
493
            session.bye()
700
494
            return
701
 
        ## This won't work here, since we're in a fork.
702
 
        # client.bump_timeout()
703
495
        sent_size = 0
704
496
        while sent_size < len(client.secret):
705
497
            sent = session.send(client.secret[sent_size:])
710
502
        session.bye()
711
503
 
712
504
 
713
 
class IPv6_TCPServer(SocketServer.ForkingMixIn,
714
 
                     SocketServer.TCPServer, object):
 
505
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
715
506
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
716
507
    Attributes:
717
508
        settings:       Server settings
718
509
        clients:        Set() of Client objects
719
 
        enabled:        Boolean; whether this server is activated yet
720
510
    """
721
511
    address_family = socket.AF_INET6
722
512
    def __init__(self, *args, **kwargs):
726
516
        if "clients" in kwargs:
727
517
            self.clients = kwargs["clients"]
728
518
            del kwargs["clients"]
729
 
        self.enabled = False
730
 
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
 
519
        return super(type(self), self).__init__(*args, **kwargs)
731
520
    def server_bind(self):
732
521
        """This overrides the normal server_bind() function
733
522
        to bind to an interface if one was specified, and also NOT to
762
551
#                                            if_nametoindex
763
552
#                                            (self.settings
764
553
#                                             ["interface"]))
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
 
554
            return super(type(self), self).server_bind()
771
555
 
772
556
 
773
557
def string_to_delta(interval):
789
573
    timevalue = datetime.timedelta(0)
790
574
    for s in interval.split():
791
575
        try:
792
 
            suffix = unicode(s[-1])
793
 
            value = int(s[:-1])
 
576
            suffix=unicode(s[-1])
 
577
            value=int(s[:-1])
794
578
            if suffix == u"d":
795
579
                delta = datetime.timedelta(value)
796
580
            elif suffix == u"s":
812
596
def server_state_changed(state):
813
597
    """Derived from the Avahi example code"""
814
598
    if state == avahi.SERVER_COLLISION:
815
 
        logger.error(u"Zeroconf server name collision")
 
599
        logger.error(u"Server name collision")
816
600
        service.remove()
817
601
    elif state == avahi.SERVER_RUNNING:
818
602
        service.add()
820
604
 
821
605
def entry_group_state_changed(state, error):
822
606
    """Derived from the Avahi example code"""
823
 
    logger.debug(u"Avahi state change: %i", state)
 
607
    logger.debug(u"state change: %i", state)
824
608
    
825
609
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
826
 
        logger.debug(u"Zeroconf service established.")
 
610
        logger.debug(u"Service established.")
827
611
    elif state == avahi.ENTRY_GROUP_COLLISION:
828
 
        logger.warning(u"Zeroconf service name collision.")
 
612
        logger.warning(u"Service name collision.")
829
613
        service.rename()
830
614
    elif state == avahi.ENTRY_GROUP_FAILURE:
831
 
        logger.critical(u"Avahi: Error in group state changed %s",
 
615
        logger.critical(u"Error in group state changed %s",
832
616
                        unicode(error))
833
617
        raise AvahiGroupError("State changed: %s", str(error))
834
618
 
836
620
    """Call the C function if_nametoindex(), or equivalent"""
837
621
    global if_nametoindex
838
622
    try:
839
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
840
 
                          (ctypes.util.find_library("c"))
841
 
                          .if_nametoindex)
 
623
        if "ctypes.util" not in sys.modules:
 
624
            import ctypes.util
 
625
        if_nametoindex = ctypes.cdll.LoadLibrary\
 
626
            (ctypes.util.find_library("c")).if_nametoindex
842
627
    except (OSError, AttributeError):
843
628
        if "struct" not in sys.modules:
844
629
            import struct
847
632
        def if_nametoindex(interface):
848
633
            "Get an interface index the hard way, i.e. using fcntl()"
849
634
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
850
 
            with closing(socket.socket()) as s:
851
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
852
 
                                    struct.pack("16s16x", interface))
 
635
            s = socket.socket()
 
636
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
637
                                struct.pack("16s16x", interface))
 
638
            s.close()
853
639
            interface_index = struct.unpack("I", ifreq[16:20])[0]
854
640
            return interface_index
855
641
    return if_nametoindex(interface)
879
665
 
880
666
 
881
667
def main():
 
668
    global main_loop_started
 
669
    main_loop_started = False
 
670
    
882
671
    parser = OptionParser(version = "%%prog %s" % version)
883
672
    parser.add_option("-i", "--interface", type="string",
884
673
                      metavar="IF", help="Bind to interface IF")
899
688
                      default="/etc/mandos", metavar="DIR",
900
689
                      help="Directory to search for configuration"
901
690
                      " files")
902
 
    options = parser.parse_args()[0]
 
691
    (options, args) = parser.parse_args()
903
692
    
904
693
    if options.check:
905
694
        import doctest
923
712
    # Convert the SafeConfigParser object to a dict
924
713
    server_settings = server_config.defaults()
925
714
    # Use getboolean on the boolean config option
926
 
    server_settings["debug"] = (server_config.getboolean
927
 
                                ("DEFAULT", "debug"))
 
715
    server_settings["debug"] = server_config.getboolean\
 
716
                               ("DEFAULT", "debug")
928
717
    del server_config
929
718
    
930
719
    # Override the settings from the config file with command line
944
733
        console.setLevel(logging.WARNING)
945
734
    
946
735
    if server_settings["servicename"] != "Mandos":
947
 
        syslogger.setFormatter(logging.Formatter
 
736
        syslogger.setFormatter(logging.Formatter\
948
737
                               ('Mandos (%s): %%(levelname)s:'
949
738
                                ' %%(message)s'
950
739
                                % server_settings["servicename"]))
959
748
    client_config.read(os.path.join(server_settings["configdir"],
960
749
                                    "clients.conf"))
961
750
    
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
 
    
997
751
    global service
998
752
    service = AvahiService(name = server_settings["servicename"],
999
 
                           servicetype = "_mandos._tcp", )
 
753
                           type = "_mandos._tcp", );
1000
754
    if server_settings["interface"]:
1001
 
        service.interface = (if_nametoindex
1002
 
                             (server_settings["interface"]))
 
755
        service.interface = if_nametoindex(server_settings["interface"])
1003
756
    
1004
757
    global main_loop
1005
758
    global bus
1008
761
    DBusGMainLoop(set_as_default=True )
1009
762
    main_loop = gobject.MainLoop()
1010
763
    bus = dbus.SystemBus()
1011
 
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
1012
 
                                           avahi.DBUS_PATH_SERVER),
1013
 
                            avahi.DBUS_INTERFACE_SERVER)
 
764
    server = dbus.Interface(
 
765
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
 
766
            avahi.DBUS_INTERFACE_SERVER )
1014
767
    # End of Avahi example code
1015
 
    bus_name = dbus.service.BusName(u"org.mandos-system.Mandos", bus)
1016
768
    
 
769
    clients = Set()
1017
770
    def remove_from_clients(client):
1018
771
        clients.remove(client)
1019
772
        if not clients:
1041
794
        # Close all input and output, do double fork, etc.
1042
795
        daemon()
1043
796
    
 
797
    pidfilename = "/var/run/mandos/mandos.pid"
 
798
    pid = os.getpid()
1044
799
    try:
1045
 
        pid = os.getpid()
 
800
        pidfile = open(pidfilename, "w")
1046
801
        pidfile.write(str(pid) + "\n")
1047
802
        pidfile.close()
1048
803
        del pidfile
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
 
804
    except IOError, err:
 
805
        logger.error(u"Could not write %s file with PID %d",
 
806
                     pidfilename, os.getpid())
1056
807
    
1057
808
    def cleanup():
1058
809
        "Cleanup function; run on exit"
1078
829
    for client in clients:
1079
830
        client.start()
1080
831
    
1081
 
    tcp_server.enable()
1082
 
    tcp_server.server_activate()
1083
 
    
 
832
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
833
                                 server_settings["port"]),
 
834
                                tcp_handler,
 
835
                                settings=server_settings,
 
836
                                clients=clients)
1084
837
    # Find out what port we got
1085
838
    service.port = tcp_server.socket.getsockname()[1]
1086
839
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
1100
853
        
1101
854
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1102
855
                             lambda *args, **kwargs:
1103
 
                             (tcp_server.handle_request
1104
 
                              (*args[2:], **kwargs) or True))
 
856
                             tcp_server.handle_request\
 
857
                             (*args[2:], **kwargs) or True)
1105
858
        
1106
859
        logger.debug(u"Starting main loop")
 
860
        main_loop_started = True
1107
861
        main_loop.run()
1108
862
    except AvahiError, error:
1109
863
        logger.critical(u"AvahiError: %s" + unicode(error))