/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-09-21 14:05:44 UTC
  • mfrom: (24.1.103 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080921140544-e9qo7alcl0bne2mn
Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
11
11
# and some lines in "main".
12
12
# 
13
13
# Everything else is
14
 
# Copyright © 2007-2008 Teddy Hogeborn & Björn Påhlsson
 
14
# Copyright © 2008 Teddy Hogeborn & Björn Påhlsson
15
15
# 
16
16
# This program is free software: you can redistribute it and/or modify
17
17
# it under the terms of the GNU General Public License as published by
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
# 
54
55
import stat
55
56
import logging
56
57
import logging.handlers
 
58
import pwd
57
59
 
58
60
import dbus
59
61
import gobject
123
125
    def rename(self):
124
126
        """Derived from the Avahi example code"""
125
127
        if self.rename_count >= self.max_renames:
126
 
            logger.critical(u"No suitable service name found after %i"
127
 
                            u" retries, exiting.", rename_count)
 
128
            logger.critical(u"No suitable Zeroconf service name found"
 
129
                            u" after %i retries, exiting.",
 
130
                            rename_count)
128
131
            raise AvahiServiceError("Too many renames")
129
132
        self.name = server.GetAlternativeServiceName(self.name)
130
 
        logger.info(u"Changing name to %r ...", str(self.name))
 
133
        logger.info(u"Changing Zeroconf service name to %r ...",
 
134
                    str(self.name))
131
135
        syslogger.setFormatter(logging.Formatter\
132
136
                               ('Mandos (%s): %%(levelname)s:'
133
137
                               ' %%(message)s' % self.name))
148
152
                     avahi.DBUS_INTERFACE_ENTRY_GROUP)
149
153
            group.connect_to_signal('StateChanged',
150
154
                                    entry_group_state_changed)
151
 
        logger.debug(u"Adding service '%s' of type '%s' ...",
 
155
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
152
156
                     service.name, service.type)
153
157
        group.AddService(
154
158
                self.interface,         # interface
413
417
    # Verify the self signature in the key
414
418
    crtverify = ctypes.c_uint();
415
419
    gnutls.library.functions.gnutls_openpgp_crt_verify_self\
416
 
        (crt, ctypes.c_uint(0), ctypes.byref(crtverify))
 
420
        (crt, 0, ctypes.byref(crtverify))
417
421
    if crtverify.value != 0:
418
422
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
419
423
        raise gnutls.errors.CertificateSecurityError("Verify failed")
514
518
    Attributes:
515
519
        settings:       Server settings
516
520
        clients:        Set() of Client objects
 
521
        enabled:        Boolean; whether this server is activated yet
517
522
    """
518
523
    address_family = socket.AF_INET6
519
524
    def __init__(self, *args, **kwargs):
523
528
        if "clients" in kwargs:
524
529
            self.clients = kwargs["clients"]
525
530
            del kwargs["clients"]
 
531
        self.enabled = False
526
532
        return super(type(self), self).__init__(*args, **kwargs)
527
533
    def server_bind(self):
528
534
        """This overrides the normal server_bind() function
559
565
#                                            (self.settings
560
566
#                                             ["interface"]))
561
567
            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
562
573
 
563
574
 
564
575
def string_to_delta(interval):
603
614
def server_state_changed(state):
604
615
    """Derived from the Avahi example code"""
605
616
    if state == avahi.SERVER_COLLISION:
606
 
        logger.error(u"Server name collision")
 
617
        logger.error(u"Zeroconf server name collision")
607
618
        service.remove()
608
619
    elif state == avahi.SERVER_RUNNING:
609
620
        service.add()
611
622
 
612
623
def entry_group_state_changed(state, error):
613
624
    """Derived from the Avahi example code"""
614
 
    logger.debug(u"state change: %i", state)
 
625
    logger.debug(u"Avahi state change: %i", state)
615
626
    
616
627
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
617
 
        logger.debug(u"Service established.")
 
628
        logger.debug(u"Zeroconf service established.")
618
629
    elif state == avahi.ENTRY_GROUP_COLLISION:
619
 
        logger.warning(u"Service name collision.")
 
630
        logger.warning(u"Zeroconf service name collision.")
620
631
        service.rename()
621
632
    elif state == avahi.ENTRY_GROUP_FAILURE:
622
 
        logger.critical(u"Error in group state changed %s",
 
633
        logger.critical(u"Avahi: Error in group state changed %s",
623
634
                        unicode(error))
624
635
        raise AvahiGroupError("State changed: %s", str(error))
625
636
 
755
766
    client_config.read(os.path.join(server_settings["configdir"],
756
767
                                    "clients.conf"))
757
768
    
 
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
    
758
804
    global service
759
805
    service = AvahiService(name = server_settings["servicename"],
760
806
                           type = "_mandos._tcp", );
761
807
    if server_settings["interface"]:
762
 
        service.interface = if_nametoindex(server_settings["interface"])
 
808
        service.interface = if_nametoindex\
 
809
                            (server_settings["interface"])
763
810
    
764
811
    global main_loop
765
812
    global bus
768
815
    DBusGMainLoop(set_as_default=True )
769
816
    main_loop = gobject.MainLoop()
770
817
    bus = dbus.SystemBus()
771
 
    server = dbus.Interface(
772
 
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
773
 
            avahi.DBUS_INTERFACE_SERVER )
 
818
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
819
                                           avahi.DBUS_PATH_SERVER),
 
820
                            avahi.DBUS_INTERFACE_SERVER)
774
821
    # End of Avahi example code
775
822
    
776
 
    clients = Set()
777
823
    def remove_from_clients(client):
778
824
        clients.remove(client)
779
825
        if not clients:
801
847
        # Close all input and output, do double fork, etc.
802
848
        daemon()
803
849
    
804
 
    pidfilename = "/var/run/mandos/mandos.pid"
805
 
    pid = os.getpid()
806
850
    try:
807
 
        pidfile = open(pidfilename, "w")
 
851
        pid = os.getpid()
808
852
        pidfile.write(str(pid) + "\n")
809
853
        pidfile.close()
810
854
        del pidfile
811
855
    except IOError, err:
812
 
        logger.error(u"Could not write %s file with PID %d",
813
 
                     pidfilename, os.getpid())
 
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
814
862
    
815
863
    def cleanup():
816
864
        "Cleanup function; run on exit"
836
884
    for client in clients:
837
885
        client.start()
838
886
    
839
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
840
 
                                 server_settings["port"]),
841
 
                                tcp_handler,
842
 
                                settings=server_settings,
843
 
                                clients=clients)
 
887
    tcp_server.enable()
 
888
    tcp_server.server_activate()
 
889
    
844
890
    # Find out what port we got
845
891
    service.port = tcp_server.socket.getsockname()[1]
846
892
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"