/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-01-08 10:19:33 UTC
  • Revision ID: teddy@recompile.se-20120108101933-xbtodqgepxax8hn1
Tags: version-1.5.2-1
* Makefile (version): Changed to "1.5.2".
* NEWS (Version 1.5.2): New entry.
* debian/changelog (1.5.2-1): - '' -

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-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 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
85
85
    except ImportError:
86
86
        SO_BINDTODEVICE = None
87
87
 
88
 
version = "1.4.1"
 
88
version = "1.5.2"
89
89
stored_state_file = "clients.pickle"
90
90
 
91
91
logger = logging.getLogger()
110
110
        return interface_index
111
111
 
112
112
 
113
 
def initlogger(level=logging.WARNING):
 
113
def initlogger(debug, level=logging.WARNING):
114
114
    """init logger and add loglevel"""
115
115
    
116
116
    syslogger.setFormatter(logging.Formatter
118
118
                            ' %(message)s'))
119
119
    logger.addHandler(syslogger)
120
120
    
121
 
    console = logging.StreamHandler()
122
 
    console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
123
 
                                           ' [%(process)d]:'
124
 
                                           ' %(levelname)s:'
125
 
                                           ' %(message)s'))
126
 
    logger.addHandler(console)
 
121
    if debug:
 
122
        console = logging.StreamHandler()
 
123
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
124
                                               ' [%(process)d]:'
 
125
                                               ' %(levelname)s:'
 
126
                                               ' %(message)s'))
 
127
        logger.addHandler(console)
127
128
    logger.setLevel(level)
128
129
 
129
130
 
141
142
        self.gnupg.options.meta_interactive = False
142
143
        self.gnupg.options.homedir = self.tempdir
143
144
        self.gnupg.options.extra_args.extend(['--force-mdc',
144
 
                                              '--quiet'])
 
145
                                              '--quiet',
 
146
                                              '--no-use-agent'])
145
147
    
146
148
    def __enter__(self):
147
149
        return self
420
422
    secret:     bytestring; sent verbatim (over TLS) to client
421
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
422
424
                                      until this client is disabled
423
 
    extended_timeout:   extra long timeout when password has been sent
 
425
    extended_timeout:   extra long timeout when secret has been sent
424
426
    runtime_expansions: Allowed attributes for runtime expansion.
425
427
    expires:    datetime.datetime(); time (UTC) when a client will be
426
428
                disabled, or None
458
460
 
459
461
    @staticmethod
460
462
    def config_parser(config):
461
 
        """ Construct a new dict of client settings of this form:
 
463
        """Construct a new dict of client settings of this form:
462
464
        { client_name: {setting_name: value, ...}, ...}
463
 
        with exceptions for any special settings as defined above"""
 
465
        with exceptions for any special settings as defined above.
 
466
        NOTE: Must be a pure function. Must return the same result
 
467
        value given the same arguments.
 
468
        """
464
469
        settings = {}
465
470
        for client_name in config.sections():
466
471
            section = dict(config.items(client_name))
470
475
            # Reformat values from string types to Python types
471
476
            client["approved_by_default"] = config.getboolean(
472
477
                client_name, "approved_by_default")
473
 
            client["enabled"] = config.getboolean(client_name, "enabled")
 
478
            client["enabled"] = config.getboolean(client_name,
 
479
                                                  "enabled")
474
480
            
475
481
            client["fingerprint"] = (section["fingerprint"].upper()
476
482
                                     .replace(" ", ""))
496
502
            client["last_approval_request"] = None
497
503
            client["last_checked_ok"] = None
498
504
            client["last_checker_status"] = None
499
 
            if client["enabled"]:
500
 
                client["last_enabled"] = datetime.datetime.utcnow()
501
 
                client["expires"] = (datetime.datetime.utcnow()
502
 
                                     + client["timeout"])
503
 
            else:
504
 
                client["last_enabled"] = None
505
 
                client["expires"] = None
506
 
 
 
505
        
507
506
        return settings
508
507
        
509
508
        
516
515
        for setting, value in settings.iteritems():
517
516
            setattr(self, setting, value)
518
517
        
 
518
        if self.enabled:
 
519
            if not hasattr(self, "last_enabled"):
 
520
                self.last_enabled = datetime.datetime.utcnow()
 
521
            if not hasattr(self, "expires"):
 
522
                self.expires = (datetime.datetime.utcnow()
 
523
                                + self.timeout)
 
524
        else:
 
525
            self.last_enabled = None
 
526
            self.expires = None
 
527
       
519
528
        logger.debug("Creating client %r", self.name)
520
529
        # Uppercase and remove spaces from fingerprint for later
521
530
        # comparison purposes with return value from the fingerprint()
522
531
        # function
523
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
524
 
        self.created = settings.get("created", datetime.datetime.utcnow())
 
533
        self.created = settings.get("created",
 
534
                                    datetime.datetime.utcnow())
525
535
 
