189
171
def password_encode(self, password):
190
172
# Passphrase can not be empty and can not contain newlines or
191
173
# NUL bytes. So we prefix it and hex encode it.
192
encoded = b"mandos" + binascii.hexlify(password)
193
if len(encoded) > 2048:
194
# GnuPG can't handle long passwords, so encode differently
195
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
.replace(b"\n", b"\\n")
197
.replace(b"\0", b"\\x00"))
174
return b"mandos" + binascii.hexlify(password)
200
176
def encrypt(self, data, password):
201
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
204
passfile.write(passphrase)
206
proc = subprocess.Popen(['gpg', '--symmetric',
210
stdin = subprocess.PIPE,
211
stdout = subprocess.PIPE,
212
stderr = subprocess.PIPE)
213
ciphertext, err = proc.communicate(input = data)
214
if proc.returncode != 0:
177
self.gnupg.passphrase = self.password_encode(password)
178
with open(os.devnull) as devnull:
180
proc = self.gnupg.run(['--symmetric'],
181
create_fhs=['stdin', 'stdout'],
182
attach_fhs={'stderr': devnull})
183
with contextlib.closing(proc.handles['stdin']) as f:
185
with contextlib.closing(proc.handles['stdout']) as f:
186
ciphertext = f.read()
190
self.gnupg.passphrase = None
216
191
return ciphertext
218
193
def decrypt(self, data, password):
219
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
222
passfile.write(passphrase)
224
proc = subprocess.Popen(['gpg', '--decrypt',
228
stdin = subprocess.PIPE,
229
stdout = subprocess.PIPE,
230
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
232
if proc.returncode != 0:
194
self.gnupg.passphrase = self.password_encode(password)
195
with open(os.devnull) as devnull:
197
proc = self.gnupg.run(['--decrypt'],
198
create_fhs=['stdin', 'stdout'],
199
attach_fhs={'stderr': devnull})
200
with contextlib.closing(proc.handles['stdin'] ) as f:
202
with contextlib.closing(proc.handles['stdout']) as f:
203
decrypted_plaintext = f.read()
207
self.gnupg.passphrase = None
234
208
return decrypted_plaintext
237
212
class AvahiError(Exception):
238
213
def __init__(self, value, *args, **kwargs):
239
214
self.value = value
240
return super(AvahiError, self).__init__(value, *args,
215
super(AvahiError, self).__init__(value, *args, **kwargs)
216
def __unicode__(self):
217
return unicode(repr(self.value))
244
219
class AvahiServiceError(AvahiError):
248
222
class AvahiGroupError(AvahiError):
475
415
last_checked_ok: datetime.datetime(); (UTC) or None
476
416
last_checker_status: integer between 0 and 255 reflecting exit
477
417
status of last checker. -1 reflects crashed
478
checker, -2 means no checker completed yet.
479
last_checker_signal: The signal which killed the last checker, if
480
last_checker_status is -1
481
419
last_enabled: datetime.datetime(); (UTC) or None
482
420
name: string; from the config file, used in log messages and
483
421
D-Bus identifiers
484
422
secret: bytestring; sent verbatim (over TLS) to client
485
423
timeout: datetime.timedelta(); How long from last_checked_ok
486
424
until this client is disabled
487
extended_timeout: extra long timeout when secret has been sent
425
extended_timeout: extra long timeout when password has been sent
488
426
runtime_expansions: Allowed attributes for runtime expansion.
489
427
expires: datetime.datetime(); time (UTC) when a client will be
490
428
disabled, or None
491
server_settings: The server_settings dict from main()
494
431
runtime_expansions = ("approval_delay", "approval_duration",
495
"created", "enabled", "expires",
496
"fingerprint", "host", "interval",
497
"last_approval_request", "last_checked_ok",
432
"created", "enabled", "fingerprint",
433
"host", "interval", "last_checked_ok",
498
434
"last_enabled", "name", "timeout")
501
"extended_timeout": "PT15M",
503
"checker": "fping -q -- %%(host)s",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
435
client_defaults = { "timeout": "5m",
436
"extended_timeout": "15m",
438
"checker": "fping -q -- %%(host)s",
440
"approval_delay": "0s",
441
"approval_duration": "1s",
442
"approved_by_default": "True",
446
def timeout_milliseconds(self):
447
"Return the 'timeout' attribute in milliseconds"
448
return timedelta_to_milliseconds(self.timeout)
450
def extended_timeout_milliseconds(self):
451
"Return the 'extended_timeout' attribute in milliseconds"
452
return timedelta_to_milliseconds(self.extended_timeout)
454
def interval_milliseconds(self):
455
"Return the 'interval' attribute in milliseconds"
456
return timedelta_to_milliseconds(self.interval)
458
def approval_delay_milliseconds(self):
459
return timedelta_to_milliseconds(self.approval_delay)
512
462
def config_parser(config):
513
463
"""Construct a new dict of client settings of this form:
644
598
def init_checker(self):
645
599
# Schedule a new checker to be started an 'interval' from now,
646
600
# and every interval from then on.
647
if self.checker_initiator_tag is not None:
648
gobject.source_remove(self.checker_initiator_tag)
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
601
self.checker_initiator_tag = (gobject.timeout_add
602
(self.interval_milliseconds(),
652
604
# Schedule a disable() when 'timeout' has passed
653
if self.disable_initiator_tag is not None:
654
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
605
self.disable_initiator_tag = (gobject.timeout_add
606
(self.timeout_milliseconds(),
657
608
# Also start a new checker *right now*.
658
609
self.start_checker()
660
def checker_callback(self, source, condition, connection,
611
def checker_callback(self, pid, condition, command):
662
612
"""The checker has completed, so take appropriate actions."""
663
613
self.checker_callback_tag = None
664
614
self.checker = None
665
# Read return code from connection (see call_pipe)
666
returncode = connection.recv()
670
self.last_checker_status = returncode
671
self.last_checker_signal = None
615
if os.WIFEXITED(condition):
616
self.last_checker_status = os.WEXITSTATUS(condition)
672
617
if self.last_checker_status == 0:
673
618
logger.info("Checker for %(name)s succeeded",
675
620
self.checked_ok()
677
logger.info("Checker for %(name)s failed", vars(self))
622
logger.info("Checker for %(name)s failed",
679
625
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
681
626
logger.warning("Checker for %(name)s crashed?",
685
def checked_ok(self):
686
"""Assert that the client has been seen, alive and well."""
687
self.last_checked_ok = datetime.datetime.utcnow()
688
self.last_checker_status = 0
689
self.last_checker_signal = None
692
def bump_timeout(self, timeout=None):
693
"""Bump up the timeout for this client."""
629
def checked_ok(self, timeout=None):
630
"""Bump up the timeout for this client.
632
This should only be called when the client has been seen,
694
635
if timeout is None:
695
636
timeout = self.timeout
637
self.last_checked_ok = datetime.datetime.utcnow()
696
638
if self.disable_initiator_tag is not None:
697
639
gobject.source_remove(self.disable_initiator_tag)
698
self.disable_initiator_tag = None
699
640
if getattr(self, "enabled", False):
700
self.disable_initiator_tag = gobject.timeout_add(
701
int(timeout.total_seconds() * 1000), self.disable)
641
self.disable_initiator_tag = (gobject.timeout_add
642
(timedelta_to_milliseconds
643
(timeout), self.disable))
702
644
self.expires = datetime.datetime.utcnow() + timeout
704
646
def need_approval(self):
710
652
If a checker already exists, leave it running and do
712
654
# The reason for not killing a running checker is that if we
713
# did that, and if a checker (for some reason) started running
714
# slowly and taking more than 'interval' time, then the client
715
# would inevitably timeout, since no checker would get a
716
# chance to run to completion. If we instead leave running
655
# did that, then if a checker (for some reason) started
656
# running slowly and taking more than 'interval' time, the
657
# client would inevitably timeout, since no checker would get
658
# a chance to run to completion. If we instead leave running
717
659
# checkers alone, the checker would have to take more time
718
660
# than 'timeout' for the client to be disabled, which is as it
721
if self.checker is not None and not self.checker.is_alive():
722
logger.warning("Checker was not alive; joining")
663
# If a checker exists, make sure it is not a zombie
665
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
666
except (AttributeError, OSError) as error:
667
if (isinstance(error, OSError)
668
and error.errno != errno.ECHILD):
672
logger.warning("Checker was a zombie")
673
gobject.source_remove(self.checker_callback_tag)
674
self.checker_callback(pid, status,
675
self.current_checker_command)
725
676
# Start a new checker if needed
726
677
if self.checker is None:
727
# Escape attributes for the shell
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
732
command = self.checker_command % escaped_attrs
733
except TypeError as error:
734
logger.error('Could not format string "%s"',
735
self.checker_command,
737
return True # Try again later
679
# In case checker_command has exactly one % operator
680
command = self.checker_command % self.host
682
# Escape attributes for the shell
683
escaped_attrs = dict(
685
re.escape(unicode(str(getattr(self, attr, "")),
689
self.runtime_expansions)
692
command = self.checker_command % escaped_attrs
693
except TypeError as error:
694
logger.error('Could not format string "%s":'
695
' %s', self.checker_command, error)
696
return True # Try again later
738
697
self.current_checker_command = command
739
logger.info("Starting checker %r for %s", command,
741
# We don't need to redirect stdout and stderr, since
742
# in normal mode, that is already done by daemon(),
743
# and in debug mode we don't want to. (Stdin is
744
# always replaced by /dev/null.)
745
# The exception is when not debugging but nevertheless
746
# running in the foreground; use the previously
748
popen_args = { "close_fds": True,
751
if (not self.server_settings["debug"]
752
and self.server_settings["foreground"]):
753
popen_args.update({"stdout": wnull,
755
pipe = multiprocessing.Pipe(duplex = False)
756
self.checker = multiprocessing.Process(
758
args = (pipe[1], subprocess.call, command),
761
self.checker_callback_tag = gobject.io_add_watch(
762
pipe[0].fileno(), gobject.IO_IN,
763
self.checker_callback, pipe[0], command)
699
logger.info("Starting checker %r for %s",
701
# We don't need to redirect stdout and stderr, since
702
# in normal mode, that is already done by daemon(),
703
# and in debug mode we don't want to. (Stdin is
704
# always replaced by /dev/null.)
705
self.checker = subprocess.Popen(command,
708
self.checker_callback_tag = (gobject.child_watch_add
710
self.checker_callback,
712
# The checker may have completed before the gobject
713
# watch was added. Check for this.
714
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
716
gobject.source_remove(self.checker_callback_tag)
717
self.checker_callback(pid, status, command)
718
except OSError as error:
719
logger.error("Failed to start subprocess: %s",
764
721
# Re-run this periodically if run by gobject.timeout_add
881
def _is_dbus_thing(thing):
882
"""Returns a function testing if an attribute is a D-Bus thing
884
If called like _is_dbus_thing("method") it returns a function
885
suitable for use as predicate to inspect.getmembers().
887
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
801
def _is_dbus_property(obj):
802
return getattr(obj, "_dbus_is_property", False)
890
def _get_all_dbus_things(self, thing):
804
def _get_all_dbus_properties(self):
891
805
"""Returns a generator of (name, attribute) pairs
893
return ((getattr(athing.__get__(self), "_dbus_name", name),
894
athing.__get__(self))
807
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
895
808
for cls in self.__class__.__mro__
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
810
inspect.getmembers(cls, self._is_dbus_property))
899
812
def _get_dbus_property(self, interface_name, property_name):
900
813
"""Returns a bound method if one exists which is a D-Bus
901
814
property with the specified name and interface.
903
for cls in self.__class__.__mro__:
904
for name, value in inspect.getmembers(
905
cls, self._is_dbus_thing("property")):
816
for cls in self.__class__.__mro__:
817
for name, value in (inspect.getmembers
818
(cls, self._is_dbus_property)):
906
819
if (value._dbus_name == property_name
907
820
and value._dbus_interface == interface_name):
908
821
return value.__get__(self)
910
823
# No such property
911
raise DBusPropertyNotFound("{}:{}.{}".format(
912
self.dbus_object_path, interface_name, property_name))
824
raise DBusPropertyNotFound(self.dbus_object_path + ":"
825
+ interface_name + "."
914
@dbus.service.method(dbus.PROPERTIES_IFACE,
828
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
916
829
out_signature="v")
917
830
def Get(self, interface_name, property_name):
918
831
"""Standard D-Bus property Get() method, see D-Bus standard.
965
875
if not hasattr(value, "variant_level"):
966
876
properties[name] = value
968
properties[name] = type(value)(
969
value, variant_level = value.variant_level + 1)
878
properties[name] = type(value)(value, variant_level=
879
value.variant_level+1)
970
880
return dbus.Dictionary(properties, signature="sv")
972
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
973
def PropertiesChanged(self, interface_name, changed_properties,
974
invalidated_properties):
975
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
980
882
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
981
883
out_signature="s",
982
884
path_keyword='object_path',
983
885
connection_keyword='connection')
984
886
def Introspect(self, object_path, connection):
985
"""Overloading of standard D-Bus method.
987
Inserts property tags and interface annotation tags.
887
"""Standard D-Bus method, overloaded to insert property tags.
989
889
xmlstring = dbus.service.Object.Introspect(self, object_path,
992
892
document = xml.dom.minidom.parseString(xmlstring)
994
893
def make_tag(document, name, prop):
995
894
e = document.createElement("property")
996
895
e.setAttribute("name", name)
997
896
e.setAttribute("type", prop._dbus_signature)
998
897
e.setAttribute("access", prop._dbus_access)
1001
899
for if_tag in document.getElementsByTagName("interface"):
1003
900
for tag in (make_tag(document, name, prop)
1005
in self._get_all_dbus_things("property")
902
in self._get_all_dbus_properties()
1006
903
if prop._dbus_interface
1007
904
== if_tag.getAttribute("name")):
1008
905
if_tag.appendChild(tag)
1009
# Add annotation tags
1010
for typ in ("method", "signal", "property"):
1011
for tag in if_tag.getElementsByTagName(typ):
1013
for name, prop in (self.
1014
_get_all_dbus_things(typ)):
1015
if (name == tag.getAttribute("name")
1016
and prop._dbus_interface
1017
== if_tag.getAttribute("name")):
1018
annots.update(getattr(
1019
prop, "_dbus_annotations", {}))
1020
for name, value in annots.items():
1021
ann_tag = document.createElement(
1023
ann_tag.setAttribute("name", name)
1024
ann_tag.setAttribute("value", value)
1025
tag.appendChild(ann_tag)
1026
# Add interface annotation tags
1027
for annotation, value in dict(
1028
itertools.chain.from_iterable(
1029
annotations().items()
1030
for name, annotations
1031
in self._get_all_dbus_things("interface")
1032
if name == if_tag.getAttribute("name")
1034
ann_tag = document.createElement("annotation")
1035
ann_tag.setAttribute("name", annotation)
1036
ann_tag.setAttribute("value", value)
1037
if_tag.appendChild(ann_tag)
1038
906
# Add the names to the return values for the
1039
907
# "org.freedesktop.DBus.Properties" methods
1040
908
if (if_tag.getAttribute("name")
1055
923
except (AttributeError, xml.dom.DOMException,
1056
924
xml.parsers.expat.ExpatError) as error:
1057
925
logger.error("Failed to override Introspection method",
1059
927
return xmlstring
1062
def datetime_to_dbus(dt, variant_level=0):
930
def datetime_to_dbus (dt, variant_level=0):
1063
931
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1065
933
return dbus.String("", variant_level = variant_level)
1066
return dbus.String(dt.isoformat(), variant_level=variant_level)
1069
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1070
"""A class decorator; applied to a subclass of
1071
dbus.service.Object, it will add alternate D-Bus attributes with
1072
interface names according to the "alt_interface_names" mapping.
1075
@alternate_dbus_interfaces({"org.example.Interface":
1076
"net.example.AlternateInterface"})
1077
class SampleDBusObject(dbus.service.Object):
1078
@dbus.service.method("org.example.Interface")
1079
def SampleDBusMethod():
1082
The above "SampleDBusMethod" on "SampleDBusObject" will be
1083
reachable via two interfaces: "org.example.Interface" and
1084
"net.example.AlternateInterface", the latter of which will have
1085
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1086
"true", unless "deprecate" is passed with a False value.
1088
This works for methods and signals, and also for D-Bus properties
1089
(from DBusObjectWithProperties) and interfaces (from the
1090
dbus_interface_annotations decorator).
934
return dbus.String(dt.isoformat(),
935
variant_level=variant_level)
938
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
940
"""Applied to an empty subclass of a D-Bus object, this metaclass
941
will add additional D-Bus attributes matching a certain pattern.
1094
for orig_interface_name, alt_interface_name in (
1095
alt_interface_names.items()):
1097
interface_names = set()
1098
# Go though all attributes of the class
1099
for attrname, attribute in inspect.getmembers(cls):
943
def __new__(mcs, name, bases, attr):
944
# Go through all the base classes which could have D-Bus
945
# methods, signals, or properties in them
946
for base in (b for b in bases
947
if issubclass(b, dbus.service.Object)):
948
# Go though all attributes of the base class
949
for attrname, attribute in inspect.getmembers(base):
1100
950
# Ignore non-D-Bus attributes, and D-Bus attributes
1101
951
# with the wrong interface name
1102
952
if (not hasattr(attribute, "_dbus_interface")
1103
or not attribute._dbus_interface.startswith(
1104
orig_interface_name)):
953
or not attribute._dbus_interface
954
.startswith("se.recompile.Mandos")):
1106
956
# Create an alternate D-Bus interface name based on
1107
957
# the current name
1108
alt_interface = attribute._dbus_interface.replace(
1109
orig_interface_name, alt_interface_name)
1110
interface_names.add(alt_interface)
958
alt_interface = (attribute._dbus_interface
959
.replace("se.recompile.Mandos",
960
"se.bsnet.fukt.Mandos"))
1111
961
# Is this a D-Bus signal?
1112
962
if getattr(attribute, "_dbus_is_signal", False):
1113
if sys.version_info.major == 2:
1114
# Extract the original non-method undecorated
1115
# function by black magic
1116
nonmethod_func = (dict(
963
# Extract the original non-method function by
965
nonmethod_func = (dict(
1117
966
zip(attribute.func_code.co_freevars,
1118
attribute.__closure__))
1119
["func"].cell_contents)
1121
nonmethod_func = attribute
967
attribute.__closure__))["func"]
1122
969
# Create a new, but exactly alike, function
1123
970
# object, and decorate it to be a new D-Bus signal
1124
971
# with the alternate D-Bus interface name
1125
if sys.version_info.major == 2:
1126
new_function = types.FunctionType(
1127
nonmethod_func.func_code,
1128
nonmethod_func.func_globals,
1129
nonmethod_func.func_name,
1130
nonmethod_func.func_defaults,
1131
nonmethod_func.func_closure)
1133
new_function = types.FunctionType(
1134
nonmethod_func.__code__,
1135
nonmethod_func.__globals__,
1136
nonmethod_func.__name__,
1137
nonmethod_func.__defaults__,
1138
nonmethod_func.__closure__)
1139
new_function = (dbus.service.signal(
1141
attribute._dbus_signature)(new_function))
1142
# Copy annotations, if any
1144
new_function._dbus_annotations = dict(
1145
attribute._dbus_annotations)
1146
except AttributeError:
972
new_function = (dbus.service.signal
974
attribute._dbus_signature)
976
nonmethod_func.func_code,
977
nonmethod_func.func_globals,
978
nonmethod_func.func_name,
979
nonmethod_func.func_defaults,
980
nonmethod_func.func_closure)))
1148
981
# Define a creator of a function to call both the
1149
# original and alternate functions, so both the
1150
# original and alternate signals gets sent when
1151
# the function is called
982
# old and new functions, so both the old and new
983
# signals gets sent when the function is called
1152
984
def fixscope(func1, func2):
1153
985
"""This function is a scope container to pass
1154
986
func1 and func2 to the "call_both" function
1155
987
outside of its arguments"""
1157
988
def call_both(*args, **kwargs):
1158
989
"""This function will emit two D-Bus
1159
990
signals by calling func1 and func2"""
1160
991
func1(*args, **kwargs)
1161
992
func2(*args, **kwargs)
1163
993
return call_both
1164
994
# Create the "call_both" function and add it to
1166
attr[attrname] = fixscope(attribute, new_function)
996
attr[attrname] = fixscope(attribute,
1167
998
# Is this a D-Bus method?
1168
999
elif getattr(attribute, "_dbus_is_method", False):
1169
1000
# Create a new, but exactly alike, function
1170
1001
# object. Decorate it to be a new D-Bus method
1171
1002
# with the alternate D-Bus interface name. Add it
1172
1003
# to the class.
1174
dbus.service.method(
1176
attribute._dbus_in_signature,
1177
attribute._dbus_out_signature)
1178
(types.FunctionType(attribute.func_code,
1179
attribute.func_globals,
1180
attribute.func_name,
1181
attribute.func_defaults,
1182
attribute.func_closure)))
1183
# Copy annotations, if any
1185
attr[attrname]._dbus_annotations = dict(
1186
attribute._dbus_annotations)
1187
except AttributeError:
1004
attr[attrname] = (dbus.service.method
1006
attribute._dbus_in_signature,
1007
attribute._dbus_out_signature)
1009
(attribute.func_code,
1010
attribute.func_globals,
1011
attribute.func_name,
1012
attribute.func_defaults,
1013
attribute.func_closure)))
1189
1014
# Is this a D-Bus property?
1190
1015
elif getattr(attribute, "_dbus_is_property", False):
1191
1016
# Create a new, but exactly alike, function
1192
1017
# object, and decorate it to be a new D-Bus
1193
1018
# property with the alternate D-Bus interface
1194
1019
# name. Add it to the class.
1195
attr[attrname] = (dbus_service_property(
1196
alt_interface, attribute._dbus_signature,
1197
attribute._dbus_access,
1198
attribute._dbus_get_args_options
1200
(types.FunctionType(
1201
attribute.func_code,
1202
attribute.func_globals,
1203
attribute.func_name,
1204
attribute.func_defaults,
1205
attribute.func_closure)))
1206
# Copy annotations, if any
1208
attr[attrname]._dbus_annotations = dict(
1209
attribute._dbus_annotations)
1210
except AttributeError:
1212
# Is this a D-Bus interface?
1213
elif getattr(attribute, "_dbus_is_interface", False):
1214
# Create a new, but exactly alike, function
1215
# object. Decorate it to be a new D-Bus interface
1216
# with the alternate D-Bus interface name. Add it
1219
dbus_interface_annotations(alt_interface)
1220
(types.FunctionType(attribute.func_code,
1221
attribute.func_globals,
1222
attribute.func_name,
1223
attribute.func_defaults,
1224
attribute.func_closure)))
1226
# Deprecate all alternate interfaces
1227
iname="_AlternateDBusNames_interface_annotation{}"
1228
for interface_name in interface_names:
1230
@dbus_interface_annotations(interface_name)
1232
return { "org.freedesktop.DBus.Deprecated":
1234
# Find an unused name
1235
for aname in (iname.format(i)
1236
for i in itertools.count()):
1237
if aname not in attr:
1241
# Replace the class with a new subclass of it with
1242
# methods, signals, etc. as created above.
1243
cls = type(b"{}Alternate".format(cls.__name__),
1250
@alternate_dbus_interfaces({"se.recompile.Mandos":
1251
"se.bsnet.fukt.Mandos"})
1020
attr[attrname] = (dbus_service_property
1022
attribute._dbus_signature,
1023
attribute._dbus_access,
1025
._dbus_get_args_options
1028
(attribute.func_code,
1029
attribute.func_globals,
1030
attribute.func_name,
1031
attribute.func_defaults,
1032
attribute.func_closure)))
1033
return type.__new__(mcs, name, bases, attr)
1252
1036
class ClientDBus(Client, DBusObjectWithProperties):
1253
1037
"""A Client class using D-Bus
1325
1098
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1326
1099
last_enabled = notifychangeproperty(datetime_to_dbus,
1328
checker = notifychangeproperty(
1329
dbus.Boolean, "CheckerRunning",
1330
type_func = lambda checker: checker is not None)
1101
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1102
type_func = lambda checker:
1103
checker is not None)
1331
1104
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1332
1105
"LastCheckedOK")
1333
last_checker_status = notifychangeproperty(dbus.Int16,
1334
"LastCheckerStatus")
1335
1106
last_approval_request = notifychangeproperty(
1336
1107
datetime_to_dbus, "LastApprovalRequest")
1337
1108
approved_by_default = notifychangeproperty(dbus.Boolean,
1338
1109
"ApprovedByDefault")
1339
approval_delay = notifychangeproperty(
1340
dbus.UInt64, "ApprovalDelay",
1341
type_func = lambda td: td.total_seconds() * 1000)
1110
approval_delay = notifychangeproperty(dbus.UInt64,
1113
timedelta_to_milliseconds)
1342
1114
approval_duration = notifychangeproperty(
1343
1115
dbus.UInt64, "ApprovalDuration",
1344
type_func = lambda td: td.total_seconds() * 1000)
1116
type_func = timedelta_to_milliseconds)
1345
1117
host = notifychangeproperty(dbus.String, "Host")
1346
timeout = notifychangeproperty(
1347
dbus.UInt64, "Timeout",
1348
type_func = lambda td: td.total_seconds() * 1000)
1118
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1120
timedelta_to_milliseconds)
1349
1121
extended_timeout = notifychangeproperty(
1350
1122
dbus.UInt64, "ExtendedTimeout",
1351
type_func = lambda td: td.total_seconds() * 1000)
1352
interval = notifychangeproperty(
1353
dbus.UInt64, "Interval",
1354
type_func = lambda td: td.total_seconds() * 1000)
1123
type_func = timedelta_to_milliseconds)
1124
interval = notifychangeproperty(dbus.UInt64,
1127
timedelta_to_milliseconds)
1355
1128
checker_command = notifychangeproperty(dbus.String, "Checker")
1356
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1357
invalidate_only=True)
1359
1130
del notifychangeproperty
1367
1138
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1368
1139
Client.__del__(self, *args, **kwargs)
1370
def checker_callback(self, source, condition,
1371
connection, command, *args, **kwargs):
1372
ret = Client.checker_callback(self, source, condition,
1373
connection, command, *args,
1375
exitstatus = self.last_checker_status
1141
def checker_callback(self, pid, condition, command,
1143
self.checker_callback_tag = None
1145
if os.WIFEXITED(condition):
1146
exitstatus = os.WEXITSTATUS(condition)
1377
1147
# Emit D-Bus signal
1378
1148
self.CheckerCompleted(dbus.Int16(exitstatus),
1149
dbus.Int64(condition),
1380
1150
dbus.String(command))
1382
1152
# Emit D-Bus signal
1383
1153
self.CheckerCompleted(dbus.Int16(-1),
1385
self.last_checker_signal),
1154
dbus.Int64(condition),
1386
1155
dbus.String(command))
1157
return Client.checker_callback(self, pid, condition, command,
1389
1160
def start_checker(self, *args, **kwargs):
1390
old_checker_pid = getattr(self.checker, "pid", None)
1161
old_checker = self.checker
1162
if self.checker is not None:
1163
old_checker_pid = self.checker.pid
1165
old_checker_pid = None
1391
1166
r = Client.start_checker(self, *args, **kwargs)
1392
1167
# Only if new checker process was started
1393
1168
if (self.checker is not None
1504
1286
self.approved_by_default = bool(value)
1506
1288
# ApprovalDelay - property
1507
@dbus_service_property(_interface,
1289
@dbus_service_property(_interface, signature="t",
1509
1290
access="readwrite")
1510
1291
def ApprovalDelay_dbus_property(self, value=None):
1511
1292
if value is None: # get
1512
return dbus.UInt64(self.approval_delay.total_seconds()
1293
return dbus.UInt64(self.approval_delay_milliseconds())
1514
1294
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1516
1296
# ApprovalDuration - property
1517
@dbus_service_property(_interface,
1297
@dbus_service_property(_interface, signature="t",
1519
1298
access="readwrite")
1520
1299
def ApprovalDuration_dbus_property(self, value=None):
1521
1300
if value is None: # get
1522
return dbus.UInt64(self.approval_duration.total_seconds()
1301
return dbus.UInt64(timedelta_to_milliseconds(
1302
self.approval_duration))
1524
1303
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1526
1305
# Name - property
1528
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1529
1306
@dbus_service_property(_interface, signature="s", access="read")
1530
1307
def Name_dbus_property(self):
1531
1308
return dbus.String(self.name)
1533
1310
# Fingerprint - property
1535
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1536
1311
@dbus_service_property(_interface, signature="s", access="read")
1537
1312
def Fingerprint_dbus_property(self):
1538
1313
return dbus.String(self.fingerprint)
1540
1315
# Host - property
1541
@dbus_service_property(_interface,
1316
@dbus_service_property(_interface, signature="s",
1543
1317
access="readwrite")
1544
1318
def Host_dbus_property(self, value=None):
1545
1319
if value is None: # get
1546
1320
return dbus.String(self.host)
1547
self.host = str(value)
1321
self.host = unicode(value)
1549
1323
# Created - property
1551
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1552
1324
@dbus_service_property(_interface, signature="s", access="read")
1553
1325
def Created_dbus_property(self):
1554
1326
return datetime_to_dbus(self.created)
1596
1361
return datetime_to_dbus(self.last_approval_request)
1598
1363
# Timeout - property
1599
@dbus_service_property(_interface,
1364
@dbus_service_property(_interface, signature="t",
1601
1365
access="readwrite")
1602
1366
def Timeout_dbus_property(self, value=None):
1603
1367
if value is None: # get
1604
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1605
old_timeout = self.timeout
1368
return dbus.UInt64(self.timeout_milliseconds())
1606
1369
self.timeout = datetime.timedelta(0, 0, 0, value)
1607
# Reschedule disabling
1370
# Reschedule timeout
1608
1371
if self.enabled:
1609
1372
now = datetime.datetime.utcnow()
1610
self.expires += self.timeout - old_timeout
1611
if self.expires <= now:
1373
time_to_die = timedelta_to_milliseconds(
1374
(self.last_checked_ok + self.timeout) - now)
1375
if time_to_die <= 0:
1612
1376
# The timeout has passed
1379
self.expires = (now +
1380
datetime.timedelta(milliseconds =
1615
1382
if (getattr(self, "disable_initiator_tag", None)
1618
1385
gobject.source_remove(self.disable_initiator_tag)
1619
self.disable_initiator_tag = gobject.timeout_add(
1620
int((self.expires - now).total_seconds() * 1000),
1386
self.disable_initiator_tag = (gobject.timeout_add
1623
1390
# ExtendedTimeout - property
1624
@dbus_service_property(_interface,
1391
@dbus_service_property(_interface, signature="t",
1626
1392
access="readwrite")
1627
1393
def ExtendedTimeout_dbus_property(self, value=None):
1628
1394
if value is None: # get
1629
return dbus.UInt64(self.extended_timeout.total_seconds()
1395
return dbus.UInt64(self.extended_timeout_milliseconds())
1631
1396
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1633
1398
# Interval - property
1634
@dbus_service_property(_interface,
1399
@dbus_service_property(_interface, signature="t",
1636
1400
access="readwrite")
1637
1401
def Interval_dbus_property(self, value=None):
1638
1402
if value is None: # get
1639
return dbus.UInt64(self.interval.total_seconds() * 1000)
1403
return dbus.UInt64(self.interval_milliseconds())
1640
1404
self.interval = datetime.timedelta(0, 0, 0, value)
1641
1405
if getattr(self, "checker_initiator_tag", None) is None:
1643
1407
if self.enabled:
1644
1408
# Reschedule checker run
1645
1409
gobject.source_remove(self.checker_initiator_tag)
1646
self.checker_initiator_tag = gobject.timeout_add(
1647
value, self.start_checker)
1648
self.start_checker() # Start one now, too
1410
self.checker_initiator_tag = (gobject.timeout_add
1411
(value, self.start_checker))
1412
self.start_checker() # Start one now, too
1650
1414
# Checker - property
1651
@dbus_service_property(_interface,
1415
@dbus_service_property(_interface, signature="s",
1653
1416
access="readwrite")
1654
1417
def Checker_dbus_property(self, value=None):
1655
1418
if value is None: # get
1656
1419
return dbus.String(self.checker_command)
1657
self.checker_command = str(value)
1420
self.checker_command = unicode(value)
1659
1422
# CheckerRunning - property
1660
@dbus_service_property(_interface,
1423
@dbus_service_property(_interface, signature="b",
1662
1424
access="readwrite")
1663
1425
def CheckerRunning_dbus_property(self, value=None):
1664
1426
if value is None: # get
1894
1658
def fingerprint(openpgp):
1895
1659
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1896
1660
# New GnuTLS "datum" with the OpenPGP public key
1897
datum = gnutls.library.types.gnutls_datum_t(
1898
ctypes.cast(ctypes.c_char_p(openpgp),
1899
ctypes.POINTER(ctypes.c_ubyte)),
1900
ctypes.c_uint(len(openpgp)))
1661
datum = (gnutls.library.types
1662
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1665
ctypes.c_uint(len(openpgp))))
1901
1666
# New empty GnuTLS certificate
1902
1667
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1903
gnutls.library.functions.gnutls_openpgp_crt_init(
1668
(gnutls.library.functions
1669
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1905
1670
# Import the OpenPGP public key into the certificate
1906
gnutls.library.functions.gnutls_openpgp_crt_import(
1907
crt, ctypes.byref(datum),
1908
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1671
(gnutls.library.functions
1672
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1673
gnutls.library.constants
1674
.GNUTLS_OPENPGP_FMT_RAW))
1909
1675
# Verify the self signature in the key
1910
1676
crtverify = ctypes.c_uint()
1911
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1912
crt, 0, ctypes.byref(crtverify))
1677
(gnutls.library.functions
1678
.gnutls_openpgp_crt_verify_self(crt, 0,
1679
ctypes.byref(crtverify)))
1913
1680
if crtverify.value != 0:
1914
1681
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1915
raise gnutls.errors.CertificateSecurityError(
1682
raise (gnutls.errors.CertificateSecurityError
1917
1684
# New buffer for the fingerprint
1918
1685
buf = ctypes.create_string_buffer(20)
1919
1686
buf_len = ctypes.c_size_t()
1920
1687
# Get the fingerprint from the certificate into the buffer
1921
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1922
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1688
(gnutls.library.functions
1689
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1690
ctypes.byref(buf_len)))
1923
1691
# Deinit the certificate
1924
1692
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1925
1693
# Convert the buffer to a Python bytestring
1976
1743
interface: None or a network interface name (string)
1977
1744
use_ipv6: Boolean; to use IPv6 or not
1980
1746
def __init__(self, server_address, RequestHandlerClass,
1984
"""If socketfd is set, use that file descriptor instead of
1985
creating a new one with socket.socket().
1747
interface=None, use_ipv6=True):
1987
1748
self.interface = interface
1989
1750
self.address_family = socket.AF_INET6
1990
if socketfd is not None:
1991
# Save the file descriptor
1992
self.socketfd = socketfd
1993
# Save the original socket.socket() function
1994
self.socket_socket = socket.socket
1995
# To implement --socket, we monkey patch socket.socket.
1997
# (When socketserver.TCPServer is a new-style class, we
1998
# could make self.socket into a property instead of monkey
1999
# patching socket.socket.)
2001
# Create a one-time-only replacement for socket.socket()
2002
@functools.wraps(socket.socket)
2003
def socket_wrapper(*args, **kwargs):
2004
# Restore original function so subsequent calls are
2006
socket.socket = self.socket_socket
2007
del self.socket_socket
2008
# This time only, return a new socket object from the
2009
# saved file descriptor.
2010
return socket.fromfd(self.socketfd, *args, **kwargs)
2011
# Replace socket.socket() function with wrapper
2012
socket.socket = socket_wrapper
2013
# The socketserver.TCPServer.__init__ will call
2014
# socket.socket(), which might be our replacement,
2015
# socket_wrapper(), if socketfd was set.
2016
1751
socketserver.TCPServer.__init__(self, server_address,
2017
1752
RequestHandlerClass)
2019
1753
def server_bind(self):
2020
1754
"""This overrides the normal server_bind() function
2021
1755
to bind to an interface if one was specified, and also NOT to
2181
def rfc3339_duration_to_delta(duration):
2182
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2184
>>> rfc3339_duration_to_delta("P7D")
2185
datetime.timedelta(7)
2186
>>> rfc3339_duration_to_delta("PT60S")
2187
datetime.timedelta(0, 60)
2188
>>> rfc3339_duration_to_delta("PT60M")
2189
datetime.timedelta(0, 3600)
2190
>>> rfc3339_duration_to_delta("PT24H")
2191
datetime.timedelta(1)
2192
>>> rfc3339_duration_to_delta("P1W")
2193
datetime.timedelta(7)
2194
>>> rfc3339_duration_to_delta("PT5M30S")
2195
datetime.timedelta(0, 330)
2196
>>> rfc3339_duration_to_delta("P1DT3M20S")
2197
datetime.timedelta(1, 200)
2200
# Parsing an RFC 3339 duration with regular expressions is not
2201
# possible - there would have to be multiple places for the same
2202
# values, like seconds. The current code, while more esoteric, is
2203
# cleaner without depending on a parsing library. If Python had a
2204
# built-in library for parsing we would use it, but we'd like to
2205
# avoid excessive use of external libraries.
2207
# New type for defining tokens, syntax, and semantics all-in-one
2208
Token = collections.namedtuple("Token", (
2209
"regexp", # To match token; if "value" is not None, must have
2210
# a "group" containing digits
2211
"value", # datetime.timedelta or None
2212
"followers")) # Tokens valid after this token
2213
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2214
# the "duration" ABNF definition in RFC 3339, Appendix A.
2215
token_end = Token(re.compile(r"$"), None, frozenset())
2216
token_second = Token(re.compile(r"(\d+)S"),
2217
datetime.timedelta(seconds=1),
2218
frozenset((token_end, )))
2219
token_minute = Token(re.compile(r"(\d+)M"),
2220
datetime.timedelta(minutes=1),
2221
frozenset((token_second, token_end)))
2222
token_hour = Token(re.compile(r"(\d+)H"),
2223
datetime.timedelta(hours=1),
2224
frozenset((token_minute, token_end)))
2225
token_time = Token(re.compile(r"T"),
2227
frozenset((token_hour, token_minute,
2229
token_day = Token(re.compile(r"(\d+)D"),
2230
datetime.timedelta(days=1),
2231
frozenset((token_time, token_end)))
2232
token_month = Token(re.compile(r"(\d+)M"),
2233
datetime.timedelta(weeks=4),
2234
frozenset((token_day, token_end)))
2235
token_year = Token(re.compile(r"(\d+)Y"),
2236
datetime.timedelta(weeks=52),
2237
frozenset((token_month, token_end)))
2238
token_week = Token(re.compile(r"(\d+)W"),
2239
datetime.timedelta(weeks=1),
2240
frozenset((token_end, )))
2241
token_duration = Token(re.compile(r"P"), None,
2242
frozenset((token_year, token_month,
2243
token_day, token_time,
2245
# Define starting values
2246
value = datetime.timedelta() # Value so far
2248
followers = frozenset((token_duration, )) # Following valid tokens
2249
s = duration # String left to parse
2250
# Loop until end token is found
2251
while found_token is not token_end:
2252
# Search for any currently valid tokens
2253
for token in followers:
2254
match = token.regexp.match(s)
2255
if match is not None:
2257
if token.value is not None:
2258
# Value found, parse digits
2259
factor = int(match.group(1), 10)
2260
# Add to value so far
2261
value += factor * token.value
2262
# Strip token from string
2263
s = token.regexp.sub("", s, 1)
2266
# Set valid next tokens
2267
followers = found_token.followers
2270
# No currently valid tokens were found
2271
raise ValueError("Invalid RFC 3339 duration: {!r}"
2277
1920
def string_to_delta(interval):
2278
1921
"""Parse a string and return a datetime.timedelta
2408
2036
"debug": "False",
2410
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2411
":+SIGN-DSA-SHA256",
2038
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2412
2039
"servicename": "Mandos",
2413
2040
"use_dbus": "True",
2414
2041
"use_ipv6": "True",
2415
2042
"debuglevel": "",
2416
2043
"restore": "True",
2418
"statedir": "/var/lib/mandos",
2419
"foreground": "False",
2044
"statedir": "/var/lib/mandos"
2423
2047
# Parse config file for server-global settings
2424
2048
server_config = configparser.SafeConfigParser(server_defaults)
2425
2049
del server_defaults
2426
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2050
server_config.read(os.path.join(options.configdir,
2427
2052
# Convert the SafeConfigParser object to a dict
2428
2053
server_settings = server_config.defaults()
2429
2054
# Use the appropriate methods on the non-string config options
2430
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2055
for option in ("debug", "use_dbus", "use_ipv6"):
2431
2056
server_settings[option] = server_config.getboolean("DEFAULT",
2433
2058
if server_settings["port"]:
2434
2059
server_settings["port"] = server_config.getint("DEFAULT",
2436
if server_settings["socket"]:
2437
server_settings["socket"] = server_config.getint("DEFAULT",
2439
# Later, stdin will, and stdout and stderr might, be dup'ed
2440
# over with an opened os.devnull. But we don't want this to
2441
# happen with a supplied network socket.
2442
if 0 <= server_settings["socket"] <= 2:
2443
server_settings["socket"] = os.dup(server_settings
2445
2061
del server_config
2447
2063
# Override the settings from the config file with command line
2448
2064
# options, if set.
2449
2065
for option in ("interface", "address", "port", "debug",
2450
"priority", "servicename", "configdir", "use_dbus",
2451
"use_ipv6", "debuglevel", "restore", "statedir",
2452
"socket", "foreground", "zeroconf"):
2066
"priority", "servicename", "configdir",
2067
"use_dbus", "use_ipv6", "debuglevel", "restore",
2453
2069
value = getattr(options, option)
2454
2070
if value is not None:
2455
2071
server_settings[option] = value
2457
2073
# Force all strings to be unicode
2458
2074
for option in server_settings.keys():
2459
if isinstance(server_settings[option], bytes):
2460
server_settings[option] = (server_settings[option]
2462
# Force all boolean options to be boolean
2463
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2464
"foreground", "zeroconf"):
2465
server_settings[option] = bool(server_settings[option])
2466
# Debug implies foreground
2467
if server_settings["debug"]:
2468
server_settings["foreground"] = True
2075
if type(server_settings[option]) is str:
2076
server_settings[option] = unicode(server_settings[option])
2469
2077
# Now we have our good server settings in "server_settings"
2471
2079
##################################################################
2473
if (not server_settings["zeroconf"]
2474
and not (server_settings["port"]
2475
or server_settings["socket"] != "")):
2476
parser.error("Needs port or socket to work without Zeroconf")
2478
2081
# For convenience
2479
2082
debug = server_settings["debug"]
2480
2083
debuglevel = server_settings["debuglevel"]
2509
2110
global mandos_dbus_service
2510
2111
mandos_dbus_service = None
2513
if server_settings["socket"] != "":
2514
socketfd = server_settings["socket"]
2515
tcp_server = MandosServer(
2516
(server_settings["address"], server_settings["port"]),
2518
interface=(server_settings["interface"] or None),
2520
gnutls_priority=server_settings["priority"],
2524
pidfilename = "/run/mandos.pid"
2525
if not os.path.isdir("/run/."):
2526
pidfilename = "/var/run/mandos.pid"
2113
tcp_server = MandosServer((server_settings["address"],
2114
server_settings["port"]),
2116
interface=(server_settings["interface"]
2120
server_settings["priority"],
2123
pidfilename = "/var/run/mandos.pid"
2529
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2530
except IOError as e:
2531
logger.error("Could not open file %r", pidfilename,
2125
pidfile = open(pidfilename, "w")
2127
logger.error("Could not open file %r", pidfilename)
2534
for name in ("_mandos", "mandos", "nobody"):
2130
uid = pwd.getpwnam("_mandos").pw_uid
2131
gid = pwd.getpwnam("_mandos").pw_gid
2536
uid = pwd.getpwnam(name).pw_uid
2537
gid = pwd.getpwnam(name).pw_gid
2134
uid = pwd.getpwnam("mandos").pw_uid
2135
gid = pwd.getpwnam("mandos").pw_gid
2539
2136
except KeyError:
2138
uid = pwd.getpwnam("nobody").pw_uid
2139
gid = pwd.getpwnam("nobody").pw_gid
2547
2146
except OSError as error:
2548
if error.errno != errno.EPERM:
2147
if error[0] != errno.EPERM:
2552
2151
# Enable all possible GnuTLS debugging
2559
2158
def debug_gnutls(level, string):
2560
2159
logger.debug("GnuTLS: %s", string[:-1])
2562
gnutls.library.functions.gnutls_global_set_log_function(
2161
(gnutls.library.functions
2162
.gnutls_global_set_log_function(debug_gnutls))
2565
2164
# Redirect stdin so all checkers get /dev/null
2566
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2165
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2567
2166
os.dup2(null, sys.stdin.fileno())
2571
2170
# Need to fork before connecting to D-Bus
2573
2172
# Close all input and output, do double fork, etc.
2576
# multiprocessing will use threads, so before we use gobject we
2577
# need to inform gobject that threads will be used.
2578
2175
gobject.threads_init()
2580
2177
global main_loop
2581
2178
# From the Avahi example code
2582
DBusGMainLoop(set_as_default=True)
2179
DBusGMainLoop(set_as_default=True )
2583
2180
main_loop = gobject.MainLoop()
2584
2181
bus = dbus.SystemBus()
2585
2182
# End of Avahi example code
2588
2185
bus_name = dbus.service.BusName("se.recompile.Mandos",
2591
old_bus_name = dbus.service.BusName(
2592
"se.bsnet.fukt.Mandos", bus,
2594
except dbus.exceptions.DBusException as e:
2595
logger.error("Disabling D-Bus:", exc_info=e)
2186
bus, do_not_queue=True)
2187
old_bus_name = (dbus.service.BusName
2188
("se.bsnet.fukt.Mandos", bus,
2190
except dbus.exceptions.NameExistsException as e:
2191
logger.error(unicode(e) + ", disabling D-Bus")
2596
2192
use_dbus = False
2597
2193
server_settings["use_dbus"] = False
2598
2194
tcp_server.use_dbus = False
2600
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2601
service = AvahiServiceToSyslog(
2602
name = server_settings["servicename"],
2603
servicetype = "_mandos._tcp",
2604
protocol = protocol,
2606
if server_settings["interface"]:
2607
service.interface = if_nametoindex(
2608
server_settings["interface"].encode("utf-8"))
2195
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2196
service = AvahiServiceToSyslog(name =
2197
server_settings["servicename"],
2198
servicetype = "_mandos._tcp",
2199
protocol = protocol, bus = bus)
2200
if server_settings["interface"]:
2201
service.interface = (if_nametoindex
2202
(str(server_settings["interface"])))
2610
2204
global multiprocessing_manager
2611
2205
multiprocessing_manager = multiprocessing.Manager()
2613
2207
client_class = Client
2615
client_class = functools.partial(ClientDBus, bus = bus)
2209
client_class = functools.partial(ClientDBusTransitional,
2617
2212
client_settings = Client.config_parser(client_config)
2618
2213
old_client_settings = {}
2619
2214
clients_data = {}
2621
# This is used to redirect stdout and stderr for checker processes
2623
wnull = open(os.devnull, "w") # A writable /dev/null
2624
# Only used if server is running in foreground but not in debug
2626
if debug or not foreground:
2629
2216
# Get client data and settings from last running state.
2630
2217
if server_settings["restore"]:
2632
2219
with open(stored_state_path, "rb") as stored_state:
2633
clients_data, old_client_settings = pickle.load(
2220
clients_data, old_client_settings = (pickle.load
2635
2222
os.remove(stored_state_path)
2636
2223
except IOError as e:
2637
if e.errno == errno.ENOENT:
2638
logger.warning("Could not load persistent state:"
2639
" {}".format(os.strerror(e.errno)))
2641
logger.critical("Could not load persistent state:",
2224
logger.warning("Could not load persistent state: {0}"
2226
if e.errno != errno.ENOENT:
2644
2228
except EOFError as e:
2645
2229
logger.warning("Could not load persistent state: "
2230
"EOFError: {0}".format(e))
2649
2232
with PGPEngine() as pgp:
2650
for client_name, client in clients_data.items():
2651
# Skip removed clients
2652
if client_name not in client_settings:
2233
for client_name, client in clients_data.iteritems():
2655
2234
# Decide which value to use after restoring saved state.
2656
2235
# We have three different values: Old config file,
2657
2236
# new config file, and saved state.
2662
2241
# For each value in new config, check if it
2663
2242
# differs from the old config value (Except for
2664
2243
# the "secret" attribute)
2665
if (name != "secret"
2667
old_client_settings[client_name][name])):
2244
if (name != "secret" and
2245
value != old_client_settings[client_name]
2668
2247
client[name] = value
2669
2248
except KeyError:
2672
2251
# Clients who has passed its expire date can still be
2673
# enabled if its last checker was successful. A Client
2674
# whose checker succeeded before we stored its state is
2675
# assumed to have successfully run all checkers during
2252
# enabled if its last checker was successful. Clients
2253
# whose checker failed before we stored its state is
2254
# assumed to have failed all checkers during downtime.
2677
2255
if client["enabled"]:
2678
2256
if datetime.datetime.utcnow() >= client["expires"]:
2679
2257
if not client["last_checked_ok"]:
2680
2258
logger.warning(
2681
"disabling client {} - Client never "
2682
"performed a successful checker".format(
2259
"disabling client {0} - Client never "
2260
"performed a successfull checker"
2261
.format(client["name"]))
2684
2262
client["enabled"] = False
2685
2263
elif client["last_checker_status"] != 0:
2686
2264
logger.warning(
2687
"disabling client {} - Client last"
2688
" checker failed with error code"
2691
client["last_checker_status"]))
2265
"disabling client {0} - Client "
2266
"last checker failed with error code {1}"
2267
.format(client["name"],
2268
client["last_checker_status"]))
2692
2269
client["enabled"] = False
2694
client["expires"] = (
2695
datetime.datetime.utcnow()
2696
+ client["timeout"])
2271
client["expires"] = (datetime.datetime
2273
+ client["timeout"])
2697
2274
logger.debug("Last checker succeeded,"
2698
" keeping {} enabled".format(
2275
" keeping {0} enabled"
2276
.format(client["name"]))
2701
client["secret"] = pgp.decrypt(
2702
client["encrypted_secret"],
2703
client_settings[client_name]["secret"])
2278
client["secret"] = (
2279
pgp.decrypt(client["encrypted_secret"],
2280
client_settings[client_name]
2704
2282
except PGPError:
2705
2283
# If decryption fails, we use secret from new settings
2706
logger.debug("Failed to decrypt {} old secret".format(
2708
client["secret"] = (client_settings[client_name]
2284
logger.debug("Failed to decrypt {0} old secret"
2285
.format(client_name))
2286
client["secret"] = (
2287
client_settings[client_name]["secret"])
2711
2290
# Add/remove clients based on new changes made to config
2712
2291
for client_name in (set(old_client_settings)
2715
2294
for client_name in (set(client_settings)
2716
2295
- set(old_client_settings)):
2717
2296
clients_data[client_name] = client_settings[client_name]
2719
# Create all client objects
2720
for client_name, client in clients_data.items():
2298
# Create clients all clients
2299
for client_name, client in clients_data.iteritems():
2721
2300
tcp_server.clients[client_name] = client_class(
2724
server_settings = server_settings)
2301
name = client_name, settings = client)
2726
2303
if not tcp_server.clients:
2727
2304
logger.warning("No clients defined")
2730
if pidfile is not None:
2734
print(pid, file=pidfile)
2736
logger.error("Could not write to file %r with PID %d",
2310
pidfile.write(str(pid) + "\n".encode("utf-8"))
2313
logger.error("Could not write to file %r with PID %d",
2316
# "pidfile" was never created
2739
2318
del pidfilename
2319
signal.signal(signal.SIGINT, signal.SIG_IGN)
2741
2321
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2742
2322
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2746
@alternate_dbus_interfaces(
2747
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2748
class MandosDBusService(DBusObjectWithProperties):
2325
class MandosDBusService(dbus.service.Object):
2749
2326
"""A D-Bus proxy object"""
2751
2327
def __init__(self):
2752
2328
dbus.service.Object.__init__(self, bus, "/")
2754
2329
_interface = "se.recompile.Mandos"
2756
@dbus_interface_annotations(_interface)
2759
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2762
2331
@dbus.service.signal(_interface, signature="o")
2763
2332
def ClientAdded(self, objpath):