82
86
except ImportError:
83
87
SO_BINDTODEVICE = None
88
#logger = logging.getLogger('mandos')
89
logger = logging.Logger('mandos')
90
stored_state_file = "clients.pickle"
92
logger = logging.getLogger()
90
93
syslogger = (logging.handlers.SysLogHandler
91
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
92
95
address = str("/dev/log")))
93
syslogger.setFormatter(logging.Formatter
94
('Mandos [%(process)d]: %(levelname)s:'
96
logger.addHandler(syslogger)
98
console = logging.StreamHandler()
99
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
102
logger.addHandler(console)
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
101
except (OSError, AttributeError):
102
def if_nametoindex(interface):
103
"Get an interface index the hard way, i.e. using fcntl()"
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
with contextlib.closing(socket.socket()) as s:
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
111
return interface_index
114
def initlogger(debug, level=logging.WARNING):
115
"""init logger and add loglevel"""
117
syslogger.setFormatter(logging.Formatter
118
('Mandos [%(process)d]: %(levelname)s:'
120
logger.addHandler(syslogger)
123
console = logging.StreamHandler()
124
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
128
logger.addHandler(console)
129
logger.setLevel(level)
132
class PGPError(Exception):
133
"""Exception if encryption/decryption fails"""
137
class PGPEngine(object):
138
"""A simple class for OpenPGP symmetric encryption & decryption"""
140
self.gnupg = GnuPGInterface.GnuPG()
141
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
142
self.gnupg = GnuPGInterface.GnuPG()
143
self.gnupg.options.meta_interactive = False
144
self.gnupg.options.homedir = self.tempdir
145
self.gnupg.options.extra_args.extend(['--force-mdc',
152
def __exit__ (self, exc_type, exc_value, traceback):
160
if self.tempdir is not None:
161
# Delete contents of tempdir
162
for root, dirs, files in os.walk(self.tempdir,
164
for filename in files:
165
os.remove(os.path.join(root, filename))
167
os.rmdir(os.path.join(root, dirname))
169
os.rmdir(self.tempdir)
172
def password_encode(self, password):
173
# Passphrase can not be empty and can not contain newlines or
174
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
177
def encrypt(self, data, password):
178
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
181
proc = self.gnupg.run(['--symmetric'],
182
create_fhs=['stdin', 'stdout'],
183
attach_fhs={'stderr': devnull})
184
with contextlib.closing(proc.handles['stdin']) as f:
186
with contextlib.closing(proc.handles['stdout']) as f:
187
ciphertext = f.read()
191
self.gnupg.passphrase = None
194
def decrypt(self, data, password):
195
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
198
proc = self.gnupg.run(['--decrypt'],
199
create_fhs=['stdin', 'stdout'],
200
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
203
with contextlib.closing(proc.handles['stdout']) as f:
204
decrypted_plaintext = f.read()
208
self.gnupg.passphrase = None
209
return decrypted_plaintext
104
213
class AvahiError(Exception):
105
214
def __init__(self, value, *args, **kwargs):
315
433
"created", "enabled", "fingerprint",
316
434
"host", "interval", "last_checked_ok",
317
435
"last_enabled", "name", "timeout")
436
client_defaults = { "timeout": "5m",
437
"extended_timeout": "15m",
439
"checker": "fping -q -- %%(host)s",
441
"approval_delay": "0s",
442
"approval_duration": "1s",
443
"approved_by_default": "True",
319
447
def timeout_milliseconds(self):
320
448
"Return the 'timeout' attribute in milliseconds"
321
return _timedelta_to_milliseconds(self.timeout)
449
return timedelta_to_milliseconds(self.timeout)
323
451
def extended_timeout_milliseconds(self):
324
452
"Return the 'extended_timeout' attribute in milliseconds"
325
return _timedelta_to_milliseconds(self.extended_timeout)
453
return timedelta_to_milliseconds(self.extended_timeout)
327
455
def interval_milliseconds(self):
328
456
"Return the 'interval' attribute in milliseconds"
329
return _timedelta_to_milliseconds(self.interval)
457
return timedelta_to_milliseconds(self.interval)
331
459
def approval_delay_milliseconds(self):
332
return _timedelta_to_milliseconds(self.approval_delay)
334
def __init__(self, name = None, disable_hook=None, config=None):
460
return timedelta_to_milliseconds(self.approval_delay)
463
def config_parser(config):
464
"""Construct a new dict of client settings of this form:
465
{ client_name: {setting_name: value, ...}, ...}
466
with exceptions for any special settings as defined above.
467
NOTE: Must be a pure function. Must return the same result
468
value given the same arguments.
471
for client_name in config.sections():
472
section = dict(config.items(client_name))
473
client = settings[client_name] = {}
475
client["host"] = section["host"]
476
# Reformat values from string types to Python types
477
client["approved_by_default"] = config.getboolean(
478
client_name, "approved_by_default")
479
client["enabled"] = config.getboolean(client_name,
482
client["fingerprint"] = (section["fingerprint"].upper()
484
if "secret" in section:
485
client["secret"] = section["secret"].decode("base64")
486
elif "secfile" in section:
487
with open(os.path.expanduser(os.path.expandvars
488
(section["secfile"])),
490
client["secret"] = secfile.read()
492
raise TypeError("No secret or secfile for section {0}"
494
client["timeout"] = string_to_delta(section["timeout"])
495
client["extended_timeout"] = string_to_delta(
496
section["extended_timeout"])
497
client["interval"] = string_to_delta(section["interval"])
498
client["approval_delay"] = string_to_delta(
499
section["approval_delay"])
500
client["approval_duration"] = string_to_delta(
501
section["approval_duration"])
502
client["checker_command"] = section["checker"]
503
client["last_approval_request"] = None
504
client["last_checked_ok"] = None
505
client["last_checker_status"] = -2
510
def __init__(self, settings, name = None):
335
511
"""Note: the 'checker' key in 'config' sets the
336
512
'checker_command' attribute and *not* the 'checker'
515
# adding all client settings
516
for setting, value in settings.iteritems():
517
setattr(self, setting, value)
520
if not hasattr(self, "last_enabled"):
521
self.last_enabled = datetime.datetime.utcnow()
522
if not hasattr(self, "expires"):
523
self.expires = (datetime.datetime.utcnow()
526
self.last_enabled = None
341
529
logger.debug("Creating client %r", self.name)
342
530
# Uppercase and remove spaces from fingerprint for later
343
531
# comparison purposes with return value from the fingerprint()
345
self.fingerprint = (config["fingerprint"].upper()
347
533
logger.debug(" Fingerprint: %s", self.fingerprint)
348
if "secret" in config:
349
self.secret = config["secret"].decode("base64")
350
elif "secfile" in config:
351
with open(os.path.expanduser(os.path.expandvars
352
(config["secfile"])),
354
self.secret = secfile.read()
356
raise TypeError("No secret or secfile for client %s"
358
self.host = config.get("host", "")
359
self.created = datetime.datetime.utcnow()
361
self.last_approval_request = None
362
self.last_enabled = None
363
self.last_checked_ok = None
364
self.timeout = string_to_delta(config["timeout"])
365
self.extended_timeout = string_to_delta(config
366
["extended_timeout"])
367
self.interval = string_to_delta(config["interval"])
368
self.disable_hook = disable_hook
534
self.created = settings.get("created",
535
datetime.datetime.utcnow())
537
# attributes specific for this server instance
369
538
self.checker = None
370
539
self.checker_initiator_tag = None
371
540
self.disable_initiator_tag = None
373
541
self.checker_callback_tag = None
374
self.checker_command = config["checker"]
375
542
self.current_checker_command = None
376
self.last_connect = None
377
self._approved = None
378
self.approved_by_default = config.get("approved_by_default",
380
544
self.approvals_pending = 0
381
self.approval_delay = string_to_delta(
382
config["approval_delay"])
383
self.approval_duration = string_to_delta(
384
config["approval_duration"])
385
545
self.changedstate = (multiprocessing_manager
386
546
.Condition(multiprocessing_manager
548
self.client_structure = [attr for attr in
549
self.__dict__.iterkeys()
550
if not attr.startswith("_")]
551
self.client_structure.append("client_structure")
553
for name, t in inspect.getmembers(type(self),
557
if not name.startswith("_"):
558
self.client_structure.append(name)
560
# Send notice to process children that client state has changed
389
561
def send_changedstate(self):
390
self.changedstate.acquire()
391
self.changedstate.notify_all()
392
self.changedstate.release()
562
with self.changedstate:
563
self.changedstate.notify_all()
394
565
def enable(self):
395
566
"""Start this client's checker and timeout hooks"""
428
589
gobject.source_remove(self.checker_initiator_tag)
429
590
self.checker_initiator_tag = None
430
591
self.stop_checker()
431
if self.disable_hook:
432
self.disable_hook(self)
433
592
self.enabled = False
434
593
# Do not run this again if called by a gobject.timeout_add
437
596
def __del__(self):
438
self.disable_hook = None
599
def init_checker(self):
600
# Schedule a new checker to be started an 'interval' from now,
601
# and every interval from then on.
602
self.checker_initiator_tag = (gobject.timeout_add
603
(self.interval_milliseconds(),
605
# Schedule a disable() when 'timeout' has passed
606
self.disable_initiator_tag = (gobject.timeout_add
607
(self.timeout_milliseconds(),
609
# Also start a new checker *right now*.
441
612
def checker_callback(self, pid, condition, command):
442
613
"""The checker has completed, so take appropriate actions."""
443
614
self.checker_callback_tag = None
444
615
self.checker = None
445
616
if os.WIFEXITED(condition):
446
exitstatus = os.WEXITSTATUS(condition)
617
self.last_checker_status = os.WEXITSTATUS(condition)
618
if self.last_checker_status == 0:
448
619
logger.info("Checker for %(name)s succeeded",
450
621
self.checked_ok()
452
623
logger.info("Checker for %(name)s failed",
626
self.last_checker_status = -1
455
627
logger.warning("Checker for %(name)s crashed?",
458
def checked_ok(self, timeout=None):
459
"""Bump up the timeout for this client.
461
This should only be called when the client has been seen,
630
def checked_ok(self):
631
"""Assert that the client has been seen, alive and well."""
632
self.last_checked_ok = datetime.datetime.utcnow()
633
self.last_checker_status = 0
636
def bump_timeout(self, timeout=None):
637
"""Bump up the timeout for this client."""
464
638
if timeout is None:
465
639
timeout = self.timeout
466
self.last_checked_ok = datetime.datetime.utcnow()
467
640
if self.disable_initiator_tag is not None:
468
641
gobject.source_remove(self.disable_initiator_tag)
469
642
if getattr(self, "enabled", False):
470
643
self.disable_initiator_tag = (gobject.timeout_add
471
(_timedelta_to_milliseconds
644
(timedelta_to_milliseconds
472
645
(timeout), self.disable))
473
646
self.expires = datetime.datetime.utcnow() + timeout
775
def dbus_interface_annotations(dbus_interface):
776
"""Decorator for marking functions returning interface annotations.
780
@dbus_interface_annotations("org.example.Interface")
781
def _foo(self): # Function name does not matter
782
return {"org.freedesktop.DBus.Deprecated": "true",
783
"org.freedesktop.DBus.Property.EmitsChangedSignal":
787
func._dbus_is_interface = True
788
func._dbus_interface = dbus_interface
789
func._dbus_name = dbus_interface
794
def dbus_annotations(annotations):
795
"""Decorator to annotate D-Bus methods, signals or properties
798
@dbus_service_property("org.example.Interface", signature="b",
800
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
801
"org.freedesktop.DBus.Property."
802
"EmitsChangedSignal": "false"})
803
def Property_dbus_property(self):
804
return dbus.Boolean(False)
807
func._dbus_annotations = annotations
602
812
class DBusPropertyException(dbus.exceptions.DBusException):
603
813
"""A base class for D-Bus property-related exceptions
630
def _is_dbus_property(obj):
631
return getattr(obj, "_dbus_is_property", False)
840
def _is_dbus_thing(thing):
841
"""Returns a function testing if an attribute is a D-Bus thing
843
If called like _is_dbus_thing("method") it returns a function
844
suitable for use as predicate to inspect.getmembers().
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
633
def _get_all_dbus_properties(self):
849
def _get_all_dbus_things(self, thing):
634
850
"""Returns a generator of (name, attribute) pairs
636
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
852
return ((getattr(athing.__get__(self), "_dbus_name",
854
athing.__get__(self))
637
855
for cls in self.__class__.__mro__
639
inspect.getmembers(cls, self._is_dbus_property))
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
641
860
def _get_dbus_property(self, interface_name, property_name):
642
861
"""Returns a bound method if one exists which is a D-Bus
726
948
e.setAttribute("access", prop._dbus_access)
728
950
for if_tag in document.getElementsByTagName("interface"):
729
952
for tag in (make_tag(document, name, prop)
731
in self._get_all_dbus_properties()
954
in self._get_all_dbus_things("property")
732
955
if prop._dbus_interface
733
956
== if_tag.getAttribute("name")):
734
957
if_tag.appendChild(tag)
958
# Add annotation tags
959
for typ in ("method", "signal", "property"):
960
for tag in if_tag.getElementsByTagName(typ):
962
for name, prop in (self.
963
_get_all_dbus_things(typ)):
964
if (name == tag.getAttribute("name")
965
and prop._dbus_interface
966
== if_tag.getAttribute("name")):
967
annots.update(getattr
971
for name, value in annots.iteritems():
972
ann_tag = document.createElement(
974
ann_tag.setAttribute("name", name)
975
ann_tag.setAttribute("value", value)
976
tag.appendChild(ann_tag)
977
# Add interface annotation tags
978
for annotation, value in dict(
980
*(annotations().iteritems()
981
for name, annotations in
982
self._get_all_dbus_things("interface")
983
if name == if_tag.getAttribute("name")
985
ann_tag = document.createElement("annotation")
986
ann_tag.setAttribute("name", annotation)
987
ann_tag.setAttribute("value", value)
988
if_tag.appendChild(ann_tag)
735
989
# Add the names to the return values for the
736
990
# "org.freedesktop.DBus.Properties" methods
737
991
if (if_tag.getAttribute("name")
858
1128
attribute.func_name,
859
1129
attribute.func_defaults,
860
1130
attribute.func_closure)))
1131
# Copy annotations, if any
1133
attr[attrname]._dbus_annotations = (
1134
dict(attribute._dbus_annotations))
1135
except AttributeError:
1137
# Is this a D-Bus interface?
1138
elif getattr(attribute, "_dbus_is_interface", False):
1139
# Create a new, but exactly alike, function
1140
# object. Decorate it to be a new D-Bus interface
1141
# with the alternate D-Bus interface name. Add it
1143
attr[attrname] = (dbus_interface_annotations
1146
(attribute.func_code,
1147
attribute.func_globals,
1148
attribute.func_name,
1149
attribute.func_defaults,
1150
attribute.func_closure)))
1151
# Deprecate all old interfaces
1152
basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
for old_interface_name in old_interface_names:
1154
@dbus_interface_annotations(old_interface_name)
1156
return { "org.freedesktop.DBus.Deprecated": "true" }
1157
# Find an unused name
1158
for aname in (basename.format(i) for i in
1160
if aname not in attr:
861
1163
return type.__new__(mcs, name, bases, attr)
863
1166
class ClientDBus(Client, DBusObjectWithProperties):
864
1167
"""A Client class using D-Bus
928
1230
checker is not None)
929
1231
last_checked_ok = notifychangeproperty(datetime_to_dbus,
930
1232
"LastCheckedOK")
1233
last_checker_status = notifychangeproperty(dbus.Int16,
1234
"LastCheckerStatus")
931
1235
last_approval_request = notifychangeproperty(
932
1236
datetime_to_dbus, "LastApprovalRequest")
933
1237
approved_by_default = notifychangeproperty(dbus.Boolean,
934
1238
"ApprovedByDefault")
935
approval_delay = notifychangeproperty(dbus.UInt16,
1239
approval_delay = notifychangeproperty(dbus.UInt64,
936
1240
"ApprovalDelay",
938
_timedelta_to_milliseconds)
1242
timedelta_to_milliseconds)
939
1243
approval_duration = notifychangeproperty(
940
dbus.UInt16, "ApprovalDuration",
941
type_func = _timedelta_to_milliseconds)
1244
dbus.UInt64, "ApprovalDuration",
1245
type_func = timedelta_to_milliseconds)
942
1246
host = notifychangeproperty(dbus.String, "Host")
943
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1247
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
945
_timedelta_to_milliseconds)
1249
timedelta_to_milliseconds)
946
1250
extended_timeout = notifychangeproperty(
947
dbus.UInt16, "ExtendedTimeout",
948
type_func = _timedelta_to_milliseconds)
949
interval = notifychangeproperty(dbus.UInt16,
1251
dbus.UInt64, "ExtendedTimeout",
1252
type_func = timedelta_to_milliseconds)
1253
interval = notifychangeproperty(dbus.UInt64,
952
_timedelta_to_milliseconds)
1256
timedelta_to_milliseconds)
953
1257
checker_command = notifychangeproperty(dbus.String, "Checker")
955
1259
del notifychangeproperty
1184
1501
if value is None: # get
1185
1502
return dbus.UInt64(self.timeout_milliseconds())
1186
1503
self.timeout = datetime.timedelta(0, 0, 0, value)
1187
if getattr(self, "disable_initiator_tag", None) is None:
1189
1504
# Reschedule timeout
1190
gobject.source_remove(self.disable_initiator_tag)
1191
self.disable_initiator_tag = None
1193
time_to_die = _timedelta_to_milliseconds((self
1198
if time_to_die <= 0:
1199
# The timeout has passed
1202
self.expires = (datetime.datetime.utcnow()
1203
+ datetime.timedelta(milliseconds =
1205
self.disable_initiator_tag = (gobject.timeout_add
1206
(time_to_die, self.disable))
1506
now = datetime.datetime.utcnow()
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
1510
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1516
if (getattr(self, "disable_initiator_tag", None)
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
1208
1524
# ExtendedTimeout - property
1209
1525
@dbus_service_property(_interface, signature="t",
1760
2079
elif suffix == "w":
1761
2080
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1763
raise ValueError("Unknown suffix %r" % suffix)
2082
raise ValueError("Unknown suffix {0!r}"
1764
2084
except (ValueError, IndexError) as e:
1765
2085
raise ValueError(*(e.args))
1766
2086
timevalue += delta
1767
2087
return timevalue
1770
def if_nametoindex(interface):
1771
"""Call the C function if_nametoindex(), or equivalent
1773
Note: This function cannot accept a unicode string."""
1774
global if_nametoindex
1776
if_nametoindex = (ctypes.cdll.LoadLibrary
1777
(ctypes.util.find_library("c"))
1779
except (OSError, AttributeError):
1780
logger.warning("Doing if_nametoindex the hard way")
1781
def if_nametoindex(interface):
1782
"Get an interface index the hard way, i.e. using fcntl()"
1783
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1784
with contextlib.closing(socket.socket()) as s:
1785
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1786
struct.pack(str("16s16x"),
1788
interface_index = struct.unpack(str("I"),
1790
return interface_index
1791
return if_nametoindex(interface)
1794
2090
def daemon(nochdir = False, noclose = False):
1795
2091
"""See daemon(3). Standard BSD Unix function.
1909
2214
debuglevel = server_settings["debuglevel"]
1910
2215
use_dbus = server_settings["use_dbus"]
1911
2216
use_ipv6 = server_settings["use_ipv6"]
2217
stored_state_path = os.path.join(server_settings["statedir"],
2221
initlogger(debug, logging.DEBUG)
2226
level = getattr(logging, debuglevel.upper())
2227
initlogger(debug, level)
1913
2229
if server_settings["servicename"] != "Mandos":
1914
2230
syslogger.setFormatter(logging.Formatter
1915
('Mandos (%s) [%%(process)d]:'
1916
' %%(levelname)s: %%(message)s'
1917
% server_settings["servicename"]))
2231
('Mandos ({0}) [%(process)d]:'
2232
' %(levelname)s: %(message)s'
2233
.format(server_settings
1919
2236
# Parse config file with clients
1920
client_defaults = { "timeout": "5m",
1921
"extended_timeout": "15m",
1923
"checker": "fping -q -- %%(host)s",
1925
"approval_delay": "0s",
1926
"approval_duration": "1s",
1928
client_config = configparser.SafeConfigParser(client_defaults)
2237
client_config = configparser.SafeConfigParser(Client
1929
2239
client_config.read(os.path.join(server_settings["configdir"],
1930
2240
"clients.conf"))
2039
2337
client_class = functools.partial(ClientDBusTransitional,
2041
def client_config_items(config, section):
2042
special_settings = {
2043
"approved_by_default":
2044
lambda: config.getboolean(section,
2045
"approved_by_default"),
2047
for name, value in config.items(section):
2340
client_settings = Client.config_parser(client_config)
2341
old_client_settings = {}
2344
# Get client data and settings from last running state.
2345
if server_settings["restore"]:
2347
with open(stored_state_path, "rb") as stored_state:
2348
clients_data, old_client_settings = (pickle.load
2350
os.remove(stored_state_path)
2351
except IOError as e:
2352
logger.warning("Could not load persistent state: {0}"
2354
if e.errno != errno.ENOENT:
2356
except EOFError as e:
2357
logger.warning("Could not load persistent state: "
2358
"EOFError: {0}".format(e))
2360
with PGPEngine() as pgp:
2361
for client_name, client in clients_data.iteritems():
2362
# Decide which value to use after restoring saved state.
2363
# We have three different values: Old config file,
2364
# new config file, and saved state.
2365
# New config value takes precedence if it differs from old
2366
# config value, otherwise use saved state.
2367
for name, value in client_settings[client_name].items():
2369
# For each value in new config, check if it
2370
# differs from the old config value (Except for
2371
# the "secret" attribute)
2372
if (name != "secret" and
2373
value != old_client_settings[client_name]
2375
client[name] = value
2379
# Clients who has passed its expire date can still be
2380
# enabled if its last checker was successful. Clients
2381
# whose checker succeeded before we stored its state is
2382
# assumed to have successfully run all checkers during
2384
if client["enabled"]:
2385
if datetime.datetime.utcnow() >= client["expires"]:
2386
if not client["last_checked_ok"]:
2388
"disabling client {0} - Client never "
2389
"performed a successful checker"
2390
.format(client_name))
2391
client["enabled"] = False
2392
elif client["last_checker_status"] != 0:
2394
"disabling client {0} - Client "
2395
"last checker failed with error code {1}"
2396
.format(client_name,
2397
client["last_checker_status"]))
2398
client["enabled"] = False
2400
client["expires"] = (datetime.datetime
2402
+ client["timeout"])
2403
logger.debug("Last checker succeeded,"
2404
" keeping {0} enabled"
2405
.format(client_name))
2049
yield (name, special_settings[name]())
2053
tcp_server.clients.update(set(
2054
client_class(name = section,
2055
config= dict(client_config_items(
2056
client_config, section)))
2057
for section in client_config.sections()))
2407
client["secret"] = (
2408
pgp.decrypt(client["encrypted_secret"],
2409
client_settings[client_name]
2412
# If decryption fails, we use secret from new settings
2413
logger.debug("Failed to decrypt {0} old secret"
2414
.format(client_name))
2415
client["secret"] = (
2416
client_settings[client_name]["secret"])
2419
# Add/remove clients based on new changes made to config
2420
for client_name in (set(old_client_settings)
2421
- set(client_settings)):
2422
del clients_data[client_name]
2423
for client_name in (set(client_settings)
2424
- set(old_client_settings)):
2425
clients_data[client_name] = client_settings[client_name]
2427
# Create all client objects
2428
for client_name, client in clients_data.iteritems():
2429
tcp_server.clients[client_name] = client_class(
2430
name = client_name, settings = client)
2058
2432
if not tcp_server.clients:
2059
2433
logger.warning("No clients defined")
2139
2519
service.cleanup()
2141
2521
multiprocessing.active_children()
2522
if not (tcp_server.clients or client_settings):
2525
# Store client before exiting. Secrets are encrypted with key
2526
# based on what config file has. If config file is
2527
# removed/edited, old secret will thus be unrecovable.
2529
with PGPEngine() as pgp:
2530
for client in tcp_server.clients.itervalues():
2531
key = client_settings[client.name]["secret"]
2532
client.encrypted_secret = pgp.encrypt(client.secret,
2536
# A list of attributes that can not be pickled
2538
exclude = set(("bus", "changedstate", "secret",
2540
for name, typ in (inspect.getmembers
2541
(dbus.service.Object)):
2544
client_dict["encrypted_secret"] = (client
2546
for attr in client.client_structure:
2547
if attr not in exclude:
2548
client_dict[attr] = getattr(client, attr)
2550
clients[client.name] = client_dict
2551
del client_settings[client.name]["secret"]
2554
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2557
(stored_state_path))
2558
with os.fdopen(tempfd, "wb") as stored_state:
2559
pickle.dump((clients, client_settings), stored_state)
2560
os.rename(tempname, stored_state_path)
2561
except (IOError, OSError) as e:
2562
logger.warning("Could not save persistent state: {0}"
2569
if e.errno not in set((errno.ENOENT, errno.EACCES,
2573
# Delete all clients, and settings from config
2142
2574
while tcp_server.clients:
2143
client = tcp_server.clients.pop()
2575
name, client = tcp_server.clients.popitem()
2145
2577
client.remove_from_connection()
2146
client.disable_hook = None
2147
2578
# Don't signal anything except ClientRemoved
2148
2579
client.disable(quiet=True)