/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: 2014-02-16 02:42:42 UTC
  • Revision ID: teddy@recompile.se-20140216024242-9wiw1nkxgt7ohovj
Fix running of self-tests.

* debian/control (Build-Depends): Add Python dependencies to
                                  successfully run self-tests.
* debian/copyright: GPLv3 now has its own license file - use it.
* debian/watch: Set PGP signature URL.
* mandos (main): Bug fix: When running self-tests, set exit code.
* mandos-ctl (main): Cosmetic fix; use os.EX_OK instead of plain 0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
88
88
    except ImportError:
89
89
        SO_BINDTODEVICE = None
90
90
 
91
 
version = "1.6.5"
 
91
version = "1.6.3"
92
92
stored_state_file = "clients.pickle"
93
93
 
94
94
logger = logging.getLogger()
95
 
syslogger = None
 
95
syslogger = (logging.handlers.SysLogHandler
 
96
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
97
              address = str("/dev/log")))
96
98
 
97
99
try:
98
100
    if_nametoindex = (ctypes.cdll.LoadLibrary
114
116
def initlogger(debug, level=logging.WARNING):
115
117
    """init logger and add loglevel"""
116
118
    
117
 
    global syslogger
118
 
    syslogger = (logging.handlers.SysLogHandler
119
 
                 (facility =
120
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
121
 
                  address = str("/dev/log")))
122
119
    syslogger.setFormatter(logging.Formatter
123
120
                           ('Mandos [%(process)d]: %(levelname)s:'
124
121
                            ' %(message)s'))
1353
1350
                                       *args, **kwargs)
1354
1351
    
1355
1352
    def start_checker(self, *args, **kwargs):
1356
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1353
        old_checker = self.checker
 
1354
        if self.checker is not None:
 
1355
            old_checker_pid = self.checker.pid
 
1356
        else:
 
1357
            old_checker_pid = None
1357
1358
        r = Client.start_checker(self, *args, **kwargs)
1358
1359
        # Only if new checker process was started
1359
1360
        if (self.checker is not None
2337
2338
                        help="Directory to save/restore state in")
2338
2339
    parser.add_argument("--foreground", action="store_true",
2339
2340
                        help="Run in foreground", default=None)
2340
 
    parser.add_argument("--no-zeroconf", action="store_false",
2341
 
                        dest="zeroconf", help="Do not use Zeroconf",
2342
 
                        default=None)
2343
2341
    
2344
2342
    options = parser.parse_args()
2345
2343
    
2363
2361
                        "socket": "",
2364
2362
                        "statedir": "/var/lib/mandos",
2365
2363
                        "foreground": "False",
2366
 
                        "zeroconf": "True",
2367
2364
                        }
2368
2365
    
2369
2366
    # Parse config file for server-global settings
2396
2393
    for option in ("interface", "address", "port", "debug",
2397
2394
                   "priority", "servicename", "configdir",
2398
2395
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2399
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2396
                   "statedir", "socket", "foreground"):
2400
2397
        value = getattr(options, option)
2401
2398
        if value is not None:
2402
2399
            server_settings[option] = value
2407
2404
            server_settings[option] = unicode(server_settings[option])
2408
2405
    # Force all boolean options to be boolean
2409
2406
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2410
 
                   "foreground", "zeroconf"):
 
2407
                   "foreground"):
2411
2408
        server_settings[option] = bool(server_settings[option])
2412
2409
    # Debug implies foreground
2413
2410
    if server_settings["debug"]:
2416
2413
    
2417
2414
    ##################################################################
2418
2415
    
2419
 
    if (not server_settings["zeroconf"] and
2420
 
        not (server_settings["port"]
2421
 
             or server_settings["socket"] != "")):
2422
 
            parser.error("Needs port or socket to work without"
2423
 
                         " Zeroconf")
2424
 
    
2425
2416
    # For convenience
2426
2417
    debug = server_settings["debug"]
2427
2418
    debuglevel = server_settings["debuglevel"]
2430
2421
    stored_state_path = os.path.join(server_settings["statedir"],
2431
2422
                                     stored_state_file)
2432
2423
    foreground = server_settings["foreground"]
2433
 
    zeroconf = server_settings["zeroconf"]
2434
2424
    
2435
2425
    if debug:
2436
2426
        initlogger(debug, logging.DEBUG)
2457
2447
    global mandos_dbus_service
2458
2448
    mandos_dbus_service = None
2459
2449
    
2460
 
    socketfd = None
2461
 
    if server_settings["socket"] != "":
2462
 
        socketfd = server_settings["socket"]
2463
2450
    tcp_server = MandosServer((server_settings["address"],
2464
2451
                               server_settings["port"]),
2465
2452
                              ClientHandler,
2469
2456
                              gnutls_priority=
2470
2457
                              server_settings["priority"],
2471
2458
                              use_dbus=use_dbus,
2472
 
                              socketfd=socketfd)
 
2459
                              socketfd=(server_settings["socket"]
 
2460
                                        or None))
2473
2461
    if not foreground:
2474
2462
        pidfilename = "/run/mandos.pid"
2475
2463
        if not os.path.isdir("/run/."):
2545
2533
            use_dbus = False
2546
2534
            server_settings["use_dbus"] = False
2547
2535
            tcp_server.use_dbus = False
2548
 
    if zeroconf:
2549
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2550
 
        service = AvahiServiceToSyslog(name =
2551
 
                                       server_settings["servicename"],
2552
 
                                       servicetype = "_mandos._tcp",
2553
 
                                       protocol = protocol, bus = bus)
2554
 
        if server_settings["interface"]:
2555
 
            service.interface = (if_nametoindex
2556
 
                                 (str(server_settings["interface"])))
 
2536
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2537
    service = AvahiServiceToSyslog(name =
 
2538
                                   server_settings["servicename"],
 
2539
                                   servicetype = "_mandos._tcp",
 
2540
                                   protocol = protocol, bus = bus)
 
2541
    if server_settings["interface"]:
 
2542
        service.interface = (if_nametoindex
 
2543
                             (str(server_settings["interface"])))
2557
2544
    
2558
2545
    global multiprocessing_manager
2559
2546
    multiprocessing_manager = multiprocessing.Manager()
2753
2740
    
2754
2741
    def cleanup():
2755
2742
        "Cleanup function; run on exit"
2756
 
        if zeroconf:
2757
 
            service.cleanup()
 
2743
        service.cleanup()
2758
2744
        
2759
2745
        multiprocessing.active_children()
2760
2746
        wnull.close()
2839
2825
    tcp_server.server_activate()
2840
2826
    
2841
2827
    # Find out what port we got
2842
 
    if zeroconf:
2843
 
        service.port = tcp_server.socket.getsockname()[1]
 
2828
    service.port = tcp_server.socket.getsockname()[1]
2844
2829
    if use_ipv6:
2845
2830
        logger.info("Now listening on address %r, port %d,"
2846
2831
                    " flowinfo %d, scope_id %d",
2852
2837
    #service.interface = tcp_server.socket.getsockname()[3]
2853
2838
    
2854
2839
    try:
2855
 
        if zeroconf:
2856
 
            # From the Avahi example code
2857
 
            try:
2858
 
                service.activate()
2859
 
            except dbus.exceptions.DBusException as error:
2860
 
                logger.critical("D-Bus Exception", exc_info=error)
2861
 
                cleanup()
2862
 
                sys.exit(1)
2863
 
            # End of Avahi example code
 
2840
        # From the Avahi example code
 
2841
        try:
 
2842
            service.activate()
 
2843
        except dbus.exceptions.DBusException as error:
 
2844
            logger.critical("D-Bus Exception", exc_info=error)
 
2845
            cleanup()
 
2846
            sys.exit(1)
 
2847
        # End of Avahi example code
2864
2848
        
2865
2849
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2866
2850
                             lambda *args, **kwargs: