/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: 2011-11-26 23:08:17 UTC
  • mto: (518.1.8 mandos-persistent)
  • mto: This revision was merged to the branch mainline in revision 524.
  • Revision ID: teddy@recompile.se-20111126230817-tv08v831s2yltbkd
Make "enabled" a client config option.

* DBUS-API: Fix wording on "Expires" option.
* clients.conf (enabled): New.
* mandos (Client): "last_enabled" can now be None.
  (Client.__init__): Get "enabled" from config.  Only set
                     "last_enabled" and "expires" if enabled.
  (ClientDBus.Created_dbus_property): Removed redundant dbus.String().
  (ClientDBus.Interval_dbus_property): If changed, only reschedule
                                       checker if enabled.
  (main/special_settings): Added "enabled".
* mandos-clients.conf (OPTIONS): Added "enabled".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
85
85
    except ImportError:
86
86
        SO_BINDTODEVICE = None
87
87
 
 
88
 
88
89
version = "1.4.1"
89
90
stored_state_file = "clients.pickle"
90
91
 
110
111
        return interface_index
111
112
 
112
113
 
113
 
def initlogger(debug, level=logging.WARNING):
 
114
def initlogger(level=logging.WARNING):
114
115
    """init logger and add loglevel"""
115
116
    
116
117
    syslogger.setFormatter(logging.Formatter
118
119
                            ' %(message)s'))
119
120
    logger.addHandler(syslogger)
120
121
    
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)
 
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)
128
128
    logger.setLevel(level)
129
129
 
130
130
 
131
 
class PGPError(Exception):
132
 
    """Exception if encryption/decryption fails"""
 
131
class CryptoError(Exception):
133
132
    pass
134
133
 
135
134
 
136
 
class PGPEngine(object):
 
135
class Crypto(object):
137
136
    """A simple class for OpenPGP symmetric encryption & decryption"""
138
137
    def __init__(self):
139
138
        self.gnupg = GnuPGInterface.GnuPG()
185
184
                    ciphertext = f.read()
186
185
                proc.wait()
187
186
            except IOError as e:
188
 
                raise PGPError(e)
 
187
                raise CryptoError(e)
189
188
        self.gnupg.passphrase = None
190
189
        return ciphertext
191
190
    
202
201
                    decrypted_plaintext = f.read()
203
202
                proc.wait()
204
203
            except IOError as e:
205
 
                raise PGPError(e)
 
204
                raise CryptoError(e)
206
205
        self.gnupg.passphrase = None
207
206
        return decrypted_plaintext
208
207
 
378
377
                                % self.name))
379
378
        return ret
380
379
 
381
 
def timedelta_to_milliseconds(td):
 
380
def _timedelta_to_milliseconds(td):
382
381
    "Convert a datetime.timedelta() to milliseconds"
383
382
    return ((td.days * 24 * 60 * 60 * 1000)
384
383
            + (td.seconds * 1000)
388
387
    """A representation of a client host served by this server.
389
388
    
390
389
    Attributes:
391
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
390
    _approved:   bool(); 'None' if not yet approved/disapproved
392
391
    approval_delay: datetime.timedelta(); Time to wait for approval
393
392
    approval_duration: datetime.timedelta(); Duration of one approval
394
393
    checker:    subprocess.Popen(); a running checker process used
412
411
    interval:   datetime.timedelta(); How often to start a new checker
413
412
    last_approval_request: datetime.datetime(); (UTC) or None
414
413
    last_checked_ok: datetime.datetime(); (UTC) or None
 
414
 
415
415
    last_checker_status: integer between 0 and 255 reflecting exit
416
416
                         status of last checker. -1 reflects crashed
417
417
                         checker, or None.
431
431
                          "created", "enabled", "fingerprint",
432
432
                          "host", "interval", "last_checked_ok",
433
433
                          "last_enabled", "name", "timeout")
434
 
    client_defaults = { "timeout": "5m",
435
 
                        "extended_timeout": "15m",
436
 
                        "interval": "2m",
437
 
                        "checker": "fping -q -- %%(host)s",
438
 
                        "host": "",
439
 
                        "approval_delay": "0s",
440
 
                        "approval_duration": "1s",
441
 
                        "approved_by_default": "True",
442
 
                        "enabled": "True",
443
 
                        }
444
434
    
445
435
    def timeout_milliseconds(self):
446
436
        "Return the 'timeout' attribute in milliseconds"
447
 
        return timedelta_to_milliseconds(self.timeout)
 
437
        return _timedelta_to_milliseconds(self.timeout)
448
438
    
449
439
    def extended_timeout_milliseconds(self):
450
440
        "Return the 'extended_timeout' attribute in milliseconds"
451
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
441
        return _timedelta_to_milliseconds(self.extended_timeout)
452
442
    
453
443
    def interval_milliseconds(self):
454
444
        "Return the 'interval' attribute in milliseconds"
455
 
        return timedelta_to_milliseconds(self.interval)
 
445
        return _timedelta_to_milliseconds(self.interval)
456
446
    
457
447
    def approval_delay_milliseconds(self):
458
 
        return timedelta_to_milliseconds(self.approval_delay)
459
 
 
460
 
    @staticmethod
461
 
    def config_parser(config):
462
 
        """ Construct a new dict of client settings of this form:
463
 
        { client_name: {setting_name: value, ...}, ...}
464
 
        with exceptions for any special settings as defined above"""
465
 
        settings = {}
466
 
        for client_name in config.sections():
467
 
            section = dict(config.items(client_name))
468
 
            client = settings[client_name] = {}
469
 
            
470
 
            client["host"] = section["host"]
471
 
            # Reformat values from string types to Python types
472
 
            client["approved_by_default"] = config.getboolean(
473
 
                client_name, "approved_by_default")
474
 
            client["enabled"] = config.getboolean(client_name, "enabled")
475
 
            
476
 
            client["fingerprint"] = (section["fingerprint"].upper()
477
 
                                     .replace(" ", ""))
478
 
            if "secret" in section:
479
 
                client["secret"] = section["secret"].decode("base64")
480
 
            elif "secfile" in section:
481
 
                with open(os.path.expanduser(os.path.expandvars
482
 
                                             (section["secfile"])),
483
 
                          "rb") as secfile:
484
 
                    client["secret"] = secfile.read()
485
 
            else:
486
 
                raise TypeError("No secret or secfile for section %s"
487
 
                                % section)
488
 
            client["timeout"] = string_to_delta(section["timeout"])
489
 
            client["extended_timeout"] = string_to_delta(
490
 
                section["extended_timeout"])
491
 
            client["interval"] = string_to_delta(section["interval"])
492
 
            client["approval_delay"] = string_to_delta(
493
 
                section["approval_delay"])
494
 
            client["approval_duration"] = string_to_delta(
495
 
                section["approval_duration"])
496
 
            client["checker_command"] = section["checker"]
497
 
            client["last_approval_request"] = None
498
 
            client["last_checked_ok"] = None
499
 
            client["last_checker_status"] = None
500
 
            if client["enabled"]:
501
 
                client["last_enabled"] = datetime.datetime.utcnow()
502
 
                client["expires"] = (datetime.datetime.utcnow()
503
 
                                     + client["timeout"])
504
 
            else:
505
 
                client["last_enabled"] = None
506
 
                client["expires"] = None
507
 
 
508
 
        return settings
509
 
        
510
 
        
511
 
    def __init__(self, settings, name = None):
 
448
        return _timedelta_to_milliseconds(self.approval_delay)
 
449
    
 
450
    def __init__(self, name = None, config=None):
512
451
        """Note: the 'checker' key in 'config' sets the
513
452
        'checker_command' attribute and *not* the 'checker'
514
453
        attribute."""
515
454
        self.name = name
516
 
        # adding all client settings
517
 
        for setting, value in settings.iteritems():
518
 
            setattr(self, setting, value)
519
 
        
 
455
        if config is None:
 
456
            config = {}
520
457
        logger.debug("Creating client %r", self.name)
521
458
        # Uppercase and remove spaces from fingerprint for later
522
459
        # comparison purposes with return value from the fingerprint()
523
460
        # function
 
461
        self.fingerprint = (config["fingerprint"].upper()
 
462
                            .replace(" ", ""))
524
463
        logger.debug("  Fingerprint: %s", self.fingerprint)
525
 
        self.created = settings.get("created", datetime.datetime.utcnow())
526
 
 
527
 
        # attributes specific for this server instance
 
464
        if "secret" in config:
 
465
            self.secret = config["secret"].decode("base64")
 
466
        elif "secfile" in config:
 
467
            with open(os.path.expanduser(os.path.expandvars
 
468
                                         (config["secfile"])),
 
469
                      "rb") as secfile:
 
470
                self.secret = secfile.read()
 
471
        else:
 
472
            raise TypeError("No secret or secfile for client %s"
 
473
                            % self.name)
 
474
        self.host = config.get("host", "")
 
475
        self.created = datetime.datetime.utcnow()
 
476
        self.enabled = config.get("enabled", True)
 
477
        self.last_approval_request = None
 
478
        if self.enabled:
 
479
            self.last_enabled = datetime.datetime.utcnow()
 
480
        else:
 
481
            self.last_enabled = None
 
482
        self.last_checked_ok = None
 
483
        self.last_checker_status = None
 
484
        self.timeout = string_to_delta(config["timeout"])
 
485
        self.extended_timeout = string_to_delta(config
 
486
                                                ["extended_timeout"])
 
487
        self.interval = string_to_delta(config["interval"])
528
488
        self.checker = None
529
489
        self.checker_initiator_tag = None
530
490
        self.disable_initiator_tag = None
 
491
        if self.enabled:
 
492
            self.expires = datetime.datetime.utcnow() + self.timeout
 
493
        else:
 
494
            self.expires = None
531
495
        self.checker_callback_tag = None
 
496
        self.checker_command = config["checker"]
532
497
        self.current_checker_command = None
533
 
        self.approved = None
 
498
        self._approved = None
 
499
        self.approved_by_default = config.get("approved_by_default",
 
500
                                              True)
534
501
        self.approvals_pending = 0
 
502
        self.approval_delay = string_to_delta(
 
503
            config["approval_delay"])
 
504
        self.approval_duration = string_to_delta(
 
505
            config["approval_duration"])
535
506
        self.changedstate = (multiprocessing_manager
536
507
                             .Condition(multiprocessing_manager
537
508
                                        .Lock()))
604
575
        self.checker_callback_tag = None
605
576
        self.checker = None
606
577
        if os.WIFEXITED(condition):
607
 
            self.last_checker_status = os.WEXITSTATUS(condition)
 
578
            self.last_checker_status =  os.WEXITSTATUS(condition)
608
579
            if self.last_checker_status == 0:
609
580
                logger.info("Checker for %(name)s succeeded",
610
581
                            vars(self))
630
601
            gobject.source_remove(self.disable_initiator_tag)
631
602
        if getattr(self, "enabled", False):
632
603
            self.disable_initiator_tag = (gobject.timeout_add
633
 
                                          (timedelta_to_milliseconds
 
604
                                          (_timedelta_to_milliseconds
634
605
                                           (timeout), self.disable))
635
606
            self.expires = datetime.datetime.utcnow() + timeout
636
607
    
1040
1011
    def __init__(self, bus = None, *args, **kwargs):
1041
1012
        self.bus = bus
1042
1013
        Client.__init__(self, *args, **kwargs)
1043
 
        self._approvals_pending = 0
1044
1014
        
1045
1015
        self._approvals_pending = 0
1046
1016
        # Only now, when this client is initialized, can it show up on
1098
1068
        datetime_to_dbus, "LastApprovalRequest")
1099
1069
    approved_by_default = notifychangeproperty(dbus.Boolean,
1100
1070
                                               "ApprovedByDefault")
1101
 
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1071
    approval_delay = notifychangeproperty(dbus.UInt16,
1102
1072
                                          "ApprovalDelay",
1103
1073
                                          type_func =
1104
 
                                          timedelta_to_milliseconds)
 
1074
                                          _timedelta_to_milliseconds)
1105
1075
    approval_duration = notifychangeproperty(
1106
 
        dbus.UInt64, "ApprovalDuration",
1107
 
        type_func = timedelta_to_milliseconds)
 
1076
        dbus.UInt16, "ApprovalDuration",
 
1077
        type_func = _timedelta_to_milliseconds)
1108
1078
    host = notifychangeproperty(dbus.String, "Host")
1109
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1079
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1110
1080
                                   type_func =
1111
 
                                   timedelta_to_milliseconds)
 
1081
                                   _timedelta_to_milliseconds)
1112
1082
    extended_timeout = notifychangeproperty(
1113
 
        dbus.UInt64, "ExtendedTimeout",
1114
 
        type_func = timedelta_to_milliseconds)
1115
 
    interval = notifychangeproperty(dbus.UInt64,
 
1083
        dbus.UInt16, "ExtendedTimeout",
 
1084
        type_func = _timedelta_to_milliseconds)
 
1085
    interval = notifychangeproperty(dbus.UInt16,
1116
1086
                                    "Interval",
1117
1087
                                    type_func =
1118
 
                                    timedelta_to_milliseconds)
 
1088
                                    _timedelta_to_milliseconds)
1119
1089
    checker_command = notifychangeproperty(dbus.String, "Checker")
1120
1090
    
1121
1091
    del notifychangeproperty
1163
1133
        return r
1164
1134
    
1165
1135
    def _reset_approved(self):
1166
 
        self.approved = None
 
1136
        self._approved = None
1167
1137
        return False
1168
1138
    
1169
1139
    def approve(self, value=True):
1170
1140
        self.send_changedstate()
1171
 
        self.approved = value
1172
 
        gobject.timeout_add(timedelta_to_milliseconds
 
1141
        self._approved = value
 
1142
        gobject.timeout_add(_timedelta_to_milliseconds
1173
1143
                            (self.approval_duration),
1174
1144
                            self._reset_approved)
1175
1145
    
1289
1259
                           access="readwrite")
1290
1260
    def ApprovalDuration_dbus_property(self, value=None):
1291
1261
        if value is None:       # get
1292
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1262
            return dbus.UInt64(_timedelta_to_milliseconds(
1293
1263
                    self.approval_duration))
1294
1264
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1295
1265
    
1309
1279
    def Host_dbus_property(self, value=None):
1310
1280
        if value is None:       # get
1311
1281
            return dbus.String(self.host)
1312
 
        self.host = unicode(value)
 
1282
        self.host = value
1313
1283
    
1314
1284
    # Created - property
1315
1285
    @dbus_service_property(_interface, signature="s", access="read")
1364
1334
        gobject.source_remove(self.disable_initiator_tag)
1365
1335
        self.disable_initiator_tag = None
1366
1336
        self.expires = None
1367
 
        time_to_die = timedelta_to_milliseconds((self
1368
 
                                                 .last_checked_ok
1369
 
                                                 + self.timeout)
1370
 
                                                - datetime.datetime
1371
 
                                                .utcnow())
 
1337
        time_to_die = _timedelta_to_milliseconds((self
 
1338
                                                  .last_checked_ok
 
1339
                                                  + self.timeout)
 
1340
                                                 - datetime.datetime
 
1341
                                                 .utcnow())
1372
1342
        if time_to_die <= 0:
1373
1343
            # The timeout has passed
1374
1344
            self.disable()
1409
1379
    def Checker_dbus_property(self, value=None):
1410
1380
        if value is None:       # get
1411
1381
            return dbus.String(self.checker_command)
1412
 
        self.checker_command = unicode(value)
 
1382
        self.checker_command = value
1413
1383
    
1414
1384
    # CheckerRunning - property
1415
1385
    @dbus_service_property(_interface, signature="b",
1444
1414
            raise KeyError()
1445
1415
    
1446
1416
    def __getattribute__(self, name):
1447
 
        if name == '_pipe':
 
1417
        if(name == '_pipe'):
1448
1418
            return super(ProxyClient, self).__getattribute__(name)
1449
1419
        self._pipe.send(('getattr', name))
1450
1420
        data = self._pipe.recv()
1457
1427
            return func
1458
1428
    
1459
1429
    def __setattr__(self, name, value):
1460
 
        if name == '_pipe':
 
1430
        if(name == '_pipe'):
1461
1431
            return super(ProxyClient, self).__setattr__(name, value)
1462
1432
        self._pipe.send(('setattr', name, value))
1463
1433
 
1532
1502
                    logger.warning("Bad certificate: %s", error)
1533
1503
                    return
1534
1504
                logger.debug("Fingerprint: %s", fpr)
 
1505
                if self.server.use_dbus:
 
1506
                    # Emit D-Bus signal
 
1507
                    client.NewRequest(str(self.client_address))
1535
1508
                
1536
1509
                try:
1537
1510
                    client = ProxyClient(child_pipe, fpr,
1539
1512
                except KeyError:
1540
1513
                    return
1541
1514
                
1542
 
                if self.server.use_dbus:
1543
 
                    # Emit D-Bus signal
1544
 
                    client.NewRequest(str(self.client_address))
1545
 
                
1546
1515
                if client.approval_delay:
1547
1516
                    delay = client.approval_delay
1548
1517
                    client.approvals_pending += 1
1557
1526
                            client.Rejected("Disabled")
1558
1527
                        return
1559
1528
                    
1560
 
                    if client.approved or not client.approval_delay:
 
1529
                    if client._approved or not client.approval_delay:
1561
1530
                        #We are approved or approval is disabled
1562
1531
                        break
1563
 
                    elif client.approved is None:
 
1532
                    elif client._approved is None:
1564
1533
                        logger.info("Client %s needs approval",
1565
1534
                                    client.name)
1566
1535
                        if self.server.use_dbus:
1580
1549
                    time = datetime.datetime.now()
1581
1550
                    client.changedstate.acquire()
1582
1551
                    (client.changedstate.wait
1583
 
                     (float(client.timedelta_to_milliseconds(delay)
 
1552
                     (float(client._timedelta_to_milliseconds(delay)
1584
1553
                            / 1000)))
1585
1554
                    client.changedstate.release()
1586
1555
                    time2 = datetime.datetime.now()
1694
1663
    def sub_process_main(self, request, address):
1695
1664
        try:
1696
1665
            self.finish_request(request, address)
1697
 
        except Exception:
 
1666
        except:
1698
1667
            self.handle_error(request, address)
1699
1668
        self.close_request(request)
1700
1669
    
2079
2048
                                     stored_state_file)
2080
2049
    
2081
2050
    if debug:
2082
 
        initlogger(debug, logging.DEBUG)
 
2051
        initlogger(logging.DEBUG)
2083
2052
    else:
2084
2053
        if not debuglevel:
2085
 
            initlogger(debug)
 
2054
            initlogger()
2086
2055
        else:
2087
2056
            level = getattr(logging, debuglevel.upper())
2088
 
            initlogger(debug, level)
 
2057
            initlogger(level)
2089
2058
    
2090
2059
    if server_settings["servicename"] != "Mandos":
2091
2060
        syslogger.setFormatter(logging.Formatter
2094
2063
                                % server_settings["servicename"]))
2095
2064
    
2096
2065
    # Parse config file with clients
2097
 
    client_config = configparser.SafeConfigParser(Client.client_defaults)
 
2066
    client_defaults = { "timeout": "5m",
 
2067
                        "extended_timeout": "15m",
 
2068
                        "interval": "2m",
 
2069
                        "checker": "fping -q -- %%(host)s",
 
2070
                        "host": "",
 
2071
                        "approval_delay": "0s",
 
2072
                        "approval_duration": "1s",
 
2073
                        }
 
2074
    client_config = configparser.SafeConfigParser(client_defaults)
2098
2075
    client_config.read(os.path.join(server_settings["configdir"],
2099
2076
                                    "clients.conf"))
2100
2077
    
2157
2134
        os.dup2(null, sys.stdin.fileno())
2158
2135
        if null > 2:
2159
2136
            os.close(null)
 
2137
    else:
 
2138
        # No console logging
 
2139
        logger.removeHandler(console)
2160
2140
    
2161
2141
    # Need to fork before connecting to D-Bus
2162
2142
    if not debug:
2163
2143
        # Close all input and output, do double fork, etc.
2164
2144
        daemon()
2165
2145
    
2166
 
    gobject.threads_init()
2167
 
    
2168
2146
    global main_loop
2169
2147
    # From the Avahi example code
2170
2148
    DBusGMainLoop(set_as_default=True )
2200
2178
        client_class = functools.partial(ClientDBusTransitional,
2201
2179
                                         bus = bus)
2202
2180
    
2203
 
    client_settings = Client.config_parser(client_config)
 
2181
    special_settings = {
 
2182
        # Some settings need to be accessd by special methods;
 
2183
        # booleans need .getboolean(), etc.  Here is a list of them:
 
2184
        "approved_by_default":
 
2185
            lambda section:
 
2186
            client_config.getboolean(section, "approved_by_default"),
 
2187
        "enabled":
 
2188
            lambda section:
 
2189
            client_config.getboolean(section, "enabled"),
 
2190
        }
 
2191
    # Construct a new dict of client settings of this form:
 
2192
    # { client_name: {setting_name: value, ...}, ...}
 
2193
    # with exceptions for any special settings as defined above
 
2194
    client_settings = dict((clientname,
 
2195
                           dict((setting,
 
2196
                                 (value
 
2197
                                  if setting not in special_settings
 
2198
                                  else special_settings[setting]
 
2199
                                  (clientname)))
 
2200
                                for setting, value in
 
2201
                                client_config.items(clientname)))
 
2202
                          for clientname in client_config.sections())
 
2203
    
2204
2204
    old_client_settings = {}
2205
 
    clients_data = {}
 
2205
    clients_data = []
2206
2206
    
2207
2207
    # Get client data and settings from last running state.
2208
2208
    if server_settings["restore"]:
2216
2216
                           .format(e))
2217
2217
            if e.errno != errno.ENOENT:
2218
2218
                raise
2219
 
        except EOFError as e:
2220
 
            logger.warning("Could not load persistent state: "
2221
 
                           "EOFError: {0}".format(e))
2222
2219
    
2223
 
    with PGPEngine() as pgp:
2224
 
        for client_name, client in clients_data.iteritems():
 
2220
    with Crypto() as crypt:
 
2221
        for client in clients_data:
 
2222
            client_name = client["name"]
 
2223
            
2225
2224
            # Decide which value to use after restoring saved state.
2226
2225
            # We have three different values: Old config file,
2227
2226
            # new config file, and saved state.
2235
2234
                    if (name != "secret" and
2236
2235
                        value != old_client_settings[client_name]
2237
2236
                        [name]):
2238
 
                        client[name] = value
 
2237
                        setattr(client, name, value)
2239
2238
                except KeyError:
2240
2239
                    pass
2241
2240
            
2242
2241
            # Clients who has passed its expire date can still be
2243
 
            # enabled if its last checker was successful.  Clients
 
2242
            # enabled if its last checker was sucessful.  Clients
2244
2243
            # whose checker failed before we stored its state is
2245
2244
            # assumed to have failed all checkers during downtime.
2246
 
            if client["enabled"]:
2247
 
                if datetime.datetime.utcnow() >= client["expires"]:
2248
 
                    if not client["last_checked_ok"]:
2249
 
                        logger.warning(
2250
 
                            "disabling client {0} - Client never "
2251
 
                            "performed a successfull checker"
2252
 
                            .format(client["name"]))
2253
 
                        client["enabled"] = False
2254
 
                    elif client["last_checker_status"] != 0:
2255
 
                        logger.warning(
2256
 
                            "disabling client {0} - Client "
2257
 
                            "last checker failed with error code {1}"
2258
 
                            .format(client["name"],
2259
 
                                    client["last_checker_status"]))
 
2245
            if client["enabled"] and client["last_checked_ok"]:
 
2246
                if ((datetime.datetime.utcnow()
 
2247
                     - client["last_checked_ok"])
 
2248
                    > client["interval"]):
 
2249
                    if client["last_checker_status"] != 0:
2260
2250
                        client["enabled"] = False
2261
2251
                    else:
2262
2252
                        client["expires"] = (datetime.datetime
2263
2253
                                             .utcnow()
2264
2254
                                             + client["timeout"])
2265
 
                    
 
2255
            
 
2256
            client["changedstate"] = (multiprocessing_manager
 
2257
                                      .Condition
 
2258
                                      (multiprocessing_manager
 
2259
                                       .Lock()))
 
2260
            if use_dbus:
 
2261
                new_client = (ClientDBusTransitional.__new__
 
2262
                              (ClientDBusTransitional))
 
2263
                tcp_server.clients[client_name] = new_client
 
2264
                new_client.bus = bus
 
2265
                for name, value in client.iteritems():
 
2266
                    setattr(new_client, name, value)
 
2267
                client_object_name = unicode(client_name).translate(
 
2268
                    {ord("."): ord("_"),
 
2269
                     ord("-"): ord("_")})
 
2270
                new_client.dbus_object_path = (dbus.ObjectPath
 
2271
                                               ("/clients/"
 
2272
                                                + client_object_name))
 
2273
                DBusObjectWithProperties.__init__(new_client,
 
2274
                                                  new_client.bus,
 
2275
                                                  new_client
 
2276
                                                  .dbus_object_path)
 
2277
            else:
 
2278
                tcp_server.clients[client_name] = (Client.__new__
 
2279
                                                   (Client))
 
2280
                for name, value in client.iteritems():
 
2281
                    setattr(tcp_server.clients[client_name],
 
2282
                            name, value)
 
2283
            
2266
2284
            try:
2267
 
                client["secret"] = (
2268
 
                    pgp.decrypt(client["encrypted_secret"],
2269
 
                                client_settings[client_name]
2270
 
                                ["secret"]))
2271
 
            except PGPError:
 
2285
                tcp_server.clients[client_name].secret = (
 
2286
                    crypt.decrypt(tcp_server.clients[client_name]
 
2287
                                  .encrypted_secret,
 
2288
                                  client_settings[client_name]
 
2289
                                  ["secret"]))
 
2290
            except CryptoError:
2272
2291
                # If decryption fails, we use secret from new settings
2273
 
                logger.debug("Failed to decrypt {0} old secret"
2274
 
                             .format(client_name))
2275
 
                client["secret"] = (
 
2292
                tcp_server.clients[client_name].secret = (
2276
2293
                    client_settings[client_name]["secret"])
2277
 
 
2278
2294
    
2279
 
    # Add/remove clients based on new changes made to config
2280
 
    for client_name in set(old_client_settings) - set(client_settings):
2281
 
        del clients_data[client_name]
2282
 
    for client_name in set(client_settings) - set(old_client_settings):
2283
 
        clients_data[client_name] = client_settings[client_name]
2284
 
 
2285
 
    # Create clients all clients
2286
 
    for client_name, client in clients_data.iteritems():
2287
 
        tcp_server.clients[client_name] = client_class(
2288
 
            name = client_name, settings = client)
 
2295
    # Create/remove clients based on new changes made to config
 
2296
    for clientname in set(old_client_settings) - set(client_settings):
 
2297
        del tcp_server.clients[clientname]
 
2298
    for clientname in set(client_settings) - set(old_client_settings):
 
2299
        tcp_server.clients[clientname] = (client_class(name
 
2300
                                                       = clientname,
 
2301
                                                       config =
 
2302
                                                       client_settings
 
2303
                                                       [clientname]))
2289
2304
    
2290
2305
    if not tcp_server.clients:
2291
2306
        logger.warning("No clients defined")
2303
2318
            # "pidfile" was never created
2304
2319
            pass
2305
2320
        del pidfilename
 
2321
        
2306
2322
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2307
2323
    
2308
2324
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2377
2393
        # Store client before exiting. Secrets are encrypted with key
2378
2394
        # based on what config file has. If config file is
2379
2395
        # removed/edited, old secret will thus be unrecovable.
2380
 
        clients = {}
2381
 
        with PGPEngine() as pgp:
 
2396
        clients = []
 
2397
        with Crypto() as crypt:
2382
2398
            for client in tcp_server.clients.itervalues():
2383
2399
                key = client_settings[client.name]["secret"]
2384
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2385
 
                                                      key)
 
2400
                client.encrypted_secret = crypt.encrypt(client.secret,
 
2401
                                                        key)
2386
2402
                client_dict = {}
2387
2403
                
2388
 
                # A list of attributes that can not be pickled
2389
 
                # + secret.
2390
 
                exclude = set(("bus", "changedstate", "secret",
2391
 
                               "checker"))
 
2404
                # A list of attributes that will not be stored when
 
2405
                # shutting down.
 
2406
                exclude = set(("bus", "changedstate", "secret"))
2392
2407
                for name, typ in (inspect.getmembers
2393
2408
                                  (dbus.service.Object)):
2394
2409
                    exclude.add(name)
2399
2414
                    if attr not in exclude:
2400
2415
                        client_dict[attr] = getattr(client, attr)
2401
2416
                
2402
 
                clients[client.name] = client_dict
 
2417
                clients.append(client_dict)
2403
2418
                del client_settings[client.name]["secret"]
2404
2419
        
2405
2420
        try:
2406
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2407
 
                                                prefix="clients-",
2408
 
                                                dir=os.path.dirname
2409
 
                                                (stored_state_path))
2410
 
            with os.fdopen(tempfd, "wb") as stored_state:
 
2421
            with os.fdopen(os.open(stored_state_path,
 
2422
                                   os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
 
2423
                                   0600), "wb") as stored_state:
2411
2424
                pickle.dump((clients, client_settings), stored_state)
2412
 
            os.rename(tempname, stored_state_path)
2413
2425
        except (IOError, OSError) as e:
2414
2426
            logger.warning("Could not save persistent state: {0}"
2415
2427
                           .format(e))
2416
 
            if not debug:
2417
 
                try:
2418
 
                    os.remove(tempname)
2419
 
                except NameError:
2420
 
                    pass
2421
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2422
 
                                   errno.EEXIST)):
2423
 
                raise e
 
2428
            if e.errno not in (errno.ENOENT, errno.EACCES):
 
2429
                raise
2424
2430
        
2425
2431
        # Delete all clients, and settings from config
2426
2432
        while tcp_server.clients:
2490
2496
    # Must run before the D-Bus bus name gets deregistered
2491
2497
    cleanup()
2492
2498
 
 
2499
 
2493
2500
if __name__ == '__main__':
2494
2501
    main()