/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 server.py

  • Committer: Teddy Hogeborn
  • Date: 2008-08-02 10:48:24 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080802104824-fx0miwp9o4g9r31e
* plugbasedclient.c (struct process): New fields "eof", "completed",
                                      and "status".
  (handle_sigchld): New function.
  (main): Initialize "dir" to NULL to only closedir() it if necessary.
          Move "process_list" to be a global variable to be accessible
          by "handle_sigchld".  Make "handle_sigchld" handle SIGCHLD.
          Remove redundant check for NULL "dir".  Free "filename" when
          no longer used.  Block SIGCHLD around fork()/exec().
          Restore normal signals in child.  Only loop while running
          processes exist.  Print process buffer when the process is
          done and it has emitted EOF, not when it only emits EOF.
          Remove processes from list which exit non-cleanly.  In
          cleaning up, closedir() if necessary.  Bug fix: set next
          pointer correctly when freeing process list.

* plugins.d/passprompt.c (main): Do not ignore SIGQUIT.

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(config["secfile"])
244
 
            self.secret = secfile.read()
245
 
            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()
246
242
        else:
247
243
            raise TypeError(u"No secret or secfile for client %s"
248
244
                            % self.name)
249
 
        self.host = config.get("host", "")
 
245
        self.fqdn = fqdn
250
246
        self.created = datetime.datetime.now()
251
247
        self.last_checked_ok = None
252
 
        self.timeout = string_to_delta(config["timeout"])
253
 
        self.interval = string_to_delta(config["interval"])
 
248
        self.timeout = string_to_delta(timeout)
 
249
        self.interval = string_to_delta(interval)
254
250
        self.stop_hook = stop_hook
255
251
        self.checker = None
256
252
        self.checker_initiator_tag = None
257
253
        self.stop_initiator_tag = None
258
254
        self.checker_callback_tag = None
259
 
        self.check_command = config["checker"]
 
255
        self.check_command = checker
260
256
    def start(self):
261
257
        """Start this client's checker and timeout hooks"""
262
258
        # Schedule a new checker to be started an 'interval' from now,
275
271
        The possibility that a client might be restarted is left open,
276
272
        but not currently used."""
277
273
        # If this client doesn't have a secret, it is already stopped.
278
 
        if hasattr(self, "secret") and self.secret:
279
 
            logger.info(u"Stopping client %s", self.name)
 
274
        if self.secret:
 
275
            logger.debug(u"Stopping client %s", self.name)
280
276
            self.secret = None
281
277
        else:
282
278
            return False
301
297
        self.checker = None
302
298
        if os.WIFEXITED(condition) \
303
299
               and (os.WEXITSTATUS(condition) == 0):
304
 
            logger.info(u"Checker for %(name)s succeeded",
305
 
                        vars(self))
 
300
            logger.debug(u"Checker for %(name)s succeeded",
 
301
                         vars(self))
306
302
            self.last_checked_ok = now
307
303
            gobject.source_remove(self.stop_initiator_tag)
308
304
            self.stop_initiator_tag = gobject.timeout_add\
312
308
            logger.warning(u"Checker for %(name)s crashed?",
313
309
                           vars(self))
314
310
        else:
315
 
            logger.info(u"Checker for %(name)s failed",
316
 
                        vars(self))
 
311
            logger.debug(u"Checker for %(name)s failed",
 
312
                         vars(self))
317
313
    def start_checker(self):
318
314
        """Start a new checker subprocess if one is not running.
319
315
        If a checker already exists, leave it running and do
329
325
        if self.checker is None:
330
326
            try:
331
327
                # In case check_command has exactly one % operator
332
 
                command = self.check_command % self.host
 
328
                command = self.check_command % self.fqdn
333
329
            except TypeError:
334
330
                # Escape attributes for the shell
335
331
                escaped_attrs = dict((key, re.escape(str(val)))
342
338
                                 u' %s', self.check_command, error)
343
339
                    return True # Try again later
344
340
            try:
345
 
                logger.info(u"Starting checker %r for %s",
346
 
                            command, self.name)
