/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: 2009-02-14 18:07:05 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090214180705-vu6b7j4i2v2hibgg
Use "getconf" to get correct LFS compile and link flags.

* Makefile (GPGME_CFLAGS): Added output of "getconf LFS_CFLAGS".
  (GPGME_LIBS): Added output of "getconf LFS_LIBS" and
                "getconf LFS_LDFLAGS".
* plugins.d/mandos-client.c: Only define "_LARGEFILE_SOURCE" and
                             "_FILE_OFFSET_BITS" if they are not
                             already defined.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
66
66
import ctypes
67
67
import ctypes.util
68
68
 
69
 
version = "1.0.5"
 
69
version = "1.0.6"
70
70
 
71
71
logger = logging.Logger('mandos')
72
72
syslogger = (logging.handlers.SysLogHandler
73
73
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
74
74
              address = "/dev/log"))
75
75
syslogger.setFormatter(logging.Formatter
76
 
                       ('Mandos: %(levelname)s: %(message)s'))
 
76
                       ('Mandos [%(process)d]: %(levelname)s:'
 
77
                        ' %(message)s'))
77
78
logger.addHandler(syslogger)
78
79
 
79
80
console = logging.StreamHandler()
80
 
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
81
 
                                       ' %(message)s'))
 
81
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
82
                                       ' %(levelname)s: %(message)s'))
82
83
logger.addHandler(console)
83
84
 
84
85
class AvahiError(Exception):
113
114
    """
114
115
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
115
116
                 servicetype = None, port = None, TXT = None,
116
 
                 domain = "", host = "", max_renames = 32768):
 
117
                 domain = "", host = "", max_renames = 32768,
 
118
                 protocol = avahi.PROTO_UNSPEC):
117
119
        self.interface = interface
118
120
        self.name = name
119
121
        self.type = servicetype
123
125
        self.host = host
124
126
        self.rename_count = 0
125
127
        self.max_renames = max_renames
 
128
        self.protocol = protocol
126
129
    def rename(self):
127
130
        """Derived from the Avahi example code"""
128
131
        if self.rename_count >= self.max_renames:
157
160
                     service.name, service.type)
158
161
        group.AddService(
159
162
                self.interface,         # interface
160
 
                avahi.PROTO_INET6,      # protocol
 
163
                self.protocol,          # protocol
161
164
                dbus.UInt32(0),         # flags
162
165
                self.name, self.type,
163
166
                self.domain, self.host,
202
205
                     client lives.  %() expansions are done at
203
206
                     runtime with vars(self) as dict, so that for
204
207
                     instance %(name)s can be used in the command.
 
208
    current_checker_command: string; current running checker_command
205
209
    use_dbus: bool(); Whether to provide D-Bus interface and signals
206
210
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
207
211
    """
256
260
        self.disable_initiator_tag = None
257
261
        self.checker_callback_tag = None
258
262
        self.checker_command = config["checker"]
 
263
        self.current_checker_command = None
259
264
        self.last_connect = None
260
265
        # Only now, when this client is initialized, can it show up on
261
266
        # the D-Bus
376
381
        # checkers alone, the checker would have to take more time
377
382
        # than 'timeout' for the client to be declared invalid, which
378
383
        # is as it should be.
 
384
        
 
385
        # If a checker exists, make sure it is not a zombie
 
386
        if self.checker is not None:
 
387
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
388
            if pid:
 
389
                logger.warning("Checker was a zombie")
 
390
                gobject.source_remove(self.checker_callback_tag)
 
391
                self.checker_callback(pid, status,
 
392
                                      self.current_checker_command)
 
393
        # Start a new checker if needed
379
394
        if self.checker is None:
380
395
            try:
381
396
                # In case checker_command has exactly one % operator
391
406
                    logger.error(u'Could not format string "%s":'
392
407
                                 u' %s', self.checker_command, error)
393
408
                    return True # Try again later
 
409
                self.current_checker_command = command
394
410
            try:
395
411
                logger.info(u"Starting checker %r for %s",
396
412
                            command, self.name)
411
427
                                             (self.checker.pid,
412
428
                                              self.checker_callback,
413
429
                                              data=command))
 
430
                # The checker may have completed before the gobject
 
431
                # watch was added.  Check for this.
 
432
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
433
                if pid:
 
434
                    gobject.source_remove(self.checker_callback_tag)
 
435
                    self.checker_callback(pid, status, command)
414
436
            except OSError, error:
415
437
                logger.error(u"Failed to start subprocess: %s",
416
438
                             error)
676
698
        # using OpenPGP certificates.
677
699
        
678
700
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
679
 
        #                "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
680
 
        #                "+DHE-DSS"))
 
701
        #                     "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
 
702
        #                     "+DHE-DSS"))
681
703
        # Use a fallback default, since this MUST be set.
682
704
        priority = self.server.settings.get("priority", "NORMAL")
683
705
        (gnutls.library.functions
731
753
 
732
754
class IPv6_TCPServer(SocketServer.ForkingMixIn,
733
755
                     SocketServer.TCPServer, object):
734
 
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
 
756
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
735
757
    Attributes:
736
758
        settings:       Server settings
737
759
        clients:        Set() of Client objects
745
767
        if "clients" in kwargs:
746
768
            self.clients = kwargs["clients"]
747
769
            del kwargs["clients"]
 
770
        if "use_ipv6" in kwargs:
 
771
            if not kwargs["use_ipv6"]:
 
772
                self.address_family = socket.AF_INET
 
773
            del kwargs["use_ipv6"]
748
774
        self.enabled = False
749
775
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
750
776
    def server_bind(self):
764
790
                                 u" bind to interface %s",
765
791
                                 self.settings["interface"])
766
792
                else:
767
 
                    raise error
 
793
                    raise
768
794
        # Only bind(2) the socket if we really need to.
769
795
        if self.server_address[0] or self.server_address[1]:
770
796
            if not self.server_address[0]:
771
 
                in6addr_any = "::"
772
 
                self.server_address = (in6addr_any,
 
797
                if self.address_family == socket.AF_INET6:
 
798
                    any_address = "::" # in6addr_any
 
799
                else:
 
800
                    any_address = socket.INADDR_ANY
 
801
                self.server_address = (any_address,
773
802
                                       self.server_address[1])
774
803
            elif not self.server_address[1]:
775
804
                self.server_address = (self.server_address[0],
922
951
                      dest="use_dbus",
923
952
                      help="Do not provide D-Bus system bus"
924
953
                      " interface")
 
954
    parser.add_option("--no-ipv6", action="store_false",
 
955
                      dest="use_ipv6", help="Do not use IPv6")
925
956
    options = parser.parse_args()[0]
926
957
    
927
958
    if options.check:
938
969
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
939
970
                        "servicename": "Mandos",
940
971
                        "use_dbus": "True",
 
972
                        "use_ipv6": "True",
941
973
                        }
942
974
    
943
975
    # Parse config file for server-global settings
951
983
                                                        "debug")
952
984
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
953
985
                                                           "use_dbus")
 
986
    server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
 
987
                                                           "use_ipv6")
954
988
    if server_settings["port"]:
955
989
        server_settings["port"] = server_config.getint("DEFAULT",
956
990
                                                       "port")
960
994
    # options, if set.
961
995
    for option in ("interface", "address", "port", "debug",
962
996
                   "priority", "servicename", "configdir",
963
 
                   "use_dbus"):
 
997
                   "use_dbus", "use_ipv6"):
964
998
        value = getattr(options, option)
965
999
        if value is not None:
966
1000
            server_settings[option] = value
970
1004
    # For convenience
971
1005
    debug = server_settings["debug"]
972
1006
    use_dbus = server_settings["use_dbus"]
973
 
 
974
 
    def sigsegvhandler(signum, frame):
975
 
        raise RuntimeError('Segmentation fault')
 
1007
    use_ipv6 = server_settings["use_ipv6"]
976
1008
    
977
1009
    if not debug:
978
1010
        syslogger.setLevel(logging.WARNING)
979
1011
        console.setLevel(logging.WARNING)
980
 
    else:
981
 
        signal.signal(signal.SIGSEGV, sigsegvhandler)
982
1012
    
983
1013
    if server_settings["servicename"] != "Mandos":
984
1014
        syslogger.setFormatter(logging.Formatter
1001
1031
                                 server_settings["port"]),
1002
1032
                                TCP_handler,
1003
1033
                                settings=server_settings,
1004
 
                                clients=clients)
 
1034
                                clients=clients, use_ipv6=use_ipv6)
1005
1035
    pidfilename = "/var/run/mandos.pid"
1006
1036
    try:
1007
1037
        pidfile = open(pidfilename, "w")
1008
 
    except IOError, error:
 
1038
    except IOError:
1009
1039
        logger.error("Could not open file %r", pidfilename)
1010
1040
    
1011
1041
    try:
1043
1073
         .gnutls_global_set_log_function(debug_gnutls))
1044
1074
    
1045
1075
    global service
 
1076
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1046
1077
    service = AvahiService(name = server_settings["servicename"],
1047
 
                           servicetype = "_mandos._tcp", )
 
1078
                           servicetype = "_mandos._tcp",
 
1079
                           protocol = protocol)
1048
1080
    if server_settings["interface"]:
1049
1081
        service.interface = (if_nametoindex
1050
1082
                             (server_settings["interface"]))
1177
1209
    
1178
1210
    # Find out what port we got
1179
1211
    service.port = tcp_server.socket.getsockname()[1]
1180
 
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
1181
 
                u" scope_id %d" % tcp_server.socket.getsockname())
 
1212
    if use_ipv6:
 
1213
        logger.info(u"Now listening on address %r, port %d,"
 
1214
                    " flowinfo %d, scope_id %d"
 
1215
                    % tcp_server.socket.getsockname())
 
1216
    else:                       # IPv4
 
1217
        logger.info(u"Now listening on address %r, port %d"
 
1218
                    % tcp_server.socket.getsockname())
1182
1219
    
1183
1220
    #service.interface = tcp_server.socket.getsockname()[3]
1184
1221
    
1204
1241
        sys.exit(1)
1205
1242
    except KeyboardInterrupt:
1206
1243
        if debug:
1207
 
            print
 
1244
            print >> sys.stderr
 
1245
        logger.debug("Server received KeyboardInterrupt")
 
1246
    logger.debug("Server exiting")
1208
1247
 
1209
1248
if __name__ == '__main__':
1210
1249
    main()