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