526
536
        # attributes specific for this server instance
527
537
        self.checker = None
840
850
            # signatures other than "ay".
841
851
            if prop._dbus_signature != "ay":
842
852
                raise ValueError
843
 
            value = dbus.ByteArray(''.join(unichr(byte)
844
 
                                           for byte in value))
 
853
            value = dbus.ByteArray(b''.join(chr(byte)
 
854
                                            for byte in value))
845
855
        prop(value)
846
856
    
847
857
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
1039
1049
    def __init__(self, bus = None, *args, **kwargs):
1040
1050
        self.bus = bus
1041
1051
        Client.__init__(self, *args, **kwargs)
1042
 
        self._approvals_pending = 0
1043
 
        
1044
 
        self._approvals_pending = 0
1045
1052
        # Only now, when this client is initialized, can it show up on
1046
1053
        # the D-Bus
1047
1054
        client_object_name = unicode(self.name).translate(
1217
1224
        "D-Bus signal"
1218
1225
        return self.need_approval()
1219
1226
    
1220
 
    # NeRwequest - signal
1221
 
    @dbus.service.signal(_interface, signature="s")
1222
 
    def NewRequest(self, ip):
1223
 
        """D-Bus signal
1224
 
        Is sent after a client request a password.
1225
 
        """
1226
 
        pass
1227
 
    
1228
1227
    ## Methods
1229
1228
    
1230
1229
    # Approve - method
1357
1356
        if value is None:       # get
1358
1357
            return dbus.UInt64(self.timeout_milliseconds())
1359
1358
        self.timeout = datetime.timedelta(0, 0, 0, value)
1360
 
        if getattr(self, "disable_initiator_tag", None) is None:
1361
 
            return
1362
1359
        # Reschedule timeout
1363
 
        gobject.source_remove(self.disable_initiator_tag)
1364
 
        self.disable_initiator_tag = None
1365
 
        self.expires = None
1366
 
        time_to_die = timedelta_to_milliseconds((self
1367
 
                                                 .last_checked_ok
1368
 
                                                 + self.timeout)
1369
 
                                                - datetime.datetime
1370
 
                                                .utcnow())
1371
 
        if time_to_die <= 0:
1372
 
            # The timeout has passed
1373
 
            self.disable()
1374
 
        else:
1375
 
            self.expires = (datetime.datetime.utcnow()
1376
 
                            + datetime.timedelta(milliseconds =
1377
 
                                                 time_to_die))
1378
 
            self.disable_initiator_tag = (gobject.timeout_add
1379
 
                                          (time_to_die, self.disable))
 
1360
        if self.enabled:
 
1361
            now = datetime.datetime.utcnow()
 
1362
            time_to_die = timedelta_to_milliseconds(
 
1363
                (self.last_checked_ok + self.timeout) - now)
 
1364
            if time_to_die <= 0:
 
1365
                # The timeout has passed
 
1366
                self.disable()
 
1367
            else:
 
1368
                self.expires = (now +
 
1369
                                datetime.timedelta(milliseconds =
 
1370
                                                   time_to_die))
 
1371
                if (getattr(self, "disable_initiator_tag", None)
 
1372
                    is None):
 
1373
                    return
 
1374
                gobject.source_remove(self.disable_initiator_tag)
 
1375
                self.disable_initiator_tag = (gobject.timeout_add
 
1376
                                              (time_to_die,
 
1377
                                               self.disable))
1380
1378
    
1381
1379
    # ExtendedTimeout - property
1382
1380
    @dbus_service_property(_interface, signature="t",
1538
1536
                except KeyError:
1539
1537
                    return
1540
1538
                
1541
 
                if self.server.use_dbus:
1542
 
                    # Emit D-Bus signal
1543
 
                    client.NewRequest(str(self.client_address))
1544
 
                
1545
1539
                if client.approval_delay:
1546
1540
                    delay = client.approval_delay
1547
1541
                    client.approvals_pending += 1
2078
2072
                                     stored_state_file)
2079
2073
    
2080
2074
    if debug:
2081
 
        initlogger(logging.DEBUG)
 
2075
        initlogger(debug, logging.DEBUG)
2082
2076
    else:
2083
2077
        if not debuglevel:
2084
 
            initlogger()
 
2078
            initlogger(debug)
2085
2079
        else:
2086
2080
            level = getattr(logging, debuglevel.upper())
2087
 
            initlogger(level)
 
2081
            initlogger(debug, level)
2088
2082
    
2089
2083
    if server_settings["servicename"] != "Mandos":
2090
2084
        syslogger.setFormatter(logging.Formatter
2093
2087
                                % server_settings["servicename"]))
2094
2088
    
2095
2089
    # Parse config file with clients
2096
 
    client_config = configparser.SafeConfigParser(Client.client_defaults)
 
2090
    client_config = configparser.SafeConfigParser(Client
 
2091
                                                  .client_defaults)
