/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: Björn Påhlsson
  • Date: 2008-08-15 20:17:32 UTC
  • mto: (237.7.1 mandos) (24.1.154 mandos)
  • mto: This revision was merged to the branch mainline in revision 77.
  • Revision ID: belorn@braxen-20080815201732-b7uux3yqs05b3fy9
Added configuration files support for mandos-client
Removed plus argument support for mandos-client

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 = []
122
119
        self.domain = domain
123
120
        self.host = host
124
121
        self.rename_count = 0
125
 
        self.max_renames = max_renames
126
122
    def rename(self):
127
123
        """Derived from the Avahi example code"""
128
124
        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)
 
125
            logger.critical(u"No suitable service name found after %i"
 
126
                            u" retries, exiting.", rename_count)
132
127
            raise AvahiServiceError("Too many renames")
133
 
        self.name = server.GetAlternativeServiceName(self.name)
134
 
        logger.info(u"Changing Zeroconf service name to %r ...",
135
 
                    str(self.name))
 
128
        name = server.GetAlternativeServiceName(name)
 
129
        logger.error(u"Changing name to %r ...", name)
136
130
        syslogger.setFormatter(logging.Formatter\
137
131
                               ('Mandos (%s): %%(levelname)s:'
138
 
                               ' %%(message)s' % self.name))
 
132
                               ' %%(message)s' % name))
139
133
        self.remove()
140
134
        self.add()
141
135
        self.rename_count += 1
153
147
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
154
148
            group.connect_to_signal('StateChanged',
155
149
                                    entry_group_state_changed)
156
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
150
        logger.debug(u"Adding service '%s' of type '%s' ...",
157
151
                     service.name, service.type)
158
152
        group.AddService(
159
153
                self.interface,         # interface
223
217
    interval = property(lambda self: self._interval,
224
218
                        _set_interval)
225
219
    del _set_interval
226
 
    def __init__(self, name = None, stop_hook=None, config=None):
 
220
    def __init__(self, name = None, stop_hook=None, config={}):
227
221
        """Note: the 'checker' key in 'config' sets the
228
222
        'checker_command' attribute and *not* the 'checker'
229
223
        attribute."""
230
 
        if config is None:
231
 
            config = {}
232
224
        self.name = name
233
225
        logger.debug(u"Creating client %r", self.name)
234
226
        # Uppercase and remove spaces from fingerprint for later
240
232
        if "secret" in config:
241
233
            self.secret = config["secret"].decode(u"base64")
242
234
        elif "secfile" in config:
243
 
            secfile = open(config["secfile"])
244
 
            self.secret = secfile.read()
245
 
            secfile.close()
 
235
            sf = open(config["secfile"])
 
236
            self.secret = sf.read()
 
237
            sf.close()
246
238
        else:
247
239
            raise TypeError(u"No secret or secfile for client %s"
248
240
                            % self.name)
344
336
            try:
345
337
                logger.info(u"Starting checker %r for %s",
346
338
                            command, self.name)
347
 
                # We don't need to redirect stdout and stderr, since
348
 
                # in normal mode, that is already done by daemon(),
349
 
                # and in debug mode we don't want to.  (Stdin is
350
 
                # always replaced by /dev/null.)
351
339
                self.checker = subprocess.Popen(command,
352
340
                                                close_fds=True,
353
341
                                                shell=True, cwd="/")
354
342
                self.checker_callback_tag = gobject.child_watch_add\
355
343
                                            (self.checker.pid,
356
344
                                             self.checker_callback)
357
 
            except OSError, error:
 
345
            except subprocess.OSError, error:
358
346
                logger.error(u"Failed to start subprocess: %s",
359
347
                             error)
360
348
        # Re-run this periodically if run by gobject.timeout_add
417
405
    gnutls.library.functions.gnutls_openpgp_crt_import\
418
406
                    (crt, ctypes.byref(datum),
419
407
                     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
408
    # New buffer for the fingerprint
428
 
    buf = ctypes.create_string_buffer(20)
429
 
    buf_len = ctypes.c_size_t()
 
409
    buffer = ctypes.create_string_buffer(20)
 
410
    buffer_length = ctypes.c_size_t()
430
411
    # Get the fingerprint from the certificate into the buffer
431
412
    gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
432
 
        (crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
413
        (crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
433
414
    # Deinit the certificate
434
415
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
435
416
    # Convert the buffer to a Python bytestring
436
 
    fpr = ctypes.string_at(buf, buf_len.value)
 
417
    fpr = ctypes.string_at(buffer, buffer_length.value)
437
418
    # Convert the bytestring to hexadecimal notation
438
419
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
439
420
    return hex_fpr
440
421
 
441
422
 
442
 
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
423
class tcp_handler(SocketServer.BaseRequestHandler, object):
443
424
    """A TCP request handler class.
444
425
    Instantiated by IPv6_TCPServer for each request to handle it.
445
426
    Note: This will run in its own forked process."""
472
453
        if self.server.settings["priority"]:
473
454
            priority = self.server.settings["priority"]
474
455
        gnutls.library.functions.gnutls_priority_set_direct\
475
 
            (session._c_object, priority, None)
 
456
            (session._c_object, priority, None);
476
457
        
477
458
        try:
478
459
            session.handshake()
521
502
    Attributes:
522
503
        settings:       Server settings
523
504
        clients:        Set() of Client objects
524
 
        enabled:        Boolean; whether this server is activated yet
525
505
    """
526
506
    address_family = socket.AF_INET6
527
507
    def __init__(self, *args, **kwargs):
531
511
        if "clients" in kwargs:
532
512
            self.clients = kwargs["clients"]
533
513
            del kwargs["clients"]
534
 
        self.enabled = False
535
 
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
 
514
        return super(type(self), self).__init__(*args, **kwargs)
536
515
    def server_bind(self):
537
516
        """This overrides the normal server_bind() function
538
517
        to bind to an interface if one was specified, and also NOT to
567
546
#                                            if_nametoindex
568
547
#                                            (self.settings
569
548
#                                             ["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
 
549
            return super(type(self), self).server_bind()
576
550
 
577
551
 
578
552
def string_to_delta(interval):
588
562
    datetime.timedelta(1)
589
563
    >>> string_to_delta(u'1w')
590
564
    datetime.timedelta(7)
591
 
    >>> string_to_delta('5m 30s')
592
 
    datetime.timedelta(0, 330)
593
565
    """
594
 
    timevalue = datetime.timedelta(0)
595
 
    for s in interval.split():
596
 
        try:
597
 
            suffix = unicode(s[-1])
598
 
            value = int(s[:-1])
599
 
            if suffix == u"d":
600
 
                delta = datetime.timedelta(value)
601
 
            elif suffix == u"s":
602
 
                delta = datetime.timedelta(0, value)
603
 
            elif suffix == u"m":
604
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
605
 
            elif suffix == u"h":
606
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
607
 
            elif suffix == u"w":
608
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
609
 
            else:
610
 
                raise ValueError
611
 
        except (ValueError, IndexError):
 
566
    try:
 
567
        suffix=unicode(interval[-1])
 
568
        value=int(interval[:-1])
 
569
        if suffix == u"d":
 
570
            delta = datetime.timedelta(value)
 
571
        elif suffix == u"s":
 
572
            delta = datetime.timedelta(0, value)
 
573
        elif suffix == u"m":
 
574
            delta = datetime.timedelta(0, 0, 0, 0, value)
 
575
        elif suffix == u"h":
 
576
            delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
577
        elif suffix == u"w":
 
578
            delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
579
        else:
612
580
            raise ValueError
613
 
        timevalue += delta
614
 
    return timevalue
 
581
    except (ValueError, IndexError):
 
582
        raise ValueError
 
583
    return delta
615
584
 
616
585
 
617
586
def server_state_changed(state):
618
587
    """Derived from the Avahi example code"""
619
588
    if state == avahi.SERVER_COLLISION:
620
 
        logger.error(u"Zeroconf server name collision")
 
589
        logger.error(u"Server name collision")
621
590
        service.remove()
622
591
    elif state == avahi.SERVER_RUNNING:
623
592
        service.add()
625
594
 
626
595
def entry_group_state_changed(state, error):
627
596
    """Derived from the Avahi example code"""
628
 
    logger.debug(u"Avahi state change: %i", state)
 
597
    logger.debug(u"state change: %i", state)
629
598
    
630
599
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
631
 
        logger.debug(u"Zeroconf service established.")
 
600
        logger.debug(u"Service established.")
632
601
    elif state == avahi.ENTRY_GROUP_COLLISION:
633
 
        logger.warning(u"Zeroconf service name collision.")
 
602
        logger.warning(u"Service name collision.")
634
603
        service.rename()
635
604
    elif state == avahi.ENTRY_GROUP_FAILURE:
636
 
        logger.critical(u"Avahi: Error in group state changed %s",
 
605
        logger.critical(u"Error in group state changed %s",
637
606
                        unicode(error))
638
607
        raise AvahiGroupError("State changed: %s", str(error))
639
608
 
641
610
    """Call the C function if_nametoindex(), or equivalent"""
642
611
    global if_nametoindex
643
612
    try:
 
613
        if "ctypes.util" not in sys.modules:
 
614
            import ctypes.util
644
615
        if_nametoindex = ctypes.cdll.LoadLibrary\
645
616
            (ctypes.util.find_library("c")).if_nametoindex
646
617
    except (OSError, AttributeError):
684
655
 
685
656
 
686
657
def main():
 
658
    global main_loop_started
 
659
    main_loop_started = False
 
660
    
687
661
    parser = OptionParser(version = "%%prog %s" % version)
688
662
    parser.add_option("-i", "--interface", type="string",
689
663
                      metavar="IF", help="Bind to interface IF")
704
678
                      default="/etc/mandos", metavar="DIR",
705
679
                      help="Directory to search for configuration"
706
680
                      " files")
707
 
    options = parser.parse_args()[0]
 
681
    (options, args) = parser.parse_args()
708
682
    
709
683
    if options.check:
710
684
        import doctest
725
699
    server_config = ConfigParser.SafeConfigParser(server_defaults)
726
700
    del server_defaults
727
701
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
702
    server_section = "server"
728
703
    # Convert the SafeConfigParser object to a dict
729
 
    server_settings = server_config.defaults()
 
704
    server_settings = dict(server_config.items(server_section))
730
705
    # Use getboolean on the boolean config option
731
706
    server_settings["debug"] = server_config.getboolean\
732
 
                               ("DEFAULT", "debug")
 
707
                               (server_section, "debug")
733
708
    del server_config
734
709
    
735
710
    # Override the settings from the config file with command line
757
732
    # Parse config file with clients
758
733
    client_defaults = { "timeout": "1h",
759
734
                        "interval": "5m",
760
 
                        "checker": "fping -q -- %(host)s",
761
 
                        "host": "",
 
735
                        "checker": "fping -q -- %%(host)s",
762
736
                        }
763
737
    client_config = ConfigParser.SafeConfigParser(client_defaults)
764
738
    client_config.read(os.path.join(server_settings["configdir"],
765
739
                                    "clients.conf"))
766
740
    
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
741
    global service
803
742
    service = AvahiService(name = server_settings["servicename"],
804
 
                           servicetype = "_mandos._tcp", )
 
743
                           type = "_mandos._tcp", );
805
744
    if server_settings["interface"]:
806
 
        service.interface = if_nametoindex\
807
 
                            (server_settings["interface"])
 
745
        service.interface = if_nametoindex(server_settings["interface"])
808
746
    
809
747
    global main_loop
810
748
    global bus
813
751
    DBusGMainLoop(set_as_default=True )
814
752
    main_loop = gobject.MainLoop()
815
753
    bus = dbus.SystemBus()
816
 
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
817
 
                                           avahi.DBUS_PATH_SERVER),
818
 
                            avahi.DBUS_INTERFACE_SERVER)
 
754
    server = dbus.Interface(
 
755
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
 
756
            avahi.DBUS_INTERFACE_SERVER )
819
757
    # End of Avahi example code
820
758
    
 
759
    clients = Set()
821
760
    def remove_from_clients(client):
822
761
        clients.remove(client)
823
762
        if not clients:
833
772
        logger.critical(u"No clients defined")
834
773
        sys.exit(1)
835
774
    
836
 
    if debug:
837
 
        # Redirect stdin so all checkers get /dev/null
838
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
839
 
        os.dup2(null, sys.stdin.fileno())
840
 
        if null > 2:
841
 
            os.close(null)
842
 
    else:
843
 
        # No console logging
 
775
    if not debug:
844
776
        logger.removeHandler(console)
845
 
        # Close all input and output, do double fork, etc.
846
777
        daemon()
847
778
    
 
779
    pidfilename = "/var/run/mandos/mandos.pid"
 
780
    pid = os.getpid()
848
781
    try:
849
 
        pid = os.getpid()
 
782
        pidfile = open(pidfilename, "w")
850
783
        pidfile.write(str(pid) + "\n")
851
784
        pidfile.close()
852
785
        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
 
786
    except IOError, err:
 
787
        logger.error(u"Could not write %s file with PID %d",
 
788
                     pidfilename, os.getpid())
860
789
    
861
790
    def cleanup():
862
791
        "Cleanup function; run on exit"
882
811
    for client in clients:
883
812
        client.start()
884
813
    
885
 
    tcp_server.enable()
886
 
    tcp_server.server_activate()
887
 
    
 
814
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
815
                                 server_settings["port"]),
 
816
                                tcp_handler,
 
817
                                settings=server_settings,
 
818
                                clients=clients)
888
819
    # Find out what port we got
889
820
    service.port = tcp_server.socket.getsockname()[1]
890
821
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
908
839
                             (*args[2:], **kwargs) or True)
909
840
        
910
841
        logger.debug(u"Starting main loop")
 
842
        main_loop_started = True
911
843
        main_loop.run()
912
844
    except AvahiError, error:
913
845
        logger.critical(u"AvahiError: %s" + unicode(error))