330
308
"host", "interval", "last_checked_ok",
331
309
"last_enabled", "name", "timeout")
312
def _timedelta_to_milliseconds(td):
313
"Convert a datetime.timedelta() to milliseconds"
314
return ((td.days * 24 * 60 * 60 * 1000)
315
+ (td.seconds * 1000)
316
+ (td.microseconds // 1000))
333
318
def timeout_milliseconds(self):
334
319
"Return the 'timeout' attribute in milliseconds"
335
return _timedelta_to_milliseconds(self.timeout)
320
return self._timedelta_to_milliseconds(self.timeout)
337
322
def extended_timeout_milliseconds(self):
338
323
"Return the 'extended_timeout' attribute in milliseconds"
339
return _timedelta_to_milliseconds(self.extended_timeout)
324
return self._timedelta_to_milliseconds(self.extended_timeout)
341
326
def interval_milliseconds(self):
342
327
"Return the 'interval' attribute in milliseconds"
343
return _timedelta_to_milliseconds(self.interval)
328
return self._timedelta_to_milliseconds(self.interval)
345
330
def approval_delay_milliseconds(self):
346
return _timedelta_to_milliseconds(self.approval_delay)
331
return self._timedelta_to_milliseconds(self.approval_delay)
348
def __init__(self, name = None, config=None):
333
def __init__(self, name = None, disable_hook=None, config=None):
349
334
"""Note: the 'checker' key in 'config' sets the
350
335
'checker_command' attribute and *not* the 'checker'
372
357
self.host = config.get("host", "")
373
358
self.created = datetime.datetime.utcnow()
375
360
self.last_approval_request = None
376
self.last_enabled = datetime.datetime.utcnow()
361
self.last_enabled = None
377
362
self.last_checked_ok = None
378
self.last_checker_status = None
379
363
self.timeout = string_to_delta(config["timeout"])
380
self.extended_timeout = string_to_delta(config
381
["extended_timeout"])
364
self.extended_timeout = string_to_delta(config["extended_timeout"])
382
365
self.interval = string_to_delta(config["interval"])
366
self.disable_hook = disable_hook
383
367
self.checker = None
384
368
self.checker_initiator_tag = None
385
369
self.disable_initiator_tag = None
386
self.expires = datetime.datetime.utcnow() + self.timeout
387
371
self.checker_callback_tag = None
388
372
self.checker_command = config["checker"]
389
373
self.current_checker_command = None
374
self.last_connect = None
390
375
self._approved = None
391
376
self.approved_by_default = config.get("approved_by_default",
395
380
config["approval_delay"])
396
381
self.approval_duration = string_to_delta(
397
382
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)
383
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
414
# Send notice to process children that client state has changed
415
385
def send_changedstate(self):
416
with self.changedstate:
417
self.changedstate.notify_all()
386
self.changedstate.acquire()
387
self.changedstate.notify_all()
388
self.changedstate.release()
419
390
def enable(self):
420
391
"""Start this client's checker and timeout hooks"""
421
392
if getattr(self, "enabled", False):
422
393
# Already enabled
424
395
self.send_changedstate()
396
self.last_enabled = datetime.datetime.utcnow()
397
# Schedule a new checker to be started an 'interval' from now,
398
# and every interval from then on.
399
self.checker_initiator_tag = (gobject.timeout_add
400
(self.interval_milliseconds(),
402
# Schedule a disable() when 'timeout' has passed
425
403
self.expires = datetime.datetime.utcnow() + self.timeout
404
self.disable_initiator_tag = (gobject.timeout_add
405
(self.timeout_milliseconds(),
426
407
self.enabled = True
427
self.last_enabled = datetime.datetime.utcnow()
408
# Also start a new checker *right now*.
430
411
def disable(self, quiet=True):
431
412
"""Disable this client."""
443
424
gobject.source_remove(self.checker_initiator_tag)
444
425
self.checker_initiator_tag = None
445
426
self.stop_checker()
427
if self.disable_hook:
428
self.disable_hook(self)
446
429
self.enabled = False
447
430
# Do not run this again if called by a gobject.timeout_add
450
433
def __del__(self):
434
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
437
def checker_callback(self, pid, condition, command):
468
438
"""The checker has completed, so take appropriate actions."""
469
439
self.checker_callback_tag = None
470
440
self.checker = None
471
441
if os.WIFEXITED(condition):
472
self.last_checker_status = os.WEXITSTATUS(condition)
473
if self.last_checker_status == 0:
442
exitstatus = os.WEXITSTATUS(condition)
474
444
logger.info("Checker for %(name)s succeeded",
476
446
self.checked_ok()
596
563
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
565
def dbus_service_property(dbus_interface, signature="v",
650
566
access="readwrite", byte_arrays=False):
651
567
"""Decorators for marking methods of a DBusObjectWithProperties to
710
626
def _get_all_dbus_properties(self):
711
627
"""Returns a generator of (name, attribute) pairs
713
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
714
for cls in self.__class__.__mro__
629
return ((prop._dbus_name, prop)
715
630
for name, prop in
716
inspect.getmembers(cls, self._is_dbus_property))
631
inspect.getmembers(self, self._is_dbus_property))
718
633
def _get_dbus_property(self, interface_name, property_name):
719
634
"""Returns a bound method if one exists which is a D-Bus
720
635
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)
637
for name in (property_name,
638
property_name + "_dbus_property"):
639
prop = getattr(self, name, None)
641
or not self._is_dbus_property(prop)
642
or prop._dbus_name != property_name
643
or (interface_name and prop._dbus_interface
644
and interface_name != prop._dbus_interface)):
729
647
# No such property
730
648
raise DBusPropertyNotFound(self.dbus_object_path + ":"
731
649
+ interface_name + "."
836
def datetime_to_dbus (dt, variant_level=0):
837
"""Convert a UTC datetime.datetime() to a D-Bus type."""
839
return dbus.String("", variant_level = variant_level)
840
return dbus.String(dt.isoformat(),
841
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
754
class ClientDBus(Client, DBusObjectWithProperties):
941
755
"""A Client class using D-Bus
966
777
("/clients/" + client_object_name))
967
778
DBusObjectWithProperties.__init__(self, self.bus,
968
779
self.dbus_object_path)
780
def _set_expires(self, value):
781
old_value = getattr(self, "_expires", None)
782
self._expires = value
783
if hasattr(self, "dbus_object_path") and old_value != value:
784
dbus_time = (self._datetime_to_dbus(self._expires,
786
self.PropertyChanged(dbus.String("Expires"),
788
expires = property(lambda self: self._expires, _set_expires)
970
def notifychangeproperty(transform_func,
971
dbus_name, type_func=lambda x: x,
973
""" Modify a variable so that it's a property which announces
791
def _get_approvals_pending(self):
792
return self._approvals_pending
793
def _set_approvals_pending(self, value):
794
old_value = self._approvals_pending
795
self._approvals_pending = value
797
if (hasattr(self, "dbus_object_path")
798
and bval is not bool(old_value)):
799
dbus_bool = dbus.Boolean(bval, variant_level=1)
800
self.PropertyChanged(dbus.String("ApprovalPending"),
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
979
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
983
attrname = "_{0}".format(dbus_name)
984
def setter(self, value):
985
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),
992
self.PropertyChanged(dbus.String(dbus_name),
994
setattr(self, attrname, value)
996
return property(lambda self: getattr(self, attrname), setter)
999
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1000
approvals_pending = notifychangeproperty(dbus.Boolean,
1003
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1004
last_enabled = notifychangeproperty(datetime_to_dbus,
1006
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1007
type_func = lambda checker:
1008
checker is not None)
1009
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1011
last_approval_request = notifychangeproperty(
1012
datetime_to_dbus, "LastApprovalRequest")
1013
approved_by_default = notifychangeproperty(dbus.Boolean,
1014
"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)
1022
host = notifychangeproperty(dbus.String, "Host")
1023
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)
1033
checker_command = notifychangeproperty(dbus.String, "Checker")
1035
del notifychangeproperty
803
approvals_pending = property(_get_approvals_pending,
804
_set_approvals_pending)
805
del _get_approvals_pending, _set_approvals_pending
808
def _datetime_to_dbus(dt, variant_level=0):
809
"""Convert a UTC datetime.datetime() to a D-Bus type."""
811
return dbus.String("", variant_level = variant_level)
812
return dbus.String(dt.isoformat(),
813
variant_level=variant_level)
816
oldstate = getattr(self, "enabled", False)
817
r = Client.enable(self)
818
if oldstate != self.enabled:
820
self.PropertyChanged(dbus.String("Enabled"),
821
dbus.Boolean(True, variant_level=1))
822
self.PropertyChanged(
823
dbus.String("LastEnabled"),
824
self._datetime_to_dbus(self.last_enabled,
828
def disable(self, quiet = False):
829
oldstate = getattr(self, "enabled", False)
830
r = Client.disable(self, quiet=quiet)
831
if not quiet and oldstate != self.enabled:
833
self.PropertyChanged(dbus.String("Enabled"),
834
dbus.Boolean(False, variant_level=1))
1037
837
def __del__(self, *args, **kwargs):
1062
865
return Client.checker_callback(self, pid, condition, command,
1063
866
*args, **kwargs)
868
def checked_ok(self, *args, **kwargs):
869
Client.checked_ok(self, *args, **kwargs)
871
self.PropertyChanged(
872
dbus.String("LastCheckedOK"),
873
(self._datetime_to_dbus(self.last_checked_ok,
876
def need_approval(self, *args, **kwargs):
877
r = Client.need_approval(self, *args, **kwargs)
879
self.PropertyChanged(
880
dbus.String("LastApprovalRequest"),
881
(self._datetime_to_dbus(self.last_approval_request,
1065
885
def start_checker(self, *args, **kwargs):
1066
886
old_checker = self.checker
1067
887
if self.checker is not None:
1188
1025
def ApprovalDelay_dbus_property(self, value=None):
1189
1026
if value is None: # get
1190
1027
return dbus.UInt64(self.approval_delay_milliseconds())
1028
old_value = self.approval_delay
1191
1029
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1031
if old_value != self.approval_delay:
1032
self.PropertyChanged(dbus.String("ApprovalDelay"),
1033
dbus.UInt64(value, variant_level=1))
1193
1035
# ApprovalDuration - property
1194
1036
@dbus_service_property(_interface, signature="t",
1195
1037
access="readwrite")
1196
1038
def ApprovalDuration_dbus_property(self, value=None):
1197
1039
if value is None: # get
1198
return dbus.UInt64(_timedelta_to_milliseconds(
1040
return dbus.UInt64(self._timedelta_to_milliseconds(
1199
1041
self.approval_duration))
1042
old_value = self.approval_duration
1200
1043
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1045
if old_value != self.approval_duration:
1046
self.PropertyChanged(dbus.String("ApprovalDuration"),
1047
dbus.UInt64(value, variant_level=1))
1202
1049
# Name - property
1203
1050
@dbus_service_property(_interface, signature="s", access="read")
1215
1062
def Host_dbus_property(self, value=None):
1216
1063
if value is None: # get
1217
1064
return dbus.String(self.host)
1065
old_value = self.host
1218
1066
self.host = value
1068
if old_value != self.host:
1069
self.PropertyChanged(dbus.String("Host"),
1070
dbus.String(value, variant_level=1))
1220
1072
# Created - property
1221
1073
@dbus_service_property(_interface, signature="s", access="read")
1222
1074
def Created_dbus_property(self):
1223
return dbus.String(datetime_to_dbus(self.created))
1075
return dbus.String(self._datetime_to_dbus(self.created))
1225
1077
# LastEnabled - property
1226
1078
@dbus_service_property(_interface, signature="s", access="read")
1227
1079
def LastEnabled_dbus_property(self):
1228
return datetime_to_dbus(self.last_enabled)
1080
return self._datetime_to_dbus(self.last_enabled)
1230
1082
# Enabled - property
1231
1083
@dbus_service_property(_interface, signature="b",
1263
1115
def Timeout_dbus_property(self, value=None):
1264
1116
if value is None: # get
1265
1117
return dbus.UInt64(self.timeout_milliseconds())
1118
old_value = self.timeout
1266
1119
self.timeout = datetime.timedelta(0, 0, 0, value)
1121
if old_value != self.timeout:
1122
self.PropertyChanged(dbus.String("Timeout"),
1123
dbus.UInt64(value, variant_level=1))
1267
1124
if getattr(self, "disable_initiator_tag", None) is None:
1269
1126
# Reschedule timeout
1270
1127
gobject.source_remove(self.disable_initiator_tag)
1271
1128
self.disable_initiator_tag = None
1272
1129
self.expires = None
1273
time_to_die = _timedelta_to_milliseconds((self
1130
time_to_die = (self.
1131
_timedelta_to_milliseconds((self
1278
1136
if time_to_die <= 0:
1279
1137
# The timeout has passed
1282
1140
self.expires = (datetime.datetime.utcnow()
1283
+ datetime.timedelta(milliseconds =
1141
+ datetime.timedelta(milliseconds = time_to_die))
1285
1142
self.disable_initiator_tag = (gobject.timeout_add
1286
1143
(time_to_die, self.disable))
1288
1145
# ExtendedTimeout - property
1289
1146
@dbus_service_property(_interface, signature="t",
1290
1147
access="readwrite")
1291
1148
def ExtendedTimeout_dbus_property(self, value=None):
1292
1149
if value is None: # get
1293
1150
return dbus.UInt64(self.extended_timeout_milliseconds())
1151
old_value = self.extended_timeout
1294
1152
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1154
if old_value != self.extended_timeout:
1155
self.PropertyChanged(dbus.String("ExtendedTimeout"),
1156
dbus.UInt64(value, variant_level=1))
1296
1158
# Interval - property
1297
1159
@dbus_service_property(_interface, signature="t",
1298
1160
access="readwrite")
1299
1161
def Interval_dbus_property(self, value=None):
1300
1162
if value is None: # get
1301
1163
return dbus.UInt64(self.interval_milliseconds())
1164
old_value = self.interval
1302
1165
self.interval = datetime.timedelta(0, 0, 0, value)
1167
if old_value != self.interval:
1168
self.PropertyChanged(dbus.String("Interval"),
1169
dbus.UInt64(value, variant_level=1))
1303
1170
if getattr(self, "checker_initiator_tag", None) is None:
1305
1172
# Reschedule checker run
1614
1480
This function creates a new pipe in self.pipe
1616
1482
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1618
proc = MultiprocessingMixIn.process_request(self, request,
1484
super(MultiprocessingMixInWithPipe,
1485
self).process_request(request, client_address)
1620
1486
self.child_pipe.close()
1621
self.add_pipe(parent_pipe, proc)
1623
def add_pipe(self, parent_pipe, proc):
1487
self.add_pipe(parent_pipe)
1489
def add_pipe(self, parent_pipe):
1624
1490
"""Dummy function; override as necessary"""
1625
1491
raise NotImplementedError
1628
1493
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1629
1494
socketserver.TCPServer, object):
1630
1495
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1714
1579
def server_activate(self):
1715
1580
if self.enabled:
1716
1581
return socketserver.TCPServer.server_activate(self)
1718
1582
def enable(self):
1719
1583
self.enabled = True
1721
def add_pipe(self, parent_pipe, proc):
1584
def add_pipe(self, parent_pipe):
1722
1585
# Call "handle_ipc" for both data and EOF events
1723
1586
gobject.io_add_watch(parent_pipe.fileno(),
1724
1587
gobject.IO_IN | gobject.IO_HUP,
1725
1588
functools.partial(self.handle_ipc,
1589
parent_pipe = parent_pipe))
1730
1591
def handle_ipc(self, source, condition, parent_pipe=None,
1731
proc = None, client_object=None):
1592
client_object=None):
1732
1593
condition_names = {
1733
1594
gobject.IO_IN: "IN", # There is data to read.
1734
1595
gobject.IO_OUT: "OUT", # Data can be written (without
1766
1625
"dress: %s", fpr, address)
1767
1626
if self.use_dbus:
1768
1627
# Emit D-Bus signal
1769
mandos_dbus_service.ClientNotFound(fpr,
1628
mandos_dbus_service.ClientNotFound(fpr, address[0])
1771
1629
parent_pipe.send(False)
1774
1632
gobject.io_add_watch(parent_pipe.fileno(),
1775
1633
gobject.IO_IN | gobject.IO_HUP,
1776
1634
functools.partial(self.handle_ipc,
1635
parent_pipe = parent_pipe,
1636
client_object = client))
1782
1637
parent_pipe.send(True)
1783
# remove the old hook in favor of the new above hook on
1638
# remove the old hook in favor of the new above hook on same fileno
1786
1640
if command == 'funcall':
1787
1641
funcname = request[1]
1788
1642
args = request[2]
1789
1643
kwargs = request[3]
1791
parent_pipe.send(('data', getattr(client_object,
1645
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1795
1647
if command == 'getattr':
1796
1648
attrname = request[1]
1797
1649
if callable(client_object.__getattribute__(attrname)):
1798
1650
parent_pipe.send(('function',))
1800
parent_pipe.send(('data', client_object
1801
.__getattribute__(attrname)))
1652
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1803
1654
if command == 'setattr':
1804
1655
attrname = request[1]
1805
1656
value = request[2]
1806
1657
setattr(client_object, attrname, value)
2097
1944
# End of Avahi example code
2100
bus_name = dbus.service.BusName("se.recompile.Mandos",
1947
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2101
1948
bus, do_not_queue=True)
2102
old_bus_name = (dbus.service.BusName
2103
("se.bsnet.fukt.Mandos", bus,
2105
1949
except dbus.exceptions.NameExistsException as e:
2106
1950
logger.error(unicode(e) + ", disabling D-Bus")
2107
1951
use_dbus = False
2108
1952
server_settings["use_dbus"] = False
2109
1953
tcp_server.use_dbus = False
2110
1954
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)
1955
service = AvahiService(name = server_settings["servicename"],
1956
servicetype = "_mandos._tcp",
1957
protocol = protocol, bus = bus)
2115
1958
if server_settings["interface"]:
2116
1959
service.interface = (if_nametoindex
2117
1960
(str(server_settings["interface"])))
2122
1965
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():
1967
client_class = functools.partial(ClientDBus, bus = bus)
1968
def client_config_items(config, section):
1969
special_settings = {
1970
"approved_by_default":
1971
lambda: config.getboolean(section,
1972
"approved_by_default"),
1974
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)
1976
yield (name, special_settings[name]())
2179
1977
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
1980
tcp_server.clients.update(set(
1981
client_class(name = section,
1982
config= dict(client_config_items(
1983
client_config, section)))
1984
for section in client_config.sections()))
2225
1985
if not tcp_server.clients:
2226
1986
logger.warning("No clients defined")
2301
class MandosDBusServiceTransitional(MandosDBusService):
2302
__metaclass__ = AlternateDBusNamesMetaclass
2303
mandos_dbus_service = MandosDBusServiceTransitional()
2060
mandos_dbus_service = MandosDBusService()
2306
2063
"Cleanup function; run on exit"
2307
2064
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
2066
while tcp_server.clients:
2351
name, client = tcp_server.clients.popitem()
2067
client = tcp_server.clients.pop()
2353
2069
client.remove_from_connection()
2070
client.disable_hook = None
2354
2071
# Don't signal anything except ClientRemoved
2355
2072
client.disable(quiet=True)
2357
2074
# Emit D-Bus signal
2358
mandos_dbus_service.ClientRemoved(client
2075
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2361
client_settings.clear()
2363
2078
atexit.register(cleanup)
2365
for client in tcp_server.clients.itervalues():
2080
for client in tcp_server.clients:
2367
2082
# Emit D-Bus signal
2368
2083
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2369
# Need to initiate checking of clients
2371
client.init_checker()
2374
2086
tcp_server.enable()
2375
2087
tcp_server.server_activate()