/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

mandosclient
        Droping privileges
        split gnutls function into global and session

* server.py (if_nametoindex): Redefine itself instead of using a
                              default keyword argument.

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