347
 
                # We don't need to redirect stdout and stderr, since
348
 
                # in normal mode, that is already done by daemon(),
349
 
                # and in debug mode we don't want to.  (Stdin is
350
 
                # always replaced by /dev/null.)
 
341
                logger.debug(u"Starting checker %r for %s",
 
342
                             command, self.name)
351
343
                self.checker = subprocess.Popen(command,
352
344
                                                close_fds=True,
353
345
                                                shell=True, cwd="/")
354
346
                self.checker_callback_tag = gobject.child_watch_add\
355
347
                                            (self.checker.pid,
356
348
                                             self.checker_callback)
357
 
            except OSError, error:
 
349
            except subprocess.OSError, error:
358
350
                logger.error(u"Failed to start subprocess: %s",
359
351
                             error)
360
352
        # Re-run this periodically if run by gobject.timeout_add
366
358
            self.checker_callback_tag = None
367
359
        if getattr(self, "checker", None) is None:
368
360
            return
369
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
361
        logger.debug("Stopping checker for %(name)s", vars(self))
370
362
        try:
371
363
            os.kill(self.checker.pid, signal.SIGTERM)
372
364
            #os.sleep(0.5)
404
396
 
405
397
def fingerprint(openpgp):
406
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))
407
403
    # New GnuTLS "datum" with the OpenPGP public key
408
404
    datum = gnutls.library.types.gnutls_datum_t\
409
405
        (ctypes.cast(ctypes.c_char_p(openpgp),
410
406
                     ctypes.POINTER(ctypes.c_ubyte)),
411
407
         ctypes.c_uint(len(openpgp)))
412
 
    # New empty GnuTLS certificate
413
 
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
414
 
    gnutls.library.functions.gnutls_openpgp_crt_init\
415
 
        (ctypes.byref(crt))
416
408
    # Import the OpenPGP public key into the certificate
417
 
    gnutls.library.functions.gnutls_openpgp_crt_import\
418
 
                    (crt, ctypes.byref(datum),
419
 
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
420
 
    # Verify the self signature in the key
421
 
    crtverify = ctypes.c_uint()
422
 
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
423
 
        (crt, 0, ctypes.byref(crtverify))
424
 
    if crtverify.value != 0:
425
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
426
 
        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)
427
413
    # New buffer for the fingerprint
428
 
    buf = ctypes.create_string_buffer(20)
429
 
    buf_len = ctypes.c_size_t()
 
414
    buffer = ctypes.create_string_buffer(20)
 
415
    buffer_length = ctypes.c_size_t()
430
416
    # Get the fingerprint from the certificate into the buffer
431
417
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
432
 
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
418
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
433
419
    # Deinit the certificate
434
420
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
435
421
    # Convert the buffer to a Python bytestring
436
 
    fpr = ctypes.string_at(buf, buf_len.value)
 
422
    fpr = ctypes.string_at(buffer, buffer_length.value)
437
423
    # Convert the bytestring to hexadecimal notation
438
424
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
439
425
    return hex_fpr
440
426
 
441
427
 
442
 
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
428
class tcp_handler(SocketServer.BaseRequestHandler, object):
443
429
    """A TCP request handler class.
444
430
    Instantiated by IPv6_TCPServer for each request to handle it.
445
431
    Note: This will run in its own forked process."""
446
432
    
447
433
    def handle(self):
448
 
        logger.info(u"TCP connection from: %s",
 
434
        logger.debug(u"TCP connection from: %s",
449
435
                     unicode(self.client_address))
450
436
        session = gnutls.connection.ClientSession\
451
437
                  (self.request, gnutls.connection.X509Credentials())
452
 
        
453
 
        line = self.request.makefile().readline()
454
 
        logger.debug(u"Protocol version: %r", line)
455
 
        try:
456
 
            if int(line.strip().split()[0]) > 1:
457
 
                raise RuntimeError
458
 
        except (ValueError, IndexError, RuntimeError), error:
459
 
            logger.error(u"Unknown protocol version: %s", error)
460
 
            return
461
 
        
462
438
        # Note: gnutls.connection.X509Credentials is really a generic
463
439
        # GnuTLS certificate credentials object so long as no X.509
464
440
        # keys are added to it.  Therefore, we can use it here despite
472
448
        if self.server.settings["priority"]:
473
449
            priority = self.server.settings["priority"]
474
450
        gnutls.library.functions.gnutls_priority_set_direct\
475
 
            (session._c_object, priority, None)
 
451
            (session._c_object, priority, None);
476
452
        
477
453
        try:
478
454
            session.handshake()
479
455
        except gnutls.errors.GNUTLSError, error:
480
 
            logger.warning(u"Handshake failed: %s", error)
 
456
            logger.debug(u"Handshake failed: %s", error)
481
457
            # Do not run session.bye() here: the session is not
482
458
            # established.  Just abandon the request.
483
459
            return
484
460
        try:
485
461
            fpr = fingerprint(peer_certificate(session))
486
462
        except (TypeError, gnutls.errors.GNUTLSError), error:
487
 
            logger.warning(u"Bad certificate: %s", error)
 
463
            logger.debug(u"Bad certificate: %s", error)
488
464
            session.bye()
489
465
            return
490
466
        logger.debug(u"Fingerprint: %s", fpr)
494
470
                client = c
495
471
                break
496
472
        if not client:
497
 
            logger.warning(u"Client not found for fingerprint: %s",
498
 
                           fpr)
 
473
            logger.debug(u"Client not found for fingerprint: %s", fpr)
499
474
            session.bye()
500
475
            return
501
476
        # Have to check if client.still_valid(), since it is possible
502
477
        # that the client timed out while establishing the GnuTLS
503
478
        # session.
504
479
        if not client.still_valid():
505
 
            logger.warning(u"Client %(name)s is invalid",
506
 
                           vars(client))
 
480
            logger.debug(u"Client %(name)s is invalid", vars(client))
507
481
            session.bye()
508
482
            return
509
483
        sent_size = 0
521
495
    Attributes:
522
496
        settings:       Server settings
523
497
        clients:        Set() of Client objects
524
 
        enabled:        Boolean; whether this server is activated yet
525
498
    """
526
499
    address_family = socket.AF_INET6
527
500
    def __init__(self, *args, **kwargs):
531
504
        if "clients" in kwargs:
532
505
            self.clients = kwargs["clients"]
533
506
            del kwargs["clients"]
534
 
        self.enabled = False
535
 
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
 
507
        return super(type(self), self).__init__(*args, **kwargs)
536
508
    def server_bind(self):
537
509
        """This overrides the normal server_bind() function
538
510
        to bind to an interface if one was specified, and also NOT to
546
518
                                       self.settings["interface"])
547
519
            except socket.error, error:
548
520
                if error[0] == errno.EPERM:
549
 
                    logger.error(u"No permission to"
550
 
                                 u" bind to interface %s",
551
 
                                 self.settings["interface"])
 
521
                    logger.warning(u"No permission to"
 
522
                                   u" bind to interface %s",
 
523
                                   self.settings["interface"])
552
524
                else:
553
525
                    raise error
554
526
        # Only bind(2) the socket if we really need to.
557
529
                in6addr_any = "::"
558
530
                self.server_address = (in6addr_any,
559
531
                                       self.server_address[1])
560
 
            elif not self.server_address[1]:
 
532
            elif self.server_address[1] is None:
561
533
                self.server_address = (self.server_address[0],
562
534
                                       0)
563
 
#                 if self.settings["interface"]:
564
 
#                     self.server_address = (self.server_address[0],
565
 
#                                            0, # port
566
 
#                                            0, # flowinfo
567
 
#                                            if_nametoindex
568
 
#                                            (self.settings
569
 
#                                             ["interface"]))
570
 
            return super(IPv6_TCPServer, self).server_bind()
571
 
    def server_activate(self):
572
 
        if self.enabled:
573
 
            return super(IPv6_TCPServer, self).server_activate()
574
 
    def enable(self):
575
 
        self.enabled = True
 
535
            return super(type(self), self).server_bind()
576
536
 
577
537
 
578
538
def string_to_delta(interval):
588
548
    datetime.timedelta(1)
589
549
    >>> string_to_delta(u'1w')
590
550
    datetime.timedelta(7)
591
 
    >>> string_to_delta('5m 30s')
592
 
    datetime.timedelta(0, 330)
593
551
    """
594
 
    timevalue = datetime.timedelta(0)
595
 
    for s in interval.split():
596
 
        try:
597
 
            suffix = unicode(s[-1])
598
 
            value = int(s[:-1])
599
 
            if suffix == u"d":
600
 
                delta = datetime.timedelta(value)
601
 
            elif suffix == u"s":
602
 
                delta = datetime.timedelta(0, value)
603
 
            elif suffix == u"m":
604
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
605
 
            elif suffix == u"h":
606
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
607
 
            elif suffix == u"w":
608
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
609
 
            else:
610
 
                raise ValueError
611
 
        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:
612
566
            raise ValueError
613
 
        timevalue += delta
614
 
    return timevalue
 
567
    except (ValueError, IndexError):
 
568
        raise ValueError
 
569
    return delta
615
570
 
616
571
 
617
572
def server_state_changed(state):
618
573
    """Derived from the Avahi example code"""
619
574
    if state == avahi.SERVER_COLLISION:
620
 
        logger.error(u"Zeroconf server name collision")
 
575
        logger.warning(u"Server name collision")
621
576
        service.remove()
622
577
    elif state == avahi.SERVER_RUNNING:
623
578
        service.add()
625
580
 
626
581
def entry_group_state_changed(state, error):
627
582
    """Derived from the Avahi example code"""
628
 
    logger.debug(u"Avahi state change: %i", state)
 
583
    logger.debug(u"state change: %i", state)
629
584
    
630
585
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
631
 
        logger.debug(u"Zeroconf service established.")
 
586
        logger.debug(u"Service established.")
632
587
    elif state == avahi.ENTRY_GROUP_COLLISION:
633
 
        logger.warning(u"Zeroconf service name collision.")
 
588
        logger.warning(u"Service name collision.")
634
589
        service.rename()
635
590
    elif state == avahi.ENTRY_GROUP_FAILURE:
636
 
        logger.critical(u"Avahi: Error in group state changed %s",
 
591
        logger.critical(u"Error in group state changed %s",
637
592
                        unicode(error))
638
593
        raise AvahiGroupError("State changed: %s", str(error))
639
594
 
640
 
def if_nametoindex(interface):
 
595
def if_nametoindex(interface, _func=[None]):
641
596
    """Call the C function if_nametoindex(), or equivalent"""
642
 
    global if_nametoindex
 
597
    if _func[0] is not None:
 
598
        return _func[0](interface)
643
599
    try:
644
 
        if_nametoindex = ctypes.cdll.LoadLibrary\
645
 
            (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
646
611
    except (OSError, AttributeError):
647
612
        if "struct" not in sys.modules:
648
613
            import struct
649
614
        if "fcntl" not in sys.modules:
650
615
            import fcntl
651
 
        def if_nametoindex(interface):
 
616
        def the_hard_way(interface):
652
617
            "Get an interface index the hard way, i.e. using fcntl()"
653
618
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
654
619
            s = socket.socket()
657
622
            s.close()
658
623
            interface_index = struct.unpack("I", ifreq[16:20])[0]
659
624
            return interface_index
660
 
    return if_nametoindex(interface)
661
 
 
662
 
 
663
 
def daemon(nochdir = False, noclose = False):
 
625
        _func[0] = the_hard_way
 
626
        return _func[0](interface)
 
627
 
 
628
 
 
629
def daemon(nochdir, noclose):
664
630
    """See daemon(3).  Standard BSD Unix function.
665
631
    This should really exist as os.daemon, but it doesn't (yet)."""
666
632
    if os.fork():
668
634
    os.setsid()
