/mandos/release

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

« back to all changes in this revision

Viewing changes to server.py

  • Committer: Teddy Hogeborn
  • Date: 2008-08-03 01:09:36 UTC
  • mfrom: (24.1.9 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080803010936-ujme8tgxceszfbi1
* plugbasedclient.c (main): New "--userid" and "--groupid" options.
                            Take an additional non-option argument and
                            parse it as a plus-separated and -prefixed
                            list of additional options.

* plugins.d/mandosclient.c (DH_BITS): Replaced with
                                      "mandos_context.dh_bits".  All
                                      users changed.
  (certdir): Renamed to "keydir".  All users changed.
  (certfile): Renamed to "pubkeyfile".  All users changed.
  (certkey): Renamed to "seckeyfile".  All users changed.
  (encrypted_session): Replaced with "mandos_context".  All users
                       changed.
  (initgnutls): Take additional "session" and "dh_params" arguments.
                All callers changed.
  (start_mandos_communication): Take additional "mc" argument.  All
                                callers changed.  Print target IPv6
                                address if different than supplied
                                string.
  (simple_poll) Replaced with "mandos_context.simple_poll".  All users
                changed.
  (server): Replaced with "mandos_context.server".  All users changed.
  (main): Default interface to "eth0".  Rename "--certdir" to
          "--keydir", "--certkey" to "--seckey", and "--certfile" to
          "--pubkey".  New options "--dh-bits" and "--priority".  If
          the interface is not up, bring it up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server.py
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>.  This includes the
9
 
# methods "add" and "remove" in the "AvahiService" class, the
10
 
# "server_state_changed" and "entry_group_state_changed" functions,
11
 
# and some lines in "main".
 
9
# following functions: "AvahiService.add", "AvahiService.remove",
 
10
# "server_state_changed", "entry_group_state_changed", and some lines
 
11
# in "main".
12
12
# 
13
13
# Everything else is
14
 
# Copyright © 2008 Teddy Hogeborn & Björn Påhlsson
 
14
# Copyright © 2007-2008 Teddy Hogeborn & Björn Påhlsson
15
15
# 
16
16
# This program is free software: you can redistribute it and/or modify
17
17
# it under the terms of the GNU General Public License as published by
24
24
#     GNU General Public License for more details.
25
25
# 
26
26
# You should have received a copy of the GNU General Public License
27
 
# along with this program.  If not, see
28
 
# <http://www.gnu.org/licenses/>.
 
27
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
29
28
# 
30
29
# Contact the authors at <mandos@fukt.bsnet.se>.
31
30
# 
34
33
 
35
34
import SocketServer
36
35
import socket
 
36
import select
37
37
from optparse import OptionParser
38
38
import datetime
39
39
import errno
54
54
import stat
55
55
import logging
56
56
import logging.handlers
57
 
import pwd
58
57
 
59
58
import dbus
60
59
import gobject
61
60
import avahi
62
61
from dbus.mainloop.glib import DBusGMainLoop
63
62
import ctypes
64
 
import ctypes.util
65
 
 
66
 
version = "1.0"
 
63
 
 
64
# Brief description of the operation of this program:
 
65
# 
 
66
# This server announces itself as a Zeroconf service.  Connecting
 
67
# clients use the TLS protocol, with the unusual quirk that this
 
68
# server program acts as a TLS "client" while a connecting client acts
 
69
# as a TLS "server".  The client (acting as a TLS "server") must
 
70
# supply an OpenPGP certificate, and the fingerprint of this
 
71
# certificate is used by this server to look up (in a list read from a
 
72
# file at start time) which binary blob to give the client.  No other
 
73
# authentication or authorization is done by this server.
 
74
 
67
75
 
68
76
logger = logging.Logger('mandos')
69
77
syslogger = logging.handlers.SysLogHandler\
70
 
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
71
 
             address = "/dev/log")
 
78
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON)
72
79
syslogger.setFormatter(logging.Formatter\
73
 
                        ('Mandos: %(levelname)s: %(message)s'))
 
80
                        ('%(levelname)s: %(message)s'))
74
81
logger.addHandler(syslogger)
 
82
del syslogger
75
83
 
76
 
console = logging.StreamHandler()
77
 
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
78
 
                                       ' %(message)s'))
79
 
logger.addHandler(console)
80
84
 
81
85
class AvahiError(Exception):
82
86
    def __init__(self, value):
