/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-07 21:45:41 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080807214541-pyg8itw6kphz1dy5
* plugbasedclient.c: Renamed to "mandos-client.c".  All users changed.

* plugins.d/mandosclient.c: Renamed to "plugins.d/password-request.c".
                            All users changed.

* plugins.d/passprompt.c: Renamed to "plugins.d/password-prompt.c".
                          All users changed.

* server.conf: Renamed to "mandos.conf".  All users changed.

* server.py: Renamed to "mandos".
  (daemon): Have default values for arguments. Caller changed.

* Makefile (distclean, mostlyclean, maintainer-clean): New aliases for
                                                       "clean".
  (check, run-client, run-server): New.

* network-protocol.txt: New.

Show diffs side-by-side

added added

removed removed

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