/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

Fixed fallback on error in mandos-client
fixed a bug in password-request

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