/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-03-23 20:48:58 UTC
  • Revision ID: teddy@recompile.se-20140323204858-l1x3aiick21oog4y
Improve error message when working around Debian bug #633582.

* plugins-runner.c (main): Improve error message when failing to work
                           around Debian bug #633582.  Also simplify
                           code to always use execve().

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1
 
#!/usr/bin/python2.7
 
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
# 
4
4
# Mandos server - give out binary blobs to connecting clients.
88
88
    except ImportError:
89
89
        SO_BINDTODEVICE = None
90
90
 
91
 
version = "1.6.7"
 
91
version = "1.6.4"
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,
338
337
        elif state == avahi.ENTRY_GROUP_FAILURE:
339
338
            logger.critical("Avahi: Error in group state changed %s",
340
339
                            unicode(error))
341
 
            raise AvahiGroupError("State changed: {!s}"
 
340
            raise AvahiGroupError("State changed: {0!s}"
342
341
                                  .format(error))
343
342
    
344
343
    def cleanup(self):
395
394
        """Add the new name to the syslog messages"""
396
395
        ret = AvahiService.rename(self)
397
396
        syslogger.setFormatter(logging.Formatter
398
 
                               ('Mandos ({}) [%(process)d]:'
 
397
                               ('Mandos ({0}) [%(process)d]:'
399
398
                                ' %(levelname)s: %(message)s'
400
399
                                .format(self.name)))
401
400
        return ret
513
512
                          "rb") as secfile:
514
513
                    client["secret"] = secfile.read()
515
514
            else:
516
 
                raise TypeError("No secret or secfile for section {}"
 
515
                raise TypeError("No secret or secfile for section {0}"
517
516
                                .format(section))
518
517
            client["timeout"] = string_to_delta(section["timeout"])
519
518
            client["extended_timeout"] = string_to_delta(
536
535
            server_settings = {}
537
536
        self.server_settings = server_settings
538
537
        # adding all client settings
539
 
        for setting, value in settings.items():
 
538
        for setting, value in settings.iteritems():
540
539
            setattr(self, setting, value)
541
540
        
542
541
        if self.enabled:
707
706
        # Start a new checker if needed
708
707
        if self.checker is None:
709
708
            # Escape attributes for the shell
710
 
            escaped_attrs = { attr:
711
 
                                  re.escape(unicode(getattr(self,
712
 
                                                            attr)))
713
 
                              for attr in self.runtime_expansions }
 
709
            escaped_attrs = dict(
 
710
                (attr, re.escape(unicode(getattr(self, attr))))
 
711
                for attr in
 
712
                self.runtime_expansions)
714
713
            try:
715
714
                command = self.checker_command % escaped_attrs
716
715
            except TypeError as error:
797
796
    # "Set" method, so we fail early here:
798
797
    if byte_arrays and signature != "ay":
799
798
        raise ValueError("Byte arrays not supported for non-'ay'"
800
 
                         " signature {!r}".format(signature))
 
799
                         " signature {0!r}".format(signature))
801
800
    def decorator(func):
802
801
        func._dbus_is_property = True
803
802
        func._dbus_interface = dbus_interface
882
881
        If called like _is_dbus_thing("method") it returns a function
883
882
        suitable for use as predicate to inspect.getmembers().
884
883
        """
885
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
884
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
886
885
                                   False)
887
886
    
888
887
    def _get_all_dbus_things(self, thing):
938
937
            # signatures other than "ay".
939
938
            if prop._dbus_signature != "ay":
940
939
                raise ValueError("Byte arrays not supported for non-"
941
 
                                 "'ay' signature {!r}"
 
940
                                 "'ay' signature {0!r}"
942
941
                                 .format(prop._dbus_signature))
943
942
            value = dbus.ByteArray(b''.join(chr(byte)
944
943
                                            for byte in value))
1009
1008
                                              (prop,
1010
1009
                                               "_dbus_annotations",
1011
1010
                                               {}))
1012
 
                        for name, value in annots.items():
 
1011
                        for name, value in annots.iteritems():
1013
1012
                            ann_tag = document.createElement(
1014
1013
                                "annotation")
1015
1014
                            ann_tag.setAttribute("name", name)
1018
1017
                # Add interface annotation tags
1019
1018
                for annotation, value in dict(
1020
1019
                    itertools.chain.from_iterable(
1021
 
                        annotations().items()
 
1020
                        annotations().iteritems()
1022
1021
                        for name, annotations in
1023
1022
                        self._get_all_dbus_things("interface")
1024
1023
                        if name == if_tag.getAttribute("name")
1025
 
                        )).items():
 
1024
                        )).iteritems():
1026
1025
                    ann_tag = document.createElement("annotation")
1027
1026
                    ann_tag.setAttribute("name", annotation)
1028
1027
                    ann_tag.setAttribute("value", value)
1084
1083
    """
1085
1084
    def wrapper(cls):
1086
1085
        for orig_interface_name, alt_interface_name in (
1087
 
            alt_interface_names.items()):
 
1086
            alt_interface_names.iteritems()):
1088
1087
            attr = {}
1089
1088
            interface_names = set()
1090
1089
            # Go though all attributes of the class
1207
1206
                                        attribute.func_closure)))
