/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-10-12 07:27:43 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081012072743-0g7o9e5mqqv4fkob
* README: Refer to man pages of usplash, splashy, and askpass-fifo.

* debian/copyright: Rewritten to conform to
  <http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=233>.

* mandos-keygen: Sign encrypted keys.

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