/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 16:24:33 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080905162433-58fgx91ae9foxlh1
* Makefile (PIDDIR, USER, GROUP): Removed.
  (install-server): Do not create $(PIDDIR).
  (uninstall-server): Do not remove $(PIDDIR).

* init.d-mandos (PIDFILE): Changed to "/var/run/$NAME.pid".

* mandos (IPv6_TCPServer.enabled): New attribute.
  (IPv6_TCPServer.server_activate): Only call method of superclass if
                                    "self.enabled".
  (IPv6_TCPServer.enable): Set "self.enabled" to True.
  (main): Create client Set() early.  Create IPv6_TCPServer object
          early.  Switch to user and group "mandos", "nobody" or
          65534, if possible.  Enable IPv6_TCPServer *after* switching
          user.

* mandos-keygen (KEYDIR): Changed to "/etc/keys/mandos".

* mandos.xml (FILES): Changed PID file.
  (SECURITY): The server does need to be privileged, but switches to a
              non-privileged user.

* plugin-runner.xml (EXAMPLE): Changed long example to something more
                               realistic.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
55
55
import stat
56
56
import logging
57
57
import logging.handlers
 
58
import pwd
58
59
 
59
60
import dbus
60
61
import gobject
517
518
    Attributes:
518
519
        settings:       Server settings
519
520
        clients:        Set() of Client objects
 
521
        enabled:        Boolean; whether this server is activated yet
520
522
    """
521
523
    address_family = socket.AF_INET6
522
524
    def __init__(self, *args, **kwargs):
526
528
        if "clients" in kwargs:
527
529
            self.clients = kwargs["clients"]
528
530
            del kwargs["clients"]
 
531
        self.enabled = False
529
532
        return super(type(self), self).__init__(*args, **kwargs)
530
533
    def server_bind(self):
531
534
        """This overrides the normal server_bind() function
562
565
#                                            (self.settings
563
566
#                                             ["interface"]))
564
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
565
573
 
566
574
 
567
575
def string_to_delta(interval):
758
766
    client_config.read(os.path.join(server_settings["configdir"],
759
767
                                    "clients.conf"))
760
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
    uid = 65534
 
776
    gid = 65534
 
777
    try:
 
778
        uid = pwd.getpwnam("mandos").pw_uid
 
779
    except KeyError:
 
780
        try:
 
781
            uid = pwd.getpwnam("nobody").pw_uid
 
782
        except KeyError:
 
783
            pass
 
784
    try:
 
785
        gid = pwd.getpwnam("mandos").pw_gid
 
786
    except KeyError:
 
787
        try:
 
788
            gid = pwd.getpwnam("nogroup").pw_gid
 
789
        except KeyError:
 
790
            pass
 
791
    try:
 
792
        os.setuid(uid)
 
793
        os.setgid(gid)
 
794
    except OSError, error:
 
795
        if error[0] != errno.EPERM:
 
796
            raise error
 
797
 
761
798
    global service
762
799
    service = AvahiService(name = server_settings["servicename"],
763
800
                           type = "_mandos._tcp", );
777
814
                            avahi.DBUS_INTERFACE_SERVER)
778
815
    # End of Avahi example code
779
816
    
780
 
    clients = Set()
781
817
    def remove_from_clients(client):
782
818
        clients.remove(client)
783
819
        if not clients:
805
841
        # Close all input and output, do double fork, etc.
806
842
        daemon()
807
843
    
808
 
    pidfilename = "/var/run/mandos/mandos.pid"
 
844
    pidfilename = "/var/run/mandos.pid"
809
845
    pid = os.getpid()
810
846
    try:
811
847
        pidfile = open(pidfilename, "w")
840
876
    for client in clients:
841
877
        client.start()
842
878
    
843
 
    tcp_server = IPv6_TCPServer((server_settings["address"],
844
 
                                 server_settings["port"]),
845
 
                                tcp_handler,
846
 
                                settings=server_settings,
847
 
                                clients=clients)
 
879
    tcp_server.enable()
 
880
    tcp_server.server_activate()
 
881
    
848
882
    # Find out what port we got
849
883
    service.port = tcp_server.socket.getsockname()[1]
850
884
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"