/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
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
119
114
        self.domain = domain
120
115
        self.host = host
121
116
        self.rename_count = 0
122
 
        self.max_renames = max_renames
123
117
    def rename(self):
124
118
        """Derived from the Avahi example code"""
125
119
        if self.rename_count >= self.max_renames:
126
120
            logger.critical(u"No suitable service name found after %i"
127
121
                            u" retries, exiting.", rename_count)
128
122
            raise AvahiServiceError("Too many renames")
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))
 
123
        name = server.GetAlternativeServiceName(name)
 
124
        logger.error(u"Changing name to %r ...", name)
134
125
        self.remove()
135
126
        self.add()
136
127
        self.rename_count += 1
172
163
    fingerprint: string (40 or 32 hexadecimal digits); used to
173
164
                 uniquely identify the client
174
165
    secret:    bytestring; sent verbatim (over TLS) to client
175
 
    host:      string; available for use by the checker command
 
166
    fqdn:      string (FQDN); available for use by the checker command
176
167
    created:   datetime.datetime(); object creation, not client host
177
168
    last_checked_ok: datetime.datetime() or None if not yet checked OK
178
169
    timeout:   datetime.timedelta(); How long from last_checked_ok
239
230
        else:
240
231
            raise TypeError(u"No secret or secfile for client %s"
241
232
                            % self.name)
242
 
        self.host = config.get("host", "")
 
233
        self.fqdn = config.get("fqdn", "")
243
234
        self.created = datetime.datetime.now()
244
235
        self.last_checked_ok = None
245
236
        self.timeout = string_to_delta(config["timeout"])
268
259
        The possibility that a client might be restarted is left open,
269
260
        but not currently used."""
270
261
        # If this client doesn't have a secret, it is already stopped.
271
 
        if hasattr(self, "secret") and self.secret:
 
262
        if self.secret:
272
263
            logger.info(u"Stopping client %s", self.name)
273
264
            self.secret = None
274
265
        else:
322
313
        if self.checker is None:
323
314
            try:
324
315
                # In case check_command has exactly one % operator
325
 
                command = self.check_command % self.host
 
316
                command = self.check_command % self.fqdn
326
317
            except TypeError:
327
318
                # Escape attributes for the shell
328
319
                escaped_attrs = dict((key, re.escape(str(val)))
337
328
            try:
338
329
                logger.info(u"Starting checker %r for %s",
339
330
                            command, self.name)
340
 
                # We don't need to redirect stdout and stderr, since
341
 
                # in normal mode, that is already done by daemon(),
342
 
                # and in debug mode we don't want to.  (Stdin is
343
 
                # always replaced by /dev/null.)
344
331
                self.checker = subprocess.Popen(command,
345
332
                                                close_fds=True,
346
333
                                                shell=True, cwd="/")
347
334
                self.checker_callback_tag = gobject.child_watch_add\
348
335
                                            (self.checker.pid,
349
336
                                             self.checker_callback)
350
 
            except OSError, error:
 
337
            except subprocess.OSError, error:
351
338
                logger.error(u"Failed to start subprocess: %s",
352
339
                             error)
353
340
        # Re-run this periodically if run by gobject.timeout_add
359
346
            self.checker_callback_tag = None
360
347
        if getattr(self, "checker", None) is None:
361
348
            return
362
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
349
        logger.debug("Stopping checker for %(name)s", vars(self))
363
350
        try:
364
351
            os.kill(self.checker.pid, signal.SIGTERM)
365
352
            #os.sleep(0.5)
541
528
                in6addr_any = "::"
542
529
                self.server_address = (in6addr_any,
543
530
                                       self.server_address[1])
544
 
            elif not self.server_address[1]:
 
531
            elif self.server_address[1] is None:
545
532
                self.server_address = (self.server_address[0],
546
533
                                       0)
547
 
#                 if self.settings["interface"]:
548
 
#                     self.server_address = (self.server_address[0],
549
 
#                                            0, # port
550
 
#                                            0, # flowinfo
551
 
#                                            if_nametoindex
552
 
#                                            (self.settings
553
 
#                                             ["interface"]))
554
534
            return super(type(self), self).server_bind()
555
535
 
556
536
 
567
547
    datetime.timedelta(1)
568
548
    >>> string_to_delta(u'1w')
569
549
    datetime.timedelta(7)
570
 
    >>> string_to_delta('5m 30s')
571
 
    datetime.timedelta(0, 330)
572
550
    """
573
 
    timevalue = datetime.timedelta(0)
574
 
    for s in interval.split():
575
 
        try:
576
 
            suffix=unicode(s[-1])
577
 
            value=int(s[:-1])
578
 
            if suffix == u"d":
579
 
                delta = datetime.timedelta(value)
580
 
            elif suffix == u"s":
581
 
                delta = datetime.timedelta(0, value)
582
 
            elif suffix == u"m":
583
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
584
 
            elif suffix == u"h":
585
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
586
 
            elif suffix == u"w":
587
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
588
 
            else:
589
 
                raise ValueError
590
 
        except (ValueError, IndexError):
 
551
    try:
 
552
        suffix=unicode(interval[-1])
 
553
        value=int(interval[:-1])
 
554
        if suffix == u"d":
 
555
            delta = datetime.timedelta(value)
 
556
        elif suffix == u"s":
 
557
            delta = datetime.timedelta(0, value)
 
558
        elif suffix == u"m":
 
559
            delta = datetime.timedelta(0, 0, 0, 0, value)
 
560
        elif suffix == u"h":
 
561
            delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
562
        elif suffix == u"w":
 
563
            delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
564
        else:
591
565
            raise ValueError
592
 
        timevalue += delta
593
 
    return timevalue
 
566
    except (ValueError, IndexError):
 
567
        raise ValueError
 
568
    return delta
594
569
 
595
570
 
596
571
def server_state_changed(state):
668
643
    global main_loop_started
669
644
    main_loop_started = False
670
645
    
671
 
    parser = OptionParser(version = "%%prog %s" % version)
 
646
    parser = OptionParser()
672
647
    parser.add_option("-i", "--interface", type="string",
673
648
                      metavar="IF", help="Bind to interface IF")
674
649
    parser.add_option("-a", "--address", type="string",
677
652
                      help="Port number to receive requests on")
678
653
    parser.add_option("--check", action="store_true", default=False,
679
654
                      help="Run self-test")
680
 
    parser.add_option("--debug", action="store_true",
 
655
    parser.add_option("--debug", action="store_true", default=False,
681
656
                      help="Debug mode; run in foreground and log to"
682
657
                      " terminal")
683
658
    parser.add_option("--priority", type="string", help="GnuTLS"
709
684
    server_config = ConfigParser.SafeConfigParser(server_defaults)
710
685
    del server_defaults
711
686
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
687
    server_section = "server"
712
688
    # Convert the SafeConfigParser object to a dict
713
 
    server_settings = server_config.defaults()
 
689
    server_settings = dict(server_config.items(server_section))
714
690
    # Use getboolean on the boolean config option
715
691
    server_settings["debug"] = server_config.getboolean\
716
 
                               ("DEFAULT", "debug")
 
692
                               (server_section, "debug")
717
693
    del server_config
718
694
    
719
695
    # Override the settings from the config file with command line
726
702
    del options
727
703
    # Now we have our good server settings in "server_settings"
728
704
    
729
 
    debug = server_settings["debug"]
730
 
    
731
 
    if not debug:
732
 
        syslogger.setLevel(logging.WARNING)
733
 
        console.setLevel(logging.WARNING)
734
 
    
735
 
    if server_settings["servicename"] != "Mandos":
736
 
        syslogger.setFormatter(logging.Formatter\
737
 
                               ('Mandos (%s): %%(levelname)s:'
738
 
                                ' %%(message)s'
739
 
                                % server_settings["servicename"]))
740
 
    
741
705
    # Parse config file with clients
742
706
    client_defaults = { "timeout": "1h",
743
707
                        "interval": "5m",
744
 
                        "checker": "fping -q -- %(host)s",
745
 
                        "host": "",
 
708
                        "checker": "fping -q -- %%(fqdn)s",
746
709
                        }
747
710
    client_config = ConfigParser.SafeConfigParser(client_defaults)
748
711
    client_config.read(os.path.join(server_settings["configdir"],
766
729
            avahi.DBUS_INTERFACE_SERVER )
767
730
    # End of Avahi example code
768
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
    
769
742
    clients = Set()
770
743
    def remove_from_clients(client):
771
744
        clients.remove(client)
778
751
                              config
779
752
                              = dict(client_config.items(section)))
780
753
                       for section in client_config.sections()))
781
 
    if not clients:
782
 
        logger.critical(u"No clients defined")
783
 
        sys.exit(1)
784
754
    
785
 
    if debug:
786
 
        # Redirect stdin so all checkers get /dev/null
787
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
788
 
        os.dup2(null, sys.stdin.fileno())
789
 
        if null > 2:
790
 
            os.close(null)
791
 
    else:
792
 
        # No console logging
793
 
        logger.removeHandler(console)
794
 
        # Close all input and output, do double fork, etc.
 
755
    if not debug:
795
756
        daemon()
796
757
    
797
 
    pidfilename = "/var/run/mandos/mandos.pid"
798
 
    pid = os.getpid()
799
 
    try:
800
 
        pidfile = open(pidfilename, "w")
801
 
        pidfile.write(str(pid) + "\n")
802
 
        pidfile.close()
803
 
        del pidfile
804
 
    except IOError, err:
805
 
        logger.error(u"Could not write %s file with PID %d",
806
 
                     pidfilename, os.getpid())
807
 
    
808
758
    def cleanup():
809
759
        "Cleanup function; run on exit"
810
760
        global group
856
806
                             tcp_server.handle_request\
857
807
                             (*args[2:], **kwargs) or True)
858
808
        
859
 
        logger.debug(u"Starting main loop")
 
809
        logger.debug("Starting main loop")
860
810
        main_loop_started = True
861
811
        main_loop.run()
862
812
    except AvahiError, error: