/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)
410
418
    gnutls.library.functions.gnutls_openpgp_crt_import\
411
419
                    (crt, ctypes.byref(datum),
412
420
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
421
    # Verify the self signature in the key
 
422
    crtverify = ctypes.c_uint()
 
423
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
 
424
        (crt, 0, ctypes.byref(crtverify))
 
425
    if crtverify.value != 0:
 
426
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
427
        raise gnutls.errors.CertificateSecurityError("Verify failed")
413
428
    # New buffer for the fingerprint
414
 
    buffer = ctypes.create_string_buffer(20)
415
 
    buffer_length = ctypes.c_size_t()
 
429
    buf = ctypes.create_string_buffer(20)
 
430
    buf_len = ctypes.c_size_t()
416
431
    # Get the fingerprint from the certificate into the buffer
417
432
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
418
 
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
 
433
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
419
434
    # Deinit the certificate
420
435
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
421
436
    # Convert the buffer to a Python bytestring
422
 
    fpr = ctypes.string_at(buffer, buffer_length.value)
 
437
    fpr = ctypes.string_at(buf, buf_len.value)
423
438
    # Convert the bytestring to hexadecimal notation
424
439
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
425
440
    return hex_fpr
426
441
 
427
442
 
428
 
class tcp_handler(SocketServer.BaseRequestHandler, object):
 
443
class TCP_handler(SocketServer.BaseRequestHandler, object):
429
444
    """A TCP request handler class.
430
445
    Instantiated by IPv6_TCPServer for each request to handle it.
431
446
    Note: This will run in its own forked process."""
458
473
        if self.server.settings["priority"]:
459
474
            priority = self.server.settings["priority"]
460
475
        gnutls.library.functions.gnutls_priority_set_direct\
461
 
            (session._c_object, priority, None);
 
476
            (session._c_object, priority, None)
462
477
        
463
478
        try:
464
479
            session.handshake()
507
522
    Attributes:
508
523
        settings:       Server settings
509
524
        clients:        Set() of Client objects
 
525
        enabled:        Boolean; whether this server is activated yet
510
526
    """
511
527
    address_family = socket.AF_INET6
512
528
    def __init__(self, *args, **kwargs):
516
532
        if "clients" in kwargs:
517
533
            self.clients = kwargs["clients"]
518
534
            del kwargs["clients"]
519
 
        return super(type(self), self).__init__(*args, **kwargs)
 
535
        self.enabled = False
 
536
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
520
537
    def server_bind(self):
521
538
        """This overrides the normal server_bind() function
522
539
        to bind to an interface if one was specified, and also NOT to
551
568
#                                            if_nametoindex
552
569
#                                            (self.settings
553
570
#                                             ["interface"]))
554
 
            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
555
577
 
556
578
 
557
579
def string_to_delta(interval):
573
595
    timevalue = datetime.timedelta(0)
574
596
    for s in interval.split():
575
597
        try:
576
 
            suffix=unicode(s[-1])
577
 
            value=int(s[:-1])
 
598
            suffix = unicode(s[-1])
 
599
            value = int(s[:-1])
578
600
            if suffix == u"d":
579
601
                delta = datetime.timedelta(value)
580
602
            elif suffix == u"s":
596
618
def server_state_changed(state):
597
619
    """Derived from the Avahi example code"""
598
620
    if state == avahi.SERVER_COLLISION:
599
 
        logger.error(u"Server name collision")
 
621
        logger.error(u"Zeroconf server name collision")
600
622
        service.remove()
601
623
    elif state == avahi.SERVER_RUNNING:
602
624
        service.add()
604
626
 
605
627
def entry_group_state_changed(state, error):
606
628
    """Derived from the Avahi example code"""
607
 
    logger.debug(u"state change: %i", state)
 
629
    logger.debug(u"Avahi state change: %i", state)
608
630
    
609
631
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
610
 
        logger.debug(u"Service established.")
 
632
        logger.debug(u"Zeroconf service established.")
611
633
    elif state == avahi.ENTRY_GROUP_COLLISION:
612
 
        logger.warning(u"Service name collision.")
 
634
        logger.warning(u"Zeroconf service name collision.")
613
635
        service.rename()
614
636
    elif state == avahi.ENTRY_GROUP_FAILURE:
615
 
        logger.critical(u"Error in group state changed %s",
 
637
        logger.critical(u"Avahi: Error in group state changed %s",
616
638
                        unicode(error))
617
639
        raise AvahiGroupError("State changed: %s", str(error))
618
640
 
620
642
    """Call the C function if_nametoindex(), or equivalent"""
621
643
    global if_nametoindex
622
644
    try:
623
 
        if "ctypes.util" not in sys.modules:
624
 
            import ctypes.util
625
645
        if_nametoindex = ctypes.cdll.LoadLibrary\
626
646
            (ctypes.util.find_library("c")).if_nametoindex
627
647
    except (OSError, AttributeError):
665
685
 
666
686
 
667
687
def main():
668
 
    global main_loop_started
669
 
    main_loop_started = False
670
 
    
671
688
    parser = OptionParser(version = "%%prog %s" % version)
672
689
    parser.add_option("-i", "--interface", type="string",
673
690
                      metavar="IF", help="Bind to interface IF")
688
705
                      default="/etc/mandos", metavar="DIR",
689
706
                      help="Directory to search for configuration"
690
707
                      " files")
691
 
    (options, args) = parser.parse_args()
 
708
    options = parser.parse_args()[0]
692
709
    
693
710
    if options.check:
694
711
        import doctest
748
765
    client_config.read(os.path.join(server_settings["configdir"],
749
766
                                    "clients.conf"))
750
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
    
751
803
    global service
752
804
    service = AvahiService(name = server_settings["servicename"],
753
 
                           type = "_mandos._tcp", );
 
805
                           servicetype = "_mandos._tcp", )
754
806
    if server_settings["interface"]:
755
 
        service.interface = if_nametoindex(server_settings["interface"])
 
807
        service.interface = if_nametoindex\
 
808
                            (server_settings["interface"])
756
809
    
757
810
    global main_loop
758
811
    global bus
761
814
    DBusGMainLoop(set_as_default=True )
762
815
    main_loop = gobject.MainLoop()
763
816
    bus = dbus.SystemBus()
764
 
    server = dbus.Interface(
765
 
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
766
 
            avahi.DBUS_INTERFACE_SERVER )
 
817
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
818
                                           avahi.DBUS_PATH_SERVER),
 
819
                            avahi.DBUS_INTERFACE_SERVER)
767
820
    # End of Avahi example code
768
821
    
769
 
    clients = Set()
770
822
    def remove_from_clients(client):
771
823
        clients.remove(client)
772
824
        if not clients:
794
846
        # Close all input and output, do double fork, etc.
795
847
        daemon()
796
848
    
797
 
    pidfilename = "/var/run/mandos/mandos.pid"
798
 
    pid = os.getpid()
799
849
    try:
800
 
        pidfile = open(pidfilename, "w")
 
850
        pid = os.getpid()
801
851
        pidfile.write(str(pid) + "\n")
802
852
        pidfile.close()
803
853
        del pidfile
804
 
    except IOError, err:
805
 
        logger.error(u"Could not write %s file with PID %d",
806
 
                     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
807
861
    
808
862
    def cleanup():
809
863
        "Cleanup function; run on exit"
829
883
    for client in clients:
830
884
        client.start()
831
885
    
832
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
833
 
                                 server_settings["port"]),
834
 
                                tcp_handler,
835
 
                                settings=server_settings,
836
 
                                clients=clients)
 
886
    tcp_server.enable()
 
887
    tcp_server.server_activate()
 
888
    
837
889
    # Find out what port we got
838
890
    service.port = tcp_server.socket.getsockname()[1]
839
891
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
857
909
                             (*args[2:], **kwargs) or True)
858
910
        
859
911
        logger.debug(u"Starting main loop")
860
 
        main_loop_started = True
861
912
        main_loop.run()
862
913
    except AvahiError, error:
863
914
        logger.critical(u"AvahiError: %s" + unicode(error))