83
87
        self.value = value
84
 
        super(AvahiError, self).__init__()
85
88
    def __str__(self):
86
89
        return repr(self.value)
87
90
 
93
96
 
94
97
 
95
98
class AvahiService(object):
96
 
    """An Avahi (Zeroconf) service.
97
 
    Attributes:
 
99
    """
98
100
    interface: integer; avahi.IF_UNSPEC or an interface index.
99
101
               Used to optionally bind to the specified interface.
100
 
    name: string; Example: 'Mandos'
101
 
    type: string; Example: '_mandos._tcp'.
102
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
103
 
    port: integer; what port to announce
104
 
    TXT: list of strings; TXT record for the service
105
 
    domain: string; Domain to publish on, default to .local if empty.
106
 
    host: string; Host to publish records for, default is localhost
107
 
    max_renames: integer; maximum number of renames
108
 
    rename_count: integer; counter so we only rename after collisions
109
 
                  a sensible number of times
 
102
    name = string; Example: "Mandos"
 
103
    type = string; Example: "_mandos._tcp".
 
104
                   See <http://www.dns-sd.org/ServiceTypes.html>
 
105
    port = integer; what port to announce
 
106
    TXT = list of strings; TXT record for the service
 
107
    domain = string; Domain to publish on, default to .local if empty.
 
108
    host = string; Host to publish records for, default to localhost
 
109
                   if empty.
 
110
    max_renames = integer; maximum number of renames
 
111
    rename_count = integer; counter so we only rename after collisions
 
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
                 type = None, port = None, TXT = None, domain = "",
 
116
                 host = "", max_renames = 12):
 
117
        """An Avahi (Zeroconf) service. """
114
118
        self.interface = interface
115
119
        self.name = name
116
 
        self.type = servicetype
 
120
        self.type = type
117
121
        self.port = port
118
122
        if TXT is None:
119
123
            self.TXT = []
122
126
        self.domain = domain
123
127
        self.host = host
124
128
        self.rename_count = 0
125
 
        self.max_renames = max_renames
126
129
    def rename(self):
127
130
        """Derived from the Avahi example code"""
128
131
        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)
 
132
            logger.critical(u"No suitable service name found after %i"
 
133
                            u" retries, exiting.", rename_count)
132
134
            raise AvahiServiceError("Too many renames")
133
 
        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\
137
 
                               ('Mandos (%s): %%(levelname)s:'
138
 
                               ' %%(message)s' % self.name))
 
135
        name = server.GetAlternativeServiceName(name)
 
136
        logger.notice(u"Changing name to %r ...", name)
139
137
        self.remove()
140
138
        self.add()
141
139
        self.rename_count += 1
153
151
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
154
152
            group.connect_to_signal('StateChanged',
155
153
                                    entry_group_state_changed)
156
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
154
        logger.debug(u"Adding service '%s' of type '%s' ...",
157
155
                     service.name, service.type)
