/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 mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-08-27 01:18:25 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080827011825-ka3ni6xvy2ehi1y8
* .bzrignore: New.

* clients.conf ([foo]): Remove Radix-64 checksum.

* mandos (AvahiService.rename, server_state_changed,
          entry_group_state_changed): Make Avahi log messages more
                                      clear that they are about
                                      Zeroconf.
  (fingerprint): Use plain "0" instead of "ctypes.c_uint(0)".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
11
11
# and some lines 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
34
34
 
35
35
import SocketServer
36
36
import socket
 
37
import select
37
38
from optparse import OptionParser
38
39
import datetime
39
40
import errno
54
55
import stat
55
56
import logging
56
57
import logging.handlers
57
 
import pwd
58
58
 
59
59
import dbus
60
60
import gobject
61
61
import avahi
62
62
from dbus.mainloop.glib import DBusGMainLoop
63
63
import ctypes
64
 
import ctypes.util
65
64
 
66
 
version = "1.0.2"
 
65
version = "1.0"
67
66
 
68
67
logger = logging.Logger('mandos')
69
68
syslogger = logging.handlers.SysLogHandler\
81
80
class AvahiError(Exception):
82
81
    def __init__(self, value):
83
82
        self.value = value
84
 
        super(AvahiError, self).__init__()
85
83
    def __str__(self):
86
84
        return repr(self.value)
87
85
 
109
107
                  a sensible number of times
110
108
    """
111
109
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
112
 
                 servicetype = None, port = None, TXT = None, domain = "",
 
110
                 type = None, port = None, TXT = None, domain = "",
113
111
                 host = "", max_renames = 32768):
114
112
        self.interface = interface
115
113
        self.name = name
116
 
        self.type = servicetype
 
114
        self.type = type
117
115
        self.port = port
118
116
        if TXT is None:
119
117
            self.TXT = []
128
126
        if self.rename_count >= self.max_renames:
129
127
            logger.critical(u"No suitable Zeroconf service name found"
130
128
                            u" after %i retries, exiting.",
131
 
                            self.rename_count)
 
129
                            rename_count)
132
130
            raise AvahiServiceError("Too many renames")
133
131
        self.name = server.GetAlternativeServiceName(self.name)
134
132
        logger.info(u"Changing Zeroconf service name to %r ...",
223
221
    interval = property(lambda self: self._interval,
224
222
                        _set_interval)
225
223
    del _set_interval
226
 
    def __init__(self, name = None, stop_hook=None, config=None):
 
224
    def __init__(self, name = None, stop_hook=None, config={}):
227
225
        """Note: the 'checker' key in 'config' sets the
228
226
        'checker_command' attribute and *not* the 'checker'
229
227
        attribute."""
230
 
        if config is None:
231
 
            config = {}
232
228
        self.name = name
233
229
        logger.debug(u"Creating client %r", self.name)
234
230
        # Uppercase and remove spaces from fingerprint for later
240
236
        if "secret" in config:
241
237
            self.secret = config["secret"].decode(u"base64")
242
238
        elif "secfile" in config:
243
 
            secfile = open(os.path.expanduser(os.path.expandvars
244
 
                                              (config["secfile"])))
245
 
            self.secret = secfile.read()
246
 
            secfile.close()
 
239
            sf = open(config["secfile"])
 
240
            self.secret = sf.read()
 
241
            sf.close()
247
242
        else:
248
243
            raise TypeError(u"No secret or secfile for client %s"
249
244
                            % self.name)
419
414
                    (crt, ctypes.byref(datum),
420
415
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
421
416
    # Verify the self signature in the key
422
 
    crtverify = ctypes.c_uint()
 
417
    crtverify = ctypes.c_uint();
423
418
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
424
419
        (crt, 0, ctypes.byref(crtverify))
425
420
    if crtverify.value != 0:
426
421
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
427
422
        raise gnutls.errors.CertificateSecurityError("Verify failed")
428
423
    # New buffer for the fingerprint
429
 
    buf = ctypes.create_string_buffer(20)
430
 
    buf_len = ctypes.c_size_t()
 
424
    buffer = ctypes.create_string_buffer(20)
 
425
    buffer_length = ctypes.c_size_t()
431
426
    # Get the fingerprint from the certificate into the buffer
432
427
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
433
 
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
428
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
434
429
    # Deinit the certificate
435
430
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
436
431
    # Convert the buffer to a Python bytestring
437
 
    fpr = ctypes.string_at(buf, buf_len.value)
 
432
    fpr = ctypes.string_at(buffer, buffer_length.value)
438
433
    # Convert the bytestring to hexadecimal notation
439
434
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
440
435
    return hex_fpr
441
436
 
442
437
 
443
 
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
438
class tcp_handler(SocketServer.BaseRequestHandler, object):
444
439
    """A TCP request handler class.
445
440
    Instantiated by IPv6_TCPServer for each request to handle it.
446
441
    Note: This will run in its own forked process."""
473
468
        if self.server.settings["priority"]:
474
469
            priority = self.server.settings["priority"]
475
470
        gnutls.library.functions.gnutls_priority_set_direct\
476
 
            (session._c_object, priority, None)
 
471
            (session._c_object, priority, None);
477
472
        
478
473
        try:
479
474
            session.handshake()
522
517
    Attributes:
523
518
        settings:       Server settings
524
519
        clients:        Set() of Client objects
525
 
        enabled:        Boolean; whether this server is activated yet
526
520
    """
527
521
    address_family = socket.AF_INET6
528
522
    def __init__(self, *args, **kwargs):
532
526
        if "clients" in kwargs:
533
527
            self.clients = kwargs["clients"]
534
528
            del kwargs["clients"]
535
 
        self.enabled = False
536
 
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
 
529
        return super(type(self), self).__init__(*args, **kwargs)
537
530
    def server_bind(self):
538
531
        """This overrides the normal server_bind() function
539
532
        to bind to an interface if one was specified, and also NOT to
568
561
#                                            if_nametoindex
569
562
#                                            (self.settings
570
563
#                                             ["interface"]))
571
 
            return super(IPv6_TCPServer, self).server_bind()
572
 
    def server_activate(self):
573
 
        if self.enabled:
574
 
            return super(IPv6_TCPServer, self).server_activate()
575
 
    def enable(self):
576
 
        self.enabled = True
 
564
            return super(type(self), self).server_bind()
577
565
 
578
566
 
579
567
def string_to_delta(interval):
595
583
    timevalue = datetime.timedelta(0)
596
584
    for s in interval.split():
597
585
        try:
598
 
            suffix = unicode(s[-1])
599
 
            value = int(s[:-1])
 
586
            suffix=unicode(s[-1])
 
587
            value=int(s[:-1])
600
588
            if suffix == u"d":
601
589
                delta = datetime.timedelta(value)
602
590
            elif suffix == u"s":
642
630
    """Call the C function if_nametoindex(), or equivalent"""
643
631
    global if_nametoindex
644
632
    try:
 
633
        if "ctypes.util" not in sys.modules:
 
634
            import ctypes.util
645
635
        if_nametoindex = ctypes.cdll.LoadLibrary\
646
636
            (ctypes.util.find_library("c")).if_nametoindex
647
637
    except (OSError, AttributeError):
685
675
 
686
676
 
687
677
def main():
 
678
    global main_loop_started
 
679
    main_loop_started = False
 
680
    
688
681
    parser = OptionParser(version = "%%prog %s" % version)
689
682
    parser.add_option("-i", "--interface", type="string",
690
683
                      metavar="IF", help="Bind to interface IF")
705
698
                      default="/etc/mandos", metavar="DIR",
706
699
                      help="Directory to search for configuration"
707
700
                      " files")
708
 
    options = parser.parse_args()[0]
 
701
    (options, args) = parser.parse_args()
709
702
    
710
703
    if options.check:
711
704
        import doctest
765
758
    client_config.read(os.path.join(server_settings["configdir"],
766
759
                                    "clients.conf"))
767
760
    
768
 
    clients = Set()
769
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
770
 
                                 server_settings["port"]),
771
 
                                TCP_handler,
772
 
                                settings=server_settings,
773
 
                                clients=clients)
774
 
    pidfilename = "/var/run/mandos.pid"
775
 
    try:
776
 
        pidfile = open(pidfilename, "w")
777
 
    except IOError, error:
778
 
        logger.error("Could not open file %r", pidfilename)
779
 
    
780
 
    uid = 65534
781
 
    gid = 65534
782
 
    try:
783
 
        uid = pwd.getpwnam("mandos").pw_uid
784
 
    except KeyError:
785
 
        try:
786
 
            uid = pwd.getpwnam("nobody").pw_uid
787
 
        except KeyError:
788
 
            pass
789
 
    try:
790
 
        gid = pwd.getpwnam("mandos").pw_gid
791
 
    except KeyError:
792
 
        try:
793
 
            gid = pwd.getpwnam("nogroup").pw_gid
794
 
        except KeyError:
795
 
            pass
796
 
    try:
797
 
        os.setuid(uid)
798
 
        os.setgid(gid)
799
 
    except OSError, error:
800
 
        if error[0] != errno.EPERM:
801
 
            raise error
802
 
    
803
761
    global service
804
762
    service = AvahiService(name = server_settings["servicename"],
805
 
                           servicetype = "_mandos._tcp", )
 
763
                           type = "_mandos._tcp", );
806
764
    if server_settings["interface"]:
807
765
        service.interface = if_nametoindex\
808
766
                            (server_settings["interface"])
819
777
                            avahi.DBUS_INTERFACE_SERVER)
820
778
    # End of Avahi example code
821
779
    
 
780
    clients = Set()
822
781
    def remove_from_clients(client):
823
782
        clients.remove(client)
824
783
        if not clients:
846
805
        # Close all input and output, do double fork, etc.
847
806
        daemon()
848
807
    
 
808
    pidfilename = "/var/run/mandos/mandos.pid"
 
809
    pid = os.getpid()
849
810
    try:
850
 
        pid = os.getpid()
 
811
        pidfile = open(pidfilename, "w")
851
812
        pidfile.write(str(pid) + "\n")
852
813
        pidfile.close()
853
814
        del pidfile
854
 
    except IOError:
855
 
        logger.error(u"Could not write to file %r with PID %d",
856
 
                     pidfilename, pid)
857
 
    except NameError:
858
 
        # "pidfile" was never created
859
 
        pass
860
 
    del pidfilename
 
815
    except IOError, err:
 
816
        logger.error(u"Could not write %s file with PID %d",
 
817
                     pidfilename, os.getpid())
861
818
    
862
819
    def cleanup():
863
820
        "Cleanup function; run on exit"
883
840
    for client in clients:
884
841
        client.start()
885
842
    
886
 
    tcp_server.enable()
887
 
    tcp_server.server_activate()
888
 
    
 
843
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
844
                                 server_settings["port"]),
 
845
                                tcp_handler,
 
846
                                settings=server_settings,
 
847
                                clients=clients)
889
848
    # Find out what port we got
890
849
    service.port = tcp_server.socket.getsockname()[1]
891
850
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
909
868
                             (*args[2:], **kwargs) or True)
910
869
        
911
870
        logger.debug(u"Starting main loop")
 
871
        main_loop_started = True
912
872
        main_loop.run()
913
873
    except AvahiError, error:
914
874
        logger.critical(u"AvahiError: %s" + unicode(error))