/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 12:54:34 UTC
  • mfrom: (655 trunk)
  • mto: This revision was merged to the branch mainline in revision 656.
  • Revision ID: teddy@recompile.se-20140216125434-zll46tlbgvvl5wda
Merge from trunk.

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.6"
 
91
version = "1.6.3"
92
92
stored_state_file = "clients.pickle"
93
93
 
94
94
logger = logging.getLogger()
114
114
def initlogger(debug, level=logging.WARNING):
115
115
    """init logger and add loglevel"""
116
116
    
117
 
    global syslogger
118
117
    syslogger = (logging.handlers.SysLogHandler
119
118
                 (facility =
120
119
                  logging.handlers.SysLogHandler.LOG_DAEMON,
1353
1352
                                       *args, **kwargs)
1354
1353
    
1355
1354
    def start_checker(self, *args, **kwargs):
1356
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1355
        old_checker = self.checker
 
1356
        if self.checker is not None:
 
1357
            old_checker_pid = self.checker.pid
 
1358
        else:
 
1359
            old_checker_pid = None
1357
1360
        r = Client.start_checker(self, *args, **kwargs)
1358
1361
        # Only if new checker process was started
1359
1362
        if (self.checker is not None
2337
2340
                        help="Directory to save/restore state in")
2338
2341
    parser.add_argument("--foreground", action="store_true",
2339
2342
                        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
2343
    
2344
2344
    options = parser.parse_args()
2345
2345
    
2363
2363
                        "socket": "",
2364
2364
                        "statedir": "/var/lib/mandos",
2365
2365
                        "foreground": "False",
2366
 
                        "zeroconf": "True",
2367
2366
                        }
2368
2367
    
2369
2368
    # Parse config file for server-global settings
2396
2395
    for option in ("interface", "address", "port", "debug",
2397
2396
                   "priority", "servicename", "configdir",
2398
2397
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2399
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2398
                   "statedir", "socket", "foreground"):
2400
2399
        value = getattr(options, option)
2401
2400
        if value is not None:
2402
2401
            server_settings[option] = value
2407
2406
            server_settings[option] = unicode(server_settings[option])
2408
2407
    # Force all boolean options to be boolean
2409
2408
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2410
 
                   "foreground", "zeroconf"):
 
2409
                   "foreground"):
2411
2410
        server_settings[option] = bool(server_settings[option])
2412
2411
    # Debug implies foreground
2413
2412
    if server_settings["debug"]:
2416
2415
    
2417
2416
    ##################################################################
2418
2417
    
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
2418
    # For convenience
2426
2419
    debug = server_settings["debug"]
2427
2420
    debuglevel = server_settings["debuglevel"]
2430
2423
    stored_state_path = os.path.join(server_settings["statedir"],
2431
2424
                                     stored_state_file)
2432
2425
    foreground = server_settings["foreground"]
2433
 
    zeroconf = server_settings["zeroconf"]
2434
2426
    
2435
2427
    if debug:
2436
2428
        initlogger(debug, logging.DEBUG)
2457
2449
    global mandos_dbus_service
2458
2450
    mandos_dbus_service = None
2459
2451
    
2460
 
    socketfd = None
2461
 
    if server_settings["socket"] != "":
2462
 
        socketfd = server_settings["socket"]
2463
2452
    tcp_server = MandosServer((server_settings["address"],
2464
2453
                               server_settings["port"]),
2465
2454
                              ClientHandler,
2469
2458
                              gnutls_priority=
2470
2459
                              server_settings["priority"],
2471
2460
                              use_dbus=use_dbus,
2472
 
                              socketfd=socketfd)
 
2461
                              socketfd=(server_settings["socket"]
 
2462
                                        or None))
2473
2463
    if not foreground:
2474
2464
        pidfilename = "/run/mandos.pid"
2475
2465
        if not os.path.isdir("/run/."):
2545
2535
            use_dbus = False
2546
2536
            server_settings["use_dbus"] = False
2547
2537
            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"])))
 
2538
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2539
    service = AvahiServiceToSyslog(name =
 
2540
                                   server_settings["servicename"],
 
2541
                                   servicetype = "_mandos._tcp",
 
2542
                                   protocol = protocol, bus = bus)
 
2543
    if server_settings["interface"]:
 
2544
        service.interface = (if_nametoindex
 
2545
                             (str(server_settings["interface"])))
2557
2546
    
2558
2547
    global multiprocessing_manager
2559
2548
    multiprocessing_manager = multiprocessing.Manager()
2753
2742
    
2754
2743
    def cleanup():
2755
2744
        "Cleanup function; run on exit"
2756
 
        if zeroconf:
2757
 
            service.cleanup()
 
2745
        service.cleanup()
2758
2746
        
2759
2747
        multiprocessing.active_children()
2760
2748
        wnull.close()
2839
2827
    tcp_server.server_activate()
2840
2828
    
2841
2829
    # Find out what port we got
2842
 
    if zeroconf:
2843
 
        service.port = tcp_server.socket.getsockname()[1]
 
2830
    service.port = tcp_server.socket.getsockname()[1]
2844
2831
    if use_ipv6:
2845
2832
        logger.info("Now listening on address %r, port %d,"
2846
2833
                    " flowinfo %d, scope_id %d",
2852
2839
    #service.interface = tcp_server.socket.getsockname()[3]
2853
2840
    
2854
2841
    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
 
2842
        # From the Avahi example code
 
2843
        try:
 
2844
            service.activate()
 
2845
        except dbus.exceptions.DBusException as error:
 
2846
            logger.critical("D-Bus Exception", exc_info=error)
 
2847
            cleanup()
 
2848
            sys.exit(1)
 
2849
        # End of Avahi example code
2864
2850
        
2865
2851
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2866
2852
                             lambda *args, **kwargs: