/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 mandos

  • Committer: Teddy Hogeborn
  • Date: 2008-08-18 05:24:20 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080818052420-ab5eurrioz8n2qy6
* Makefile: Bug fix: fixed creation of man pages in "plugins.d".

* mandos-keygen Bug fix: make the --expire option modify
                KEYEXPIRE, not KEYCOMMENT.  Use the "--no-options"
                option to gpg when exporting keys from the temporary
                key ring files.

* mandos-keygen.xml (EXIT STATUS): Filled in.
  (ENVIRONMENT): New section, documenting use of TMPDIR.
  (FILES): Document use of key files and /tmp.
  (BUGS): Filled in.
  (EXAMPLE): Added two examples.
  (SECURITY): Added some text.

* plugins.d/password-prompt.xml (NOTES): Removed, since this is
                                         created automatically for
                                         footnotes.
  (ENVIRONMENT, FILES): Added empty sections.
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).

* plugins.d/password-request.xml: Reordered sections.
  (ENVIRONMENT): New empty section.
  (EXAMPLES): Renamed to "EXAMPLE", as per man-pages(7).

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
114
119
        self.domain = domain
115
120
        self.host = host
116
121
        self.rename_count = 0
 
122
        self.max_renames = max_renames
117
123
    def rename(self):
118
124
        """Derived from the Avahi example code"""
119
125
        if self.rename_count >= self.max_renames:
120
126
            logger.critical(u"No suitable service name found after %i"
121
127
                            u" retries, exiting.", rename_count)
122
128
            raise AvahiServiceError("Too many renames")
123
 
        name = server.GetAlternativeServiceName(name)
124
 
        logger.error(u"Changing name to %r ...", name)
 
129
        self.name = server.GetAlternativeServiceName(self.name)
 
130
        logger.info(u"Changing name to %r ...", str(self.name))
 
131
        syslogger.setFormatter(logging.Formatter\
 
132
                               ('Mandos (%s): %%(levelname)s:'
 
133
                               ' %%(message)s' % self.name))
125
134
        self.remove()
126
135
        self.add()
127
136
        self.rename_count += 1
163
172
    fingerprint: string (40 or 32 hexadecimal digits); used to
164
173
                 uniquely identify the client
165
174
    secret:    bytestring; sent verbatim (over TLS) to client
166
 
    fqdn:      string (FQDN); available for use by the checker command
 
175
    host:      string; available for use by the checker command
167
176
    created:   datetime.datetime(); object creation, not client host
168
177
    last_checked_ok: datetime.datetime() or None if not yet checked OK
169
178
    timeout:   datetime.timedelta(); How long from last_checked_ok
230
239
        else:
231
240
            raise TypeError(u"No secret or secfile for client %s"
232
241
                            % self.name)
233
 
        self.fqdn = config.get("fqdn", "")
 
242
        self.host = config.get("host", "")
234
243
        self.created = datetime.datetime.now()
235
244
        self.last_checked_ok = None
236
245
        self.timeout = string_to_delta(config["timeout"])
259
268
        The possibility that a client might be restarted is left open,
260
269
        but not currently used."""
261
270
        # If this client doesn't have a secret, it is already stopped.
262
 
        if self.secret:
 
271
        if hasattr(self, "secret") and self.secret:
263
272
            logger.info(u"Stopping client %s", self.name)
264
273
            self.secret = None
265
274
        else:
313
322
        if self.checker is None:
314
323
            try:
315
324
                # In case check_command has exactly one % operator
316
 
                command = self.check_command % self.fqdn
 
325
                command = self.check_command % self.host
317
326
            except TypeError:
318
327
                # Escape attributes for the shell
319
328
                escaped_attrs = dict((key, re.escape(str(val)))
346
355
            self.checker_callback_tag = None
347
356
        if getattr(self, "checker", None) is None:
348
357
            return
349
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
358
        logger.debug(u"Stopping checker for %(name)s", vars(self))
350
359
        try:
351
360
            os.kill(self.checker.pid, signal.SIGTERM)
352
361
            #os.sleep(0.5)
528
537
                in6addr_any = "::"
529
538
                self.server_address = (in6addr_any,
530
539
                                       self.server_address[1])
531
 
            elif self.server_address[1] is None:
 
540
            elif not self.server_address[1]:
532
541
                self.server_address = (self.server_address[0],
533
542
                                       0)
 
543
#                 if self.settings["interface"]:
 
544
#                     self.server_address = (self.server_address[0],
 
545
#                                            0, # port
 
546
#                                            0, # flowinfo
 
547
#                                            if_nametoindex
 
548
#                                            (self.settings
 
549
#                                             ["interface"]))
534
550
            return super(type(self), self).server_bind()
535
551
 
536
552
 
616
632
    return if_nametoindex(interface)
617
633
 
618
634
 
619
 
def daemon(nochdir, noclose):
 
635
def daemon(nochdir = False, noclose = False):
620
636
    """See daemon(3).  Standard BSD Unix function.
621
637
    This should really exist as os.daemon, but it doesn't (yet)."""
622
638
    if os.fork():
643
659
    global main_loop_started
644
660
    main_loop_started = False
645
661
    
646
 
    parser = OptionParser()
 
662
    parser = OptionParser(version = "%%prog %s" % version)
647
663
    parser.add_option("-i", "--interface", type="string",
648
664
                      metavar="IF", help="Bind to interface IF")
649
665
    parser.add_option("-a", "--address", type="string",
652
668
                      help="Port number to receive requests on")
653
669
    parser.add_option("--check", action="store_true", default=False,
654
670
                      help="Run self-test")
655
 
    parser.add_option("--debug", action="store_true", default=False,
 
671
    parser.add_option("--debug", action="store_true",
656
672
                      help="Debug mode; run in foreground and log to"
657
673
                      " terminal")
658
674
    parser.add_option("--priority", type="string", help="GnuTLS"
683
699
    # Parse config file for server-global settings
684
700
    server_config = ConfigParser.SafeConfigParser(server_defaults)
685
701
    del server_defaults
686
 
    server_config.read(os.path.join(options.configdir, "server.conf"))
 
702
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
687
703
    server_section = "server"
688
704
    # Convert the SafeConfigParser object to a dict
689
705
    server_settings = dict(server_config.items(server_section))
702
718
    del options
703
719
    # Now we have our good server settings in "server_settings"
704
720
    
 
721
    debug = server_settings["debug"]
 
722
    
 
723
    if not debug:
 
724
        syslogger.setLevel(logging.WARNING)
 
725
        console.setLevel(logging.WARNING)
 
726
    
 
727
    if server_settings["servicename"] != "Mandos":
 
728
        syslogger.setFormatter(logging.Formatter\
 
729
                               ('Mandos (%s): %%(levelname)s:'
 
730
                                ' %%(message)s'
 
731
                                % server_settings["servicename"]))
 
732
    
705
733
    # Parse config file with clients
706
734
    client_defaults = { "timeout": "1h",
707
735
                        "interval": "5m",
708
 
                        "checker": "fping -q -- %%(fqdn)s",
 
736
                        "checker": "fping -q -- %%(host)s",
709
737
                        }
710
738
    client_config = ConfigParser.SafeConfigParser(client_defaults)
711
739
    client_config.read(os.path.join(server_settings["configdir"],
729
757
            avahi.DBUS_INTERFACE_SERVER )
730
758
    # End of Avahi example code
731
759
    
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
760
    clients = Set()
743
761
    def remove_from_clients(client):
744
762
        clients.remove(client)
751
769
                              config
752
770
                              = dict(client_config.items(section)))
753
771
                       for section in client_config.sections()))
 
772
    if not clients:
 
773
        logger.critical(u"No clients defined")
 
774
        sys.exit(1)
754
775
    
755
776
    if not debug:
756
 
        daemon(False, False)
 
777
        logger.removeHandler(console)
 
778
        daemon()
 
779
    
 
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())
757
790
    
758
791
    def cleanup():
759
792
        "Cleanup function; run on exit"
806
839
                             tcp_server.handle_request\
807
840
                             (*args[2:], **kwargs) or True)
808
841
        
809
 
        logger.debug("Starting main loop")
 
842
        logger.debug(u"Starting main loop")
810
843
        main_loop_started = True
811
844
        main_loop.run()
812
845
    except AvahiError, error: