/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: 2013-10-22 19:24:01 UTC
  • Revision ID: teddy@recompile.se-20131022192401-op6mwsb7f7gygjyh
http://bugs.debian.org/702120
* mandos (priority): Bug fix: Add even more magic to make the old
                     DSA/ELG 2048-bit keys work with GnuTLS.
* mandos-keygen (KEYCOMMENT): Changed default to "".
* mandos-keygen (OPTIONS): Document new default value of "--comment".
* mandos-options.xml (priority): Document new default value.
* mandos.conf (priority): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
# 
13
13
# Everything else is
14
 
# Copyright © 2008-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008-2013 Teddy Hogeborn
 
15
# Copyright © 2008-2013 Björn Påhlsson
16
16
# 
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
88
88
    except ImportError:
89
89
        SO_BINDTODEVICE = None
90
90
 
91
 
version = "1.6.0"
 
91
version = "1.6.1"
92
92
stored_state_file = "clients.pickle"
93
93
 
94
94
logger = logging.getLogger()
172
172
    def password_encode(self, password):
173
173
        # Passphrase can not be empty and can not contain newlines or
174
174
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        return b"mandos" + binascii.hexlify(password)
 
175
        encoded = b"mandos" + binascii.hexlify(password)
 
176
        if len(encoded) > 2048:
 
177
            # GnuPG can't handle long passwords, so encode differently
 
178
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
 
179
                       .replace(b"\n", b"\\n")
 
180
                       .replace(b"\0", b"\\x00"))
 
181
        return encoded
176
182
    
177
183
    def encrypt(self, data, password):
178
184
        passphrase = self.password_encode(password)
440
446
    runtime_expansions: Allowed attributes for runtime expansion.
441
447
    expires:    datetime.datetime(); time (UTC) when a client will be
442
448
                disabled, or None
 
449
    server_settings: The server_settings dict from main()
443
450
    """
444
451
    
445
452
    runtime_expansions = ("approval_delay", "approval_duration",
520
527
        
521
528
        return settings
522
529
    
523
 
    def __init__(self, settings, name = None):
 
530
    def __init__(self, settings, name = None, server_settings=None):
524
531
        self.name = name
 
532
        if server_settings is None:
 
533
            server_settings = {}
 
534
        self.server_settings = server_settings
525
535
        # adding all client settings
526
536
        for setting, value in settings.iteritems():
527
537
            setattr(self, setting, value)
711
721
                # in normal mode, that is already done by daemon(),
712
722
                # and in debug mode we don't want to.  (Stdin is
713
723
                # always replaced by /dev/null.)
 
724
                # The exception is when not debugging but nevertheless
 
725
                # running in the foreground; use the previously
 
726
                # created wnull.
 
727
                popen_args = {}
 
728
                if (not self.server_settings["debug"]
 
729
                    and self.server_settings["foreground"]):
 
730
                    popen_args.update({"stdout": wnull,
 
731
                                       "stderr": wnull })
714
732
                self.checker = subprocess.Popen(command,
715
733
                                                close_fds=True,
716
 
                                                shell=True, cwd="/")
 
734
                                                shell=True, cwd="/",
 
735
                                                **popen_args)
717
736
            except OSError as error:
718
737
                logger.error("Failed to start subprocess",
719
738
                             exc_info=error)
1978
1997
                if self.address_family == socket.AF_INET6:
1979
1998
                    any_address = "::" # in6addr_any
1980
1999
                else:
1981
 
                    any_address = socket.INADDR_ANY
 
2000
                    any_address = "0.0.0.0" # INADDR_ANY
1982
2001
                self.server_address = (any_address,
1983
2002
                                       self.server_address[1])
1984
2003
            elif not self.server_address[1]:
2289
2308
                        help="Run self-test")
2290
2309
    parser.add_argument("--debug", action="store_true",
2291
2310
                        help="Debug mode; run in foreground and log"
2292
 
                        " to terminal")
 
2311
                        " to terminal", default=None)
2293
2312
    parser.add_argument("--debuglevel", metavar="LEVEL",
2294
2313
                        help="Debug level for stdout output")
2295
2314
    parser.add_argument("--priority", help="GnuTLS"
2302
2321
                        " files")
2303
2322
    parser.add_argument("--no-dbus", action="store_false",
2304
2323
                        dest="use_dbus", help="Do not provide D-Bus"
2305
 
                        " system bus interface")
 
2324
                        " system bus interface", default=None)
2306
2325
    parser.add_argument("--no-ipv6", action="store_false",
2307
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2326
                        dest="use_ipv6", help="Do not use IPv6",
 
2327
                        default=None)
2308
2328
    parser.add_argument("--no-restore", action="store_false",
2309
2329
                        dest="restore", help="Do not restore stored"
2310
 
                        " state")
 
2330
                        " state", default=None)
2311
2331
    parser.add_argument("--socket", type=int,
2312
2332
                        help="Specify a file descriptor to a network"
2313
2333
                        " socket to use instead of creating one")
2314
2334
    parser.add_argument("--statedir", metavar="DIR",
2315
2335
                        help="Directory to save/restore state in")
2316
2336
    parser.add_argument("--foreground", action="store_true",
2317
 
                        help="Run in foreground")
 
2337
                        help="Run in foreground", default=None)
2318
2338
    
2319
2339
    options = parser.parse_args()
2320
2340
    
2329
2349
                        "port": "",
2330
2350
                        "debug": "False",
2331
2351
                        "priority":
2332
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2352
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2333
2353
                        "servicename": "Mandos",
2334
2354
                        "use_dbus": "True",
2335
2355
                        "use_ipv6": "True",
2379
2399
    for option in server_settings.keys():
2380
2400
        if type(server_settings[option]) is str:
2381
2401
            server_settings[option] = unicode(server_settings[option])
 
2402
    # Force all boolean options to be boolean
 
2403
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2404
                   "foreground"):
 
2405
        server_settings[option] = bool(server_settings[option])
2382
2406
    # Debug implies foreground
2383
2407
    if server_settings["debug"]:
2384
2408
        server_settings["foreground"] = True
2432
2456
                              socketfd=(server_settings["socket"]
2433
2457
                                        or None))
2434
2458
    if not foreground:
2435
 
        pidfilename = "/var/run/mandos.pid"
 
2459
        pidfilename = "/run/mandos.pid"
2436
2460
        pidfile = None
2437
2461
        try:
2438
2462
            pidfile = open(pidfilename, "w")
2524
2548
    old_client_settings = {}
2525
2549
    clients_data = {}
2526
2550
    
 
2551
    # This is used to redirect stdout and stderr for checker processes
 
2552
    global wnull
 
2553
    wnull = open(os.devnull, "w") # A writable /dev/null
 
2554
    # Only used if server is running in foreground but not in debug
 
2555
    # mode
 
2556
    if debug or not foreground:
 
2557
        wnull.close()
 
2558
    
2527
2559
    # Get client data and settings from last running state.
2528
2560
    if server_settings["restore"]:
2529
2561
        try:
2545
2577
    
2546
2578
    with PGPEngine() as pgp:
2547
2579
        for client_name, client in clients_data.iteritems():
 
2580
            # Skip removed clients
 
2581
            if client_name not in client_settings:
 
2582
                continue
 
2583
            
2548
2584
            # Decide which value to use after restoring saved state.
2549
2585
            # We have three different values: Old config file,
2550
2586
            # new config file, and saved state.
2612
2648
    # Create all client objects
2613
2649
    for client_name, client in clients_data.iteritems():
2614
2650
        tcp_server.clients[client_name] = client_class(
2615
 
            name = client_name, settings = client)
 
2651
            name = client_name, settings = client,
 
2652
            server_settings = server_settings)
2616
2653
    
2617
2654
    if not tcp_server.clients:
2618
2655
        logger.warning("No clients defined")
2701
2738
        service.cleanup()
2702
2739
        
2703
2740
        multiprocessing.active_children()
 
2741
        wnull.close()
2704
2742
        if not (tcp_server.clients or client_settings):
2705
2743
            return
2706
2744
        
2718
2756
                # A list of attributes that can not be pickled
2719
2757
                # + secret.
2720
2758
                exclude = set(("bus", "changedstate", "secret",
2721
 
                               "checker"))
 
2759
                               "checker", "server_settings"))
2722
2760
                for name, typ in (inspect.getmembers
2723
2761
                                  (dbus.service.Object)):
2724
2762
                    exclude.add(name)