/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

merge +
mandosclient
        Added a adjustbuffer function.

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