/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

Added fallback to mandos-client

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
61
61
from dbus.mainloop.glib import DBusGMainLoop
62
62
import ctypes
63
63
 
 
64
version = "1.0"
64
65
 
65
66
logger = logging.Logger('mandos')
66
67
syslogger = logging.handlers.SysLogHandler\
67
 
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON)
 
68
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
69
             address = "/dev/log")
68
70
syslogger.setFormatter(logging.Formatter\
69
 
                        ('%(levelname)s: %(message)s'))
 
71
                        ('Mandos: %(levelname)s: %(message)s'))
70
72
logger.addHandler(syslogger)
71
 
del syslogger
72
73
 
 
74
console = logging.StreamHandler()
 
75
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
 
76
                                       ' %(message)s'))
 
77
logger.addHandler(console)
73
78
 
74
79
class AvahiError(Exception):
75
80
    def __init__(self, value):
102
107
    """
103
108
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
104
109
                 type = None, port = None, TXT = None, domain = "",
105
 
                 host = "", max_renames = 12):
 
110
                 host = "", max_renames = 32768):
106
111
        self.interface = interface
107
112
        self.name = name
108
113
        self.type = type
122
127
            raise AvahiServiceError("Too many renames")
123
128
        name = server.GetAlternativeServiceName(name)
124
129
        logger.error(u"Changing name to %r ...", name)
 
130
        syslogger.setFormatter(logging.Formatter\
 
131
                               ('Mandos (%s): %%(levelname)s:'
 
132
                               ' %%(message)s' % name))
125
133
        self.remove()
126
134
        self.add()
127
135
        self.rename_count += 1
163
171
    fingerprint: string (40 or 32 hexadecimal digits); used to
164
172
                 uniquely identify the client
165
173
    secret:    bytestring; sent verbatim (over TLS) to client
166
 
    fqdn:      string (FQDN); available for use by the checker command
 
174
    host:      string; available for use by the checker command
167
175
    created:   datetime.datetime(); object creation, not client host
168
176
    last_checked_ok: datetime.datetime() or None if not yet checked OK
169
177
    timeout:   datetime.timedelta(); How long from last_checked_ok
230
238
        else:
231
239
            raise TypeError(u"No secret or secfile for client %s"
232
240
                            % self.name)
233
 
        self.fqdn = config.get("fqdn", "")
 
241
        self.host = config.get("host", "")
234
242
        self.created = datetime.datetime.now()
235
243
        self.last_checked_ok = None
236
244
        self.timeout = string_to_delta(config["timeout"])
259
267
        The possibility that a client might be restarted is left open,
260
268
        but not currently used."""
261
269
        # If this client doesn't have a secret, it is already stopped.
262
 
        if self.secret:
 
270
        if hasattr(self, "secret") and self.secret:
263
271
            logger.info(u"Stopping client %s", self.name)
264
272
            self.secret = None
265
273
        else:
313
321
        if self.checker is None:
314
322
            try:
315
323
                # In case check_command has exactly one % operator
316
 
                command = self.check_command % self.fqdn
 
324
                command = self.check_command % self.host
317
325
            except TypeError:
318
326
                # Escape attributes for the shell
319
327
                escaped_attrs = dict((key, re.escape(str(val)))
346
354
            self.checker_callback_tag = None
347
355
        if getattr(self, "checker", None) is None:
348
356
            return
349
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
357
        logger.debug(u"Stopping checker for %(name)s", vars(self))
350
358
        try:
351
359
            os.kill(self.checker.pid, signal.SIGTERM)
352
360
            #os.sleep(0.5)
528
536
                in6addr_any = "::"
529
537
                self.server_address = (in6addr_any,
530
538
                                       self.server_address[1])
531
 
            elif self.server_address[1] is None:
 
539
            elif not self.server_address[1]:
532
540
                self.server_address = (self.server_address[0],
533
541
                                       0)
 
542
#                 if self.settings["interface"]:
 
543
#                     self.server_address = (self.server_address[0],
 
544
#                                            0, # port
 
545
#                                            0, # flowinfo
 
546
#                                            if_nametoindex
 
547
#                                            (self.settings
 
548
#                                             ["interface"]))
534
549
            return super(type(self), self).server_bind()
535
550
 
536
551
 
643
658
    global main_loop_started
644
659
    main_loop_started = False
645
660
    
646
 
    parser = OptionParser()
 
661
    parser = OptionParser(version = "%%prog %s" % version)
647
662
    parser.add_option("-i", "--interface", type="string",
648
663
                      metavar="IF", help="Bind to interface IF")
649
664
    parser.add_option("-a", "--address", type="string",
652
667
                      help="Port number to receive requests on")
653
668
    parser.add_option("--check", action="store_true", default=False,
654
669
                      help="Run self-test")
655
 
    parser.add_option("--debug", action="store_true", default=False,
 
670
    parser.add_option("--debug", action="store_true",
656
671
                      help="Debug mode; run in foreground and log to"
657
672
                      " terminal")
658
673
    parser.add_option("--priority", type="string", help="GnuTLS"
702
717
    del options
703
718
    # Now we have our good server settings in "server_settings"
704
719
    
 
720
    debug = server_settings["debug"]
 
721
    
 
722
    if not debug:
 
723
        syslogger.setLevel(logging.WARNING)
 
724
        console.setLevel(logging.WARNING)
 
725
    
 
726
    if server_settings["servicename"] != "Mandos":
 
727
        syslogger.setFormatter(logging.Formatter\
 
728
                               ('Mandos (%s): %%(levelname)s:'
 
729
                                ' %%(message)s'
 
730
                                % server_settings["servicename"]))
 
731
    
705
732
    # Parse config file with clients
706
733
    client_defaults = { "timeout": "1h",
707
734
                        "interval": "5m",
708
 
                        "checker": "fping -q -- %%(fqdn)s",
 
735
                        "checker": "fping -q -- %%(host)s",
709
736
                        }
710
737
    client_config = ConfigParser.SafeConfigParser(client_defaults)
711
738
    client_config.read(os.path.join(server_settings["configdir"],
729
756
            avahi.DBUS_INTERFACE_SERVER )
730
757
    # End of Avahi example code
731
758
    
732
 
    debug = server_settings["debug"]
733
 
    
734
 
    if debug:
735
 
        console = logging.StreamHandler()
736
 
        # console.setLevel(logging.DEBUG)
737
 
        console.setFormatter(logging.Formatter\
738
 
                             ('%(levelname)s: %(message)s'))
739
 
        logger.addHandler(console)
740
 
        del console
741
 
    
742
759
    clients = Set()
743
760
    def remove_from_clients(client):
744
761
        clients.remove(client)
751
768
                              config
752
769
                              = dict(client_config.items(section)))
753
770
                       for section in client_config.sections()))
 
771
    if not clients:
 
772
        logger.critical(u"No clients defined")
 
773
        sys.exit(1)
754
774
    
755
775
    if not debug:
 
776
        logger.removeHandler(console)
756
777
        daemon()
757
778
    
 
779
    pidfilename = "/var/run/mandos/mandos.pid"
 
780
    pid = os.getpid()
 
781
    try:
 
782
        pidfile = open(pidfilename, "w")
 
783
        pidfile.write(str(pid) + "\n")
 
784
        pidfile.close()
 
785
        del pidfile
 
786
    except IOError, err:
 
787
        logger.error(u"Could not write %s file with PID %d",
 
788
                     pidfilename, os.getpid())
 
789
    
758
790
    def cleanup():
759
791
        "Cleanup function; run on exit"
760
792
        global group
806
838
                             tcp_server.handle_request\
807
839
                             (*args[2:], **kwargs) or True)
808
840
        
809
 
        logger.debug("Starting main loop")
 
841
        logger.debug(u"Starting main loop")
810
842
        main_loop_started = True
811
843
        main_loop.run()
812
844
    except AvahiError, error: