329
313
"created", "enabled", "fingerprint",
330
314
"host", "interval", "last_checked_ok",
331
315
"last_enabled", "name", "timeout")
333
317
def timeout_milliseconds(self):
334
318
"Return the 'timeout' attribute in milliseconds"
335
319
return _timedelta_to_milliseconds(self.timeout)
337
321
def extended_timeout_milliseconds(self):
338
322
"Return the 'extended_timeout' attribute in milliseconds"
339
return _timedelta_to_milliseconds(self.extended_timeout)
323
return _timedelta_to_milliseconds(self.extended_timeout)
341
325
def interval_milliseconds(self):
342
326
"Return the 'interval' attribute in milliseconds"
343
327
return _timedelta_to_milliseconds(self.interval)
345
329
def approval_delay_milliseconds(self):
346
330
return _timedelta_to_milliseconds(self.approval_delay)
348
def __init__(self, name = None, config=None):
332
def __init__(self, name = None, disable_hook=None, config=None):
349
333
"""Note: the 'checker' key in 'config' sets the
350
334
'checker_command' attribute and *not* the 'checker'
372
356
self.host = config.get("host", "")
373
357
self.created = datetime.datetime.utcnow()
375
359
self.last_approval_request = None
376
self.last_enabled = datetime.datetime.utcnow()
360
self.last_enabled = None
377
361
self.last_checked_ok = None
378
self.last_checker_status = None
379
362
self.timeout = string_to_delta(config["timeout"])
380
self.extended_timeout = string_to_delta(config
381
["extended_timeout"])
363
self.extended_timeout = string_to_delta(config["extended_timeout"])
382
364
self.interval = string_to_delta(config["interval"])
365
self.disable_hook = disable_hook
383
366
self.checker = None
384
367
self.checker_initiator_tag = None
385
368
self.disable_initiator_tag = None
386
self.expires = datetime.datetime.utcnow() + self.timeout
387
370
self.checker_callback_tag = None
388
371
self.checker_command = config["checker"]
389
372
self.current_checker_command = None
373
self.last_connect = None
390
374
self._approved = None
391
375
self.approved_by_default = config.get("approved_by_default",
395
379
config["approval_delay"])
396
380
self.approval_duration = string_to_delta(
397
381
config["approval_duration"])
398
self.changedstate = (multiprocessing_manager
399
.Condition(multiprocessing_manager
401
self.client_structure = [attr for attr in self.__dict__.iterkeys() if not attr.startswith("_")]
402
self.client_structure.append("client_structure")
405
for name, t in inspect.getmembers(type(self),
406
lambda obj: isinstance(obj, property)):
407
if not name.startswith("_"):
408
self.client_structure.append(name)
382
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
410
# Send notice to process children that client state has changed
411
384
def send_changedstate(self):
412
with self.changedstate:
413
self.changedstate.notify_all()
385
self.changedstate.acquire()
386
self.changedstate.notify_all()
387
self.changedstate.release()
415
389
def enable(self):
416
390
"""Start this client's checker and timeout hooks"""
417
391
if getattr(self, "enabled", False):
418
392
# Already enabled
420
394
self.send_changedstate()
395
# Schedule a new checker to be started an 'interval' from now,
396
# and every interval from then on.
397
self.checker_initiator_tag = (gobject.timeout_add
398
(self.interval_milliseconds(),
400
# Schedule a disable() when 'timeout' has passed
421
401
self.expires = datetime.datetime.utcnow() + self.timeout
402
self.disable_initiator_tag = (gobject.timeout_add
403
(self.timeout_milliseconds(),
422
405
self.enabled = True
423
406
self.last_enabled = datetime.datetime.utcnow()
407
# Also start a new checker *right now*.
426
410
def disable(self, quiet=True):
427
411
"""Disable this client."""
439
423
gobject.source_remove(self.checker_initiator_tag)
440
424
self.checker_initiator_tag = None
441
425
self.stop_checker()
426
if self.disable_hook:
427
self.disable_hook(self)
442
428
self.enabled = False
443
429
# Do not run this again if called by a gobject.timeout_add
446
432
def __del__(self):
433
self.disable_hook = None
449
def init_checker(self):
450
# Schedule a new checker to be started an 'interval' from now,
451
# and every interval from then on.
452
self.checker_initiator_tag = (gobject.timeout_add
453
(self.interval_milliseconds(),
455
# Schedule a disable() when 'timeout' has passed
456
self.disable_initiator_tag = (gobject.timeout_add
457
(self.timeout_milliseconds(),
459
# Also start a new checker *right now*.
463
436
def checker_callback(self, pid, condition, command):
464
437
"""The checker has completed, so take appropriate actions."""
465
438
self.checker_callback_tag = None
466
439
self.checker = None
467
440
if os.WIFEXITED(condition):
468
self.last_checker_status = os.WEXITSTATUS(condition)
469
if self.last_checker_status == 0:
441
exitstatus = os.WEXITSTATUS(condition)
470
443
logger.info("Checker for %(name)s succeeded",
472
445
self.checked_ok()
487
459
if timeout is None:
488
460
timeout = self.timeout
489
461
self.last_checked_ok = datetime.datetime.utcnow()
490
if self.disable_initiator_tag is not None:
491
gobject.source_remove(self.disable_initiator_tag)
492
if getattr(self, "enabled", False):
493
self.disable_initiator_tag = (gobject.timeout_add
494
(_timedelta_to_milliseconds
495
(timeout), self.disable))
496
self.expires = datetime.datetime.utcnow() + timeout
462
gobject.source_remove(self.disable_initiator_tag)
463
self.expires = datetime.datetime.utcnow() + timeout
464
self.disable_initiator_tag = (gobject.timeout_add
465
(_timedelta_to_milliseconds(timeout),
498
468
def need_approval(self):
499
469
self.last_approval_request = datetime.datetime.utcnow()
592
562
self.checker = None
594
# Encrypts a client secret and stores it in a varible encrypted_secret
595
def encrypt_secret(self, key):
596
# Encryption-key need to be of a specific size, so we hash inputed key
597
hasheng = hashlib.sha256()
599
encryptionkey = hasheng.digest()
601
# Create validation hash so we know at decryption if it was sucessful
602
hasheng = hashlib.sha256()
603
hasheng.update(self.secret)
604
validationhash = hasheng.digest()
607
iv = os.urandom(Crypto.Cipher.AES.block_size)
608
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
609
Crypto.Cipher.AES.MODE_CFB, iv)
610
ciphertext = ciphereng.encrypt(validationhash+self.secret)
611
self.encrypted_secret = (ciphertext, iv)
613
# Decrypt a encrypted client secret
614
def decrypt_secret(self, key):
615
# Decryption-key need to be of a specific size, so we hash inputed key
616
hasheng = hashlib.sha256()
618
encryptionkey = hasheng.digest()
620
# Decrypt encrypted secret
621
ciphertext, iv = self.encrypted_secret
622
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
623
Crypto.Cipher.AES.MODE_CFB, iv)
624
plain = ciphereng.decrypt(ciphertext)
626
# Validate decrypted secret to know if it was succesful
627
hasheng = hashlib.sha256()
628
validationhash = plain[:hasheng.digest_size]
629
secret = plain[hasheng.digest_size:]
630
hasheng.update(secret)
632
# if validation fails, we use key as new secret. Otherwhise, we use
633
# the decrypted secret
634
if hasheng.digest() == validationhash:
638
del self.encrypted_secret
641
564
def dbus_service_property(dbus_interface, signature="v",
642
565
access="readwrite", byte_arrays=False):
643
566
"""Decorators for marking methods of a DBusObjectWithProperties to
702
625
def _get_all_dbus_properties(self):
703
626
"""Returns a generator of (name, attribute) pairs
705
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
706
for cls in self.__class__.__mro__
628
return ((prop._dbus_name, prop)
707
629
for name, prop in
708
inspect.getmembers(cls, self._is_dbus_property))
630
inspect.getmembers(self, self._is_dbus_property))
710
632
def _get_dbus_property(self, interface_name, property_name):
711
633
"""Returns a bound method if one exists which is a D-Bus
712
634
property with the specified name and interface.
714
for cls in self.__class__.__mro__:
715
for name, value in (inspect.getmembers
716
(cls, self._is_dbus_property)):
717
if (value._dbus_name == property_name
718
and value._dbus_interface == interface_name):
719
return value.__get__(self)
636
for name in (property_name,
637
property_name + "_dbus_property"):
638
prop = getattr(self, name, None)
640
or not self._is_dbus_property(prop)
641
or prop._dbus_name != property_name
642
or (interface_name and prop._dbus_interface
643
and interface_name != prop._dbus_interface)):
721
646
# No such property
722
647
raise DBusPropertyNotFound(self.dbus_object_path + ":"
723
648
+ interface_name + "."
832
757
return dbus.String(dt.isoformat(),
833
758
variant_level=variant_level)
835
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
837
"""Applied to an empty subclass of a D-Bus object, this metaclass
838
will add additional D-Bus attributes matching a certain pattern.
840
def __new__(mcs, name, bases, attr):
841
# Go through all the base classes which could have D-Bus
842
# methods, signals, or properties in them
843
for base in (b for b in bases
844
if issubclass(b, dbus.service.Object)):
845
# Go though all attributes of the base class
846
for attrname, attribute in inspect.getmembers(base):
847
# Ignore non-D-Bus attributes, and D-Bus attributes
848
# with the wrong interface name
849
if (not hasattr(attribute, "_dbus_interface")
850
or not attribute._dbus_interface
851
.startswith("se.recompile.Mandos")):
853
# Create an alternate D-Bus interface name based on
855
alt_interface = (attribute._dbus_interface
856
.replace("se.recompile.Mandos",
857
"se.bsnet.fukt.Mandos"))
858
# Is this a D-Bus signal?
859
if getattr(attribute, "_dbus_is_signal", False):
860
# Extract the original non-method function by
862
nonmethod_func = (dict(
863
zip(attribute.func_code.co_freevars,
864
attribute.__closure__))["func"]
866
# Create a new, but exactly alike, function
867
# object, and decorate it to be a new D-Bus signal
868
# with the alternate D-Bus interface name
869
new_function = (dbus.service.signal
871
attribute._dbus_signature)
873
nonmethod_func.func_code,
874
nonmethod_func.func_globals,
875
nonmethod_func.func_name,
876
nonmethod_func.func_defaults,
877
nonmethod_func.func_closure)))
878
# Define a creator of a function to call both the
879
# old and new functions, so both the old and new
880
# signals gets sent when the function is called
881
def fixscope(func1, func2):
882
"""This function is a scope container to pass
883
func1 and func2 to the "call_both" function
884
outside of its arguments"""
885
def call_both(*args, **kwargs):
886
"""This function will emit two D-Bus
887
signals by calling func1 and func2"""
888
func1(*args, **kwargs)
889
func2(*args, **kwargs)
891
# Create the "call_both" function and add it to
893
attr[attrname] = fixscope(attribute,
895
# Is this a D-Bus method?
896
elif getattr(attribute, "_dbus_is_method", False):
897
# Create a new, but exactly alike, function
898
# object. Decorate it to be a new D-Bus method
899
# with the alternate D-Bus interface name. Add it
901
attr[attrname] = (dbus.service.method
903
attribute._dbus_in_signature,
904
attribute._dbus_out_signature)
906
(attribute.func_code,
907
attribute.func_globals,
909
attribute.func_defaults,
910
attribute.func_closure)))
911
# Is this a D-Bus property?
912
elif getattr(attribute, "_dbus_is_property", False):
913
# Create a new, but exactly alike, function
914
# object, and decorate it to be a new D-Bus
915
# property with the alternate D-Bus interface
916
# name. Add it to the class.
917
attr[attrname] = (dbus_service_property
919
attribute._dbus_signature,
920
attribute._dbus_access,
922
._dbus_get_args_options
925
(attribute.func_code,
926
attribute.func_globals,
928
attribute.func_defaults,
929
attribute.func_closure)))
930
return type.__new__(mcs, name, bases, attr)
932
760
class ClientDBus(Client, DBusObjectWithProperties):
933
761
"""A Client class using D-Bus
960
787
def notifychangeproperty(transform_func,
961
788
dbus_name, type_func=lambda x: x,
962
789
variant_level=1):
963
""" Modify a variable so that it's a property which announces
966
transform_fun: Function that takes a value and a variant_level
967
and transforms it to a D-Bus type.
968
dbus_name: D-Bus name of the variable
790
""" Modify a variable so that its a property that announce its
792
transform_fun: Function that takes a value and transform it to
794
dbus_name: DBus name of the variable
969
795
type_func: Function that transform the value before sending it
970
to the D-Bus. Default: no transform
971
variant_level: D-Bus variant level. Default: 1
797
variant_level: DBus variant level. default: 1
973
attrname = "_{0}".format(dbus_name)
974
800
def setter(self, value):
801
old_value = real_value[0]
802
real_value[0] = value
975
803
if hasattr(self, "dbus_object_path"):
976
if (not hasattr(self, attrname) or
977
type_func(getattr(self, attrname, None))
978
!= type_func(value)):
979
dbus_value = transform_func(type_func(value),
804
if type_func(old_value) != type_func(real_value[0]):
805
dbus_value = transform_func(type_func(real_value[0]),
982
807
self.PropertyChanged(dbus.String(dbus_name),
984
setattr(self, attrname, value)
986
return property(lambda self: getattr(self, attrname), setter)
810
return property(lambda self: real_value[0], setter)
989
813
expires = notifychangeproperty(datetime_to_dbus, "Expires")
990
814
approvals_pending = notifychangeproperty(dbus.Boolean,
991
815
"ApprovalPending",
994
818
last_enabled = notifychangeproperty(datetime_to_dbus,
996
820
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
997
type_func = lambda checker:
821
type_func = lambda checker: checker is not None)
999
822
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1000
823
"LastCheckedOK")
1001
last_approval_request = notifychangeproperty(
1002
datetime_to_dbus, "LastApprovalRequest")
824
last_approval_request = notifychangeproperty(datetime_to_dbus,
825
"LastApprovalRequest")
1003
826
approved_by_default = notifychangeproperty(dbus.Boolean,
1004
827
"ApprovedByDefault")
1005
approval_delay = notifychangeproperty(dbus.UInt16,
1008
_timedelta_to_milliseconds)
1009
approval_duration = notifychangeproperty(
1010
dbus.UInt16, "ApprovalDuration",
1011
type_func = _timedelta_to_milliseconds)
828
approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
829
type_func = _timedelta_to_milliseconds)
830
approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
831
type_func = _timedelta_to_milliseconds)
1012
832
host = notifychangeproperty(dbus.String, "Host")
1013
833
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1015
_timedelta_to_milliseconds)
1016
extended_timeout = notifychangeproperty(
1017
dbus.UInt16, "ExtendedTimeout",
1018
type_func = _timedelta_to_milliseconds)
1019
interval = notifychangeproperty(dbus.UInt16,
1022
_timedelta_to_milliseconds)
834
type_func = _timedelta_to_milliseconds)
835
extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
836
type_func = _timedelta_to_milliseconds)
837
interval = notifychangeproperty(dbus.UInt16, "Interval",
838
type_func = _timedelta_to_milliseconds)
1023
839
checker_command = notifychangeproperty(dbus.String, "Checker")
1025
841
del notifychangeproperty
1371
1185
unicode(self.client_address))
1372
1186
logger.debug("Pipe FD: %d",
1373
1187
self.server.child_pipe.fileno())
1375
1189
session = (gnutls.connection
1376
1190
.ClientSession(self.request,
1377
1191
gnutls.connection
1378
1192
.X509Credentials()))
1380
1194
# Note: gnutls.connection.X509Credentials is really a
1381
1195
# generic GnuTLS certificate credentials object so long as
1382
1196
# no X.509 keys are added to it. Therefore, we can use it
1383
1197
# here despite using OpenPGP certificates.
1385
1199
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1386
1200
# "+AES-256-CBC", "+SHA1",
1387
1201
# "+COMP-NULL", "+CTYPE-OPENPGP",
1604
1413
This function creates a new pipe in self.pipe
1606
1415
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1608
proc = MultiprocessingMixIn.process_request(self, request,
1417
super(MultiprocessingMixInWithPipe,
1418
self).process_request(request, client_address)
1610
1419
self.child_pipe.close()
1611
self.add_pipe(parent_pipe, proc)
1613
def add_pipe(self, parent_pipe, proc):
1420
self.add_pipe(parent_pipe)
1422
def add_pipe(self, parent_pipe):
1614
1423
"""Dummy function; override as necessary"""
1615
1424
raise NotImplementedError
1618
1426
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1619
1427
socketserver.TCPServer, object):
1620
1428
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1704
1512
def server_activate(self):
1705
1513
if self.enabled:
1706
1514
return socketserver.TCPServer.server_activate(self)
1708
1515
def enable(self):
1709
1516
self.enabled = True
1711
def add_pipe(self, parent_pipe, proc):
1517
def add_pipe(self, parent_pipe):
1712
1518
# Call "handle_ipc" for both data and EOF events
1713
1519
gobject.io_add_watch(parent_pipe.fileno(),
1714
1520
gobject.IO_IN | gobject.IO_HUP,
1715
1521
functools.partial(self.handle_ipc,
1522
parent_pipe = parent_pipe))
1720
1524
def handle_ipc(self, source, condition, parent_pipe=None,
1721
proc = None, client_object=None):
1525
client_object=None):
1722
1526
condition_names = {
1723
1527
gobject.IO_IN: "IN", # There is data to read.
1724
1528
gobject.IO_OUT: "OUT", # Data can be written (without
1756
1558
"dress: %s", fpr, address)
1757
1559
if self.use_dbus:
1758
1560
# Emit D-Bus signal
1759
mandos_dbus_service.ClientNotFound(fpr,
1561
mandos_dbus_service.ClientNotFound(fpr, address[0])
1761
1562
parent_pipe.send(False)
1764
1565
gobject.io_add_watch(parent_pipe.fileno(),
1765
1566
gobject.IO_IN | gobject.IO_HUP,
1766
1567
functools.partial(self.handle_ipc,
1568
parent_pipe = parent_pipe,
1569
client_object = client))
1772
1570
parent_pipe.send(True)
1773
# remove the old hook in favor of the new above hook on
1571
# remove the old hook in favor of the new above hook on same fileno
1776
1573
if command == 'funcall':
1777
1574
funcname = request[1]
1778
1575
args = request[2]
1779
1576
kwargs = request[3]
1781
parent_pipe.send(('data', getattr(client_object,
1578
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1785
1580
if command == 'getattr':
1786
1581
attrname = request[1]
1787
1582
if callable(client_object.__getattribute__(attrname)):
1788
1583
parent_pipe.send(('function',))
1790
parent_pipe.send(('data', client_object
1791
.__getattribute__(attrname)))
1585
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1793
1587
if command == 'setattr':
1794
1588
attrname = request[1]
1795
1589
value = request[2]
1796
1590
setattr(client_object, attrname, value)
2086
1877
# End of Avahi example code
2089
bus_name = dbus.service.BusName("se.recompile.Mandos",
1880
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2090
1881
bus, do_not_queue=True)
2091
old_bus_name = (dbus.service.BusName
2092
("se.bsnet.fukt.Mandos", bus,
2094
1882
except dbus.exceptions.NameExistsException as e:
2095
1883
logger.error(unicode(e) + ", disabling D-Bus")
2096
1884
use_dbus = False
2097
1885
server_settings["use_dbus"] = False
2098
1886
tcp_server.use_dbus = False
2099
1887
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2100
service = AvahiServiceToSyslog(name =
2101
server_settings["servicename"],
2102
servicetype = "_mandos._tcp",
2103
protocol = protocol, bus = bus)
1888
service = AvahiService(name = server_settings["servicename"],
1889
servicetype = "_mandos._tcp",
1890
protocol = protocol, bus = bus)
2104
1891
if server_settings["interface"]:
2105
1892
service.interface = (if_nametoindex
2106
1893
(str(server_settings["interface"])))
2111
1898
client_class = Client
2113
client_class = functools.partial(ClientDBusTransitional,
2116
special_settings = {
2117
# Some settings need to be accessd by special methods;
2118
# booleans need .getboolean(), etc. Here is a list of them:
2119
"approved_by_default":
2121
client_config.getboolean(section, "approved_by_default"),
2123
# Construct a new dict of client settings of this form:
2124
# { client_name: {setting_name: value, ...}, ...}
2125
# with exceptions for any special settings as defined above
2126
client_settings = dict((clientname,
2128
(value if setting not in special_settings
2129
else special_settings[setting](clientname)))
2130
for setting, value in client_config.items(clientname)))
2131
for clientname in client_config.sections())
2133
old_client_settings = {}
2136
# Get client data and settings from last running state.
2137
if server_settings["restore"]:
2139
with open(stored_state_path, "rb") as stored_state:
2140
clients_data, old_client_settings = pickle.load(stored_state)
2141
os.remove(stored_state_path)
2142
except IOError as e:
2143
logger.warning("Could not load persistant state: {0}".format(e))
2144
if e.errno != errno.ENOENT:
2147
for client in clients_data:
2148
client_name = client["name"]
2150
# Decide which value to use after restoring saved state.
2151
# We have three different values: Old config file,
2152
# new config file, and saved state.
2153
# New config value takes precedence if it differs from old
2154
# config value, otherwise use saved state.
2155
for name, value in client_settings[client_name].items():
1900
client_class = functools.partial(ClientDBus, bus = bus)
1901
def client_config_items(config, section):
1902
special_settings = {
1903
"approved_by_default":
1904
lambda: config.getboolean(section,
1905
"approved_by_default"),
1907
for name, value in config.items(section):
2157
# For each value in new config, check if it differs
2158
# from the old config value (Except for the "secret"
2160
if name != "secret" and value != old_client_settings[client_name][name]:
2161
setattr(client, name, value)
1909
yield (name, special_settings[name]())
2162
1910
except KeyError:
2165
# Clients who has passed its expire date, can still be enabled if its
2166
# last checker was sucessful. Clients who checkers failed before we
2167
# stored it state is asumed to had failed checker during downtime.
2168
if client["enabled"] and client["last_checked_ok"]:
2169
if ((datetime.datetime.utcnow() - client["last_checked_ok"])
2170
> client["interval"]):
2171
if client["last_checker_status"] != 0:
2172
client["enabled"] = False
2174
client["expires"] = datetime.datetime.utcnow() + client["timeout"]
2176
client["changedstate"] = (multiprocessing_manager
2177
.Condition(multiprocessing_manager
2180
new_client = ClientDBusTransitional.__new__(ClientDBusTransitional)
2181
tcp_server.clients[client_name] = new_client
2182
new_client.bus = bus
2183
for name, value in client.iteritems():
2184
setattr(new_client, name, value)
2185
client_object_name = unicode(client_name).translate(
2186
{ord("."): ord("_"),
2187
ord("-"): ord("_")})
2188
new_client.dbus_object_path = (dbus.ObjectPath
2189
("/clients/" + client_object_name))
2190
DBusObjectWithProperties.__init__(new_client,
2192
new_client.dbus_object_path)
2194
tcp_server.clients[client_name] = Client.__new__(Client)
2195
for name, value in client.iteritems():
2196
setattr(tcp_server.clients[client_name], name, value)
2198
tcp_server.clients[client_name].decrypt_secret(
2199
client_settings[client_name]["secret"])
2201
# Create/remove clients based on new changes made to config
2202
for clientname in set(old_client_settings) - set(client_settings):
2203
del tcp_server.clients[clientname]
2204
for clientname in set(client_settings) - set(old_client_settings):
2205
tcp_server.clients[clientname] = (client_class(name = clientname,
1913
tcp_server.clients.update(set(
1914
client_class(name = section,
1915
config= dict(client_config_items(
1916
client_config, section)))
1917
for section in client_config.sections()))
2211
1918
if not tcp_server.clients:
2212
1919
logger.warning("No clients defined")
2287
class MandosDBusServiceTransitional(MandosDBusService):
2288
__metaclass__ = AlternateDBusNamesMetaclass
2289
mandos_dbus_service = MandosDBusServiceTransitional()
1993
mandos_dbus_service = MandosDBusService()
2292
1996
"Cleanup function; run on exit"
2293
1997
service.cleanup()
2295
multiprocessing.active_children()
2296
if not (tcp_server.clients or client_settings):
2299
# Store client before exiting. Secrets are encrypted with key based
2300
# on what config file has. If config file is removed/edited, old
2301
# secret will thus be unrecovable.
2303
for client in tcp_server.clients.itervalues():
2304
client.encrypt_secret(client_settings[client.name]["secret"])
2308
# A list of attributes that will not be stored when shuting down.
2309
exclude = set(("bus", "changedstate", "secret"))
2310
for name, typ in inspect.getmembers(dbus.service.Object):
2313
client_dict["encrypted_secret"] = client.encrypted_secret
2314
for attr in client.client_structure:
2315
if attr not in exclude:
2316
client_dict[attr] = getattr(client, attr)
2318
clients.append(client_dict)
2319
del client_settings[client.name]["secret"]
2322
with os.fdopen(os.open(stored_state_path, os.O_CREAT|os.O_WRONLY|os.O_TRUNC, 0600), "wb") as stored_state:
2323
pickle.dump((clients, client_settings), stored_state)
2324
except IOError as e:
2325
logger.warning("Could not save persistant state: {0}".format(e))
2326
if e.errno != errno.ENOENT:
2329
# Delete all clients, and settings from config
2330
1999
while tcp_server.clients:
2331
name, client = tcp_server.clients.popitem()
2000
client = tcp_server.clients.pop()
2333
2002
client.remove_from_connection()
2003
client.disable_hook = None
2334
2004
# Don't signal anything except ClientRemoved
2335
2005
client.disable(quiet=True)
2337
2007
# Emit D-Bus signal
2338
mandos_dbus_service.ClientRemoved(client
2008
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2341
client_settings.clear()
2343
2011
atexit.register(cleanup)
2345
for client in tcp_server.clients.itervalues():
2013
for client in tcp_server.clients:
2347
2015
# Emit D-Bus signal
2348
2016
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2349
# Need to initiate checking of clients
2351
client.init_checker()
2354
2019
tcp_server.enable()
2355
2020
tcp_server.server_activate()