2097
2092
    client_config.read(os.path.join(server_settings["configdir"],
2098
2093
                                    "clients.conf"))
2099
2094
    
2156
2151
        os.dup2(null, sys.stdin.fileno())
2157
2152
        if null > 2:
2158
2153
            os.close(null)
2159
 
    else:
2160
 
        # No console logging
2161
 
        logger.removeHandler(console)
2162
2154
    
2163
2155
    # Need to fork before connecting to D-Bus
2164
2156
    if not debug:
2165
2157
        # Close all input and output, do double fork, etc.
2166
2158
        daemon()
2167
2159
    
 
2160
    gobject.threads_init()
 
2161
    
2168
2162
    global main_loop
2169
2163
    # From the Avahi example code
2170
2164
    DBusGMainLoop(set_as_default=True )
2216
2210
                           .format(e))
2217
2211
            if e.errno != errno.ENOENT:
2218
2212
                raise
 
2213
        except EOFError as e:
 
2214
            logger.warning("Could not load persistent state: "
 
2215
                           "EOFError: {0}".format(e))
2219
2216
    
2220
2217
    with PGPEngine() as pgp:
2221
2218
        for client_name, client in clients_data.iteritems():
2238
2235
            
2239
2236
            # Clients who has passed its expire date can still be
2240
2237
            # enabled if its last checker was successful.  Clients
2241
 
            # whose checker failed before we stored its state is
2242
 
            # assumed to have failed all checkers during downtime.
 
2238
            # whose checker succeeded before we stored its state is
 
2239
            # assumed to have successfully run all checkers during
 
2240
            # downtime.
2243
2241
            if client["enabled"]:
2244
2242
                if datetime.datetime.utcnow() >= client["expires"]:
2245
2243
                    if not client["last_checked_ok"]:
2246
2244
                        logger.warning(
2247
2245
                            "disabling client {0} - Client never "
2248
 
                            "performed a successfull checker"
2249
 
                            .format(client["name"]))
 
2246
                            "performed a successful checker"
 
2247
                            .format(client_name))
2250
2248
                        client["enabled"] = False
2251
2249
                    elif client["last_checker_status"] != 0:
2252
2250
                        logger.warning(
2253
2251
                            "disabling client {0} - Client "
2254
2252
                            "last checker failed with error code {1}"
2255
 
                            .format(client["name"],
 
2253
                            .format(client_name,
2256
2254
                                    client["last_checker_status"]))
2257
2255
                        client["enabled"] = False
2258
2256
                    else:
2259
2257
                        client["expires"] = (datetime.datetime
2260
2258
                                             .utcnow()
2261
2259
                                             + client["timeout"])
2262
 
                    
 
2260
                        logger.debug("Last checker succeeded,"
 
2261
                                     " keeping {0} enabled"
 
2262
                                     .format(client_name))
2263
2263
            try:
2264
2264
                client["secret"] = (
2265
2265
                    pgp.decrypt(client["encrypted_secret"],
2274
2274
 
2275
2275
    
2276
2276
    # Add/remove clients based on new changes made to config
2277
 
    for client_name in set(old_client_settings) - set(client_settings):
 
2277
    for client_name in (set(old_client_settings)
 
2278
                        - set(client_settings)):
2278
2279
        del clients_data[client_name]
2279
 
    for client_name in set(client_settings) - set(old_client_settings):
 
2280
    for client_name in (set(client_settings)
 
2281
                        - set(old_client_settings)):
2280
2282
        clients_data[client_name] = client_settings[client_name]
2281
2283
 
2282
 
    # Create clients all clients
 
2284
    # Create all client objects
2283
2285
    for client_name, client in clients_data.iteritems():
2284
2286
        tcp_server.clients[client_name] = client_class(
2285
2287
            name = client_name, settings = client)
2400
2402
                del client_settings[client.name]["secret"]
2401
2403
        
2402
2404
        try:
2403
 
            with os.fdopen(os.open(stored_state_path,
2404
 
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2405
 
                                   0600), "wb") as stored_state:
 
2405
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2406
                                                prefix="clients-",
 
2407
                                                dir=os.path.dirname
 
2408
                                                (stored_state_path))
 
2409
            with os.fdopen(tempfd, "wb") as stored_state:
2406
2410
                pickle.dump((clients, client_settings), stored_state)
 
2411
            os.rename(tempname, stored_state_path)
2407
2412
        except (IOError, OSError) as e:
2408
2413
            logger.warning("Could not save persistent state: {0}"
2409
2414
                           .format(e))
2410
 
            if e.errno not in (errno.ENOENT, errno.EACCES):
2411
 
                raise
 
2415
            if not debug:
 
2416
                try:
 
2417
                    os.remove(tempname)
 
2418
                except NameError:
 
2419
                    pass
 
2420
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2421
                                   errno.EEXIST)):
 
2422
                raise e
2412
2423
        
2413
2424
        # Delete all clients, and settings from config
2414
2425
        while tcp_server.clients: