/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-16 03:29:08 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080816032908-ihw7c05r2mnyk389
Add feature to specify custom environment variables for plugins.

* plugin-runner.c (plugin): New members "environ" and "envc" to
                            contain possible custom environment.
  (getplugin): Return NULL on failure instead of doing exit(); all
               callers changed.
  (add_to_char_array): New helper function for "add_argument" and
                       "add_environment".
  (addargument): Renamed to "add_argument".  Return bool.  Call
                 "add_to_char_array" to actually do things.
  (add_environment): New; analogous to "add_argument".
  (addcustomargument): Renamed to "add_to_argv" to avoid confusion
                       with "add_argument".
  (main): New options "--global-envs" and "--envs-for" to specify
          custom environment for plugins.  Print environment for
          plugins in debug mode.  Use asprintf instead of strcpy and
          strcat.  Use execve() for plugins with custom environments.
          Free environment for plugin when freeing plugin list.

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