669
635
    if not nochdir:
670
636
        os.chdir("/")
671
 
    if os.fork():
672
 
        sys.exit()
673
637
    if not noclose:
674
638
        # Close all standard open file descriptors
675
639
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
684
648
 
685
649
 
686
650
def main():
687
 
    parser = OptionParser(version = "%%prog %s" % version)
 
651
    global main_loop_started
 
652
    main_loop_started = False
 
653
    
 
654
    parser = OptionParser()
688
655
    parser.add_option("-i", "--interface", type="string",
689
656
                      metavar="IF", help="Bind to interface IF")
690
657
    parser.add_option("-a", "--address", type="string",
693
660
                      help="Port number to receive requests on")
694
661
    parser.add_option("--check", action="store_true", default=False,
695
662
                      help="Run self-test")
696
 
    parser.add_option("--debug", action="store_true",
 
663
    parser.add_option("--debug", action="store_true", default=False,
697
664
                      help="Debug mode; run in foreground and log to"
698
665
                      " terminal")
699
666
    parser.add_option("--priority", type="string", help="GnuTLS"
704
671
                      default="/etc/mandos", metavar="DIR",
705
672
                      help="Directory to search for configuration"
706
673
                      " files")
707
 
    options = parser.parse_args()[0]
 
674
    (options, args) = parser.parse_args()
708
675
    
709
676
    if options.check:
710
677
        import doctest
724
691
    # Parse config file for server-global settings
725
692
    server_config = ConfigParser.SafeConfigParser(server_defaults)
726
693
    del server_defaults
727
 
    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"
728
696
    # Convert the SafeConfigParser object to a dict
729
 
    server_settings = server_config.defaults()
 
697
    server_settings = dict(server_config.items(server_section))
730
698
    # Use getboolean on the boolean config option
731
699
    server_settings["debug"] = server_config.getboolean\
732
 
                               ("DEFAULT", "debug")
 
700
                               (server_section, "debug")
733
701
    del server_config
734
702
    
735
703
    # Override the settings from the config file with command line
742
710
    del options
743
711
    # Now we have our good server settings in "server_settings"
744
712
    
745
 
    debug = server_settings["debug"]
746
 
    
747
 
    if not debug:
748
 
        syslogger.setLevel(logging.WARNING)
749
 
        console.setLevel(logging.WARNING)
750
 
    
751
 
    if server_settings["servicename"] != "Mandos":
752
 
        syslogger.setFormatter(logging.Formatter\
753
 
                               ('Mandos (%s): %%(levelname)s:'
754
 
                                ' %%(message)s'
755
 
                                % server_settings["servicename"]))
756
 
    
757
713
    # Parse config file with clients
758
714
    client_defaults = { "timeout": "1h",
759
715
                        "interval": "5m",
760
 
                        "checker": "fping -q -- %(host)s",
761
 
                        "host": "",
 
716
                        "checker": "fping -q -- %%(fqdn)s",
762
717
                        }
763
718
    client_config = ConfigParser.SafeConfigParser(client_defaults)
764
719
    client_config.read(os.path.join(server_settings["configdir"],
765
720
                                    "clients.conf"))
766
721
    
767
 
    clients = Set()
768
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
769
 
                                 server_settings["port"]),
770
 
                                TCP_handler,
771
 
                                settings=server_settings,
772
 
                                clients=clients)
773
 
    pidfilename = "/var/run/mandos.pid"
774
 
    try:
775
 
        pidfile = open(pidfilename, "w")
776
 
    except IOError, error:
777
 
        logger.error("Could not open file %r", pidfilename)
778
 
    
779
 
    uid = 65534
780
 
    gid = 65534
781
 
    try:
782
 
        uid = pwd.getpwnam("mandos").pw_uid
783
 
    except KeyError:
784
 
        try:
785
 
            uid = pwd.getpwnam("nobody").pw_uid
786
 
        except KeyError:
787
 
            pass
788
 
    try:
789
 
        gid = pwd.getpwnam("mandos").pw_gid
790
 
    except KeyError:
791
 
        try:
792
 
            gid = pwd.getpwnam("nogroup").pw_gid
793
 
        except KeyError:
794
 
            pass
795
 
    try:
796
 
        os.setuid(uid)
797
 
        os.setgid(gid)
798
 
    except OSError, error:
799
 
        if error[0] != errno.EPERM:
800
 
            raise error
801
 
    
802
722
    global service
803
723
    service = AvahiService(name = server_settings["servicename"],
804
 
                           servicetype = "_mandos._tcp", )
 
724
                           type = "_mandos._tcp", );
805
725
    if server_settings["interface"]:
806
 
        service.interface = if_nametoindex\
807
 
                            (server_settings["interface"])
 
726
        service.interface = if_nametoindex(server_settings["interface"])
808
727
    
809
728
    global main_loop
810
729
    global bus
813
732
    DBusGMainLoop(set_as_default=True )
814
733
    main_loop = gobject.MainLoop()
815
734
    bus = dbus.SystemBus()
816
 
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
817
 
                                           avahi.DBUS_PATH_SERVER),
818
 
                            avahi.DBUS_INTERFACE_SERVER)
 
735
    server = dbus.Interface(
 
736
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
 
737
            avahi.DBUS_INTERFACE_SERVER )
819
738
    # End of Avahi example code
820
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()
821
751
    def remove_from_clients(client):
822
752
        clients.remove(client)
823
753
        if not clients:
824
 
            logger.critical(u"No clients left, exiting")
 
754
            logger.debug(u"No clients left, exiting")
825
755
            sys.exit()
826
756
    
827
 
    clients.update(Set(Client(name = section,
 
757
    clients.update(Set(Client(name=section,
828
758
                              stop_hook = remove_from_clients,
829
 
                              config
830
 
                              = dict(client_config.items(section)))
 
759
                              **(dict(client_config\
 
760
                                      .items(section))))
831
761
                       for section in client_config.sections()))
832
 
    if not clients:
833
 
        logger.critical(u"No clients defined")
834
 
        sys.exit(1)
835
 
    
836
 
    if debug:
837
 
        # Redirect stdin so all checkers get /dev/null
838
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
839
 
        os.dup2(null, sys.stdin.fileno())
840
 
        if null > 2:
841
 
            os.close(null)
842
 
    else:
843
 
        # No console logging
844
 
        logger.removeHandler(console)
845
 
        # Close all input and output, do double fork, etc.
846
 
        daemon()
847
 
    
848
 
    try:
849
 
        pid = os.getpid()
850
 
        pidfile.write(str(pid) + "\n")
851
 
        pidfile.close()
852
 
        del pidfile
853
 
    except IOError:
854
 
        logger.error(u"Could not write to file %r with PID %d",
855
 
                     pidfilename, pid)
856
 
    except NameError:
857
 
        # "pidfile" was never created
858
 
        pass
859
 
    del pidfilename
 
762
    
 
763
    if not debug:
 
764
        daemon(False, False)
860
765
    
861
766
    def cleanup():
862
767
        "Cleanup function; run on exit"
882
787
    for client in clients:
883
788
        client.start()
884
789
    
885
 
    tcp_server.enable()
886
 
    tcp_server.server_activate()
887
 
    
 
790
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
791
                                 server_settings["port"]),
 
792
                                tcp_handler,
 
793
                                settings=server_settings,
 
794
                                clients=clients)
888
795
    # Find out what port we got
889
796
    service.port = tcp_server.socket.getsockname()[1]
890
 
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
891
 
                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())
892
799
    
893
800
    #service.interface = tcp_server.socket.getsockname()[3]
894
801
    
907
814
                             tcp_server.handle_request\
908
815
                             (*args[2:], **kwargs) or True)
909
816
        
910
 
        logger.debug(u"Starting main loop")
 
817
        logger.debug("Starting main loop")
 
818
        main_loop_started = True
911
819
        main_loop.run()
912
820
    except AvahiError, error:
913
821
        logger.critical(u"AvahiError: %s" + unicode(error))