158
156
        group.AddService(
159
157
                self.interface,         # interface
177
175
    fingerprint: string (40 or 32 hexadecimal digits); used to
178
176
                 uniquely identify the client
179
177
    secret:    bytestring; sent verbatim (over TLS) to client
180
 
    host:      string; available for use by the checker command
 
178
    fqdn:      string (FQDN); available for use by the checker command
181
179
    created:   datetime.datetime(); object creation, not client host
182
180
    last_checked_ok: datetime.datetime() or None if not yet checked OK
183
181
    timeout:   datetime.timedelta(); How long from last_checked_ok
223
221
    interval = property(lambda self: self._interval,
224
222
                        _set_interval)
225
223
    del _set_interval
226
 
    def __init__(self, name = None, stop_hook=None, config=None):
227
 
        """Note: the 'checker' key in 'config' sets the
228
 
        'checker_command' attribute and *not* the 'checker'
229
 
        attribute."""
230
 
        if config is None:
231
 
            config = {}
 
224
    def __init__(self, name=None, stop_hook=None, fingerprint=None,
 
225
                 secret=None, secfile=None, fqdn=None, timeout=None,
 
226
                 interval=-1, checker=None):
 
227
        """Note: the 'checker' argument sets the 'checker_command'
 
228
        attribute and not the 'checker' attribute.."""
232
229
        self.name = name
233
230
        logger.debug(u"Creating client %r", self.name)
234
 
        # Uppercase and remove spaces from fingerprint for later
235
 
        # comparison purposes with return value from the fingerprint()
236
 
        # function
237
 
        self.fingerprint = config["fingerprint"].upper()\
238
 
                           .replace(u" ", u"")
 
231
        # Uppercase and remove spaces from fingerprint
 
232
        # for later comparison purposes with return value of
 
233
        # the fingerprint() function
 
234
        self.fingerprint = fingerprint.upper().replace(u" ", u"")
239
235
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
240
 
        if "secret" in config:
241
 
            self.secret = config["secret"].decode(u"base64")
242
 
        elif "secfile" in config:
243
 
            secfile = open(os.path.expanduser(os.path.expandvars
244
 
                                              (config["secfile"])))
245
 
            self.secret = secfile.read()
246
 
            secfile.close()
 
236
        if secret:
 
237
            self.secret = secret.decode(u"base64")
 
238
        elif secfile:
 
239
            sf = open(secfile)
 
240
            self.secret = sf.read()
 
241
            sf.close()
247
242
        else:
248
243
            raise TypeError(u"No secret or secfile for client %s"
249
244
                            % self.name)
250
 
        self.host = config.get("host", "")
 
245
        self.fqdn = fqdn
251
246
        self.created = datetime.datetime.now()
252
247
        self.last_checked_ok = None
253
 
        self.timeout = string_to_delta(config["timeout"])
254
 
        self.interval = string_to_delta(config["interval"])
 
248
        self.timeout = string_to_delta(timeout)
 
249
        self.interval = string_to_delta(interval)
255
250
        self.stop_hook = stop_hook
256
251
        self.checker = None
257
252
        self.checker_initiator_tag = None
258
253
        self.stop_initiator_tag = None
259
254
        self.checker_callback_tag = None
260
 
        self.check_command = config["checker"]
 
255
        self.check_command = checker
261
256
    def start(self):
262
257
        """Start this client's checker and timeout hooks"""
263
258
        # Schedule a new checker to be started an 'interval' from now,
276
271
        The possibility that a client might be restarted is left open,
277
272
        but not currently used."""
278
273
        # If this client doesn't have a secret, it is already stopped.
279
 
        if hasattr(self, "secret") and self.secret:
280
 
            logger.info(u"Stopping client %s", self.name)
 
274
        if self.secret:
 
275
            logger.debug(u"Stopping client %s", self.name)
281
276
            self.secret = None
282
277
        else:
283
278
            return False
302
297
        self.checker = None
303
298
        if os.WIFEXITED(condition) \
304
299
               and (os.WEXITSTATUS(condition) == 0):
305
 
            logger.info(u"Checker for %(name)s succeeded",
306
 
                        vars(self))
 
300
            logger.debug(u"Checker for %(name)s succeeded",
 
301
                         vars(self))
307
302
            self.last_checked_ok = now
308
303
            gobject.source_remove(self.stop_initiator_tag)
309
304
            self.stop_initiator_tag = gobject.timeout_add\
313
308
            logger.warning(u"Checker for %(name)s crashed?",
314
309
                           vars(self))
315
310
        else:
316
 
            logger.info(u"Checker for %(name)s failed",
317
 
                        vars(self))
 
311
            logger.debug(u"Checker for %(name)s failed",
 
312
                         vars(self))
318
313
    def start_checker(self):
319
314
        """Start a new checker subprocess if one is not running.
320
315
        If a checker already exists, leave it running and do
330
325
        if self.checker is None:
331
326
            try:
332
327
                # In case check_command has exactly one % operator
333
 
                command = self.check_command % self.host
 
328
                command = self.check_command % self.fqdn
334
329
            except TypeError:
335
330
                # Escape attributes for the shell
336
331
                escaped_attrs = dict((key, re.escape(str(val)))
343
338
                                 u' %s', self.check_command, error)
344
339
                    return True # Try again later
345
340
            try:
346
 
                logger.info(u"Starting checker %r for %s",
347
 
                            command, self.name)
348
 
                # We don't need to redirect stdout and stderr, since
349
 
                # in normal mode, that is already done by daemon(),
350
 
                # and in debug mode we don't want to.  (Stdin is
351
 
                # always replaced by /dev/null.)
 
341
                logger.debug(u"Starting checker %r for %s",
 
342
                             command, self.name)
352
343
                self.checker = subprocess.Popen(command,
353
344
                                                close_fds=True,
354
345
                                                shell=True, cwd="/")
355
346
                self.checker_callback_tag = gobject.child_watch_add\
356
347
                                            (self.checker.pid,
357
348
                                             self.checker_callback)
358
 
            except OSError, error:
 
349
            except subprocess.OSError, error:
359
350
                logger.error(u"Failed to start subprocess: %s",
360
351
                             error)
361
352
        # Re-run this periodically if run by gobject.timeout_add
367
358
            self.checker_callback_tag = None
368
359
        if getattr(self, "checker", None) is None:
369
360
            return
370
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
361
        logger.debug("Stopping checker for %(name)s", vars(self))
371
362
        try:
372
363
            os.kill(self.checker.pid, signal.SIGTERM)
373
364
            #os.sleep(0.5)
405
396
 
406
397
def fingerprint(openpgp):
407
398
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
 
399
    # New empty GnuTLS certificate
 
400
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
401
    gnutls.library.functions.gnutls_openpgp_crt_init\
 
402
        (ctypes.byref(crt))
408
403
    # New GnuTLS "datum" with the OpenPGP public key
409
404
    datum = gnutls.library.types.gnutls_datum_t\
410
405
        (ctypes.cast(ctypes.c_char_p(openpgp),
411
406
                     ctypes.POINTER(ctypes.c_ubyte)),
412
407
         ctypes.c_uint(len(openpgp)))
413
 
    # New empty GnuTLS certificate
414
 
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
415
 
    gnutls.library.functions.gnutls_openpgp_crt_init\
416
 
        (ctypes.byref(crt))
417
408
    # 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)
421
 
    # Verify the self signature in the key
422
 
    crtverify = ctypes.c_uint()
423
 
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
424
 
        (crt, 0, ctypes.byref(crtverify))
425
 
    if crtverify.value != 0:
426
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
427
 
        raise gnutls.errors.CertificateSecurityError("Verify failed")
 
409
    ret = gnutls.library.functions.gnutls_openpgp_crt_import\
 
410
        (crt,
 
411
         ctypes.byref(datum),
 
412
         gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
428
413
    # New buffer for the fingerprint
429
 
    buf = ctypes.create_string_buffer(20)
430
 
    buf_len = ctypes.c_size_t()
 
414
    buffer = ctypes.create_string_buffer(20)
 
415
    buffer_length = ctypes.c_size_t()
431
416
    # Get the fingerprint from the certificate into the buffer
432
417
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
433
 
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
418
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
434
419
    # Deinit the certificate
435
420
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
436
421
    # Convert the buffer to a Python bytestring
437
 
    fpr = ctypes.string_at(buf, buf_len.value)
 
422
    fpr = ctypes.string_at(buffer, buffer_length.value)
438
423
    # Convert the bytestring to hexadecimal notation
439
424
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
440
425
    return hex_fpr
441
426
 
442
427
 
443
 
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
428
class tcp_handler(SocketServer.BaseRequestHandler, object):
444
429
    """A TCP request handler class.
445
430
    Instantiated by IPv6_TCPServer for each request to handle it.
446
431
    Note: This will run in its own forked process."""
447
432
    
448
433
    def handle(self):
449
 
        logger.info(u"TCP connection from: %s",
 
434
        logger.debug(u"TCP connection from: %s",
450
435
                     unicode(self.client_address))
451
436
        session = gnutls.connection.ClientSession\
452
437
                  (self.request, gnutls.connection.X509Credentials())
453
 
        
454
 
        line = self.request.makefile().readline()
455
 
        logger.debug(u"Protocol version: %r", line)
456
 
        try:
457
 
            if int(line.strip().split()[0]) > 1:
458
 
                raise RuntimeError
459
 
        except (ValueError, IndexError, RuntimeError), error:
460
 
            logger.error(u"Unknown protocol version: %s", error)
461
 
            return
462
 
        
463
438
        # Note: gnutls.connection.X509Credentials is really a generic
464
439
        # GnuTLS certificate credentials object so long as no X.509
465
440
        # keys are added to it.  Therefore, we can use it here despite
473
448
        if self.server.settings["priority"]:
474
449
            priority = self.server.settings["priority"]
475
450
        gnutls.library.functions.gnutls_priority_set_direct\
476
 
            (session._c_object, priority, None)
 
451
            (session._c_object, priority, None);
477
452
        
478
453
        try:
479
454
            session.handshake()
480
455
        except gnutls.errors.GNUTLSError, error:
481
 
            logger.warning(u"Handshake failed: %s", error)
 
456
            logger.debug(u"Handshake failed: %s", error)
482
457
            # Do not run session.bye() here: the session is not
483
458
            # established.  Just abandon the request.
484
459
            return
485
460
        try:
486
461
            fpr = fingerprint(peer_certificate(session))
487
462
        except (TypeError, gnutls.errors.GNUTLSError), error:
488
 
            logger.warning(u"Bad certificate: %s", error)
 
463
            logger.debug(u"Bad certificate: %s", error)
489
464
            session.bye()
490
465
            return
491
466
        logger.debug(u"Fingerprint: %s", fpr)
495
470
                client = c
496
471
                break
497
472
        if not client:
498
 
            logger.warning(u"Client not found for fingerprint: %s",
499
 
                           fpr)
 
473
            logger.debug(u"Client not found for fingerprint: %s", fpr)
500
474
            session.bye()
501
475
            return
502
476
        # Have to check if client.still_valid(), since it is possible
503
477
        # that the client timed out while establishing the GnuTLS
504
478
        # session.
505
479
        if not client.still_valid():
506
 
            logger.warning(u"Client %(name)s is invalid",
507
 
                           vars(client))
 
480
            logger.debug(u"Client %(name)s is invalid", vars(client))
508
481
            session.bye()
509
482
            return
510
483
        sent_size = 0
522
495
    Attributes:
523
496
        settings:       Server settings
524
497
        clients:        Set() of Client objects
525
 
        enabled:        Boolean; whether this server is activated yet
526
498
    """
527
499
    address_family = socket.AF_INET6
528
500
    def __init__(self, *args, **kwargs):
532
504
        if "clients" in kwargs:
533
505
            self.clients = kwargs["clients"]
534
506
            del kwargs["clients"]
535
 
        self.enabled = False
536
 
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
 
507
        return super(type(self), self).__init__(*args, **kwargs)
537
508
    def server_bind(self):
538
509
        """This overrides the normal server_bind() function
539
510
        to bind to an interface if one was specified, and also NOT to
547
518
                                       self.settings["interface"])
548
519
            except socket.error, error:
549
520
                if error[0] == errno.EPERM:
550
 
                    logger.error(u"No permission to"
551
 
                                 u" bind to interface %s",
552
 
                                 self.settings["interface"])
 
521
                    logger.warning(u"No permission to"
 
522
                                   u" bind to interface %s",
 
523
                                   self.settings["interface"])
553
524
                else:
554
525
                    raise error
555
526
        # Only bind(2) the socket if we really need to.
558
529
                in6addr_any = "::"
559
530
                self.server_address = (in6addr_any,
560
531
                                       self.server_address[1])
561
 
            elif not self.server_address[1]:
 
532
            elif self.server_address[1] is None:
562
533
                self.server_address = (self.server_address[0],
563
534
                                       0)
564
 
#                 if self.settings["interface"]:
565
 
#                     self.server_address = (self.server_address[0],
566
 
#                                            0, # port
567
 
#                                            0, # flowinfo
568
 
#                                            if_nametoindex
569
 
#                                            (self.settings
570
 
#                                             ["interface"]))
571
 
            return super(IPv6_TCPServer, self).server_bind()
572
 
    def server_activate(self):
573
 
        if self.enabled:
574
 
            return super(IPv6_TCPServer, self).server_activate()
575
 
    def enable(self):
576
 
        self.enabled = True
 
535
            return super(type(self), self).server_bind()
577
536
 
578
537
 
579
538
def string_to_delta(interval):
589
548
    datetime.timedelta(1)
590
549
    >>> string_to_delta(u'1w')
591
550
    datetime.timedelta(7)
592
 
    >>> string_to_delta('5m 30s')
593
 
    datetime.timedelta(0, 330)
594
551
    """
595
 
    timevalue = datetime.timedelta(0)
596
 
    for s in interval.split():
597
 
        try:
598
 
            suffix = unicode(s[-1])
599
 
            value = int(s[:-1])
600
 
            if suffix == u"d":
601
 
                delta = datetime.timedelta(value)
602
 
            elif suffix == u"s":
603
 
                delta = datetime.timedelta(0, value)
604
 
            elif suffix == u"m":
605
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
606
 
            elif suffix == u"h":
607
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
608
 
            elif suffix == u"w":
609
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
610
 
            else:
611
 
                raise ValueError
612
 
        except (ValueError, IndexError):
 
552
    try:
 
553
        suffix=unicode(interval[-1])
 
554
        value=int(interval[:-1])
 
555
        if suffix == u"d":
 
556
            delta = datetime.timedelta(value)
 
557
        elif suffix == u"s":
 
558
            delta = datetime.timedelta(0, value)
 
559
        elif suffix == u"m":
 
560
            delta = datetime.timedelta(0, 0, 0, 0, value)
 
561
        elif suffix == u"h":
 
562
            delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
563
        elif suffix == u"w":
 
564
            delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
565
        else:
613
566
            raise ValueError
614
 
        timevalue += delta
615
 
    return timevalue
 
567
    except (ValueError, IndexError):
 
568
        raise ValueError
 
569
    return delta
616
570
 
617
571
 
618
572
def server_state_changed(state):
619
573
    """Derived from the Avahi example code"""
620
574
    if state == avahi.SERVER_COLLISION:
621
 
        logger.error(u"Zeroconf server name collision")
 
575
        logger.warning(u"Server name collision")
622
576
        service.remove()
623
577
    elif state == avahi.SERVER_RUNNING:
624
578
        service.add()
626
580
 
627
581
def entry_group_state_changed(state, error):
628
582
    """Derived from the Avahi example code"""
629
 
    logger.debug(u"Avahi state change: %i", state)
 
583
    logger.debug(u"state change: %i", state)
630
584
    
631
585
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
632
 
        logger.debug(u"Zeroconf service established.")
 
586
        logger.debug(u"Service established.")
633
587
    elif state == avahi.ENTRY_GROUP_COLLISION:
634
 
        logger.warning(u"Zeroconf service name collision.")
 
588
        logger.warning(u"Service name collision.")
635
589
        service.rename()
636
590
    elif state == avahi.ENTRY_GROUP_FAILURE:
637
 
        logger.critical(u"Avahi: Error in group state changed %s",
 
591
        logger.critical(u"Error in group state changed %s",
638
592
                        unicode(error))
639
593
        raise AvahiGroupError("State changed: %s", str(error))
640
594
 
641
 
def if_nametoindex(interface):
 
595
def if_nametoindex(interface, _func=[None]):
642
596
    """Call the C function if_nametoindex(), or equivalent"""
643
 
    global if_nametoindex
 
597
    if _func[0] is not None:
 
598
        return _func[0](interface)
644
599
    try:
645
 
        if_nametoindex = ctypes.cdll.LoadLibrary\
646
 
            (ctypes.util.find_library("c")).if_nametoindex
 
600
        if "ctypes.util" not in sys.modules:
 
601
            import ctypes.util
 
602
        while True:
 
603
            try:
 
604
                libc = ctypes.cdll.LoadLibrary\
 
605
                       (ctypes.util.find_library("c"))
 
606
                _func[0] = libc.if_nametoindex
 
607
                return _func[0](interface)
 
608
            except IOError, e:
 
609
                if e != errno.EINTR:
 
610
                    raise
647
611
    except (OSError, AttributeError):
648
612
        if "struct" not in sys.modules:
649
613
            import struct
650
614
        if "fcntl" not in sys.modules:
651
615
            import fcntl
652
 
        def if_nametoindex(interface):
 
616
        def the_hard_way(interface):
653
617
            "Get an interface index the hard way, i.e. using fcntl()"
654
618
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
655
619
            s = socket.socket()
658
622
            s.close()
659
623
            interface_index = struct.unpack("I", ifreq[16:20])[0]
660
624
            return interface_index
661
 
    return if_nametoindex(interface)
662
 
 
663
 
 
664
 
def daemon(nochdir = False, noclose = False):
 
625
        _func[0] = the_hard_way
 
626
        return _func[0](interface)
 
627
 
 
628
 
 
629
def daemon(nochdir, noclose):
665
630
    """See daemon(3).  Standard BSD Unix function.
666
631
    This should really exist as os.daemon, but it doesn't (yet)."""
667
632
    if os.fork():
669
634
    os.setsid()
670
635
    if not nochdir:
671
636
        os.chdir("/")
672
 
    if os.fork():
673
 
        sys.exit()
674
637
    if not noclose:
675
638
        # Close all standard open file descriptors
676
639
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
685
648
 
686
649
 
687
650
def main():
688
 
    parser = OptionParser(version = "%%prog %s" % version)
 
651
    global main_loop_started
 
652
    main_loop_started = False
 
653
    
 
654
    parser = OptionParser()
689
655
    parser.add_option("-i", "--interface", type="string",
690
656
                      metavar="IF", help="Bind to interface IF")
691
657
    parser.add_option("-a", "--address", type="string",
694
660
                      help="Port number to receive requests on")
695
661
    parser.add_option("--check", action="store_true", default=False,
696
662
                      help="Run self-test")
697
 
    parser.add_option("--debug", action="store_true",
 
663
    parser.add_option("--debug", action="store_true", default=False,
698
664
                      help="Debug mode; run in foreground and log to"
699
665
                      " terminal")
700
666
    parser.add_option("--priority", type="string", help="GnuTLS"
705
671
                      default="/etc/mandos", metavar="DIR",
706
672
                      help="Directory to search for configuration"
707
673
                      " files")
708
 
    options = parser.parse_args()[0]
 
674
    (options, args) = parser.parse_args()
709
675
    
710
676
    if options.check:
711
677
        import doctest
725
691
    # Parse config file for server-global settings
726
692
    server_config = ConfigParser.SafeConfigParser(server_defaults)
727
693
    del server_defaults
728
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
694
    server_config.read(os.path.join(options.configdir, "server.conf"))
 
695
    server_section = "server"
729
696
    # Convert the SafeConfigParser object to a dict
730
 
    server_settings = server_config.defaults()
 
697
    server_settings = dict(server_config.items(server_section))
731
698
    # Use getboolean on the boolean config option
732
699
    server_settings["debug"] = server_config.getboolean\
733
 
                               ("DEFAULT", "debug")
 
700
                               (server_section, "debug")
734
701
    del server_config
735
702
    
736
703
    # Override the settings from the config file with command line
743
710
    del options
744
711
    # Now we have our good server settings in "server_settings"
745
712
    
746
 
    debug = server_settings["debug"]
747
 
    
748
 
    if not debug:
749
 
        syslogger.setLevel(logging.WARNING)
750
 
        console.setLevel(logging.WARNING)
751
 
    
752
 
    if server_settings["servicename"] != "Mandos":
753
 
        syslogger.setFormatter(logging.Formatter\
754
 
                               ('Mandos (%s): %%(levelname)s:'
755
 
                                ' %%(message)s'
756
 
                                % server_settings["servicename"]))
757
 
    
758
713
    # Parse config file with clients
759
714
    client_defaults = { "timeout": "1h",
760
715
                        "interval": "5m",
761
 
                        "checker": "fping -q -- %(host)s",
762
 
                        "host": "",
 
716
                        "checker": "fping -q -- %%(fqdn)s",
763
717
                        }
764
718
    client_config = ConfigParser.SafeConfigParser(client_defaults)
765
719
    client_config.read(os.path.join(server_settings["configdir"],
766
720
                                    "clients.conf"))
767
721
    
768
 
    clients = Set()
769
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
770
 
                                 server_settings["port"]),
771
 
                                TCP_handler,
772
 
                                settings=server_settings,
773
 
                                clients=clients)
774
 
    pidfilename = "/var/run/mandos.pid"
775
 
    try:
776
 
        pidfile = open(pidfilename, "w")
777
 
    except IOError, error:
778
 
        logger.error("Could not open file %r", pidfilename)
779
 
    
780
 
    uid = 65534
781
 
    gid = 65534
782
 
    try:
783
 
        uid = pwd.getpwnam("mandos").pw_uid
784
 
    except KeyError:
785
 
        try:
786
 
            uid = pwd.getpwnam("nobody").pw_uid
787
 
        except KeyError:
788
 
            pass
789
 
    try:
790
 
        gid = pwd.getpwnam("mandos").pw_gid
791
 
    except KeyError:
792
 
        try:
793
 
            gid = pwd.getpwnam("nogroup").pw_gid
794
 
        except KeyError:
795
 
            pass
796
 
    try:
797
 
        os.setuid(uid)
798
 
        os.setgid(gid)
799
 
    except OSError, error:
800
 
        if error[0] != errno.EPERM:
801
 
            raise error
802
 
    
803
722
    global service
804
723
    service = AvahiService(name = server_settings["servicename"],
805
 
                           servicetype = "_mandos._tcp", )
 
724
                           type = "_mandos._tcp", );
