/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to server.py

  • Committer: Teddy Hogeborn
  • Date: 2008-08-04 23:38:26 UTC
  • mfrom: (24.1.20 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080804233826-idy7v8x36llseue0
* network-protocol.txt: New.

* server.py (daemon): Do the double fork thing.

Show diffs side-by-side

added added

removed removed

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