/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-10-18 11:17:22 UTC
  • Revision ID: teddy@fukt.bsnet.se-20081018111722-jtbz35c031lxuuc9
* debian/mandos-client.docs (NEWS): Added.
* debian/mandos.docs (NEWS): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
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 <http://www.gnu.org/licenses/>.
 
27
# along with this program.  If not, see
 
28
# <http://www.gnu.org/licenses/>.
28
29
29
30
# Contact the authors at <mandos@fukt.bsnet.se>.
30
31
33
34
 
34
35
import SocketServer
35
36
import socket
36
 
import select
37
37
from optparse import OptionParser
38
38
import datetime
39
39
import errno
54
54
import stat
55
55
import logging
56
56
import logging.handlers
 
57
import pwd
57
58
 
58
59
import dbus
59
60
import gobject
60
61
import avahi
61
62
from dbus.mainloop.glib import DBusGMainLoop
62
63
import ctypes
 
64
import ctypes.util
63
65
 
64
 
version = "1.0"
 
66
version = "1.0.2"
65
67
 
66
68
logger = logging.Logger('mandos')
67
69
syslogger = logging.handlers.SysLogHandler\
79
81
class AvahiError(Exception):
80
82
    def __init__(self, value):
81
83
        self.value = value
 
84
        super(AvahiError, self).__init__()
82
85
    def __str__(self):
83
86
        return repr(self.value)
84
87
 
106
109
                  a sensible number of times
107
110
    """
108
111
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
109
 
                 type = None, port = None, TXT = None, domain = "",
 
112
                 servicetype = None, port = None, TXT = None, domain = "",
110
113
                 host = "", max_renames = 32768):
111
114
        self.interface = interface
112
115
        self.name = name
113
 
        self.type = type
 
116
        self.type = servicetype
114
117
        self.port = port
115
118
        if TXT is None:
116
119
            self.TXT = []
123
126
    def rename(self):
124
127
        """Derived from the Avahi example code"""
125
128
        if self.rename_count >= self.max_renames:
126
 
            logger.critical(u"No suitable service name found after %i"
127
 
                            u" retries, exiting.", rename_count)
 
129
            logger.critical(u"No suitable Zeroconf service name found"
 
130
                            u" after %i retries, exiting.",
 
131
                            self.rename_count)
128
132
            raise AvahiServiceError("Too many renames")
129
133
        self.name = server.GetAlternativeServiceName(self.name)
130
 
        logger.info(u"Changing name to %r ...", str(self.name))
 
134
        logger.info(u"Changing Zeroconf service name to %r ...",
 
135
                    str(self.name))
131
136
        syslogger.setFormatter(logging.Formatter\
132
137
                               ('Mandos (%s): %%(levelname)s:'
133
138
                               ' %%(message)s' % self.name))
148
153
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
149
154
            group.connect_to_signal('StateChanged',
150
155
                                    entry_group_state_changed)
151
 
        logger.debug(u"Adding service '%s' of type '%s' ...",
 
156
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
152
157
                     service.name, service.type)
153
158
        group.AddService(
154
159
                self.interface,         # interface
218
223
    interval = property(lambda self: self._interval,
219
224
                        _set_interval)
220
225
    del _set_interval
221
 
    def __init__(self, name = None, stop_hook=None, config={}):
 
226
    def __init__(self, name = None, stop_hook=None, config=None):
222
227
        """Note: the 'checker' key in 'config' sets the
223
228
        'checker_command' attribute and *not* the 'checker'
224
229
        attribute."""
 
230
        if config is None:
 
231
            config = {}
225
232
        self.name = name
226
233
        logger.debug(u"Creating client %r", self.name)
227
234
        # Uppercase and remove spaces from fingerprint for later
233
240
        if "secret" in config:
234
241
            self.secret = config["secret"].decode(u"base64")
235
242
        elif "secfile" in config:
236
 
            sf = open(config["secfile"])
237
 
            self.secret = sf.read()
238
 
            sf.close()
 
243
            secfile = open(os.path.expanduser(os.path.expandvars
 
244
                                              (config["secfile"])))
 
245
            self.secret = secfile.read()
 
246
            secfile.close()
239
247
        else:
240
248
            raise TypeError(u"No secret or secfile for client %s"
241
249
                            % self.name)
411
419
                    (crt, ctypes.byref(datum),
412
420
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
413
421
    # Verify the self signature in the key
414
 
    crtverify = ctypes.c_uint();
 
422
    crtverify = ctypes.c_uint()
415
423
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
416
 
        (crt, ctypes.c_uint(0), ctypes.byref(crtverify))
 
424
        (crt, 0, ctypes.byref(crtverify))
417
425
    if crtverify.value != 0:
418
426
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
419
427
        raise gnutls.errors.CertificateSecurityError("Verify failed")
420
428
    # New buffer for the fingerprint
421
 
    buffer = ctypes.create_string_buffer(20)
422
 
    buffer_length = ctypes.c_size_t()
 
429
    buf = ctypes.create_string_buffer(20)
 
430
    buf_len = ctypes.c_size_t()
423
431
    # Get the fingerprint from the certificate into the buffer
424
432
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
425
 
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
 
433
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
426
434
    # Deinit the certificate
427
435
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
428
436
    # Convert the buffer to a Python bytestring
429
 
    fpr = ctypes.string_at(buffer, buffer_length.value)
 
437
    fpr = ctypes.string_at(buf, buf_len.value)
430
438
    # Convert the bytestring to hexadecimal notation
431
439
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
432
440
    return hex_fpr
433
441
 
434
442
 
435
 
class tcp_handler(SocketServer.BaseRequestHandler, object):
 
443
class TCP_handler(SocketServer.BaseRequestHandler, object):
436
444
    """A TCP request handler class.
437
445
    Instantiated by IPv6_TCPServer for each request to handle it.
438
446
    Note: This will run in its own forked process."""
465
473
        if self.server.settings["priority"]:
466
474
            priority = self.server.settings["priority"]
467
475
        gnutls.library.functions.gnutls_priority_set_direct\
468
 
            (session._c_object, priority, None);
 
476
            (session._c_object, priority, None)
469
477
        
470
478
        try:
471
479
            session.handshake()
514
522
    Attributes:
515
523
        settings:       Server settings
516
524
        clients:        Set() of Client objects
 
525
        enabled:        Boolean; whether this server is activated yet
517
526
    """
518
527
    address_family = socket.AF_INET6
519
528
    def __init__(self, *args, **kwargs):
523
532
        if "clients" in kwargs:
524
533
            self.clients = kwargs["clients"]
525
534
            del kwargs["clients"]
526
 
        return super(type(self), self).__init__(*args, **kwargs)
 
535
        self.enabled = False
 
536
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
527
537
    def server_bind(self):
528
538
        """This overrides the normal server_bind() function
529
539
        to bind to an interface if one was specified, and also NOT to
558
568
#                                            if_nametoindex
559
569
#                                            (self.settings
560
570
#                                             ["interface"]))
561
 
            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
562
577
 
563
578
 
564
579
def string_to_delta(interval):
580
595
    timevalue = datetime.timedelta(0)
581
596
    for s in interval.split():
582
597
        try:
583
 
            suffix=unicode(s[-1])
584
 
            value=int(s[:-1])
 
598
            suffix = unicode(s[-1])
 
599
            value = int(s[:-1])
585
600
            if suffix == u"d":
586
601
                delta = datetime.timedelta(value)
587
602
            elif suffix == u"s":
603
618
def server_state_changed(state):
604
619
    """Derived from the Avahi example code"""
605
620
    if state == avahi.SERVER_COLLISION:
606
 
        logger.error(u"Server name collision")
 
621
        logger.error(u"Zeroconf server name collision")
607
622
        service.remove()
608
623
    elif state == avahi.SERVER_RUNNING:
609
624
        service.add()
611
626
 
612
627
def entry_group_state_changed(state, error):
613
628
    """Derived from the Avahi example code"""
614
 
    logger.debug(u"state change: %i", state)
 
629
    logger.debug(u"Avahi state change: %i", state)
615
630
    
616
631
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
617
 
        logger.debug(u"Service established.")
 
632
        logger.debug(u"Zeroconf service established.")
618
633
    elif state == avahi.ENTRY_GROUP_COLLISION:
619
 
        logger.warning(u"Service name collision.")
 
634
        logger.warning(u"Zeroconf service name collision.")
620
635
        service.rename()
621
636
    elif state == avahi.ENTRY_GROUP_FAILURE:
622
 
        logger.critical(u"Error in group state changed %s",
 
637
        logger.critical(u"Avahi: Error in group state changed %s",
623
638
                        unicode(error))
624
639
        raise AvahiGroupError("State changed: %s", str(error))
625
640
 
627
642
    """Call the C function if_nametoindex(), or equivalent"""
628
643
    global if_nametoindex
629
644
    try:
630
 
        if "ctypes.util" not in sys.modules:
631
 
            import ctypes.util
632
645
        if_nametoindex = ctypes.cdll.LoadLibrary\
633
646
            (ctypes.util.find_library("c")).if_nametoindex
634
647
    except (OSError, AttributeError):
672
685
 
673
686
 
674
687
def main():
675
 
    global main_loop_started
676
 
    main_loop_started = False
677
 
    
678
688
    parser = OptionParser(version = "%%prog %s" % version)
679
689
    parser.add_option("-i", "--interface", type="string",
680
690
                      metavar="IF", help="Bind to interface IF")
695
705
                      default="/etc/mandos", metavar="DIR",
696
706
                      help="Directory to search for configuration"
697
707
                      " files")
698
 
    (options, args) = parser.parse_args()
 
708
    options = parser.parse_args()[0]
699
709
    
700
710
    if options.check:
701
711
        import doctest
755
765
    client_config.read(os.path.join(server_settings["configdir"],
756
766
                                    "clients.conf"))
757
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
    
758
803
    global service
759
804
    service = AvahiService(name = server_settings["servicename"],
760
 
                           type = "_mandos._tcp", );
 
805
                           servicetype = "_mandos._tcp", )
761
806
    if server_settings["interface"]:
762
 
        service.interface = if_nametoindex(server_settings["interface"])
 
807
        service.interface = if_nametoindex\
 
808
                            (server_settings["interface"])
763
809
    
764
810
    global main_loop
765
811
    global bus
768
814
    DBusGMainLoop(set_as_default=True )
769
815
    main_loop = gobject.MainLoop()
770
816
    bus = dbus.SystemBus()
771
 
    server = dbus.Interface(
772
 
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
773
 
            avahi.DBUS_INTERFACE_SERVER )
 
817
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
818
                                           avahi.DBUS_PATH_SERVER),
 
819
                            avahi.DBUS_INTERFACE_SERVER)
774
820
    # End of Avahi example code
775
821
    
776
 
    clients = Set()
777
822
    def remove_from_clients(client):
778
823
        clients.remove(client)
779
824
        if not clients:
801
846
        # Close all input and output, do double fork, etc.
802
847
        daemon()
803
848
    
804
 
    pidfilename = "/var/run/mandos/mandos.pid"
805
 
    pid = os.getpid()
806
849
    try:
807
 
        pidfile = open(pidfilename, "w")
 
850
        pid = os.getpid()
808
851
        pidfile.write(str(pid) + "\n")
809
852
        pidfile.close()
810
853
        del pidfile
811
 
    except IOError, err:
812
 
        logger.error(u"Could not write %s file with PID %d",
813
 
                     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
814
861
    
815
862
    def cleanup():
816
863
        "Cleanup function; run on exit"
836
883
    for client in clients:
837
884
        client.start()
838
885
    
839
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
840
 
                                 server_settings["port"]),
841
 
                                tcp_handler,
842
 
                                settings=server_settings,
843
 
                                clients=clients)
 
886
    tcp_server.enable()
 
887
    tcp_server.server_activate()
 
888
    
844
889
    # Find out what port we got
845
890
    service.port = tcp_server.socket.getsockname()[1]
846
891
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
864
909
                             (*args[2:], **kwargs) or True)
865
910
        
866
911
        logger.debug(u"Starting main loop")
867
 
        main_loop_started = True
868
912
        main_loop.run()
869
913
    except AvahiError, error:
870
914
        logger.critical(u"AvahiError: %s" + unicode(error))