806
725
    if server_settings["interface"]:
807
 
        service.interface = if_nametoindex\
808
 
                            (server_settings["interface"])
 
726
        service.interface = if_nametoindex(server_settings["interface"])
809
727
    
810
728
    global main_loop
811
729
    global bus
814
732
    DBusGMainLoop(set_as_default=True )
815
733
    main_loop = gobject.MainLoop()
816
734
    bus = dbus.SystemBus()
817
 
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
818
 
                                           avahi.DBUS_PATH_SERVER),
819
 
                            avahi.DBUS_INTERFACE_SERVER)
 
735
    server = dbus.Interface(
 
736
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
 
737
            avahi.DBUS_INTERFACE_SERVER )
820
738
    # End of Avahi example code
821
739
    
 
740
    debug = server_settings["debug"]
 
741
    
 
742
    if debug:
 
743
        console = logging.StreamHandler()
 
744
        # console.setLevel(logging.DEBUG)
 
745
        console.setFormatter(logging.Formatter\
 
746
                             ('%(levelname)s: %(message)s'))
 
747
        logger.addHandler(console)
 
748
        del console
 
749
    
 
750
    clients = Set()
822
751
    def remove_from_clients(client):
823
752
        clients.remove(client)
824
753
        if not clients:
825
 
            logger.critical(u"No clients left, exiting")
 
