/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

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
61
61
from dbus.mainloop.glib import DBusGMainLoop
62
62
import ctypes
63
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
 
64
75
 
65
76
logger = logging.Logger('mandos')
66
77
syslogger = logging.handlers.SysLogHandler\
85
96
 
86
97
 
87
98
class AvahiService(object):
88
 
    """An Avahi (Zeroconf) service.
89
 
    Attributes:
 
99
    """
90
100
    interface: integer; avahi.IF_UNSPEC or an interface index.
91
101
               Used to optionally bind to the specified interface.
92
 
    name: string; Example: 'Mandos'
93
 
    type: string; Example: '_mandos._tcp'.
94
 
                  See <http://www.dns-sd.org/ServiceTypes.html>
95
 
    port: integer; what port to announce
96
 
    TXT: list of strings; TXT record for the service
97
 
    domain: string; Domain to publish on, default to .local if empty.
98
 
    host: string; Host to publish records for, default is localhost
99
 
    max_renames: integer; maximum number of renames
100
 
    rename_count: integer; counter so we only rename after collisions
101
 
                  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
102
113
    """
103
114
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
104
115
                 type = None, port = None, TXT = None, domain = "",
105
116
                 host = "", max_renames = 12):
 
117
        """An Avahi (Zeroconf) service. """
106
118
        self.interface = interface
107
119
        self.name = name
108
120
        self.type = type
121
133
                            u" retries, exiting.", rename_count)
122
134
            raise AvahiServiceError("Too many renames")
123
135
        name = server.GetAlternativeServiceName(name)
124
 
        logger.error(u"Changing name to %r ...", name)
 
136
        logger.notice(u"Changing name to %r ...", name)
125
137
        self.remove()
126
138
        self.add()
127
139
        self.rename_count += 1
209
221
    interval = property(lambda self: self._interval,
210
222
                        _set_interval)
211
223
    del _set_interval
212
 
    def __init__(self, name = None, stop_hook=None, config={}):
213
 
        """Note: the 'checker' key in 'config' sets the
214
 
        'checker_command' attribute and *not* the 'checker'
215
 
        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.."""
216
229
        self.name = name
217
230
        logger.debug(u"Creating client %r", self.name)
218
 
        # Uppercase and remove spaces from fingerprint for later
219
 
        # comparison purposes with return value from the fingerprint()
220
 
        # function
221
 
        self.fingerprint = config["fingerprint"].upper()\
222
 
                           .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"")
223
235
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
224
 
        if "secret" in config:
225
 
            self.secret = config["secret"].decode(u"base64")
226
 
        elif "secfile" in config:
227
 
            sf = open(config["secfile"])
 
236
        if secret:
 
237
            self.secret = secret.decode(u"base64")
 
238
        elif secfile:
 
239
            sf = open(secfile)
228
240
            self.secret = sf.read()
229
241
            sf.close()
230
242
        else:
231
243
            raise TypeError(u"No secret or secfile for client %s"
232
244
                            % self.name)
233
 
        self.fqdn = config.get("fqdn", "")
 
245
        self.fqdn = fqdn
234
246
        self.created = datetime.datetime.now()
235
247
        self.last_checked_ok = None
236
 
        self.timeout = string_to_delta(config["timeout"])
237
 
        self.interval = string_to_delta(config["interval"])
 
248
        self.timeout = string_to_delta(timeout)
 
249
        self.interval = string_to_delta(interval)
238
250
        self.stop_hook = stop_hook
239
251
        self.checker = None
240
252
        self.checker_initiator_tag = None
241
253
        self.stop_initiator_tag = None
242
254
        self.checker_callback_tag = None
243
 
        self.check_command = config["checker"]
 
255
        self.check_command = checker
244
256
    def start(self):
245
257
        """Start this client's checker and timeout hooks"""
246
258
        # Schedule a new checker to be started an 'interval' from now,
260
272
        but not currently used."""
261
273
        # If this client doesn't have a secret, it is already stopped.
262
274
        if self.secret:
263
 
            logger.info(u"Stopping client %s", self.name)
 
275
            logger.debug(u"Stopping client %s", self.name)
264
276
            self.secret = None
265
277
        else:
266
278
            return False
285
297
        self.checker = None
286
298
        if os.WIFEXITED(condition) \
287
299
               and (os.WEXITSTATUS(condition) == 0):
288
 
            logger.info(u"Checker for %(name)s succeeded",
289
 
                        vars(self))
 
300
            logger.debug(u"Checker for %(name)s succeeded",
 
301
                         vars(self))
290
302
            self.last_checked_ok = now
291
303
            gobject.source_remove(self.stop_initiator_tag)
292
304
            self.stop_initiator_tag = gobject.timeout_add\
296
308
            logger.warning(u"Checker for %(name)s crashed?",
297
309
                           vars(self))
298
310
        else:
299
 
            logger.info(u"Checker for %(name)s failed",
300
 
                        vars(self))
 
311
            logger.debug(u"Checker for %(name)s failed",
 
312
                         vars(self))
301
313
    def start_checker(self):
302
314
        """Start a new checker subprocess if one is not running.
303
315
        If a checker already exists, leave it running and do
326
338
                                 u' %s', self.check_command, error)
327
339
                    return True # Try again later
328
340
            try:
329
 
                logger.info(u"Starting checker %r for %s",
330
 
                            command, self.name)
 
341
                logger.debug(u"Starting checker %r for %s",
 
342
                             command, self.name)
331
343
                self.checker = subprocess.Popen(command,
332
344
                                                close_fds=True,
333
345
                                                shell=True, cwd="/")
384
396
 
385
397
def fingerprint(openpgp):
386
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))
387
403
    # New GnuTLS "datum" with the OpenPGP public key
388
404
    datum = gnutls.library.types.gnutls_datum_t\
389
405
        (ctypes.cast(ctypes.c_char_p(openpgp),
390
406
                     ctypes.POINTER(ctypes.c_ubyte)),
391
407
         ctypes.c_uint(len(openpgp)))
392
 
    # New empty GnuTLS certificate
393
 
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
394
 
    gnutls.library.functions.gnutls_openpgp_crt_init\
395
 
        (ctypes.byref(crt))
396
408
    # Import the OpenPGP public key into the certificate
397
 
    gnutls.library.functions.gnutls_openpgp_crt_import\
398
 
                    (crt, ctypes.byref(datum),
399
 
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
409
    ret = gnutls.library.functions.gnutls_openpgp_crt_import\
 
410
        (crt,
 
411
         ctypes.byref(datum),
 
412
         gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
400
413
    # New buffer for the fingerprint
401
414
    buffer = ctypes.create_string_buffer(20)
402
415
    buffer_length = ctypes.c_size_t()
418
431
    Note: This will run in its own forked process."""
419
432
    
420
433
    def handle(self):
421
 
        logger.info(u"TCP connection from: %s",
 
434
        logger.debug(u"TCP connection from: %s",
422
435
                     unicode(self.client_address))
423
436
        session = gnutls.connection.ClientSession\
424
437
                  (self.request, gnutls.connection.X509Credentials())
450
463
        try:
451
464
            session.handshake()
452
465
        except gnutls.errors.GNUTLSError, error:
453
 
            logger.warning(u"Handshake failed: %s", error)
 
466
            logger.debug(u"Handshake failed: %s", error)
454
467
            # Do not run session.bye() here: the session is not
455
468
            # established.  Just abandon the request.
456
469
            return
457
470
        try:
458
471
            fpr = fingerprint(peer_certificate(session))
459
472
        except (TypeError, gnutls.errors.GNUTLSError), error:
460
 
            logger.warning(u"Bad certificate: %s", error)
 
473
            logger.debug(u"Bad certificate: %s", error)
461
474
            session.bye()
462
475
            return
463
476
        logger.debug(u"Fingerprint: %s", fpr)
467
480
                client = c
468
481
                break
469
482
        if not client:
470
 
            logger.warning(u"Client not found for fingerprint: %s",
471
 
                           fpr)
 
483
            logger.debug(u"Client not found for fingerprint: %s", fpr)
472
484
            session.bye()
473
485
            return
474
486
        # Have to check if client.still_valid(), since it is possible
475
487
        # that the client timed out while establishing the GnuTLS
476
488
        # session.
477
489
        if not client.still_valid():
478
 
            logger.warning(u"Client %(name)s is invalid",
479
 
                           vars(client))
 
490
            logger.debug(u"Client %(name)s is invalid", vars(client))
480
491
            session.bye()
481
492
            return
482
493
        sent_size = 0
517
528
                                       self.settings["interface"])
518
529
            except socket.error, error:
519
530
                if error[0] == errno.EPERM:
520
 
                    logger.error(u"No permission to"
521
 
                                 u" bind to interface %s",
522
 
                                 self.settings["interface"])
 
531
                    logger.warning(u"No permission to"
 
532
                                   u" bind to interface %s",
 
533
                                   self.settings["interface"])
523
534
                else:
524
535
                    raise error
525
536
        # Only bind(2) the socket if we really need to.
528
539
                in6addr_any = "::"
529
540
                self.server_address = (in6addr_any,
530
541
                                       self.server_address[1])
531
 
            elif not self.server_address[1]:
 
542
            elif self.server_address[1] is None:
532
543
                self.server_address = (self.server_address[0],
533
544
                                       0)
534
 
#                 if self.settings["interface"]:
535
 
#                     self.server_address = (self.server_address[0],
536
 
#                                            0, # port
537
 
#                                            0, # flowinfo
538
 
#                                            if_nametoindex
539
 
#                                            (self.settings
540
 
#                                             ["interface"]))
541
545
            return super(type(self), self).server_bind()
542
546
 
543
547
 
578
582
def server_state_changed(state):
579
583
    """Derived from the Avahi example code"""
580
584
    if state == avahi.SERVER_COLLISION:
581
 
        logger.error(u"Server name collision")
 
585
        logger.warning(u"Server name collision")
582
586
        service.remove()
583
587
    elif state == avahi.SERVER_RUNNING:
584
588
        service.add()
623
627
    return if_nametoindex(interface)
624
628
 
625
629
 
626
 
def daemon(nochdir = False, noclose = False):
 
630
def daemon(nochdir, noclose):
627
631
    """See daemon(3).  Standard BSD Unix function.
628
632
    This should really exist as os.daemon, but it doesn't (yet)."""
629
633
    if os.fork():
631
635
    os.setsid()
632
636
    if not nochdir:
633
637
        os.chdir("/")
634
 
    if os.fork():
635
 
        sys.exit()
636
638
    if not noclose:
637
639
        # Close all standard open file descriptors
638
640
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
659
661
                      help="Port number to receive requests on")
660
662
    parser.add_option("--check", action="store_true", default=False,
661
663
                      help="Run self-test")
662
 
    parser.add_option("--debug", action="store_true",
 
664
    parser.add_option("--debug", action="store_true", default=False,
663
665
                      help="Debug mode; run in foreground and log to"
664
666
                      " terminal")
665
667
    parser.add_option("--priority", type="string", help="GnuTLS"
690
692
    # Parse config file for server-global settings
691
693
    server_config = ConfigParser.SafeConfigParser(server_defaults)
692
694
    del server_defaults
693
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
695
    server_config.read(os.path.join(options.configdir, "server.conf"))
694
696
    server_section = "server"
695
697
    # Convert the SafeConfigParser object to a dict
696
698
    server_settings = dict(server_config.items(server_section))
750
752
    def remove_from_clients(client):
751
753
        clients.remove(client)
752
754
        if not clients:
753
 
            logger.critical(u"No clients left, exiting")
 
755
            logger.debug(u"No clients left, exiting")
754
756
            sys.exit()
755
757
    
756
 
    clients.update(Set(Client(name = section,
 
758
    clients.update(Set(Client(name=section,
757
759
                              stop_hook = remove_from_clients,
758
 
                              config
759
 
                              = dict(client_config.items(section)))
 
760
                              **(dict(client_config\
 
761
                                      .items(section))))
760
762
                       for section in client_config.sections()))
761
763
    
762
764
    if not debug:
763
 
        daemon()
 
765
        daemon(False, False)
764
766
    
765
767
    def cleanup():
766
768
        "Cleanup function; run on exit"
793
795
                                clients=clients)
794
796
    # Find out what port we got
795
797
    service.port = tcp_server.socket.getsockname()[1]
796
 
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
797
 
                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())
798
800
    
799
801
    #service.interface = tcp_server.socket.getsockname()[3]
800
802