/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-08 01:17:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080808011717-h1vzp4vs7oyzkgx3
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty
                                       as well as None.
  (main): Bug fix: Let debug option default to 'None' to allow
          override from config file.

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
28
 
# <http://www.gnu.org/licenses/>.
 
27
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
29
28
# 
30
29
# Contact the authors at <mandos@fukt.bsnet.se>.
31
30
# 
55
54
import stat
56
55
import logging
57
56
import logging.handlers
58
 
import pwd
59
57
 
60
58
import dbus
61
59
import gobject
63
61
from dbus.mainloop.glib import DBusGMainLoop
64
62
import ctypes
65
63
 
66
 
version = "1.0"
67
64
 
68
65
logger = logging.Logger('mandos')
69
66
syslogger = logging.handlers.SysLogHandler\
70
 
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
71
 
             address = "/dev/log")
 
67
            (facility = logging.handlers.SysLogHandler.LOG_DAEMON)
72
68
syslogger.setFormatter(logging.Formatter\
73
 
                        ('Mandos: %(levelname)s: %(message)s'))
 
69
                        ('%(levelname)s: %(message)s'))
74
70
logger.addHandler(syslogger)
 
71
del syslogger
75
72
 
76
 
console = logging.StreamHandler()
77
 
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
78
 
                                       ' %(message)s'))
79
 
logger.addHandler(console)
80
73
 
81
74
class AvahiError(Exception):
82
75
    def __init__(self, value):
109
102
    """
110
103
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
111
104
                 type = None, port = None, TXT = None, domain = "",
112
 
                 host = "", max_renames = 32768):
 
105
                 host = "", max_renames = 12):
113
106
        self.interface = interface
114
107
        self.name = name
115
108
        self.type = type
121
114
        self.domain = domain
122
115
        self.host = host
123
116
        self.rename_count = 0
124
 
        self.max_renames = max_renames
125
117
    def rename(self):
126
118
        """Derived from the Avahi example code"""
127
119
        if self.rename_count >= self.max_renames:
128
 
            logger.critical(u"No suitable Zeroconf service name found"
129
 
                            u" after %i retries, exiting.",
130
 
                            rename_count)
 
120
            logger.critical(u"No suitable service name found after %i"
 
121
                            u" retries, exiting.", rename_count)
131
122
            raise AvahiServiceError("Too many renames")
132
 
        self.name = server.GetAlternativeServiceName(self.name)
133
 
        logger.info(u"Changing Zeroconf service name to %r ...",
134
 
                    str(self.name))
135
 
        syslogger.setFormatter(logging.Formatter\
136
 
                               ('Mandos (%s): %%(levelname)s:'
137
 
                               ' %%(message)s' % self.name))
 
123
        name = server.GetAlternativeServiceName(name)
 
124
        logger.error(u"Changing name to %r ...", name)
138
125
        self.remove()
139
126
        self.add()
140
127
        self.rename_count += 1
152
139
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
153
140
            group.connect_to_signal('StateChanged',
154
141
                                    entry_group_state_changed)
155
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
142
        logger.debug(u"Adding service '%s' of type '%s' ...",
156
143
                     service.name, service.type)
157
144
        group.AddService(
158
145
                self.interface,         # interface
176
163
    fingerprint: string (40 or 32 hexadecimal digits); used to
177
164
                 uniquely identify the client
178
165
    secret:    bytestring; sent verbatim (over TLS) to client
179
 
    host:      string; available for use by the checker command
 
166
    fqdn:      string (FQDN); available for use by the checker command
180
167
    created:   datetime.datetime(); object creation, not client host
181
168
    last_checked_ok: datetime.datetime() or None if not yet checked OK
182
169
    timeout:   datetime.timedelta(); How long from last_checked_ok
243
230
        else:
244
231
            raise TypeError(u"No secret or secfile for client %s"
245
232
                            % self.name)
246
 
        self.host = config.get("host", "")
 
233
        self.fqdn = config.get("fqdn", "")
247
234
        self.created = datetime.datetime.now()
248
235
        self.last_checked_ok = None
249
236
        self.timeout = string_to_delta(config["timeout"])
272
259
        The possibility that a client might be restarted is left open,
273
260
        but not currently used."""
274
261
        # If this client doesn't have a secret, it is already stopped.
275
 
        if hasattr(self, "secret") and self.secret:
 
262
        if self.secret:
276
263
            logger.info(u"Stopping client %s", self.name)
277
264
            self.secret = None
278
265
        else:
326
313
        if self.checker is None:
327
314
            try:
328
315
                # In case check_command has exactly one % operator
329
 
                command = self.check_command % self.host
 
316
                command = self.check_command % self.fqdn
330
317
            except TypeError:
331
318
                # Escape attributes for the shell
332
319
                escaped_attrs = dict((key, re.escape(str(val)))
341
328
            try:
342
329
                logger.info(u"Starting checker %r for %s",
343
330
                            command, self.name)
344
 
                # We don't need to redirect stdout and stderr, since
345
 
                # in normal mode, that is already done by daemon(),
346
 
                # and in debug mode we don't want to.  (Stdin is
347
 
                # always replaced by /dev/null.)
348
331
                self.checker = subprocess.Popen(command,
349
332
                                                close_fds=True,
350
333
                                                shell=True, cwd="/")
351
334
                self.checker_callback_tag = gobject.child_watch_add\
352
335
                                            (self.checker.pid,
353
336
                                             self.checker_callback)
354
 
            except OSError, error:
 
337
            except subprocess.OSError, error:
355
338
                logger.error(u"Failed to start subprocess: %s",
356
339
                             error)
357
340
        # Re-run this periodically if run by gobject.timeout_add
363
346
            self.checker_callback_tag = None
364
347
        if getattr(self, "checker", None) is None:
365
348
            return
366
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
349
        logger.debug("Stopping checker for %(name)s", vars(self))
367
350
        try:
368
351
            os.kill(self.checker.pid, signal.SIGTERM)
369
352
            #os.sleep(0.5)
414
397
    gnutls.library.functions.gnutls_openpgp_crt_import\
415
398
                    (crt, ctypes.byref(datum),
416
399
                     gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
417
 
    # Verify the self signature in the key
418
 
    crtverify = ctypes.c_uint();
419
 
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
420
 
        (crt, 0, ctypes.byref(crtverify))
421
 
    if crtverify.value != 0:
422
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
423
 
        raise gnutls.errors.CertificateSecurityError("Verify failed")
424
400
    # New buffer for the fingerprint
425
401
    buffer = ctypes.create_string_buffer(20)
426
402
    buffer_length = ctypes.c_size_t()
518
494
    Attributes:
519
495
        settings:       Server settings
520
496
        clients:        Set() of Client objects
521
 
        enabled:        Boolean; whether this server is activated yet
522
497
    """
523
498
    address_family = socket.AF_INET6
524
499
    def __init__(self, *args, **kwargs):
528
503
        if "clients" in kwargs:
529
504
            self.clients = kwargs["clients"]
530
505
            del kwargs["clients"]
531
 
        self.enabled = False
532
506
        return super(type(self), self).__init__(*args, **kwargs)
533
507
    def server_bind(self):
534
508
        """This overrides the normal server_bind() function
565
539
#                                            (self.settings
566
540
#                                             ["interface"]))
567
541
            return super(type(self), self).server_bind()
568
 
    def server_activate(self):
569
 
        if self.enabled:
570
 
            return super(type(self), self).server_activate()
571
 
    def enable(self):
572
 
        self.enabled = True
573
542
 
574
543
 
575
544
def string_to_delta(interval):
585
554
    datetime.timedelta(1)
586
555
    >>> string_to_delta(u'1w')
587
556
    datetime.timedelta(7)
588
 
    >>> string_to_delta('5m 30s')
589
 
    datetime.timedelta(0, 330)
590
557
    """
591
 
    timevalue = datetime.timedelta(0)
592
 
    for s in interval.split():
593
 
        try:
594
 
            suffix=unicode(s[-1])
595
 
            value=int(s[:-1])
596
 
            if suffix == u"d":
597
 
                delta = datetime.timedelta(value)
598
 
            elif suffix == u"s":
599
 
                delta = datetime.timedelta(0, value)
600
 
            elif suffix == u"m":
601
 
                delta = datetime.timedelta(0, 0, 0, 0, value)
602
 
            elif suffix == u"h":
603
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
604
 
            elif suffix == u"w":
605
 
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
606
 
            else:
607
 
                raise ValueError
608
 
        except (ValueError, IndexError):
 
558
    try:
 
559
        suffix=unicode(interval[-1])
 
560
        value=int(interval[:-1])
 
561
        if suffix == u"d":
 
562
            delta = datetime.timedelta(value)
 
563
        elif suffix == u"s":
 
564
            delta = datetime.timedelta(0, value)
 
565
        elif suffix == u"m":
 
566
            delta = datetime.timedelta(0, 0, 0, 0, value)
 
567
        elif suffix == u"h":
 
568
            delta = datetime.timedelta(0, 0, 0, 0, 0, value)
 
569
        elif suffix == u"w":
 
570
            delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
 
571
        else:
609
572
            raise ValueError
610
 
        timevalue += delta
611
 
    return timevalue
 
573
    except (ValueError, IndexError):
 
574
        raise ValueError
 
575
    return delta
612
576
 
613
577
 
614
578
def server_state_changed(state):
615
579
    """Derived from the Avahi example code"""
616
580
    if state == avahi.SERVER_COLLISION:
617
 
        logger.error(u"Zeroconf server name collision")
 
581
        logger.error(u"Server name collision")
618
582
        service.remove()
619
583
    elif state == avahi.SERVER_RUNNING:
620
584
        service.add()
622
586
 
623
587
def entry_group_state_changed(state, error):
624
588
    """Derived from the Avahi example code"""
625
 
    logger.debug(u"Avahi state change: %i", state)
 
589
    logger.debug(u"state change: %i", state)
626
590
    
627
591
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
628
 
        logger.debug(u"Zeroconf service established.")
 
592
        logger.debug(u"Service established.")
629
593
    elif state == avahi.ENTRY_GROUP_COLLISION:
630
 
        logger.warning(u"Zeroconf service name collision.")
 
594
        logger.warning(u"Service name collision.")
631
595
        service.rename()
632
596
    elif state == avahi.ENTRY_GROUP_FAILURE:
633
 
        logger.critical(u"Avahi: Error in group state changed %s",
 
597
        logger.critical(u"Error in group state changed %s",
634
598
                        unicode(error))
635
599
        raise AvahiGroupError("State changed: %s", str(error))
636
600
 
686
650
    global main_loop_started
687
651
    main_loop_started = False
688
652
    
689
 
    parser = OptionParser(version = "%%prog %s" % version)
 
653
    parser = OptionParser()
690
654
    parser.add_option("-i", "--interface", type="string",
691
655
                      metavar="IF", help="Bind to interface IF")
692
656
    parser.add_option("-a", "--address", type="string",
727
691
    server_config = ConfigParser.SafeConfigParser(server_defaults)
728
692
    del server_defaults
729
693
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
694
    server_section = "server"
730
695
    # Convert the SafeConfigParser object to a dict
731
 
    server_settings = server_config.defaults()
 
696
    server_settings = dict(server_config.items(server_section))
732
697
    # Use getboolean on the boolean config option
733
698
    server_settings["debug"] = server_config.getboolean\
734
 
                               ("DEFAULT", "debug")
 
699
                               (server_section, "debug")
735
700
    del server_config
736
701
    
737
702
    # Override the settings from the config file with command line
744
709
    del options
745
710
    # Now we have our good server settings in "server_settings"
746
711
    
747
 
    debug = server_settings["debug"]
748
 
    
749
 
    if not debug:
750
 
        syslogger.setLevel(logging.WARNING)
751
 
        console.setLevel(logging.WARNING)
752
 
    
753
 
    if server_settings["servicename"] != "Mandos":
754
 
        syslogger.setFormatter(logging.Formatter\
755
 
                               ('Mandos (%s): %%(levelname)s:'
756
 
                                ' %%(message)s'
757
 
                                % server_settings["servicename"]))
758
 
    
759
712
    # Parse config file with clients
760
713
    client_defaults = { "timeout": "1h",
761
714
                        "interval": "5m",
762
 
                        "checker": "fping -q -- %(host)s",
763
 
                        "host": "",
 
715
                        "checker": "fping -q -- %%(fqdn)s",
764
716
                        }
765
717
    client_config = ConfigParser.SafeConfigParser(client_defaults)
766
718
    client_config.read(os.path.join(server_settings["configdir"],
767
719
                                    "clients.conf"))
768
720
    
769
 
    clients = Set()
770
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
771
 
                                 server_settings["port"]),
772
 
                                tcp_handler,
773
 
                                settings=server_settings,
774
 
                                clients=clients)
775
 
    pidfilename = "/var/run/mandos.pid"
776
 
    try:
777
 
        pidfile = open(pidfilename, "w")
778
 
    except IOError, error:
779
 
        logger.error("Could not open file %r", pidfilename)
780
 
    
781
 
    uid = 65534
782
 
    gid = 65534
783
 
    try:
784
 
        uid = pwd.getpwnam("mandos").pw_uid
785
 
    except KeyError:
786
 
        try:
787
 
            uid = pwd.getpwnam("nobody").pw_uid
788
 
        except KeyError:
789
 
            pass
790
 
    try:
791
 
        gid = pwd.getpwnam("mandos").pw_gid
792
 
    except KeyError:
793
 
        try:
794
 
            gid = pwd.getpwnam("nogroup").pw_gid
795
 
        except KeyError:
796
 
            pass
797
 
    try:
798
 
        os.setuid(uid)
799
 
        os.setgid(gid)
800
 
    except OSError, error:
801
 
        if error[0] != errno.EPERM:
802
 
            raise error
803
 
    
804
721
    global service
805
722
    service = AvahiService(name = server_settings["servicename"],
806
723
                           type = "_mandos._tcp", );
807
724
    if server_settings["interface"]:
808
 
        service.interface = if_nametoindex\
809
 
                            (server_settings["interface"])
 
725
        service.interface = if_nametoindex(server_settings["interface"])
810
726
    
811
727
    global main_loop
812
728
    global bus
815
731
    DBusGMainLoop(set_as_default=True )
816
732
    main_loop = gobject.MainLoop()
817
733
    bus = dbus.SystemBus()
818
 
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
819
 
                                           avahi.DBUS_PATH_SERVER),
820
 
                            avahi.DBUS_INTERFACE_SERVER)
 
734
    server = dbus.Interface(
 
735
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
 
736
            avahi.DBUS_INTERFACE_SERVER )
821
737
    # End of Avahi example code
822
738
    
 
739
    debug = server_settings["debug"]
 
740
    
 
741
    if debug:
 
742
        console = logging.StreamHandler()
 
743
        # console.setLevel(logging.DEBUG)
 
744
        console.setFormatter(logging.Formatter\
 
745
                             ('%(levelname)s: %(message)s'))
 
746
        logger.addHandler(console)
 
747
        del console
 
748
    
 
749
    clients = Set()
823
750
    def remove_from_clients(client):
824
751
        clients.remove(client)
825
752
        if not clients:
831
758
                              config
832
759
                              = dict(client_config.items(section)))
833
760
                       for section in client_config.sections()))
834
 
    if not clients:
835
 
        logger.critical(u"No clients defined")
836
 
        sys.exit(1)
837
761
    
838
 
    if debug:
839
 
        # Redirect stdin so all checkers get /dev/null
840
 
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
841
 
        os.dup2(null, sys.stdin.fileno())
842
 
        if null > 2:
843
 
            os.close(null)
844
 
    else:
845
 
        # No console logging
846
 
        logger.removeHandler(console)
847
 
        # Close all input and output, do double fork, etc.
 
762
    if not debug:
848
763
        daemon()
849
764
    
850
 
    try:
851
 
        pid = os.getpid()
852
 
        pidfile.write(str(pid) + "\n")
853
 
        pidfile.close()
854
 
        del pidfile
855
 
    except IOError, err:
856
 
        logger.error(u"Could not write to file %r with PID %d",
857
 
                     pidfilename, pid)
858
 
    except NameError:
859
 
        # "pidfile" was never created
860
 
        pass
861
 
    del pidfilename
862
 
    
863
765
    def cleanup():
864
766
        "Cleanup function; run on exit"
865
767
        global group
884
786
    for client in clients:
885
787
        client.start()
886
788
    
887
 
    tcp_server.enable()
888
 
    tcp_server.server_activate()
889
 
    
 
789
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
790
                                 server_settings["port"]),
 
791
                                tcp_handler,
 
792
                                settings=server_settings,
 
793
                                clients=clients)
890
794
    # Find out what port we got
891
795
    service.port = tcp_server.socket.getsockname()[1]
892
796
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
909
813
                             tcp_server.handle_request\
910
814
                             (*args[2:], **kwargs) or True)
911
815
        
912
 
        logger.debug(u"Starting main loop")
 
816
        logger.debug("Starting main loop")
913
817
        main_loop_started = True
914
818
        main_loop.run()
915
819
    except AvahiError, error: