/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-22 00:16:20 UTC
  • mfrom: (24.1.57 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080822001620-vxpn1evy0t0kyvj0
* clients.conf ([DEFAULT]/checker): Update to new default value.

* mandos (Client.start_checker): Bug fix: OSError, not
                                 subprocess.OSError.
  (main): Use "fping -q -- %(host)s" instead of "fping -q --
          %%(host)s" as default value for "checker".  Always redirect
          stdin to be from /dev/null, even if in debug mode.

* mandos-clients.conf.xml (DESCRIPTION): Improved wording and refer to
                                         the EXPANSION section.
  (OPTIONS): Added synopsis and improved wording for "checker",
             "fingerprint", and "secret".  Refer to the RUNTIME
             EXPANSION section for the "checker" option.
  (EXAMPLE): Update to new default value for "checker".

* mandos-keygen (trap): Split lines and add "set +e".

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
125
123
    def rename(self):
126
124
        """Derived from the Avahi example code"""
127
125
        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)
 
126
            logger.critical(u"No suitable service name found after %i"
 
127
                            u" retries, exiting.", rename_count)
131
128
            raise AvahiServiceError("Too many renames")
132
129
        self.name = server.GetAlternativeServiceName(self.name)
133
 
        logger.info(u"Changing Zeroconf service name to %r ...",
134
 
                    str(self.name))
 
130
        logger.info(u"Changing name to %r ...", str(self.name))
135
131
        syslogger.setFormatter(logging.Formatter\
136
132
                               ('Mandos (%s): %%(levelname)s:'
137
133
                               ' %%(message)s' % self.name))
152
148
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
153
149
            group.connect_to_signal('StateChanged',
154
150
                                    entry_group_state_changed)
155
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
151
        logger.debug(u"Adding service '%s' of type '%s' ...",
156
152
                     service.name, service.type)
157
153
        group.AddService(
158
154
                self.interface,         # interface
414
410
    gnutls.library.functions.gnutls_openpgp_crt_import\
415
411
                    (crt, ctypes.byref(datum),
416
412
                     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
413
    # New buffer for the fingerprint
425
414
    buffer = ctypes.create_string_buffer(20)
426
415
    buffer_length = ctypes.c_size_t()
518
507
    Attributes:
519
508
        settings:       Server settings
520
509
        clients:        Set() of Client objects
521
 
        enabled:        Boolean; whether this server is activated yet
522
510
    """
523
511
    address_family = socket.AF_INET6
524
512
    def __init__(self, *args, **kwargs):
528
516
        if "clients" in kwargs:
529
517
            self.clients = kwargs["clients"]
530
518
            del kwargs["clients"]
531
 
        self.enabled = False
532
519
        return super(type(self), self).__init__(*args, **kwargs)
533
520
    def server_bind(self):
534
521
        """This overrides the normal server_bind() function
565
552
#                                            (self.settings
566
553
#                                             ["interface"]))
567
554
            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
555
 
574
556
 
575
557
def string_to_delta(interval):
614
596
def server_state_changed(state):
615
597
    """Derived from the Avahi example code"""
616
598
    if state == avahi.SERVER_COLLISION:
617
 
        logger.error(u"Zeroconf server name collision")
 
599
        logger.error(u"Server name collision")
618
600
        service.remove()
619
601
    elif state == avahi.SERVER_RUNNING:
620
602
        service.add()
622
604
 
623
605
def entry_group_state_changed(state, error):
624
606
    """Derived from the Avahi example code"""
625
 
    logger.debug(u"Avahi state change: %i", state)
 
607
    logger.debug(u"state change: %i", state)
626
608
    
627
609
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
628
 
        logger.debug(u"Zeroconf service established.")
 
610
        logger.debug(u"Service established.")
629
611
    elif state == avahi.ENTRY_GROUP_COLLISION:
630
 
        logger.warning(u"Zeroconf service name collision.")
 
612
        logger.warning(u"Service name collision.")
631
613
        service.rename()
632
614
    elif state == avahi.ENTRY_GROUP_FAILURE:
633
 
        logger.critical(u"Avahi: Error in group state changed %s",
 
615
        logger.critical(u"Error in group state changed %s",
634
616
                        unicode(error))
635
617
        raise AvahiGroupError("State changed: %s", str(error))
636
618
 
766
748
    client_config.read(os.path.join(server_settings["configdir"],
767
749
                                    "clients.conf"))
768
750
    
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
751
    global service
805
752
    service = AvahiService(name = server_settings["servicename"],
806
753
                           type = "_mandos._tcp", );
807
754
    if server_settings["interface"]:
808
 
        service.interface = if_nametoindex\
809
 
                            (server_settings["interface"])
 
755
        service.interface = if_nametoindex(server_settings["interface"])
810
756
    
811
757
    global main_loop
812
758
    global bus
815
761
    DBusGMainLoop(set_as_default=True )
816
762
    main_loop = gobject.MainLoop()
817
763
    bus = dbus.SystemBus()
818
 
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
819
 
                                           avahi.DBUS_PATH_SERVER),
820
 
                            avahi.DBUS_INTERFACE_SERVER)
 
764
    server = dbus.Interface(
 
765
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
 
766
            avahi.DBUS_INTERFACE_SERVER )
821
767
    # End of Avahi example code
822
768
    
 
769
    clients = Set()
823
770
    def remove_from_clients(client):
824
771
        clients.remove(client)
825
772
        if not clients:
847
794
        # Close all input and output, do double fork, etc.
848
795
        daemon()
849
796
    
 
797
    pidfilename = "/var/run/mandos/mandos.pid"
 
798
    pid = os.getpid()
850
799
    try:
851
 
        pid = os.getpid()
 
800
        pidfile = open(pidfilename, "w")
852
801
        pidfile.write(str(pid) + "\n")
853
802
        pidfile.close()
854
803
        del pidfile
855
804
    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
 
805
        logger.error(u"Could not write %s file with PID %d",
 
806
                     pidfilename, os.getpid())
862
807
    
863
808
    def cleanup():
864
809
        "Cleanup function; run on exit"
884
829
    for client in clients:
885
830
        client.start()
886
831
    
887
 
    tcp_server.enable()
888
 
    tcp_server.server_activate()
889
 
    
 
832
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
833
                                 server_settings["port"]),
 
834
                                tcp_handler,
 
835
                                settings=server_settings,
 
836
                                clients=clients)
890
837
    # Find out what port we got
891
838
    service.port = tcp_server.socket.getsockname()[1]
892
839
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"