1208
1207
            if deprecate:
1209
1208
                # Deprecate all alternate interfaces
1210
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1209
                iname="_AlternateDBusNames_interface_annotation{0}"
1211
1210
                for interface_name in interface_names:
1212
1211
                    @dbus_interface_annotations(interface_name)
1213
1212
                    def func(self):
1222
1221
            if interface_names:
1223
1222
                # Replace the class with a new subclass of it with
1224
1223
                # methods, signals, etc. as created above.
1225
 
                cls = type(b"{}Alternate".format(cls.__name__),
 
1224
                cls = type(b"{0}Alternate".format(cls.__name__),
1226
1225
                           (cls,), attr)
1227
1226
        return cls
1228
1227
    return wrapper
1269
1268
                   to the D-Bus.  Default: no transform
1270
1269
        variant_level: D-Bus variant level.  Default: 1
1271
1270
        """
1272
 
        attrname = "_{}".format(dbus_name)
 
1271
        attrname = "_{0}".format(dbus_name)
1273
1272
        def setter(self, value):
1274
1273
            if hasattr(self, "dbus_object_path"):
1275
1274
                if (not hasattr(self, attrname) or
2188
2187
    token_duration = Token(re.compile(r"P"), None,
2189
2188
                           frozenset((token_year, token_month,
2190
2189
                                      token_day, token_time,
2191
 
                                      token_week)))
 
2190
                                      token_week))),
2192
2191
    # Define starting values
2193
2192
    value = datetime.timedelta() # Value so far
2194
2193
    found_token = None
2195
 
    followers = frozenset((token_duration,)) # Following valid tokens
 
2194
    followers = frozenset(token_duration,) # Following valid tokens
2196
2195
    s = duration                # String left to parse
2197
2196
    # Loop until end token is found
2198
2197
    while found_token is not token_end:
2258
2257
            elif suffix == "w":
2259
2258
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2260
2259
            else:
2261
 
                raise ValueError("Unknown suffix {!r}"
 
2260
                raise ValueError("Unknown suffix {0!r}"
2262
2261
                                 .format(suffix))
2263
2262
        except IndexError as e:
2264
2263
            raise ValueError(*(e.args))
2281
2280
        # Close all standard open file descriptors
2282
2281
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2283
2282
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2284
 
            raise OSError(errno.ENODEV, "{} not a character device"
 
2283
            raise OSError(errno.ENODEV,
 
2284
                          "{0} not a character device"
2285
2285
                          .format(os.devnull))
2286
2286
        os.dup2(null, sys.stdin.fileno())
2287
2287
        os.dup2(null, sys.stdout.fileno())
2297
2297
    
2298
2298
    parser = argparse.ArgumentParser()
2299
2299
    parser.add_argument("-v", "--version", action="version",
2300
 
                        version = "%(prog)s {}".format(version),
 
2300
                        version = "%(prog)s {0}".format(version),
2301
2301
                        help="show version number and exit")
2302
2302
    parser.add_argument("-i", "--interface", metavar="IF",
2303
2303
                        help="Bind to interface IF")
2336
2336
                        help="Directory to save/restore state in")
2337
2337
    parser.add_argument("--foreground", action="store_true",
2338
2338
                        help="Run in foreground", default=None)
2339
 
    parser.add_argument("--no-zeroconf", action="store_false",
2340
 
                        dest="zeroconf", help="Do not use Zeroconf",
2341
 
                        default=None)
2342
2339
    
2343
2340
    options = parser.parse_args()
2344
2341
    
2362
2359
                        "socket": "",
2363
2360
                        "statedir": "/var/lib/mandos",
2364
2361
                        "foreground": "False",
2365
 
                        "zeroconf": "True",
2366
2362
                        }
2367
2363
    
2368
2364
    # Parse config file for server-global settings
2395
2391
    for option in ("interface", "address", "port", "debug",
2396
2392
                   "priority", "servicename", "configdir",
2397
2393
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2398
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
2394
                   "statedir", "socket", "foreground"):
2399
2395
        value = getattr(options, option)
2400
2396
        if value is not None:
2401
2397
            server_settings[option] = value
2406
2402
            server_settings[option] = unicode(server_settings[option])
2407
2403
    # Force all boolean options to be boolean
2408
2404
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2409
 
                   "foreground", "zeroconf"):
 
2405
                   "foreground"):
2410
2406
        server_settings[option] = bool(server_settings[option])
2411
2407
    # Debug implies foreground
2412
2408
    if server_settings["debug"]:
2415
2411
    
2416
2412
    ##################################################################
2417
2413
    
2418
 
    if (not server_settings["zeroconf"] and
2419
 
        not (server_settings["port"]
2420
 
             or server_settings["socket"] != "")):
2421
 
            parser.error("Needs port or socket to work without"
2422
 
                         " Zeroconf")
2423
 
    
2424
2414
    # For convenience
2425
2415
    debug = server_settings["debug"]
2426
2416
    debuglevel = server_settings["debuglevel"]
2429
2419
    stored_state_path = os.path.join(server_settings["statedir"],
2430
2420
                                     stored_state_file)
2431
2421
    foreground = server_settings["foreground"]
2432
 
    zeroconf = server_settings["zeroconf"]
2433
2422
    
2434
2423
    if debug:
2435
2424
        initlogger(debug, logging.DEBUG)
2442
2431
    
2443
2432
    if server_settings["servicename"] != "Mandos":
2444
2433
        syslogger.setFormatter(logging.Formatter
2445
 
                               ('Mandos ({}) [%(process)d]:'
 
2434
                               ('Mandos ({0}) [%(process)d]:'
2446
2435
                                ' %(levelname)s: %(message)s'
2447
2436
                                .format(server_settings
2448
2437
                                        ["servicename"])))
2456
2445
    global mandos_dbus_service
2457
2446
    mandos_dbus_service = None
2458
2447
    
2459
 
    socketfd = None
2460
 
    if server_settings["socket"] != "":
2461
 
        socketfd = server_settings["socket"]
2462
2448
    tcp_server = MandosServer((server_settings["address"],
2463
2449
                               server_settings["port"]),
2464
2450
                              ClientHandler,
2468
2454
                              gnutls_priority=
2469
2455
                              server_settings["priority"],
2470
2456
                              use_dbus=use_dbus,
2471
 
                              socketfd=socketfd)
 
2457
                              socketfd=(server_settings["socket"]
 
2458
                                        or None))
2472
2459
    if not foreground:
2473
2460
        pidfilename = "/run/mandos.pid"
2474
2461
        if not os.path.isdir("/run/."):
2544
2531
            use_dbus = False
2545
2532
            server_settings["use_dbus"] = False
2546
2533
            tcp_server.use_dbus = False
2547
 
    if zeroconf:
2548
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2549
 
        service = AvahiServiceToSyslog(name =
2550
 
                                       server_settings["servicename"],
2551
 
                                       servicetype = "_mandos._tcp",
2552
 
                                       protocol = protocol, bus = bus)
2553
 
        if server_settings["interface"]:
2554
 
            service.interface = (if_nametoindex
2555
 
                                 (str(server_settings["interface"])))
 
2534
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2535
    service = AvahiServiceToSyslog(name =
 
2536
                                   server_settings["servicename"],
 
2537
                                   servicetype = "_mandos._tcp",
 
2538
                                   protocol = protocol, bus = bus)
 
2539
    if server_settings["interface"]:
 
2540
        service.interface = (if_nametoindex
 
2541
                             (str(server_settings["interface"])))
2556
2542
    
2557
2543
    global multiprocessing_manager
2558
2544
    multiprocessing_manager = multiprocessing.Manager()
2582
2568
            os.remove(stored_state_path)
2583
2569
        except IOError as e:
2584
2570
            if e.errno == errno.ENOENT:
2585
 
                logger.warning("Could not load persistent state: {}"
 
2571
                logger.warning("Could not load persistent state: {0}"
2586
2572
                                .format(os.strerror(e.errno)))
2587
2573
            else:
2588
2574
                logger.critical("Could not load persistent state:",
2593
2579
                           "EOFError:", exc_info=e)
2594
2580
    
2595
2581
    with PGPEngine() as pgp:
2596
 
        for client_name, client in clients_data.items():
 
2582
        for client_name, client in clients_data.iteritems():
2597
2583
            # Skip removed clients
2598
2584
            if client_name not in client_settings:
2599
2585
                continue
2624
2610
                if datetime.datetime.utcnow() >= client["expires"]:
2625
2611
                    if not client["last_checked_ok"]:
2626
2612
                        logger.warning(
2627
 
                            "disabling client {} - Client never "
 
2613
                            "disabling client {0} - Client never "
2628
2614
                            "performed a successful checker"
2629
2615
                            .format(client_name))
2630
2616
                        client["enabled"] = False
2631
2617
                    elif client["last_checker_status"] != 0:
2632
2618
                        logger.warning(
2633
 
                            "disabling client {} - Client last"
2634
 
                            " checker failed with error code {}"
 
2619
                            "disabling client {0} - Client "
 
2620
                            "last checker failed with error code {1}"
2635
2621
                            .format(client_name,
2636
2622
                                    client["last_checker_status"]))
2637
2623
                        client["enabled"] = False
2640
2626
                                             .utcnow()
2641
2627
                                             + client["timeout"])
2642
2628
                        logger.debug("Last checker succeeded,"
2643
 
                                     " keeping {} enabled"
 
2629
                                     " keeping {0} enabled"
2644
2630
                                     .format(client_name))
2645
2631
            try:
2646
2632
                client["secret"] = (
2649
2635
                                ["secret"]))
2650
2636
            except PGPError:
2651
2637
                # If decryption fails, we use secret from new settings
2652
 
                logger.debug("Failed to decrypt {} old secret"
 
2638
                logger.debug("Failed to decrypt {0} old secret"
2653
2639
                             .format(client_name))
2654
2640
                client["secret"] = (
2655
2641
                    client_settings[client_name]["secret"])
2663
2649
        clients_data[client_name] = client_settings[client_name]
2664
2650
    
2665
2651
    # Create all client objects
2666
 
    for client_name, client in clients_data.items():
 
2652
    for client_name, client in clients_data.iteritems():
2667
2653
        tcp_server.clients[client_name] = client_class(
2668
2654
            name = client_name, settings = client,
2669
2655
            server_settings = server_settings)
2752
2738
    
2753
2739
    def cleanup():
2754
2740
        "Cleanup function; run on exit"
2755
 
        if zeroconf:
2756
 
            service.cleanup()
 
2741
        service.cleanup()
2757
2742
        
2758
2743
        multiprocessing.active_children()
2759
2744
        wnull.close()
2773
2758
                
2774
2759
                # A list of attributes that can not be pickled
2775
2760
                # + secret.
2776
 
                exclude = { "bus", "changedstate", "secret",
2777
 
                            "checker", "server_settings" }
 
2761
                exclude = set(("bus", "changedstate", "secret",
 
2762
                               "checker", "server_settings"))
2778
2763
                for name, typ in (inspect.getmembers
2779
2764
                                  (dbus.service.Object)):
2780
2765
                    exclude.add(name)
2803
2788
                except NameError:
2804
2789
                    pass
2805
2790
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2806
 
                logger.warning("Could not save persistent state: {}"
 
2791
                logger.warning("Could not save persistent state: {0}"
2807
2792
                               .format(os.strerror(e.errno)))
2808
2793
            else:
2809
2794
                logger.warning("Could not save persistent state:",
2838
2823
    tcp_server.server_activate()
2839
2824
    
2840
2825
    # Find out what port we got
2841
 
    if zeroconf:
2842
 
        service.port = tcp_server.socket.getsockname()[1]
 
2826
    service.port = tcp_server.socket.getsockname()[1]
2843
2827
    if use_ipv6:
2844
2828
        logger.info("Now listening on address %r, port %d,"
2845
2829
                    " flowinfo %d, scope_id %d",
2851
2835
    #service.interface = tcp_server.socket.getsockname()[3]
2852
2836
    
2853
2837
    try:
2854
 
        if zeroconf:
2855
 
            # From the Avahi example code
2856
 
            try:
2857
 
                service.activate()
2858
 
            except dbus.exceptions.DBusException as error:
2859
 
                logger.critical("D-Bus Exception", exc_info=error)
2860
 
                cleanup()
2861
 
                sys.exit(1)
2862
 
            # End of Avahi example code
 
2838
        # From the Avahi example code
 
2839
        try:
 
2840
            service.activate()
 
2841
        except dbus.exceptions.DBusException as error:
 
2842
            logger.critical("D-Bus Exception", exc_info=error)
 
2843
            cleanup()
 
2844
            sys.exit(1)
 
2845
        # End of Avahi example code
2863
2846
        
2864
2847
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2865
2848
                             lambda *args, **kwargs: