/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
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
# 
55
54
import stat
56
55
import logging
57
56
import logging.handlers
58
 
import pwd
59
57
 
60
58
import dbus
61
59
import gobject
121
119
        self.domain = domain
122
120
        self.host = host
123
121
        self.rename_count = 0
124
 
        self.max_renames = max_renames
125
122
    def rename(self):
126
123
        """Derived from the Avahi example code"""
127
124
        if self.rename_count >= self.max_renames:
128
 
            logger.critical(u"No suitable Zeroconf service name found"
129
 
                            u" after %i retries, exiting.",
130
 
                            rename_count)
 
125
            logger.critical(u"No suitable service name found after %i"
 
126
                            u" retries, exiting.", rename_count)
131
127
            raise AvahiServiceError("Too many renames")
132
 
        self.name = server.GetAlternativeServiceName(self.name)
133
 
        logger.info(u"Changing Zeroconf service name to %r ...",
134
 
                    str(self.name))
 
128
        name = server.GetAlternativeServiceName(name)
 
129
        logger.error(u"Changing name to %r ...", name)
135
130
        syslogger.setFormatter(logging.Formatter\
136
131
                               ('Mandos (%s): %%(levelname)s:'
137
 
                               ' %%(message)s' % self.name))
 
132
                               ' %%(message)s' % name))
138
133
        self.remove()
139
134
        self.add()
140
135
        self.rename_count += 1
152
147
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
153
148
            group.connect_to_signal('StateChanged',
154
149
                                    entry_group_state_changed)
155
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
150
        logger.debug(u"Adding service '%s' of type '%s' ...",
156
151
                     service.name, service.type)
157
152
        group.AddService(
158
153
                self.interface,         # interface
341
336
            try:
342
337
                logger.info(u"Starting checker %r for %s",
343
338
                            command, self.name)
344
 
                # We don't need to redirect stdout and stderr, since
345
 
                # in normal mode, that is already done by daemon(),
346
 
                # and in debug mode we don't want to.  (Stdin is
347
 
                # always replaced by /dev/null.)
348
339
                self.checker = subprocess.Popen(command,
349
340
                                                close_fds=True,
350
341
                                                shell=True, cwd="/")
351
342
                self.checker_callback_tag = gobject.child_watch_add\
352
343
                                            (self.checker.pid,
353
344
                                             self.checker_callback)
354
 
            except OSError, error:
 
345
            except subprocess.OSError, error:
355
346
                logger.error(u"Failed to start subprocess: %s",
356
347
                             error)
357
348
        # Re-run this periodically if run by gobject.timeout_add
414
405
    gnutls.library.functions.gnutls_openpgp_crt_import\
415
406
                    (crt, ctypes.byref(datum),
416
407
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
417
 
    # Verify the self signature in the key
418
 
    crtverify = ctypes.c_uint();
419
 
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
420
 
        (crt, 0, ctypes.byref(crtverify))
421
 
    if crtverify.value != 0:
422
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
423
 
        raise gnutls.errors.CertificateSecurityError("Verify failed")
424
408
    # New buffer for the fingerprint
425
409
    buffer = ctypes.create_string_buffer(20)
426
410
    buffer_length = ctypes.c_size_t()
518
502
    Attributes:
519
503
        settings:       Server settings
520
504
        clients:        Set() of Client objects
521
 
        enabled:        Boolean; whether this server is activated yet
522
505
    """
523
506
    address_family = socket.AF_INET6
524
507
    def __init__(self, *args, **kwargs):
528
511
        if "clients" in kwargs:
529
512
            self.clients = kwargs["clients"]
530
513
            del kwargs["clients"]
531
 
        self.enabled = False
532
514
        return super(type(self), self).__init__(*args, **kwargs)
533
515
    def server_bind(self):
534
516
        """This overrides the normal server_bind() function
565
547
#                                            (self.settings
566
548
#                                             ["interface"]))
567
549
            return super(type(self), self).server_bind()
568
 
    def server_activate(self):
569
 
        if self.enabled:
570
 
            return super(type(self), self).server_activate()
571
 
    def enable(self):
572
 
        self.enabled = True
573
550
 
574
551
 
575
552
def string_to_delta(interval):
585
562
    datetime.timedelta(1)
586
563
    >>> string_to_delta(u'1w')
587
564
    datetime.timedelta(7)
588
 
    >>> string_to_delta('5m 30s')
589
 
    datetime.timedelta(0, 330)
590
565
    """
591
 
    timevalue = datetime.timedelta(0)
592
 
    for s in interval.split():
593
 
        try:
594
 
            suffix=unicode(s[-1])
595
 
            value=int(s[:-1])
596
 
            if suffix == u"d":
597
 
                delta = datetime.timedelta(value)
598
 
            elif suffix == u"s":
599
 
                delta = datetime.timedelta(0, value)
600
 
            elif suffix == u"m":
601
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
602
 
            elif suffix == u"h":
603
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
604
 
            elif suffix == u"w":
605
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
606
 
            else:
607
 
                raise ValueError
608
 
        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:
609
580
            raise ValueError
610
 
        timevalue += delta
611
 
    return timevalue
 
581
    except (ValueError, IndexError):
 
582
        raise ValueError
 
583
    return delta
612
584
 
613
585
 
614
586
def server_state_changed(state):
615
587
    """Derived from the Avahi example code"""
616
588
    if state == avahi.SERVER_COLLISION:
617
 
        logger.error(u"Zeroconf server name collision")
 
589
        logger.error(u"Server name collision")
618
590
        service.remove()
619
591
    elif state == avahi.SERVER_RUNNING:
620
592
        service.add()
622
594
 
623
595
def entry_group_state_changed(state, error):
624
596
    """Derived from the Avahi example code"""
625
 
    logger.debug(u"Avahi state change: %i", state)
 
597
    logger.debug(u"state change: %i", state)
626
598
    
627
599
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
628
 
        logger.debug(u"Zeroconf service established.")
 
600
        logger.debug(u"Service established.")
629
601
    elif state == avahi.ENTRY_GROUP_COLLISION:
630
 
        logger.warning(u"Zeroconf service name collision.")
 
602
        logger.warning(u"Service name collision.")
631
603
        service.rename()
632
604
    elif state == avahi.ENTRY_GROUP_FAILURE:
633
 
        logger.critical(u"Avahi: Error in group state changed %s",
 
605
        logger.critical(u"Error in group state changed %s",
634
606
                        unicode(error))
635
607
        raise AvahiGroupError("State changed: %s", str(error))
636
608
 
727
699
    server_config = ConfigParser.SafeConfigParser(server_defaults)
728
700
    del server_defaults
729
701
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
702
    server_section = "server"
730
703
    # Convert the SafeConfigParser object to a dict
731
 
    server_settings = server_config.defaults()
 
704
    server_settings = dict(server_config.items(server_section))
732
705
    # Use getboolean on the boolean config option
733
706
    server_settings["debug"] = server_config.getboolean\
734
 
                               ("DEFAULT", "debug")
 
707
                               (server_section, "debug")
735
708
    del server_config
736
709
    
737
710
    # Override the settings from the config file with command line
759
732
    # Parse config file with clients
760
733
    client_defaults = { "timeout": "1h",
761
734
                        "interval": "5m",
762
 
                        "checker": "fping -q -- %(host)s",
763
 
                        "host": "",
 
735
                        "checker": "fping -q -- %%(host)s",
764
736
                        }
765
737
    client_config = ConfigParser.SafeConfigParser(client_defaults)
766
738
    client_config.read(os.path.join(server_settings["configdir"],
767
739
                                    "clients.conf"))
768
740
    
769
 
    clients = Set()
770
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
771
 
                                 server_settings["port"]),
772
 
                                tcp_handler,
773
 
                                settings=server_settings,
774
 
                                clients=clients)
775
 
    pidfilename = "/var/run/mandos.pid"
776
 
    try:
777
 
        pidfile = open(pidfilename, "w")
778
 
    except IOError, error:
779
 
        logger.error("Could not open file %r", pidfilename)
780
 
    
781
 
    uid = 65534
782
 
    gid = 65534
783
 
    try:
784
 
        uid = pwd.getpwnam("mandos").pw_uid
785
 
    except KeyError:
786
 
        try:
787
 
            uid = pwd.getpwnam("nobody").pw_uid
788
 
        except KeyError:
789
 
            pass
790
 
    try:
791
 
        gid = pwd.getpwnam("mandos").pw_gid
792
 
    except KeyError:
793
 
        try:
794
 
            gid = pwd.getpwnam("nogroup").pw_gid
795
 
        except KeyError:
796
 
            pass
797
 
    try:
798
 
        os.setuid(uid)
799
 
        os.setgid(gid)
800
 
    except OSError, error:
801
 
        if error[0] != errno.EPERM:
802
 
            raise error
803
 
    
804
741
    global service
805
742
    service = AvahiService(name = server_settings["servicename"],
806
743
                           type = "_mandos._tcp", );
807
744
    if server_settings["interface"]:
808
 
        service.interface = if_nametoindex\
809
 
                            (server_settings["interface"])
 
745
        service.interface = if_nametoindex(server_settings["interface"])
810
746
    
811
747
    global main_loop
812
748
    global bus
815
751
    DBusGMainLoop(set_as_default=True )
816
752
    main_loop = gobject.MainLoop()
817
753
    bus = dbus.SystemBus()
818
 
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
819
 
                                           avahi.DBUS_PATH_SERVER),
820
 
                            avahi.DBUS_INTERFACE_SERVER)
 
754
    server = dbus.Interface(
 
755
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
 
756
            avahi.DBUS_INTERFACE_SERVER )
821
757
    # End of Avahi example code
822
758
    
 
759
    clients = Set()
823
760
    def remove_from_clients(client):
824
761
        clients.remove(client)
825
762
        if not clients:
835
772
        logger.critical(u"No clients defined")
836
773
        sys.exit(1)
837
774
    
838
 
    if debug:
839
 
        # Redirect stdin so all checkers get /dev/null
840
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
841
 
        os.dup2(null, sys.stdin.fileno())
842
 
        if null > 2:
843
 
            os.close(null)
844
 
    else:
845
 
        # No console logging
 
775
    if not debug:
846
776
        logger.removeHandler(console)
847
 
        # Close all input and output, do double fork, etc.
848
777
        daemon()
849
778
    
 
779
    pidfilename = "/var/run/mandos/mandos.pid"
 
780
    pid = os.getpid()
850
781
    try:
851
 
        pid = os.getpid()
 
782
        pidfile = open(pidfilename, "w")
852
783
        pidfile.write(str(pid) + "\n")
853
784
        pidfile.close()
854
785
        del pidfile
855
786
    except IOError, err:
856
 
        logger.error(u"Could not write to file %r with PID %d",
857
 
                     pidfilename, pid)
858
 
    except NameError:
859
 
        # "pidfile" was never created
860
 
        pass
861
 
    del pidfilename
 
787
        logger.error(u"Could not write %s file with PID %d",
 
788
                     pidfilename, os.getpid())
862
789
    
863
790
    def cleanup():
864
791
        "Cleanup function; run on exit"
884
811
    for client in clients:
885
812
        client.start()
886
813
    
887
 
    tcp_server.enable()
888
 
    tcp_server.server_activate()
889
 
    
 
814
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
815
                                 server_settings["port"]),
 
816
                                tcp_handler,
 
817
                                settings=server_settings,
 
818
                                clients=clients)
890
819
    # Find out what port we got
891
820
    service.port = tcp_server.socket.getsockname()[1]
892
821
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"