754
            logger.debug(u"No clients left, exiting")
826
755
            sys.exit()
827
756
    
828
 
    clients.update(Set(Client(name = section,
 
757
    clients.update(Set(Client(name=section,
829
758
                              stop_hook = remove_from_clients,
830
 
                              config
831
 
                              = dict(client_config.items(section)))
 
759
                              **(dict(client_config\
 
760
                                      .items(section))))
832
761
                       for section in client_config.sections()))
833
 
    if not clients:
834
 
        logger.critical(u"No clients defined")
835
 
        sys.exit(1)
836
 
    
837
 
    if debug:
838
 
        # Redirect stdin so all checkers get /dev/null
839
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
840
 
        os.dup2(null, sys.stdin.fileno())
841
 
        if null > 2:
842
 
            os.close(null)
843
 
    else:
844
 
        # No console logging
845
 
        logger.removeHandler(console)
846
 
        # Close all input and output, do double fork, etc.
847
 
        daemon()
848
 
    
849
 
    try:
850
 
        pid = os.getpid()
851
 
        pidfile.write(str(pid) + "\n")
852
 
        pidfile.close()
853
 
        del pidfile
854
 
    except IOError:
855
 
        logger.error(u"Could not write to file %r with PID %d",
856
 
                     pidfilename, pid)
857
 
    except NameError:
858
 
        # "pidfile" was never created
859
 
        pass
860
 
    del pidfilename
 
762
    
 
763
    if not debug:
 
764
        daemon(False, False)
861
765
    
862
766
    def cleanup():
863
767
        "Cleanup function; run on exit"
883
787
    for client in clients:
884
788
        client.start()
885
789
    
886
 
    tcp_server.enable()
887
 
    tcp_server.server_activate()
888
 
    
 
790
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
791
                                 server_settings["port"]),
 
792
                                tcp_handler,
 
793
                                settings=server_settings,
 
794
                                clients=clients)
889
795
    # Find out what port we got
890
796
    service.port = tcp_server.socket.getsockname()[1]
891
 
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
892
 
                u" scope_id %d" % tcp_server.socket.getsockname())
 
797
    logger.debug(u"Now listening on address %r, port %d, flowinfo %d,"
 
798
                 u" scope_id %d" % tcp_server.socket.getsockname())
893
799
    
894
800
    #service.interface = tcp_server.socket.getsockname()[3]
895
801
    
908
814
                             tcp_server.handle_request\
909
815
                             (*args[2:], **kwargs) or True)
910
816
        
911
 
        logger.debug(u"Starting main loop")
 
817
        logger.debug("Starting main loop")
 
818
        main_loop_started = True
912
819
        main_loop.run()
913
820
    except AvahiError, error:
914
821
        logger.critical(u"AvahiError: %s" + unicode(error))