/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-06-14 23:43:07 UTC
  • Revision ID: teddy@recompile.se-20140614234307-i0mh9r2n4orkqtki
plugin-runner: Release memory and close FD's correctly in all cases.

* plugins.d/mandos-client.c (main): Init "direntries" to NULL.  Close
                                    "dir_fd" at fallback label.  Do
                                    not free "direntries" if
                                    scandirat() or scandir() failed.
                                    Do free(direntries) at fallback
                                    label.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
2337
2337
                        help="Directory to save/restore state in")
2338
2338
    parser.add_argument("--foreground", action="store_true",
2339
2339
                        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
2340
    
2344
2341
    options = parser.parse_args()
2345
2342
    
2363
2360
                        "socket": "",
2364
2361
                        "statedir": "/var/lib/mandos",
2365
2362
                        "foreground": "False",
2366
 
                        "zeroconf": "True",
2367
2363
                        }
2368
2364
    
2369
2365
    # Parse config file for server-global settings
2396
2392
    for option in ("interface", "address", "port", "debug",
2397
2393
                   "priority", "servicename", "configdir",
2398
2394
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2399
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2395
                   "statedir", "socket", "foreground"):
2400
2396
        value = getattr(options, option)
2401
2397
        if value is not None:
2402
2398
            server_settings[option] = value
2407
2403
            server_settings[option] = unicode(server_settings[option])
2408
2404
    # Force all boolean options to be boolean
2409
2405
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2410
 
                   "foreground", "zeroconf"):
 
2406
                   "foreground"):
2411
2407
        server_settings[option] = bool(server_settings[option])
2412
2408
    # Debug implies foreground
2413
2409
    if server_settings["debug"]:
2416
2412
    
2417
2413
    ##################################################################
2418
2414
    
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
2415
    # For convenience
2426
2416
    debug = server_settings["debug"]
2427
2417
    debuglevel = server_settings["debuglevel"]
2430
2420
    stored_state_path = os.path.join(server_settings["statedir"],
2431
2421
                                     stored_state_file)
2432
2422
    foreground = server_settings["foreground"]
2433
 
    zeroconf = server_settings["zeroconf"]
2434
2423
    
2435
2424
    if debug:
2436
2425
        initlogger(debug, logging.DEBUG)
2457
2446
    global mandos_dbus_service
2458
2447
    mandos_dbus_service = None
2459
2448
    
2460
 
    socketfd = None
2461
 
    if server_settings["socket"] != "":
2462
 
        socketfd = server_settings["socket"]
2463
2449
    tcp_server = MandosServer((server_settings["address"],
2464
2450
                               server_settings["port"]),
2465
2451
                              ClientHandler,
2469
2455
                              gnutls_priority=
2470
2456
                              server_settings["priority"],
2471
2457
                              use_dbus=use_dbus,
2472
 
                              socketfd=socketfd)
 
2458
                              socketfd=(server_settings["socket"]
 
2459
                                        or None))
2473
2460
    if not foreground:
2474
2461
        pidfilename = "/run/mandos.pid"
2475
2462
        if not os.path.isdir("/run/."):
2545
2532
            use_dbus = False
2546
2533
            server_settings["use_dbus"] = False
2547
2534
            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"])))
 
2535
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2536
    service = AvahiServiceToSyslog(name =
 
2537
                                   server_settings["servicename"],
 
2538
                                   servicetype = "_mandos._tcp",
 
2539
                                   protocol = protocol, bus = bus)
 
2540
    if server_settings["interface"]:
 
2541
        service.interface = (if_nametoindex
 
2542
                             (str(server_settings["interface"])))
2557
2543
    
2558
2544
    global multiprocessing_manager
2559
2545
    multiprocessing_manager = multiprocessing.Manager()
2753
2739
    
2754
2740
    def cleanup():
2755
2741
        "Cleanup function; run on exit"
2756
 
        if zeroconf:
2757
 
            service.cleanup()
 
2742
        service.cleanup()
2758
2743
        
2759
2744
        multiprocessing.active_children()
2760
2745
        wnull.close()
2839
2824
    tcp_server.server_activate()
2840
2825
    
2841
2826
    # Find out what port we got
2842
 
    if zeroconf:
2843
 
        service.port = tcp_server.socket.getsockname()[1]
 
2827
    service.port = tcp_server.socket.getsockname()[1]
2844
2828
    if use_ipv6:
2845
2829
        logger.info("Now listening on address %r, port %d,"
2846
2830
                    " flowinfo %d, scope_id %d",
2852
2836
    #service.interface = tcp_server.socket.getsockname()[3]
2853
2837
    
2854
2838
    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
 
2839
        # From the Avahi example code
 
2840
        try:
 
2841
            service.activate()
 
2842
        except dbus.exceptions.DBusException as error:
 
2843
            logger.critical("D-Bus Exception", exc_info=error)
 
2844
            cleanup()
 
2845
            sys.exit(1)
 
2846
        # End of Avahi example code
2864
2847
        
2865
2848
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2866
2849
                             lambda *args, **kwargs: