/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-05 18:19:52 UTC
  • mfrom: (24.1.91 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20080905181952-qfuwtyvefanh9v3v
* mandos: Open the PID file before daemonizing, but write to it
          afterwards.

* plugin-runner.xml (SECURITY): Improved grammar.

Also merge.

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
# 
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
410
414
    gnutls.library.functions.gnutls_openpgp_crt_import\
411
415
                    (crt, ctypes.byref(datum),
412
416
                     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")
413
424
    # New buffer for the fingerprint
414
425
    buffer = ctypes.create_string_buffer(20)
415
426
    buffer_length = ctypes.c_size_t()
507
518
    Attributes:
508
519
        settings:       Server settings
509
520
        clients:        Set() of Client objects
 
521
        enabled:        Boolean; whether this server is activated yet
510
522
    """
511
523
    address_family = socket.AF_INET6
512
524
    def __init__(self, *args, **kwargs):
516
528
        if "clients" in kwargs:
517
529
            self.clients = kwargs["clients"]
518
530
            del kwargs["clients"]
 
531
        self.enabled = False
519
532
        return super(type(self), self).__init__(*args, **kwargs)
520
533
    def server_bind(self):
521
534
        """This overrides the normal server_bind() function
552
565
#                                            (self.settings
553
566
#                                             ["interface"]))
554
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
555
573
 
556
574
 
557
575
def string_to_delta(interval):
596
614
def server_state_changed(state):
597
615
    """Derived from the Avahi example code"""
598
616
    if state == avahi.SERVER_COLLISION:
599
 
        logger.error(u"Server name collision")
 
617
        logger.error(u"Zeroconf server name collision")
600
618
        service.remove()
601
619
    elif state == avahi.SERVER_RUNNING:
602
620
        service.add()
604
622
 
605
623
def entry_group_state_changed(state, error):
606
624
    """Derived from the Avahi example code"""
607
 
    logger.debug(u"state change: %i", state)
 
625
    logger.debug(u"Avahi state change: %i", state)
608
626
    
609
627
    if state == avahi.ENTRY_GROUP_ESTABLISHED:
610
 
        logger.debug(u"Service established.")
 
628
        logger.debug(u"Zeroconf service established.")
611
629
    elif state == avahi.ENTRY_GROUP_COLLISION:
612
 
        logger.warning(u"Service name collision.")
 
630
        logger.warning(u"Zeroconf service name collision.")
613
631
        service.rename()
614
632
    elif state == avahi.ENTRY_GROUP_FAILURE:
615
 
        logger.critical(u"Error in group state changed %s",
 
633
        logger.critical(u"Avahi: Error in group state changed %s",
616
634
                        unicode(error))
617
635
        raise AvahiGroupError("State changed: %s", str(error))
618
636
 
748
766
    client_config.read(os.path.join(server_settings["configdir"],
749
767
                                    "clients.conf"))
750
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
    pidfile = None
 
777
    try:
 
778
        pidfile = open(pidfilename, "w")
 
779
    except IOError, error:
 
780
        logger.error("Could not open file %r", pidfilename)
 
781
    
 
782
    uid = 65534
 
783
    gid = 65534
 
784
    try:
 
785
        uid = pwd.getpwnam("mandos").pw_uid
 
786
    except KeyError:
 
787
        try:
 
788
            uid = pwd.getpwnam("nobody").pw_uid
 
789
        except KeyError:
 
790
            pass
 
791
    try:
 
792
        gid = pwd.getpwnam("mandos").pw_gid
 
793
    except KeyError:
 
794
        try:
 
795
            gid = pwd.getpwnam("nogroup").pw_gid
 
796
        except KeyError:
 
797
            pass
 
798
    try:
 
799
        os.setuid(uid)
 
800
        os.setgid(gid)
 
801
    except OSError, error:
 
802
        if error[0] != errno.EPERM:
 
803
            raise error
 
804
    
751
805
    global service
752
806
    service = AvahiService(name = server_settings["servicename"],
753
807
                           type = "_mandos._tcp", );
754
808
    if server_settings["interface"]:
755
 
        service.interface = if_nametoindex(server_settings["interface"])
 
809
        service.interface = if_nametoindex\
 
810
                            (server_settings["interface"])
756
811
    
757
812
    global main_loop
758
813
    global bus
761
816
    DBusGMainLoop(set_as_default=True )
762
817
    main_loop = gobject.MainLoop()
763
818
    bus = dbus.SystemBus()
764
 
    server = dbus.Interface(
765
 
            bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
766
 
            avahi.DBUS_INTERFACE_SERVER )
 
819
    server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
 
820
                                           avahi.DBUS_PATH_SERVER),
 
821
                            avahi.DBUS_INTERFACE_SERVER)
767
822
    # End of Avahi example code
768
823
    
769
 
    clients = Set()
770
824
    def remove_from_clients(client):
771
825
        clients.remove(client)
772
826
        if not clients:
794
848
        # Close all input and output, do double fork, etc.
795
849
        daemon()
796
850
    
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())
 
851
    if pidfile is not None:
 
852
        pid = os.getpid()
 
853
        try:
 
854
            pidfile.write(str(pid) + "\n")
 
855
            pidfile.close()
 
856
        except IOError, err:
 
857
            logger.error(u"Could not write %s file with PID %d",
 
858
                         pidfilename, os.getpid())
 
859
    del pidfile
 
860
    del pidfilename
807
861
    
808
862
    def cleanup():
809
863
        "Cleanup function; run on exit"
829
883
    for client in clients:
830
884
        client.start()
831
885
    
832
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
833
 
                                 server_settings["port"]),
834
 
                                tcp_handler,
835
 
                                settings=server_settings,
836
 
                                clients=clients)
 
886
    tcp_server.enable()
 
887
    tcp_server.server_activate()
 
888
    
837
889
    # Find out what port we got
838
890
    service.port = tcp_server.socket.getsockname()[1]
839
891
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"