/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
65
version = "1.0"
67
66
 
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(config["secfile"])
244
 
            self.secret = secfile.read()
245
 
            secfile.close()
 
239
            sf = open(config["secfile"])
 
240
            self.secret = sf.read()
 
241
            sf.close()
246
242
        else:
247
243
            raise TypeError(u"No secret or secfile for client %s"
248
244
                            % self.name)
418
414
                    (crt, ctypes.byref(datum),
419
415
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
420
416
    # Verify the self signature in the key
421
 
    crtverify = ctypes.c_uint()
 
417
    crtverify = ctypes.c_uint();
422
418
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
423
419
        (crt, 0, ctypes.byref(crtverify))
424
420
    if crtverify.value != 0:
425
421
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
426
422
        raise gnutls.errors.CertificateSecurityError("Verify failed")
427
423
    # New buffer for the fingerprint
428
 
    buf = ctypes.create_string_buffer(20)
429
 
    buf_len = ctypes.c_size_t()
 
424
    buffer = ctypes.create_string_buffer(20)
 
425
    buffer_length = ctypes.c_size_t()
430
426
    # Get the fingerprint from the certificate into the buffer
431
427
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
432
 
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
428
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
433
429
    # Deinit the certificate
434
430
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
435
431
    # Convert the buffer to a Python bytestring
436
 
    fpr = ctypes.string_at(buf, buf_len.value)
 
432
    fpr = ctypes.string_at(buffer, buffer_length.value)
437
433
    # Convert the bytestring to hexadecimal notation
438
434
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
439
435
    return hex_fpr
440
436
 
441
437
 
442
 
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
438
class tcp_handler(SocketServer.BaseRequestHandler, object):
443
439
    """A TCP request handler class.
444
440
    Instantiated by IPv6_TCPServer for each request to handle it.
445
441
    Note: This will run in its own forked process."""
472
468
        if self.server.settings["priority"]:
473
469
            priority = self.server.settings["priority"]
474
470
        gnutls.library.functions.gnutls_priority_set_direct\
475
 
            (session._c_object, priority, None)
 
471
            (session._c_object, priority, None);
476
472
        
477
473
        try:
478
474
            session.handshake()
521
517
    Attributes:
522
518
        settings:       Server settings
523
519
        clients:        Set() of Client objects
524
 
        enabled:        Boolean; whether this server is activated yet
525
520
    """
526
521
    address_family = socket.AF_INET6
527
522
    def __init__(self, *args, **kwargs):
531
526
        if "clients" in kwargs:
532
527
            self.clients = kwargs["clients"]
533
528
            del kwargs["clients"]
534
 
        self.enabled = False
535
 
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
 
529
        return super(type(self), self).__init__(*args, **kwargs)
536
530
    def server_bind(self):
537
531
        """This overrides the normal server_bind() function
538
532
        to bind to an interface if one was specified, and also NOT to
567
561
#                                            if_nametoindex
568
562
#                                            (self.settings
569
563
#                                             ["interface"]))
570
 
            return super(IPv6_TCPServer, self).server_bind()
571
 
    def server_activate(self):
572
 
        if self.enabled:
573
 
            return super(IPv6_TCPServer, self).server_activate()
574
 
    def enable(self):
575
 
        self.enabled = True
 
564
            return super(type(self), self).server_bind()
576
565
 
577
566
 
578
567
def string_to_delta(interval):
594
583
    timevalue = datetime.timedelta(0)
595
584
    for s in interval.split():
596
585
        try:
597
 
            suffix = unicode(s[-1])
598
 
            value = int(s[:-1])
 
586
            suffix=unicode(s[-1])
 
587
            value=int(s[:-1])
599
588
            if suffix == u"d":
600
589
                delta = datetime.timedelta(value)
601
590
            elif suffix == u"s":
641
630
    """Call the C function if_nametoindex(), or equivalent"""
642
631
    global if_nametoindex
643
632
    try:
 
633
        if "ctypes.util" not in sys.modules:
 
634
            import ctypes.util
644
635
        if_nametoindex = ctypes.cdll.LoadLibrary\
645
636
            (ctypes.util.find_library("c")).if_nametoindex
646
637
    except (OSError, AttributeError):
684
675
 
685
676
 
686
677
def main():
 
678
    global main_loop_started
 
679
    main_loop_started = False
 
680
    
687
681
    parser = OptionParser(version = "%%prog %s" % version)
688
682
    parser.add_option("-i", "--interface", type="string",
689
683
                      metavar="IF", help="Bind to interface IF")
704
698
                      default="/etc/mandos", metavar="DIR",
705
699
                      help="Directory to search for configuration"
706
700
                      " files")
707
 
    options = parser.parse_args()[0]
 
701
    (options, args) = parser.parse_args()
708
702
    
709
703
    if options.check:
710
704
        import doctest
764
758
    client_config.read(os.path.join(server_settings["configdir"],
765
759
                                    "clients.conf"))
766
760
    
767
 
    clients = Set()
768
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
769
 
                                 server_settings["port"]),
770
 
                                TCP_handler,
771
 
                                settings=server_settings,
772
 
                                clients=clients)
773
 
    pidfilename = "/var/run/mandos.pid"
774
 
    try:
775
 
        pidfile = open(pidfilename, "w")
776
 
    except IOError, error:
777
 
        logger.error("Could not open file %r", pidfilename)
778
 
    
779
 
    uid = 65534
780
 
    gid = 65534
781
 
    try:
782
 
        uid = pwd.getpwnam("mandos").pw_uid
783
 
    except KeyError:
784
 
        try:
785
 
            uid = pwd.getpwnam("nobody").pw_uid
786
 
        except KeyError:
787
 
            pass
788
 
    try:
789
 
        gid = pwd.getpwnam("mandos").pw_gid
790
 
    except KeyError:
791
 
        try:
792
 
            gid = pwd.getpwnam("nogroup").pw_gid
793
 
        except KeyError:
794
 
            pass
795
 
    try:
796
 
        os.setuid(uid)
797
 
        os.setgid(gid)
798
 
    except OSError, error:
799
 
        if error[0] != errno.EPERM:
800
 
            raise error
801
 
    
802
761
    global service
803
762
    service = AvahiService(name = server_settings["servicename"],
804
 
                           servicetype = "_mandos._tcp", )
 
763
                           type = "_mandos._tcp", );
805
764
    if server_settings["interface"]:
806
765
        service.interface = if_nametoindex\
807
766
                            (server_settings["interface"])
818
777
                            avahi.DBUS_INTERFACE_SERVER)
819
778
    # End of Avahi example code
820
779
    
 
780
    clients = Set()
821
781
    def remove_from_clients(client):
822
782
        clients.remove(client)
823
783
        if not clients:
845
805
        # Close all input and output, do double fork, etc.
846
806
        daemon()
847
807
    
 
808
    pidfilename = "/var/run/mandos/mandos.pid"
 
809
    pid = os.getpid()
848
810
    try:
849
 
        pid = os.getpid()
 
811
        pidfile = open(pidfilename, "w")
850
812
        pidfile.write(str(pid) + "\n")
851
813
        pidfile.close()
852
814
        del pidfile
853
 
    except IOError:
854
 
        logger.error(u"Could not write to file %r with PID %d",
855
 
                     pidfilename, pid)
856
 
    except NameError:
857
 
        # "pidfile" was never created
858
 
        pass
859
 
    del pidfilename
 
815
    except IOError, err:
 
816
        logger.error(u"Could not write %s file with PID %d",
 
817
                     pidfilename, os.getpid())
860
818
    
861
819
    def cleanup():
862
820
        "Cleanup function; run on exit"
882
840
    for client in clients:
883
841
        client.start()
884
842
    
885
 
    tcp_server.enable()
886
 
    tcp_server.server_activate()
887
 
    
 
843
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
844
                                 server_settings["port"]),
 
845
                                tcp_handler,
 
846
                                settings=server_settings,
 
847
                                clients=clients)
888
848
    # Find out what port we got
889
849
    service.port = tcp_server.socket.getsockname()[1]
890
850
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
908
868
                             (*args[2:], **kwargs) or True)
909
869
        
910
870
        logger.debug(u"Starting main loop")
 
871
        main_loop_started = True
911
872
        main_loop.run()
912
873
    except AvahiError, error:
913
874
        logger.critical(u"AvahiError: %s" + unicode(error))