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
402
in self.__dict__.iterkeys()
403
if not attr.startswith("_")]
404
self.client_structure.append("client_structure")
407
for name, t in inspect.getmembers(type(self),
411
if not name.startswith("_"):
412
self.client_structure.append(name)
382
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
414
# Send notice to process children that client state has changed
415
384
def send_changedstate(self):
416
with self.changedstate:
417
self.changedstate.notify_all()
385
self.changedstate.acquire()
386
self.changedstate.notify_all()
387
self.changedstate.release()
419
389
def enable(self):
420
390
"""Start this client's checker and timeout hooks"""
421
391
if getattr(self, "enabled", False):
422
392
# Already enabled
424
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
425
401
self.expires = datetime.datetime.utcnow() + self.timeout
402
self.disable_initiator_tag = (gobject.timeout_add
403
(self.timeout_milliseconds(),
426
405
self.enabled = True
427
406
self.last_enabled = datetime.datetime.utcnow()
407
# Also start a new checker *right now*.
430
410
def disable(self, quiet=True):
431
411
"""Disable this client."""
443
423
gobject.source_remove(self.checker_initiator_tag)
444
424
self.checker_initiator_tag = None
445
425
self.stop_checker()
426
if self.disable_hook:
427
self.disable_hook(self)
446
428
self.enabled = False
447
429
# Do not run this again if called by a gobject.timeout_add
450
432
def __del__(self):
433
self.disable_hook = None
453
def init_checker(self):
454
# Schedule a new checker to be started an 'interval' from now,
455
# and every interval from then on.
456
self.checker_initiator_tag = (gobject.timeout_add
457
(self.interval_milliseconds(),
459
# Schedule a disable() when 'timeout' has passed
460
self.disable_initiator_tag = (gobject.timeout_add
461
(self.timeout_milliseconds(),
463
# Also start a new checker *right now*.
467
436
def checker_callback(self, pid, condition, command):
468
437
"""The checker has completed, so take appropriate actions."""
469
438
self.checker_callback_tag = None
470
439
self.checker = None
471
440
if os.WIFEXITED(condition):
472
self.last_checker_status = os.WEXITSTATUS(condition)
473
if self.last_checker_status == 0:
441
exitstatus = os.WEXITSTATUS(condition)
474
443
logger.info("Checker for %(name)s succeeded",
476
445
self.checked_ok()
491
459
if timeout is None:
492
460
timeout = self.timeout
493
461
self.last_checked_ok = datetime.datetime.utcnow()
494
if self.disable_initiator_tag is not None:
495
gobject.source_remove(self.disable_initiator_tag)
496
if getattr(self, "enabled", False):
497
self.disable_initiator_tag = (gobject.timeout_add
498
(_timedelta_to_milliseconds
499
(timeout), self.disable))
500
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),
502
468
def need_approval(self):
503
469
self.last_approval_request = datetime.datetime.utcnow()
596
562
self.checker = None
598
# Encrypts a client secret and stores it in a varible
600
def encrypt_secret(self, key):
601
# Encryption-key need to be of a specific size, so we hash
603
hasheng = hashlib.sha256()
605
encryptionkey = hasheng.digest()
607
# Create validation hash so we know at decryption if it was
609
hasheng = hashlib.sha256()
610
hasheng.update(self.secret)
611
validationhash = hasheng.digest()
614
iv = os.urandom(Crypto.Cipher.AES.block_size)
615
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
616
Crypto.Cipher.AES.MODE_CFB, iv)
617
ciphertext = ciphereng.encrypt(validationhash+self.secret)
618
self.encrypted_secret = (ciphertext, iv)
620
# Decrypt a encrypted client secret
621
def decrypt_secret(self, key):
622
# Decryption-key need to be of a specific size, so we hash
624
hasheng = hashlib.sha256()
626
encryptionkey = hasheng.digest()
628
# Decrypt encrypted secret
629
ciphertext, iv = self.encrypted_secret
630
ciphereng = Crypto.Cipher.AES.new(encryptionkey,
631
Crypto.Cipher.AES.MODE_CFB, iv)
632
plain = ciphereng.decrypt(ciphertext)
634
# Validate decrypted secret to know if it was succesful
635
hasheng = hashlib.sha256()
636
validationhash = plain[:hasheng.digest_size]
637
secret = plain[hasheng.digest_size:]
638
hasheng.update(secret)
640
# If validation fails, we use key as new secret. Otherwise, we
641
# use the decrypted secret
642
if hasheng.digest() == validationhash:
646
del self.encrypted_secret
649
564
def dbus_service_property(dbus_interface, signature="v",
650
565
access="readwrite", byte_arrays=False):
651
566
"""Decorators for marking methods of a DBusObjectWithProperties to
710
625
def _get_all_dbus_properties(self):
711
626
"""Returns a generator of (name, attribute) pairs
713
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
714
for cls in self.__class__.__mro__
628
return ((prop._dbus_name, prop)
715
629
for name, prop in
716
inspect.getmembers(cls, self._is_dbus_property))
630
inspect.getmembers(self, self._is_dbus_property))
718
632
def _get_dbus_property(self, interface_name, property_name):
719
633
"""Returns a bound method if one exists which is a D-Bus
720
634
property with the specified name and interface.
722
for cls in self.__class__.__mro__:
723
for name, value in (inspect.getmembers
724
(cls, self._is_dbus_property)):
725
if (value._dbus_name == property_name
726
and value._dbus_interface == interface_name):
727
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)):
729
646
# No such property
730
647
raise DBusPropertyNotFound(self.dbus_object_path + ":"
731
648
+ interface_name + "."
840
757
return dbus.String(dt.isoformat(),
841
758
variant_level=variant_level)
843
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
845
"""Applied to an empty subclass of a D-Bus object, this metaclass
846
will add additional D-Bus attributes matching a certain pattern.
848
def __new__(mcs, name, bases, attr):
849
# Go through all the base classes which could have D-Bus
850
# methods, signals, or properties in them
851
for base in (b for b in bases
852
if issubclass(b, dbus.service.Object)):
853
# Go though all attributes of the base class
854
for attrname, attribute in inspect.getmembers(base):
855
# Ignore non-D-Bus attributes, and D-Bus attributes
856
# with the wrong interface name
857
if (not hasattr(attribute, "_dbus_interface")
858
or not attribute._dbus_interface
859
.startswith("se.recompile.Mandos")):
861
# Create an alternate D-Bus interface name based on
863
alt_interface = (attribute._dbus_interface
864
.replace("se.recompile.Mandos",
865
"se.bsnet.fukt.Mandos"))
866
# Is this a D-Bus signal?
867
if getattr(attribute, "_dbus_is_signal", False):
868
# Extract the original non-method function by
870
nonmethod_func = (dict(
871
zip(attribute.func_code.co_freevars,
872
attribute.__closure__))["func"]
874
# Create a new, but exactly alike, function
875
# object, and decorate it to be a new D-Bus signal
876
# with the alternate D-Bus interface name
877
new_function = (dbus.service.signal
879
attribute._dbus_signature)
881
nonmethod_func.func_code,
882
nonmethod_func.func_globals,
883
nonmethod_func.func_name,
884
nonmethod_func.func_defaults,
885
nonmethod_func.func_closure)))
886
# Define a creator of a function to call both the
887
# old and new functions, so both the old and new
888
# signals gets sent when the function is called
889
def fixscope(func1, func2):
890
"""This function is a scope container to pass
891
func1 and func2 to the "call_both" function
892
outside of its arguments"""
893
def call_both(*args, **kwargs):
894
"""This function will emit two D-Bus
895
signals by calling func1 and func2"""
896
func1(*args, **kwargs)
897
func2(*args, **kwargs)
899
# Create the "call_both" function and add it to
901
attr[attrname] = fixscope(attribute,
903
# Is this a D-Bus method?
904
elif getattr(attribute, "_dbus_is_method", False):
905
# Create a new, but exactly alike, function
906
# object. Decorate it to be a new D-Bus method
907
# with the alternate D-Bus interface name. Add it
909
attr[attrname] = (dbus.service.method
911
attribute._dbus_in_signature,
912
attribute._dbus_out_signature)
914
(attribute.func_code,
915
attribute.func_globals,
917
attribute.func_defaults,
918
attribute.func_closure)))
919
# Is this a D-Bus property?
920
elif getattr(attribute, "_dbus_is_property", False):
921
# Create a new, but exactly alike, function
922
# object, and decorate it to be a new D-Bus
923
# property with the alternate D-Bus interface
924
# name. Add it to the class.
925
attr[attrname] = (dbus_service_property
927
attribute._dbus_signature,
928
attribute._dbus_access,
930
._dbus_get_args_options
933
(attribute.func_code,
934
attribute.func_globals,
936
attribute.func_defaults,
937
attribute.func_closure)))
938
return type.__new__(mcs, name, bases, attr)
940
760
class ClientDBus(Client, DBusObjectWithProperties):
941
761
"""A Client class using D-Bus
970
787
def notifychangeproperty(transform_func,
971
788
dbus_name, type_func=lambda x: x,
972
789
variant_level=1):
973
""" Modify a variable so that it's a property which announces
976
transform_fun: Function that takes a value and a variant_level
977
and transforms it to a D-Bus type.
978
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
979
795
type_func: Function that transform the value before sending it
980
to the D-Bus. Default: no transform
981
variant_level: D-Bus variant level. Default: 1
797
variant_level: DBus variant level. default: 1
983
attrname = "_{0}".format(dbus_name)
984
800
def setter(self, value):
801
old_value = real_value[0]
802
real_value[0] = value
985
803
if hasattr(self, "dbus_object_path"):
986
if (not hasattr(self, attrname) or
987
type_func(getattr(self, attrname, None))
988
!= type_func(value)):
989
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]),
992
807
self.PropertyChanged(dbus.String(dbus_name),
994
setattr(self, attrname, value)
996
return property(lambda self: getattr(self, attrname), setter)
810
return property(lambda self: real_value[0], setter)
999
813
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1000
814
approvals_pending = notifychangeproperty(dbus.Boolean,
1001
815
"ApprovalPending",
1004
818
last_enabled = notifychangeproperty(datetime_to_dbus,
1006
820
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1007
type_func = lambda checker:
1008
checker is not None)
821
type_func = lambda checker: checker is not None)
1009
822
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1010
823
"LastCheckedOK")
1011
last_approval_request = notifychangeproperty(
1012
datetime_to_dbus, "LastApprovalRequest")
824
last_approval_request = notifychangeproperty(datetime_to_dbus,
825
"LastApprovalRequest")
1013
826
approved_by_default = notifychangeproperty(dbus.Boolean,
1014
827
"ApprovedByDefault")
1015
approval_delay = notifychangeproperty(dbus.UInt16,
1018
_timedelta_to_milliseconds)
1019
approval_duration = notifychangeproperty(
1020
dbus.UInt16, "ApprovalDuration",
1021
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)
1022
832
host = notifychangeproperty(dbus.String, "Host")
1023
833
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
1025
_timedelta_to_milliseconds)
1026
extended_timeout = notifychangeproperty(
1027
dbus.UInt16, "ExtendedTimeout",
1028
type_func = _timedelta_to_milliseconds)
1029
interval = notifychangeproperty(dbus.UInt16,
1032
_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)
1033
839
checker_command = notifychangeproperty(dbus.String, "Checker")
1035
841
del notifychangeproperty
1381
1185
unicode(self.client_address))
1382
1186
logger.debug("Pipe FD: %d",
1383
1187
self.server.child_pipe.fileno())
1385
1189
session = (gnutls.connection
1386
1190
.ClientSession(self.request,
1387
1191
gnutls.connection
1388
1192
.X509Credentials()))
1390
1194
# Note: gnutls.connection.X509Credentials is really a
1391
1195
# generic GnuTLS certificate credentials object so long as
1392
1196
# no X.509 keys are added to it. Therefore, we can use it
1393
1197
# here despite using OpenPGP certificates.
1395
1199
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1396
1200
# "+AES-256-CBC", "+SHA1",
1397
1201
# "+COMP-NULL", "+CTYPE-OPENPGP",
1614
1413
This function creates a new pipe in self.pipe
1616
1415
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1618
proc = MultiprocessingMixIn.process_request(self, request,
1417
super(MultiprocessingMixInWithPipe,
1418
self).process_request(request, client_address)
1620
1419
self.child_pipe.close()
1621
self.add_pipe(parent_pipe, proc)
1623
def add_pipe(self, parent_pipe, proc):
1420
self.add_pipe(parent_pipe)
1422
def add_pipe(self, parent_pipe):
1624
1423
"""Dummy function; override as necessary"""
1625
1424
raise NotImplementedError
1628
1426
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1629
1427
socketserver.TCPServer, object):
1630
1428
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1714
1512
def server_activate(self):
1715
1513
if self.enabled:
1716
1514
return socketserver.TCPServer.server_activate(self)
1718
1515
def enable(self):
1719
1516
self.enabled = True
1721
def add_pipe(self, parent_pipe, proc):
1517
def add_pipe(self, parent_pipe):
1722
1518
# Call "handle_ipc" for both data and EOF events
1723
1519
gobject.io_add_watch(parent_pipe.fileno(),
1724
1520
gobject.IO_IN | gobject.IO_HUP,
1725
1521
functools.partial(self.handle_ipc,
1522
parent_pipe = parent_pipe))
1730
1524
def handle_ipc(self, source, condition, parent_pipe=None,
1731
proc = None, client_object=None):
1525
client_object=None):
1732
1526
condition_names = {
1733
1527
gobject.IO_IN: "IN", # There is data to read.
1734
1528
gobject.IO_OUT: "OUT", # Data can be written (without
1766
1558
"dress: %s", fpr, address)
1767
1559
if self.use_dbus:
1768
1560
# Emit D-Bus signal
1769
mandos_dbus_service.ClientNotFound(fpr,
1561
mandos_dbus_service.ClientNotFound(fpr, address[0])
1771
1562
parent_pipe.send(False)
1774
1565
gobject.io_add_watch(parent_pipe.fileno(),
1775
1566
gobject.IO_IN | gobject.IO_HUP,
1776
1567
functools.partial(self.handle_ipc,
1568
parent_pipe = parent_pipe,
1569
client_object = client))
1782
1570
parent_pipe.send(True)
1783
# 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
1786
1573
if command == 'funcall':
1787
1574
funcname = request[1]
1788
1575
args = request[2]
1789
1576
kwargs = request[3]
1791
parent_pipe.send(('data', getattr(client_object,
1578
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1795
1580
if command == 'getattr':
1796
1581
attrname = request[1]
1797
1582
if callable(client_object.__getattribute__(attrname)):
1798
1583
parent_pipe.send(('function',))
1800
parent_pipe.send(('data', client_object
1801
.__getattribute__(attrname)))
1585
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1803
1587
if command == 'setattr':
1804
1588
attrname = request[1]
1805
1589
value = request[2]
1806
1590
setattr(client_object, attrname, value)
2097
1877
# End of Avahi example code
2100
bus_name = dbus.service.BusName("se.recompile.Mandos",
1880
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2101
1881
bus, do_not_queue=True)
2102
old_bus_name = (dbus.service.BusName
2103
("se.bsnet.fukt.Mandos", bus,
2105
1882
except dbus.exceptions.NameExistsException as e:
2106
1883
logger.error(unicode(e) + ", disabling D-Bus")
2107
1884
use_dbus = False
2108
1885
server_settings["use_dbus"] = False
2109
1886
tcp_server.use_dbus = False
2110
1887
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2111
service = AvahiServiceToSyslog(name =
2112
server_settings["servicename"],
2113
servicetype = "_mandos._tcp",
2114
protocol = protocol, bus = bus)
1888
service = AvahiService(name = server_settings["servicename"],
1889
servicetype = "_mandos._tcp",
1890
protocol = protocol, bus = bus)
2115
1891
if server_settings["interface"]:
2116
1892
service.interface = (if_nametoindex
2117
1893
(str(server_settings["interface"])))
2122
1898
client_class = Client
2124
client_class = functools.partial(ClientDBusTransitional,
2127
special_settings = {
2128
# Some settings need to be accessd by special methods;
2129
# booleans need .getboolean(), etc. Here is a list of them:
2130
"approved_by_default":
2132
client_config.getboolean(section, "approved_by_default"),
2134
# Construct a new dict of client settings of this form:
2135
# { client_name: {setting_name: value, ...}, ...}
2136
# with exceptions for any special settings as defined above
2137
client_settings = dict((clientname,
2140
setting not in special_settings
2141
else special_settings[setting]
2144
in client_config.items(clientname)))
2145
for clientname in client_config.sections())
2147
old_client_settings = {}
2150
# Get client data and settings from last running state.
2151
if server_settings["restore"]:
2153
with open(stored_state_path, "rb") as stored_state:
2154
clients_data, old_client_settings = (
2155
pickle.load(stored_state))
2156
os.remove(stored_state_path)
2157
except IOError as e:
2158
logger.warning("Could not load persistant state: {0}"
2160
if e.errno != errno.ENOENT:
2163
for client in clients_data:
2164
client_name = client["name"]
2166
# Decide which value to use after restoring saved state.
2167
# We have three different values: Old config file,
2168
# new config file, and saved state.
2169
# New config value takes precedence if it differs from old
2170
# config value, otherwise use saved state.
2171
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):
2173
# For each value in new config, check if it differs
2174
# from the old config value (Except for the "secret"
2176
if (name != "secret" and
2177
value != old_client_settings[client_name][name]):
2178
setattr(client, name, value)
1909
yield (name, special_settings[name]())
2179
1910
except KeyError:
2182
# Clients who has passed its expire date, can still be enabled
2183
# if its last checker was sucessful. Clients who checkers
2184
# failed before we stored it state is asumed to had failed
2185
# checker during downtime.
2186
if client["enabled"] and client["last_checked_ok"]:
2187
if ((datetime.datetime.utcnow()
2188
- client["last_checked_ok"]) > client["interval"]):
2189
if client["last_checker_status"] != 0:
2190
client["enabled"] = False
2192
client["expires"] = (datetime.datetime.utcnow()
2193
+ client["timeout"])
2195
client["changedstate"] = (multiprocessing_manager
2196
.Condition(multiprocessing_manager
2199
new_client = ClientDBusTransitional.__new__(
2200
ClientDBusTransitional)
2201
tcp_server.clients[client_name] = new_client
2202
new_client.bus = bus
2203
for name, value in client.iteritems():
2204
setattr(new_client, name, value)
2205
new_client._approvals_pending = 0
2206
new_client.add_to_dbus()
2208
tcp_server.clients[client_name] = Client.__new__(Client)
2209
for name, value in client.iteritems():
2210
setattr(tcp_server.clients[client_name], name, value)
2212
tcp_server.clients[client_name].decrypt_secret(
2213
client_settings[client_name]["secret"])
2215
# Create/remove clients based on new changes made to config
2216
for clientname in set(old_client_settings) - set(client_settings):
2217
del tcp_server.clients[clientname]
2218
for clientname in set(client_settings) - set(old_client_settings):
2219
tcp_server.clients[clientname] = client_class(name
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()))
2225
1918
if not tcp_server.clients:
2226
1919
logger.warning("No clients defined")
2280
1972
return dbus.Dictionary(
2281
1973
((c.dbus_object_path, c.GetAll(""))
2282
for c in tcp_server.clients.itervalues()),
1974
for c in tcp_server.clients),
2283
1975
signature="oa{sv}")
2285
1977
@dbus.service.method(_interface, in_signature="o")
2286
1978
def RemoveClient(self, object_path):
2288
for c in tcp_server.clients.itervalues():
1980
for c in tcp_server.clients:
2289
1981
if c.dbus_object_path == object_path:
2290
del tcp_server.clients[c.name]
1982
tcp_server.clients.remove(c)
2291
1983
c.remove_from_connection()
2292
1984
# Don't signal anything except ClientRemoved
2293
1985
c.disable(quiet=True)
2301
class MandosDBusServiceTransitional(MandosDBusService):
2302
__metaclass__ = AlternateDBusNamesMetaclass
2303
mandos_dbus_service = MandosDBusServiceTransitional()
1993
mandos_dbus_service = MandosDBusService()
2306
1996
"Cleanup function; run on exit"
2307
1997
service.cleanup()
2309
multiprocessing.active_children()
2310
if not (tcp_server.clients or client_settings):
2313
# Store client before exiting. Secrets are encrypted with key
2314
# based on what config file has. If config file is
2315
# removed/edited, old secret will thus be unrecovable.
2317
for client in tcp_server.clients.itervalues():
2318
client.encrypt_secret(
2319
client_settings[client.name]["secret"])
2323
# A list of attributes that will not be stored when
2325
exclude = set(("bus", "changedstate", "secret"))
2326
for name, typ in inspect.getmembers(dbus.service.Object):
2329
client_dict["encrypted_secret"] = client.encrypted_secret
2330
for attr in client.client_structure:
2331
if attr not in exclude:
2332
client_dict[attr] = getattr(client, attr)
2334
clients.append(client_dict)
2335
del client_settings[client.name]["secret"]
2338
with os.fdopen(os.open(stored_state_path,
2339
os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2340
stat.S_IRUSR | stat.S_IWUSR),
2341
"wb") as stored_state:
2342
pickle.dump((clients, client_settings), stored_state)
2343
except IOError as e:
2344
logger.warning("Could not save persistant state: {0}"
2346
if e.errno != errno.ENOENT:
2349
# Delete all clients, and settings from config
2350
1999
while tcp_server.clients:
2351
name, client = tcp_server.clients.popitem()
2000
client = tcp_server.clients.pop()
2353
2002
client.remove_from_connection()
2003
client.disable_hook = None
2354
2004
# Don't signal anything except ClientRemoved
2355
2005
client.disable(quiet=True)
2357
2007
# Emit D-Bus signal
2358
mandos_dbus_service.ClientRemoved(client
2008
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2361
client_settings.clear()
2363
2011
atexit.register(cleanup)
2365
for client in tcp_server.clients.itervalues():
2013
for client in tcp_server.clients:
2367
2015
# Emit D-Bus signal
2368
2016
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2369
# Need to initiate checking of clients
2371
client.init_checker()
2374
2019
tcp_server.enable()
2375
2020
tcp_server.server_activate()