/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-22 00:16:20 UTC
  • mfrom: (24.1.57 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080822001620-vxpn1evy0t0kyvj0
* clients.conf ([DEFAULT]/checker): Update to new default value.

* mandos (Client.start_checker): Bug fix: OSError, not
                                 subprocess.OSError.
  (main): Use "fping -q -- %(host)s" instead of "fping -q --
          %%(host)s" as default value for "checker".  Always redirect
          stdin to be from /dev/null, even if in debug mode.

* mandos-clients.conf.xml (DESCRIPTION): Improved wording and refer to
                                         the EXPANSION section.
  (OPTIONS): Added synopsis and improved wording for "checker",
             "fingerprint", and "secret".  Refer to the RUNTIME
             EXPANSION section for the "checker" option.
  (EXAMPLE): Update to new default value for "checker".

* mandos-keygen (trap): Split lines and add "set +e".

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