/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-27 01:18:25 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080827011825-ka3ni6xvy2ehi1y8
* .bzrignore: New.

* clients.conf ([foo]): Remove Radix-64 checksum.

* mandos (AvahiService.rename, server_state_changed,
          entry_group_state_changed): Make Avahi log messages more
                                      clear that they are about
                                      Zeroconf.
  (fingerprint): Use plain "0" instead of "ctypes.c_uint(0)".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
24
24
#     GNU General Public License for more details.
25
25
# 
26
26
# You should have received a copy of the GNU General Public License
27
 
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
27
# along with this program.  If not, see
 
28
# <http://www.gnu.org/licenses/>.
28
29
# 
29
30
# Contact the authors at <mandos@fukt.bsnet.se>.
30
31
# 
61
62
from dbus.mainloop.glib import DBusGMainLoop
62
63
import ctypes
63
64
 
 
65
version = "1.0"
64
66
 
65
67
logger = logging.Logger('mandos')
66
68
syslogger = logging.handlers.SysLogHandler\
67
 
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON)
 
69
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
70
             address = "/dev/log")
68
71
syslogger.setFormatter(logging.Formatter\
69
 
                        ('%(levelname)s: %(message)s'))
 
72
                        ('Mandos: %(levelname)s: %(message)s'))
70
73
logger.addHandler(syslogger)
71
 
del syslogger
72
74
 
 
75
console = logging.StreamHandler()
 
76
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
 
77
                                       ' %(message)s'))
 
78
logger.addHandler(console)
73
79
 
74
80
class AvahiError(Exception):
75
81
    def __init__(self, value):
102
108
    """
103
109
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
104
110
                 type = None, port = None, TXT = None, domain = "",
105
 
                 host = "", max_renames = 12):
 
111
                 host = "", max_renames = 32768):
106
112
        self.interface = interface
107
113
        self.name = name
108
114
        self.type = type
114
120
        self.domain = domain
115
121
        self.host = host
116
122
        self.rename_count = 0
 
123
        self.max_renames = max_renames
117
124
    def rename(self):
118
125
        """Derived from the Avahi example code"""
119
126
        if self.rename_count >= self.max_renames:
120
 
            logger.critical(u"No suitable service name found after %i"
121
 
                            u" retries, exiting.", rename_count)
 
127
            logger.critical(u"No suitable Zeroconf service name found"
 
128
                            u" after %i retries, exiting.",
 
129
                            rename_count)
122
130
            raise AvahiServiceError("Too many renames")
123
 
        name = server.GetAlternativeServiceName(name)
124
 
        logger.error(u"Changing name to %r ...", name)
 
131
        self.name = server.GetAlternativeServiceName(self.name)
 
132
        logger.info(u"Changing Zeroconf service name to %r ...",
 
133
                    str(self.name))
 
134
        syslogger.setFormatter(logging.Formatter\
 
135
                               ('Mandos (%s): %%(levelname)s:'
 
136
                               ' %%(message)s' % self.name))
125
137
        self.remove()
126
138
        self.add()
127
139
        self.rename_count += 1
139
151
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
140
152
            group.connect_to_signal('StateChanged',
141
153
                                    entry_group_state_changed)
142
 
        logger.debug(u"Adding service '%s' of type '%s' ...",
 
154
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
143
155
                     service.name, service.type)
144
156
        group.AddService(
145
157
                self.interface,         # interface
163
175
    fingerprint: string (40 or 32 hexadecimal digits); used to
164
176
                 uniquely identify the client
165
177
    secret:    bytestring; sent verbatim (over TLS) to client
166
 
    fqdn:      string (FQDN); available for use by the checker command
 
178
    host:      string; available for use by the checker command
167
179
    created:   datetime.datetime(); object creation, not client host
168
180
    last_checked_ok: datetime.datetime() or None if not yet checked OK
169
181
    timeout:   datetime.timedelta(); How long from last_checked_ok
230
242
        else:
231
243
            raise TypeError(u"No secret or secfile for client %s"
232
244
                            % self.name)
233
 
        self.fqdn = config.get("fqdn", "")
 
245
        self.host = config.get("host", "")
234
246
        self.created = datetime.datetime.now()
235
247
        self.last_checked_ok = None
236
248
        self.timeout = string_to_delta(config["timeout"])
259
271
        The possibility that a client might be restarted is left open,
260
272
        but not currently used."""
261
273
        # If this client doesn't have a secret, it is already stopped.
262
 
        if self.secret:
 
274
        if hasattr(self, "secret") and self.secret:
263
275
            logger.info(u"Stopping client %s", self.name)
264
276
            self.secret = None
265
277
        else:
313
325
        if self.checker is None:
314
326
            try:
315
327
                # In case check_command has exactly one % operator
316
 
                command = self.check_command % self.fqdn
 
328
                command = self.check_command % self.host
317
329
            except TypeError:
318
330
                # Escape attributes for the shell
319
331
                escaped_attrs = dict((key, re.escape(str(val)))
328
340
            try:
329
341
                logger.info(u"Starting checker %r for %s",
330
342
                            command, self.name)
 
343
                # We don't need to redirect stdout and stderr, since
 
344
                # in normal mode, that is already done by daemon(),
 
345
                # and in debug mode we don't want to.  (Stdin is
 
346
                # always replaced by /dev/null.)
331
347
                self.checker = subprocess.Popen(command,
332
348
                                                close_fds=True,
333
349
                                                shell=True, cwd="/")
334
350
                self.checker_callback_tag = gobject.child_watch_add\
335
351
                                            (self.checker.pid,
336
352
                                             self.checker_callback)
337
 
            except subprocess.OSError, error:
 
353
            except OSError, error:
338
354
                logger.error(u"Failed to start subprocess: %s",
339
355
                             error)
340
356
        # Re-run this periodically if run by gobject.timeout_add
346
362
            self.checker_callback_tag = None
347
363
        if getattr(self, "checker", None) is None:
348
364
            return
349
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
365
        logger.debug(u"Stopping checker for %(name)s", vars(self))
350
366
        try:
351
367
            os.kill(self.checker.pid, signal.SIGTERM)
352
368
            #os.sleep(0.5)
397
413
    gnutls.library.functions.gnutls_openpgp_crt_import\
398
414
                    (crt, ctypes.byref(datum),
399
415
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
416
    # Verify the self signature in the key
 
417
    crtverify = ctypes.c_uint();
 
418
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
 
419
        (crt, 0, ctypes.byref(crtverify))
 
420
    if crtverify.value != 0:
 
421
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
422
        raise gnutls.errors.CertificateSecurityError("Verify failed")
400
423
    # New buffer for the fingerprint
401
424
    buffer = ctypes.create_string_buffer(20)
402
425
    buffer_length = ctypes.c_size_t()
528
551
                in6addr_any = "::"
529
552
                self.server_address = (in6addr_any,
530
553
                                       self.server_address[1])
531
 
            elif self.server_address[1] is None:
 
554
            elif not self.server_address[1]:
532
555
                self.server_address = (self.server_address[0],
533
556
                                       0)
 
557
#                 if self.settings["interface"]:
 
558
#                     self.server_address = (self.server_address[0],
 
559
#                                            0, # port
 
560
#                                            0, # flowinfo
 
561
#                                            if_nametoindex
 
562
#                                            (self.settings
 
563
#                                             ["interface"]))
534
564
            return super(type(self), self).server_bind()
535
565
 
536
566
 
547
577
    datetime.timedelta(1)
548
578
    >>> string_to_delta(u'1w')
549
579
    datetime.timedelta(7)
 
580
    >>> string_to_delta('5m 30s')
 
581
    datetime.timedelta(0, 330)
550
582
    """
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:
 
583
    timevalue = datetime.timedelta(0)
 
584
    for s in interval.split():
 
585
        try:
 
586
            suffix=unicode(s[-1])
 
587
            value=int(s[:-1])
 
588
            if suffix == u"d":
 
589
                delta = datetime.timedelta(value)
 
590
            elif suffix == u"s":
 
591
                delta = datetime.timedelta(0, value)
 
592
            elif suffix == u"m":
 
593
                delta = datetime.timedelta(0, 0, 0, 0, value)
 
594
            elif suffix == u"h":
 
595
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
596
            elif suffix == u"w":
 
597
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
598
            else:
 
599
                raise ValueError
 
600
        except (ValueError, IndexError):
565
601
            raise ValueError
566
 
    except (ValueError, IndexError):
567
 
        raise ValueError
568
 
    return delta
 
602
        timevalue += delta
 
603
    return timevalue
569
604
 
570
605
 
571
606
def server_state_changed(state):
572
607
    """Derived from the Avahi example code"""
573
608
    if state == avahi.SERVER_COLLISION:
574
 
        logger.error(u"Server name collision")
 
609
        logger.error(u"Zeroconf server name collision")
575
610
        service.remove()
576
611
    elif state == avahi.SERVER_RUNNING:
577
612
        service.add()
579
614
 
580
615
def entry_group_state_changed(state, error):
581
616
    """Derived from the Avahi example code"""
582
 
    logger.debug(u"state change: %i", state)
 
617
    logger.debug(u"Avahi state change: %i", state)
583
618
    
584
619
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
585
 
        logger.debug(u"Service established.")
 
620
        logger.debug(u"Zeroconf service established.")
586
621
    elif state == avahi.ENTRY_GROUP_COLLISION:
587
 
        logger.warning(u"Service name collision.")
 
622
        logger.warning(u"Zeroconf service name collision.")
588
623
        service.rename()
589
624
    elif state == avahi.ENTRY_GROUP_FAILURE:
590
 
        logger.critical(u"Error in group state changed %s",
 
625
        logger.critical(u"Avahi: Error in group state changed %s",
591
626
                        unicode(error))
592
627
        raise AvahiGroupError("State changed: %s", str(error))
593
628
 
616
651
    return if_nametoindex(interface)
617
652
 
618
653
 
619
 
def daemon(nochdir, noclose):
 
654
def daemon(nochdir = False, noclose = False):
620
655
    """See daemon(3).  Standard BSD Unix function.
621
656
    This should really exist as os.daemon, but it doesn't (yet)."""
622
657
    if os.fork():
643
678
    global main_loop_started
644
679
    main_loop_started = False
645
680
    
646
 
    parser = OptionParser()
 
681
    parser = OptionParser(version = "%%prog %s" % version)
647
682
    parser.add_option("-i", "--interface", type="string",
648
683
                      metavar="IF", help="Bind to interface IF")
649
684
    parser.add_option("-a", "--address", type="string",
652
687
                      help="Port number to receive requests on")
653
688
    parser.add_option("--check", action="store_true", default=False,
654
689
                      help="Run self-test")
655
 
    parser.add_option("--debug", action="store_true", default=False,
 
690
    parser.add_option("--debug", action="store_true",
656
691
                      help="Debug mode; run in foreground and log to"
657
692
                      " terminal")
658
693
    parser.add_option("--priority", type="string", help="GnuTLS"
683
718
    # Parse config file for server-global settings
684
719
    server_config = ConfigParser.SafeConfigParser(server_defaults)
685
720
    del server_defaults
686
 
    server_config.read(os.path.join(options.configdir, "server.conf"))
687
 
    server_section = "server"
 
721
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
688
722
    # Convert the SafeConfigParser object to a dict
689
 
    server_settings = dict(server_config.items(server_section))
 
723
    server_settings = server_config.defaults()
690
724
    # Use getboolean on the boolean config option
691
725
    server_settings["debug"] = server_config.getboolean\
692
 
                               (server_section, "debug")
 
726
                               ("DEFAULT", "debug")
693
727
    del server_config
694
728
    
695
729
    # Override the settings from the config file with command line
702
736
    del options
703
737
    # Now we have our good server settings in "server_settings"
704
738
    
 
739
    debug = server_settings["debug"]
 
740
    
 
741
    if not debug:
 
742
        syslogger.setLevel(logging.WARNING)
 
743
        console.setLevel(logging.WARNING)
 
744
    
 
745
    if server_settings["servicename"] != "Mandos":
 
746
        syslogger.setFormatter(logging.Formatter\
 
747
                               ('Mandos (%s): %%(levelname)s:'
 
748
                                ' %%(message)s'
 
749
                                % server_settings["servicename"]))
 
750
    
705
751
    # Parse config file with clients
706
752
    client_defaults = { "timeout": "1h",
707
753
                        "interval": "5m",
708
 
                        "checker": "fping -q -- %%(fqdn)s",
 
754
                        "checker": "fping -q -- %(host)s",
 
755
                        "host": "",
709
756
                        }
710
757
    client_config = ConfigParser.SafeConfigParser(client_defaults)
711
758
    client_config.read(os.path.join(server_settings["configdir"],
715
762
    service = AvahiService(name = server_settings["servicename"],
716
763
                           type = "_mandos._tcp", );
717
764
    if server_settings["interface"]:
718
 
        service.interface = if_nametoindex(server_settings["interface"])
 
765
        service.interface = if_nametoindex\
 
766
                            (server_settings["interface"])
719
767
    
720
768
    global main_loop
721
769
    global bus
724
772
    DBusGMainLoop(set_as_default=True )
725
773
    main_loop = gobject.MainLoop()
726
774
    bus = dbus.SystemBus()
727
 
    server = dbus.Interface(
728
 
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
729
 
            avahi.DBUS_INTERFACE_SERVER )
 
775
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
776
                                           avahi.DBUS_PATH_SERVER),
 
777
                            avahi.DBUS_INTERFACE_SERVER)
730
778
    # End of Avahi example code
731
779
    
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
780
    clients = Set()
743
781
    def remove_from_clients(client):
744
782
        clients.remove(client)
751
789
                              config
752
790
                              = dict(client_config.items(section)))
753
791
                       for section in client_config.sections()))
754
 
    
755
 
    if not debug:
756
 
        daemon(False, False)
 
792
    if not clients:
 
793
        logger.critical(u"No clients defined")
 
794
        sys.exit(1)
 
795
    
 
796
    if debug:
 
797
        # Redirect stdin so all checkers get /dev/null
 
798
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
 
799
        os.dup2(null, sys.stdin.fileno())
 
800
        if null > 2:
 
801
            os.close(null)
 
802
    else:
 
803
        # No console logging
 
804
        logger.removeHandler(console)
 
805
        # Close all input and output, do double fork, etc.
 
806
        daemon()
 
807
    
 
808
    pidfilename = "/var/run/mandos/mandos.pid"
 
809
    pid = os.getpid()
 
810
    try:
 
811
        pidfile = open(pidfilename, "w")
 
812
        pidfile.write(str(pid) + "\n")
 
813
        pidfile.close()
 
814
        del pidfile
 
815
    except IOError, err:
 
816
        logger.error(u"Could not write %s file with PID %d",
 
817
                     pidfilename, os.getpid())
757
818
    
758
819
    def cleanup():
759
820
        "Cleanup function; run on exit"
806
867
                             tcp_server.handle_request\
807
868
                             (*args[2:], **kwargs) or True)
808
869
        
809
 
        logger.debug("Starting main loop")
 
870
        logger.debug(u"Starting main loop")
810
871
        main_loop_started = True
811
872
        main_loop.run()
812
873
    except AvahiError, error: