170
189
def password_encode(self, password):
171
190
# Passphrase can not be empty and can not contain newlines or
172
191
# NUL bytes. So we prefix it and hex encode it.
173
return b"mandos" + binascii.hexlify(password)
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"))
175
200
def encrypt(self, data, password):
176
self.gnupg.passphrase = self.password_encode(password)
177
with open(os.devnull) as devnull:
179
proc = self.gnupg.run(['--symmetric'],
180
create_fhs=['stdin', 'stdout'],
181
attach_fhs={'stderr': devnull})
182
with contextlib.closing(proc.handles['stdin']) as f:
184
with contextlib.closing(proc.handles['stdout']) as f:
185
ciphertext = f.read()
189
self.gnupg.passphrase = None
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:
190
216
return ciphertext
192
218
def decrypt(self, data, password):
193
self.gnupg.passphrase = self.password_encode(password)
194
with open(os.devnull) as devnull:
196
proc = self.gnupg.run(['--decrypt'],
197
create_fhs=['stdin', 'stdout'],
198
attach_fhs={'stderr': devnull})
199
with contextlib.closing(proc.handles['stdin'] ) as f:
201
with contextlib.closing(proc.handles['stdout']) as f:
202
decrypted_plaintext = f.read()
206
self.gnupg.passphrase = None
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:
207
234
return decrypted_plaintext
211
237
class AvahiError(Exception):
212
238
def __init__(self, value, *args, **kwargs):
213
239
self.value = value
214
super(AvahiError, self).__init__(value, *args, **kwargs)
215
def __unicode__(self):
216
return unicode(repr(self.value))
240
return super(AvahiError, self).__init__(value, *args,
218
244
class AvahiServiceError(AvahiError):
221
248
class AvahiGroupError(AvahiError):
414
475
last_checked_ok: datetime.datetime(); (UTC) or None
415
476
last_checker_status: integer between 0 and 255 reflecting exit
416
477
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
418
481
last_enabled: datetime.datetime(); (UTC) or None
419
482
name: string; from the config file, used in log messages and
420
483
D-Bus identifiers
421
484
secret: bytestring; sent verbatim (over TLS) to client
422
485
timeout: datetime.timedelta(); How long from last_checked_ok
423
486
until this client is disabled
424
extended_timeout: extra long timeout when password has been sent
487
extended_timeout: extra long timeout when secret has been sent
425
488
runtime_expansions: Allowed attributes for runtime expansion.
426
489
expires: datetime.datetime(); time (UTC) when a client will be
427
490
disabled, or None
491
server_settings: The server_settings dict from main()
430
494
runtime_expansions = ("approval_delay", "approval_duration",
431
"created", "enabled", "fingerprint",
432
"host", "interval", "last_checked_ok",
495
"created", "enabled", "expires",
496
"fingerprint", "host", "interval",
497
"last_approval_request", "last_checked_ok",
433
498
"last_enabled", "name", "timeout")
434
client_defaults = { "timeout": "5m",
435
"extended_timeout": "15m",
437
"checker": "fping -q -- %%(host)s",
439
"approval_delay": "0s",
440
"approval_duration": "1s",
441
"approved_by_default": "True",
445
def timeout_milliseconds(self):
446
"Return the 'timeout' attribute in milliseconds"
447
return timedelta_to_milliseconds(self.timeout)
449
def extended_timeout_milliseconds(self):
450
"Return the 'extended_timeout' attribute in milliseconds"
451
return timedelta_to_milliseconds(self.extended_timeout)
453
def interval_milliseconds(self):
454
"Return the 'interval' attribute in milliseconds"
455
return timedelta_to_milliseconds(self.interval)
457
def approval_delay_milliseconds(self):
458
return timedelta_to_milliseconds(self.approval_delay)
501
"extended_timeout": "PT15M",
503
"checker": "fping -q -- %%(host)s",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
461
512
def config_parser(config):
462
""" Construct a new dict of client settings of this form:
513
"""Construct a new dict of client settings of this form:
463
514
{ client_name: {setting_name: value, ...}, ...}
464
with exceptions for any special settings as defined above"""
515
with exceptions for any special settings as defined above.
516
NOTE: Must be a pure function. Must return the same result
517
value given the same arguments.
466
520
for client_name in config.sections():
467
521
section = dict(config.items(client_name))
496
554
client["checker_command"] = section["checker"]
497
555
client["last_approval_request"] = None
498
556
client["last_checked_ok"] = None
499
client["last_checker_status"] = None
500
if client["enabled"]:
501
client["last_enabled"] = datetime.datetime.utcnow()
502
client["expires"] = (datetime.datetime.utcnow()
505
client["last_enabled"] = None
506
client["expires"] = None
557
client["last_checker_status"] = -2
511
def __init__(self, settings, name = None):
512
"""Note: the 'checker' key in 'config' sets the
513
'checker_command' attribute and *not* the 'checker'
561
def __init__(self, settings, name = None, server_settings=None):
563
if server_settings is None:
565
self.server_settings = server_settings
516
566
# adding all client settings
517
for setting, value in settings.iteritems():
567
for setting, value in settings.items():
518
568
setattr(self, setting, value)
571
if not hasattr(self, "last_enabled"):
572
self.last_enabled = datetime.datetime.utcnow()
573
if not hasattr(self, "expires"):
574
self.expires = (datetime.datetime.utcnow()
577
self.last_enabled = None
520
580
logger.debug("Creating client %r", self.name)
521
# Uppercase and remove spaces from fingerprint for later
522
# comparison purposes with return value from the fingerprint()
524
581
logger.debug(" Fingerprint: %s", self.fingerprint)
525
self.created = settings.get("created", datetime.datetime.utcnow())
582
self.created = settings.get("created",
583
datetime.datetime.utcnow())
527
585
# attributes specific for this server instance
528
586
self.checker = None
529
587
self.checker_initiator_tag = None
589
644
def init_checker(self):
590
645
# Schedule a new checker to be started an 'interval' from now,
591
646
# and every interval from then on.
592
self.checker_initiator_tag = (gobject.timeout_add
593
(self.interval_milliseconds(),
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),
595
652
# Schedule a disable() when 'timeout' has passed
596
self.disable_initiator_tag = (gobject.timeout_add
597
(self.timeout_milliseconds(),
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)
599
657
# Also start a new checker *right now*.
600
658
self.start_checker()
602
def checker_callback(self, pid, condition, command):
660
def checker_callback(self, source, condition, connection,
603
662
"""The checker has completed, so take appropriate actions."""
604
663
self.checker_callback_tag = None
605
664
self.checker = None
606
if os.WIFEXITED(condition):
607
self.last_checker_status = os.WEXITSTATUS(condition)
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
608
672
if self.last_checker_status == 0:
609
673
logger.info("Checker for %(name)s succeeded",
611
675
self.checked_ok()
613
logger.info("Checker for %(name)s failed",
677
logger.info("Checker for %(name)s failed", vars(self))
616
679
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
617
681
logger.warning("Checker for %(name)s crashed?",
620
def checked_ok(self, timeout=None):
621
"""Bump up the timeout for this client.
623
This should only be called when the client has been seen,
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."""
626
694
if timeout is None:
627
695
timeout = self.timeout
628
self.last_checked_ok = datetime.datetime.utcnow()
629
696
if self.disable_initiator_tag is not None:
630
697
gobject.source_remove(self.disable_initiator_tag)
698
self.disable_initiator_tag = None
631
699
if getattr(self, "enabled", False):
632
self.disable_initiator_tag = (gobject.timeout_add
633
(timedelta_to_milliseconds
634
(timeout), self.disable))
700
self.disable_initiator_tag = gobject.timeout_add(
701
int(timeout.total_seconds() * 1000), self.disable)
635
702
self.expires = datetime.datetime.utcnow() + timeout
637
704
def need_approval(self):
643
710
If a checker already exists, leave it running and do
645
712
# The reason for not killing a running checker is that if we
646
# did that, then if a checker (for some reason) started
647
# running slowly and taking more than 'interval' time, the
648
# client would inevitably timeout, since no checker would get
649
# a chance to run to completion. If we instead leave running
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
650
717
# checkers alone, the checker would have to take more time
651
718
# than 'timeout' for the client to be disabled, which is as it
654
# If a checker exists, make sure it is not a zombie
656
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
657
except (AttributeError, OSError) as error:
658
if (isinstance(error, OSError)
659
and error.errno != errno.ECHILD):
663
logger.warning("Checker was a zombie")
664
gobject.source_remove(self.checker_callback_tag)
665
self.checker_callback(pid, status,
666
self.current_checker_command)
721
if self.checker is not None and not self.checker.is_alive():
722
logger.warning("Checker was not alive; joining")
667
725
# Start a new checker if needed
668
726
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 }
670
# In case checker_command has exactly one % operator
671
command = self.checker_command % self.host
673
# Escape attributes for the shell
674
escaped_attrs = dict(
676
re.escape(unicode(str(getattr(self, attr, "")),
680
self.runtime_expansions)
683
command = self.checker_command % escaped_attrs
684
except TypeError as error:
685
logger.error('Could not format string "%s":'
686
' %s', self.checker_command, error)
687
return True # Try again later
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
688
738
self.current_checker_command = command
690
logger.info("Starting checker %r for %s",
692
# We don't need to redirect stdout and stderr, since
693
# in normal mode, that is already done by daemon(),
694
# and in debug mode we don't want to. (Stdin is
695
# always replaced by /dev/null.)
696
self.checker = subprocess.Popen(command,
699
self.checker_callback_tag = (gobject.child_watch_add
701
self.checker_callback,
703
# The checker may have completed before the gobject
704
# watch was added. Check for this.
705
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
707
gobject.source_remove(self.checker_callback_tag)
708
self.checker_callback(pid, status, command)
709
except OSError as error:
710
logger.error("Failed to start subprocess: %s",
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)
712
764
# Re-run this periodically if run by gobject.timeout_add
783
class DBusObjectWithProperties(dbus.service.Object):
874
class DBusObjectWithAnnotations(dbus.service.Object):
875
"""A D-Bus object with annotations.
877
Classes inheriting from this can use the dbus_annotations
878
decorator to add annotations to methods or signals.
882
def _is_dbus_thing(thing):
883
"""Returns a function testing if an attribute is a D-Bus thing
885
If called like _is_dbus_thing("method") it returns a function
886
suitable for use as predicate to inspect.getmembers().
888
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
891
def _get_all_dbus_things(self, thing):
892
"""Returns a generator of (name, attribute) pairs
894
return ((getattr(athing.__get__(self), "_dbus_name", name),
895
athing.__get__(self))
896
for cls in self.__class__.__mro__
898
inspect.getmembers(cls, self._is_dbus_thing(thing)))
900
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
902
path_keyword = 'object_path',
903
connection_keyword = 'connection')
904
def Introspect(self, object_path, connection):
905
"""Overloading of standard D-Bus method.
907
Inserts annotation tags on methods and signals.
909
xmlstring = dbus.service.Object.Introspect(self, object_path,
912
document = xml.dom.minidom.parseString(xmlstring)
914
for if_tag in document.getElementsByTagName("interface"):
915
# Add annotation tags
916
for typ in ("method", "signal"):
917
for tag in if_tag.getElementsByTagName(typ):
919
for name, prop in (self.
920
_get_all_dbus_things(typ)):
921
if (name == tag.getAttribute("name")
922
and prop._dbus_interface
923
== if_tag.getAttribute("name")):
924
annots.update(getattr(
925
prop, "_dbus_annotations", {}))
926
for name, value in annots.items():
927
ann_tag = document.createElement(
929
ann_tag.setAttribute("name", name)
930
ann_tag.setAttribute("value", value)
931
tag.appendChild(ann_tag)
932
# Add interface annotation tags
933
for annotation, value in dict(
934
itertools.chain.from_iterable(
935
annotations().items()
936
for name, annotations
937
in self._get_all_dbus_things("interface")
938
if name == if_tag.getAttribute("name")
940
ann_tag = document.createElement("annotation")
941
ann_tag.setAttribute("name", annotation)
942
ann_tag.setAttribute("value", value)
943
if_tag.appendChild(ann_tag)
944
# Fix argument name for the Introspect method itself
945
if (if_tag.getAttribute("name")
946
== dbus.INTROSPECTABLE_IFACE):
947
for cn in if_tag.getElementsByTagName("method"):
948
if cn.getAttribute("name") == "Introspect":
949
for arg in cn.getElementsByTagName("arg"):
950
if (arg.getAttribute("direction")
952
arg.setAttribute("name",
954
xmlstring = document.toxml("utf-8")
956
except (AttributeError, xml.dom.DOMException,
957
xml.parsers.expat.ExpatError) as error:
958
logger.error("Failed to override Introspection method",
963
class DBusObjectWithProperties(DBusObjectWithAnnotations):
784
964
"""A D-Bus object with properties.
786
966
Classes inheriting from this can use the dbus_service_property
788
968
standard Get(), Set(), and GetAll() methods on the D-Bus.
792
def _is_dbus_property(obj):
793
return getattr(obj, "_dbus_is_property", False)
795
def _get_all_dbus_properties(self):
796
"""Returns a generator of (name, attribute) pairs
798
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
799
for cls in self.__class__.__mro__
801
inspect.getmembers(cls, self._is_dbus_property))
803
971
def _get_dbus_property(self, interface_name, property_name):
804
972
"""Returns a bound method if one exists which is a D-Bus
805
973
property with the specified name and interface.
807
for cls in self.__class__.__mro__:
808
for name, value in (inspect.getmembers
809
(cls, self._is_dbus_property)):
975
for cls in self.__class__.__mro__:
976
for name, value in inspect.getmembers(
977
cls, self._is_dbus_thing("property")):
810
978
if (value._dbus_name == property_name
811
979
and value._dbus_interface == interface_name):
812
980
return value.__get__(self)
814
982
# No such property
815
raise DBusPropertyNotFound(self.dbus_object_path + ":"
816
+ interface_name + "."
983
raise DBusPropertyNotFound("{}:{}.{}".format(
984
self.dbus_object_path, interface_name, property_name))
819
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
986
@dbus.service.method(dbus.PROPERTIES_IFACE,
820
988
out_signature="v")
821
989
def Get(self, interface_name, property_name):
822
990
"""Standard D-Bus property Get() method, see D-Bus standard.
866
1037
if not hasattr(value, "variant_level"):
867
1038
properties[name] = value
869
properties[name] = type(value)(value, variant_level=
870
value.variant_level+1)
1040
properties[name] = type(value)(
1041
value, variant_level = value.variant_level + 1)
871
1042
return dbus.Dictionary(properties, signature="sv")
1044
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1045
def PropertiesChanged(self, interface_name, changed_properties,
1046
invalidated_properties):
1047
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
873
1052
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
874
1053
out_signature="s",
875
1054
path_keyword='object_path',
876
1055
connection_keyword='connection')
877
1056
def Introspect(self, object_path, connection):
878
"""Standard D-Bus method, overloaded to insert property tags.
1057
"""Overloading of standard D-Bus method.
1059
Inserts property tags and interface annotation tags.
880
xmlstring = dbus.service.Object.Introspect(self, object_path,
1061
xmlstring = DBusObjectWithAnnotations.Introspect(self,
883
1065
document = xml.dom.minidom.parseString(xmlstring)
884
1067
def make_tag(document, name, prop):
885
1068
e = document.createElement("property")
886
1069
e.setAttribute("name", name)
887
1070
e.setAttribute("type", prop._dbus_signature)
888
1071
e.setAttribute("access", prop._dbus_access)
890
1074
for if_tag in document.getElementsByTagName("interface"):
891
1076
for tag in (make_tag(document, name, prop)
893
in self._get_all_dbus_properties()
1078
in self._get_all_dbus_things("property")
894
1079
if prop._dbus_interface
895
1080
== if_tag.getAttribute("name")):
896
1081
if_tag.appendChild(tag)
1082
# Add annotation tags for properties
1083
for tag in if_tag.getElementsByTagName("property"):
1085
for name, prop in self._get_all_dbus_things(
1087
if (name == tag.getAttribute("name")
1088
and prop._dbus_interface
1089
== if_tag.getAttribute("name")):
1090
annots.update(getattr(
1091
prop, "_dbus_annotations", {}))
1092
for name, value in annots.items():
1093
ann_tag = document.createElement(
1095
ann_tag.setAttribute("name", name)
1096
ann_tag.setAttribute("value", value)
1097
tag.appendChild(ann_tag)
897
1098
# Add the names to the return values for the
898
1099
# "org.freedesktop.DBus.Properties" methods
899
1100
if (if_tag.getAttribute("name")
914
1115
except (AttributeError, xml.dom.DOMException,
915
1116
xml.parsers.expat.ExpatError) as error:
916
1117
logger.error("Failed to override Introspection method",
918
1119
return xmlstring
921
def datetime_to_dbus (dt, variant_level=0):
1122
def datetime_to_dbus(dt, variant_level=0):
922
1123
"""Convert a UTC datetime.datetime() to a D-Bus type."""
924
1125
return dbus.String("", variant_level = variant_level)
925
return dbus.String(dt.isoformat(),
926
variant_level=variant_level)
929
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
931
"""Applied to an empty subclass of a D-Bus object, this metaclass
932
will add additional D-Bus attributes matching a certain pattern.
1126
return dbus.String(dt.isoformat(), variant_level=variant_level)
1129
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1130
"""A class decorator; applied to a subclass of
1131
dbus.service.Object, it will add alternate D-Bus attributes with
1132
interface names according to the "alt_interface_names" mapping.
1135
@alternate_dbus_interfaces({"org.example.Interface":
1136
"net.example.AlternateInterface"})
1137
class SampleDBusObject(dbus.service.Object):
1138
@dbus.service.method("org.example.Interface")
1139
def SampleDBusMethod():
1142
The above "SampleDBusMethod" on "SampleDBusObject" will be
1143
reachable via two interfaces: "org.example.Interface" and
1144
"net.example.AlternateInterface", the latter of which will have
1145
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1146
"true", unless "deprecate" is passed with a False value.
1148
This works for methods and signals, and also for D-Bus properties
1149
(from DBusObjectWithProperties) and interfaces (from the
1150
dbus_interface_annotations decorator).
934
def __new__(mcs, name, bases, attr):
935
# Go through all the base classes which could have D-Bus
936
# methods, signals, or properties in them
937
for base in (b for b in bases
938
if issubclass(b, dbus.service.Object)):
939
# Go though all attributes of the base class
940
for attrname, attribute in inspect.getmembers(base):
1154
for orig_interface_name, alt_interface_name in (
1155
alt_interface_names.items()):
1157
interface_names = set()
1158
# Go though all attributes of the class
1159
for attrname, attribute in inspect.getmembers(cls):
941
1160
# Ignore non-D-Bus attributes, and D-Bus attributes
942
1161
# with the wrong interface name
943
1162
if (not hasattr(attribute, "_dbus_interface")
944
or not attribute._dbus_interface
945
.startswith("se.recompile.Mandos")):
1163
or not attribute._dbus_interface.startswith(
1164
orig_interface_name)):
947
1166
# Create an alternate D-Bus interface name based on
948
1167
# the current name
949
alt_interface = (attribute._dbus_interface
950
.replace("se.recompile.Mandos",
951
"se.bsnet.fukt.Mandos"))
1168
alt_interface = attribute._dbus_interface.replace(
1169
orig_interface_name, alt_interface_name)
1170
interface_names.add(alt_interface)
952
1171
# Is this a D-Bus signal?
953
1172
if getattr(attribute, "_dbus_is_signal", False):
954
# Extract the original non-method function by
956
nonmethod_func = (dict(
1173
if sys.version_info.major == 2:
1174
# Extract the original non-method undecorated
1175
# function by black magic
1176
nonmethod_func = (dict(
957
1177
zip(attribute.func_code.co_freevars,
958
attribute.__closure__))["func"]
1178
attribute.__closure__))
1179
["func"].cell_contents)
1181
nonmethod_func = attribute
960
1182
# Create a new, but exactly alike, function
961
1183
# object, and decorate it to be a new D-Bus signal
962
1184
# with the alternate D-Bus interface name
963
new_function = (dbus.service.signal
965
attribute._dbus_signature)
967
nonmethod_func.func_code,
968
nonmethod_func.func_globals,
969
nonmethod_func.func_name,
970
nonmethod_func.func_defaults,
971
nonmethod_func.func_closure)))
1185
if sys.version_info.major == 2:
1186
new_function = types.FunctionType(
1187
nonmethod_func.func_code,
1188
nonmethod_func.func_globals,
1189
nonmethod_func.func_name,
1190
nonmethod_func.func_defaults,
1191
nonmethod_func.func_closure)
1193
new_function = types.FunctionType(
1194
nonmethod_func.__code__,
1195
nonmethod_func.__globals__,
1196
nonmethod_func.__name__,
1197
nonmethod_func.__defaults__,
1198
nonmethod_func.__closure__)
1199
new_function = (dbus.service.signal(
1201
attribute._dbus_signature)(new_function))
1202
# Copy annotations, if any
1204
new_function._dbus_annotations = dict(
1205
attribute._dbus_annotations)
1206
except AttributeError:
972
1208
# Define a creator of a function to call both the
973
# old and new functions, so both the old and new
974
# signals gets sent when the function is called
1209
# original and alternate functions, so both the
1210
# original and alternate signals gets sent when
1211
# the function is called
975
1212
def fixscope(func1, func2):
976
1213
"""This function is a scope container to pass
977
1214
func1 and func2 to the "call_both" function
978
1215
outside of its arguments"""
979
1217
def call_both(*args, **kwargs):
980
1218
"""This function will emit two D-Bus
981
1219
signals by calling func1 and func2"""
982
1220
func1(*args, **kwargs)
983
1221
func2(*args, **kwargs)
984
1223
return call_both
985
1224
# Create the "call_both" function and add it to
987
attr[attrname] = fixscope(attribute,
1226
attr[attrname] = fixscope(attribute, new_function)
989
1227
# Is this a D-Bus method?
990
1228
elif getattr(attribute, "_dbus_is_method", False):
991
1229
# Create a new, but exactly alike, function
992
1230
# object. Decorate it to be a new D-Bus method
993
1231
# with the alternate D-Bus interface name. Add it
995
attr[attrname] = (dbus.service.method
997
attribute._dbus_in_signature,
998
attribute._dbus_out_signature)
1000
(attribute.func_code,
1001
attribute.func_globals,
1002
attribute.func_name,
1003
attribute.func_defaults,
1004
attribute.func_closure)))
1234
dbus.service.method(
1236
attribute._dbus_in_signature,
1237
attribute._dbus_out_signature)
1238
(types.FunctionType(attribute.func_code,
1239
attribute.func_globals,
1240
attribute.func_name,
1241
attribute.func_defaults,
1242
attribute.func_closure)))
1243
# Copy annotations, if any
1245
attr[attrname]._dbus_annotations = dict(
1246
attribute._dbus_annotations)
1247
except AttributeError:
1005
1249
# Is this a D-Bus property?
1006
1250
elif getattr(attribute, "_dbus_is_property", False):
1007
1251
# Create a new, but exactly alike, function
1008
1252
# object, and decorate it to be a new D-Bus
1009
1253
# property with the alternate D-Bus interface
1010
1254
# name. Add it to the class.
1011
attr[attrname] = (dbus_service_property
1013
attribute._dbus_signature,
1014
attribute._dbus_access,
1016
._dbus_get_args_options
1019
(attribute.func_code,
1020
attribute.func_globals,
1021
attribute.func_name,
1022
attribute.func_defaults,
1023
attribute.func_closure)))
1024
return type.__new__(mcs, name, bases, attr)
1255
attr[attrname] = (dbus_service_property(
1256
alt_interface, attribute._dbus_signature,
1257
attribute._dbus_access,
1258
attribute._dbus_get_args_options
1260
(types.FunctionType(
1261
attribute.func_code,
1262
attribute.func_globals,
1263
attribute.func_name,
1264
attribute.func_defaults,
1265
attribute.func_closure)))
1266
# Copy annotations, if any
1268
attr[attrname]._dbus_annotations = dict(
1269
attribute._dbus_annotations)
1270
except AttributeError:
1272
# Is this a D-Bus interface?
1273
elif getattr(attribute, "_dbus_is_interface", False):
1274
# Create a new, but exactly alike, function
1275
# object. Decorate it to be a new D-Bus interface
1276
# with the alternate D-Bus interface name. Add it
1279
dbus_interface_annotations(alt_interface)
1280
(types.FunctionType(attribute.func_code,
1281
attribute.func_globals,
1282
attribute.func_name,
1283
attribute.func_defaults,
1284
attribute.func_closure)))
1286
# Deprecate all alternate interfaces
1287
iname="_AlternateDBusNames_interface_annotation{}"
1288
for interface_name in interface_names:
1290
@dbus_interface_annotations(interface_name)
1292
return { "org.freedesktop.DBus.Deprecated":
1294
# Find an unused name
1295
for aname in (iname.format(i)
1296
for i in itertools.count()):
1297
if aname not in attr:
1301
# Replace the class with a new subclass of it with
1302
# methods, signals, etc. as created above.
1303
cls = type(b"{}Alternate".format(cls.__name__),
1310
@alternate_dbus_interfaces({"se.recompile.Mandos":
1311
"se.bsnet.fukt.Mandos"})
1027
1312
class ClientDBus(Client, DBusObjectWithProperties):
1028
1313
"""A Client class using D-Bus
1089
1385
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1090
1386
last_enabled = notifychangeproperty(datetime_to_dbus,
1092
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1093
type_func = lambda checker:
1094
checker is not None)
1388
checker = notifychangeproperty(
1389
dbus.Boolean, "CheckerRunning",
1390
type_func = lambda checker: checker is not None)
1095
1391
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1096
1392
"LastCheckedOK")
1393
last_checker_status = notifychangeproperty(dbus.Int16,
1394
"LastCheckerStatus")
1097
1395
last_approval_request = notifychangeproperty(
1098
1396
datetime_to_dbus, "LastApprovalRequest")
1099
1397
approved_by_default = notifychangeproperty(dbus.Boolean,
1100
1398
"ApprovedByDefault")
1101
approval_delay = notifychangeproperty(dbus.UInt64,
1104
timedelta_to_milliseconds)
1399
approval_delay = notifychangeproperty(
1400
dbus.UInt64, "ApprovalDelay",
1401
type_func = lambda td: td.total_seconds() * 1000)
1105
1402
approval_duration = notifychangeproperty(
1106
1403
dbus.UInt64, "ApprovalDuration",
1107
type_func = timedelta_to_milliseconds)
1404
type_func = lambda td: td.total_seconds() * 1000)
1108
1405
host = notifychangeproperty(dbus.String, "Host")
1109
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1111
timedelta_to_milliseconds)
1406
timeout = notifychangeproperty(
1407
dbus.UInt64, "Timeout",
1408
type_func = lambda td: td.total_seconds() * 1000)
1112
1409
extended_timeout = notifychangeproperty(
1113
1410
dbus.UInt64, "ExtendedTimeout",
1114
type_func = timedelta_to_milliseconds)
1115
interval = notifychangeproperty(dbus.UInt64,
1118
timedelta_to_milliseconds)
1411
type_func = lambda td: td.total_seconds() * 1000)
1412
interval = notifychangeproperty(
1413
dbus.UInt64, "Interval",
1414
type_func = lambda td: td.total_seconds() * 1000)
1119
1415
checker_command = notifychangeproperty(dbus.String, "Checker")
1416
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1417
invalidate_only=True)
1121
1419
del notifychangeproperty
1129
1427
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1130
1428
Client.__del__(self, *args, **kwargs)
1132
def checker_callback(self, pid, condition, command,
1134
self.checker_callback_tag = None
1136
if os.WIFEXITED(condition):
1137
exitstatus = os.WEXITSTATUS(condition)
1430
def checker_callback(self, source, condition,
1431
connection, command, *args, **kwargs):
1432
ret = Client.checker_callback(self, source, condition,
1433
connection, command, *args,
1435
exitstatus = self.last_checker_status
1138
1437
# Emit D-Bus signal
1139
1438
self.CheckerCompleted(dbus.Int16(exitstatus),
1140
dbus.Int64(condition),
1439
# This is specific to GNU libC
1440
dbus.Int64(exitstatus << 8),
1141
1441
dbus.String(command))
1143
1443
# Emit D-Bus signal
1144
1444
self.CheckerCompleted(dbus.Int16(-1),
1145
dbus.Int64(condition),
1446
# This is specific to GNU libC
1448
| self.last_checker_signal),
1146
1449
dbus.String(command))
1148
return Client.checker_callback(self, pid, condition, command,
1151
1452
def start_checker(self, *args, **kwargs):
1152
old_checker = self.checker
1153
if self.checker is not None:
1154
old_checker_pid = self.checker.pid
1156
old_checker_pid = None
1453
old_checker_pid = getattr(self.checker, "pid", None)
1157
1454
r = Client.start_checker(self, *args, **kwargs)
1158
1455
# Only if new checker process was started
1159
1456
if (self.checker is not None
1277
1571
self.approved_by_default = bool(value)
1279
1573
# ApprovalDelay - property
1280
@dbus_service_property(_interface, signature="t",
1574
@dbus_service_property(_interface,
1281
1576
access="readwrite")
1282
1577
def ApprovalDelay_dbus_property(self, value=None):
1283
1578
if value is None: # get
1284
return dbus.UInt64(self.approval_delay_milliseconds())
1579
return dbus.UInt64(self.approval_delay.total_seconds()
1285
1581
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1287
1583
# ApprovalDuration - property
1288
@dbus_service_property(_interface, signature="t",
1584
@dbus_service_property(_interface,
1289
1586
access="readwrite")
1290
1587
def ApprovalDuration_dbus_property(self, value=None):
1291
1588
if value is None: # get
1292
return dbus.UInt64(timedelta_to_milliseconds(
1293
self.approval_duration))
1589
return dbus.UInt64(self.approval_duration.total_seconds()
1294
1591
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1296
1593
# Name - property
1595
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1297
1596
@dbus_service_property(_interface, signature="s", access="read")
1298
1597
def Name_dbus_property(self):
1299
1598
return dbus.String(self.name)
1301
1600
# Fingerprint - property
1602
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1302
1603
@dbus_service_property(_interface, signature="s", access="read")
1303
1604
def Fingerprint_dbus_property(self):
1304
1605
return dbus.String(self.fingerprint)
1306
1607
# Host - property
1307
@dbus_service_property(_interface, signature="s",
1608
@dbus_service_property(_interface,
1308
1610
access="readwrite")
1309
1611
def Host_dbus_property(self, value=None):
1310
1612
if value is None: # get
1311
1613
return dbus.String(self.host)
1312
self.host = unicode(value)
1614
self.host = str(value)
1314
1616
# Created - property
1618
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1315
1619
@dbus_service_property(_interface, signature="s", access="read")
1316
1620
def Created_dbus_property(self):
1317
1621
return datetime_to_dbus(self.created)
1352
1663
return datetime_to_dbus(self.last_approval_request)
1354
1665
# Timeout - property
1355
@dbus_service_property(_interface, signature="t",
1666
@dbus_service_property(_interface,
1356
1668
access="readwrite")
1357
1669
def Timeout_dbus_property(self, value=None):
1358
1670
if value is None: # get
1359
return dbus.UInt64(self.timeout_milliseconds())
1671
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1672
old_timeout = self.timeout
1360
1673
self.timeout = datetime.timedelta(0, 0, 0, value)
1361
if getattr(self, "disable_initiator_tag", None) is None:
1363
# Reschedule timeout
1364
gobject.source_remove(self.disable_initiator_tag)
1365
self.disable_initiator_tag = None
1367
time_to_die = timedelta_to_milliseconds((self
1372
if time_to_die <= 0:
1373
# The timeout has passed
1376
self.expires = (datetime.datetime.utcnow()
1377
+ datetime.timedelta(milliseconds =
1379
self.disable_initiator_tag = (gobject.timeout_add
1380
(time_to_die, self.disable))
1674
# Reschedule disabling
1676
now = datetime.datetime.utcnow()
1677
self.expires += self.timeout - old_timeout
1678
if self.expires <= now:
1679
# The timeout has passed
1682
if (getattr(self, "disable_initiator_tag", None)
1685
gobject.source_remove(self.disable_initiator_tag)
1686
self.disable_initiator_tag = gobject.timeout_add(
1687
int((self.expires - now).total_seconds() * 1000),
1382
1690
# ExtendedTimeout - property
1383
@dbus_service_property(_interface, signature="t",
1691
@dbus_service_property(_interface,
1384
1693
access="readwrite")
1385
1694
def ExtendedTimeout_dbus_property(self, value=None):
1386
1695
if value is None: # get
1387
return dbus.UInt64(self.extended_timeout_milliseconds())
1696
return dbus.UInt64(self.extended_timeout.total_seconds()
1388
1698
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1390
1700
# Interval - property
1391
@dbus_service_property(_interface, signature="t",
1701
@dbus_service_property(_interface,
1392
1703
access="readwrite")
1393
1704
def Interval_dbus_property(self, value=None):
1394
1705
if value is None: # get
1395
return dbus.UInt64(self.interval_milliseconds())
1706
return dbus.UInt64(self.interval.total_seconds() * 1000)
1396
1707
self.interval = datetime.timedelta(0, 0, 0, value)
1397
1708
if getattr(self, "checker_initiator_tag", None) is None:
1399
1710
if self.enabled:
1400
1711
# Reschedule checker run
1401
1712
gobject.source_remove(self.checker_initiator_tag)
1402
self.checker_initiator_tag = (gobject.timeout_add
1403
(value, self.start_checker))
1404
self.start_checker() # Start one now, too
1713
self.checker_initiator_tag = gobject.timeout_add(
1714
value, self.start_checker)
1715
self.start_checker() # Start one now, too
1406
1717
# Checker - property
1407
@dbus_service_property(_interface, signature="s",
1718
@dbus_service_property(_interface,
1408
1720
access="readwrite")
1409
1721
def Checker_dbus_property(self, value=None):
1410
1722
if value is None: # get
1411
1723
return dbus.String(self.checker_command)
1412
self.checker_command = unicode(value)
1724
self.checker_command = str(value)
1414
1726
# CheckerRunning - property
1415
@dbus_service_property(_interface, signature="b",
1727
@dbus_service_property(_interface,
1416
1729
access="readwrite")
1417
1730
def CheckerRunning_dbus_property(self, value=None):
1418
1731
if value is None: # get
1650
1962
def fingerprint(openpgp):
1651
1963
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1652
1964
# New GnuTLS "datum" with the OpenPGP public key
1653
datum = (gnutls.library.types
1654
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1657
ctypes.c_uint(len(openpgp))))
1965
datum = gnutls.library.types.gnutls_datum_t(
1966
ctypes.cast(ctypes.c_char_p(openpgp),
1967
ctypes.POINTER(ctypes.c_ubyte)),
1968
ctypes.c_uint(len(openpgp)))
1658
1969
# New empty GnuTLS certificate
1659
1970
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1660
(gnutls.library.functions
1661
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1971
gnutls.library.functions.gnutls_openpgp_crt_init(
1662
1973
# Import the OpenPGP public key into the certificate
1663
(gnutls.library.functions
1664
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1665
gnutls.library.constants
1666
.GNUTLS_OPENPGP_FMT_RAW))
1974
gnutls.library.functions.gnutls_openpgp_crt_import(
1975
crt, ctypes.byref(datum),
1976
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1667
1977
# Verify the self signature in the key
1668
1978
crtverify = ctypes.c_uint()
1669
(gnutls.library.functions
1670
.gnutls_openpgp_crt_verify_self(crt, 0,
1671
ctypes.byref(crtverify)))
1979
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1980
crt, 0, ctypes.byref(crtverify))
1672
1981
if crtverify.value != 0:
1673
1982
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1674
raise (gnutls.errors.CertificateSecurityError
1983
raise gnutls.errors.CertificateSecurityError(
1676
1985
# New buffer for the fingerprint
1677
1986
buf = ctypes.create_string_buffer(20)
1678
1987
buf_len = ctypes.c_size_t()
1679
1988
# Get the fingerprint from the certificate into the buffer
1680
(gnutls.library.functions
1681
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1682
ctypes.byref(buf_len)))
1989
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1990
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1683
1991
# Deinit the certificate
1684
1992
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1685
1993
# Convert the buffer to a Python bytestring
1735
2044
interface: None or a network interface name (string)
1736
2045
use_ipv6: Boolean; to use IPv6 or not
1738
2048
def __init__(self, server_address, RequestHandlerClass,
1739
interface=None, use_ipv6=True):
2052
"""If socketfd is set, use that file descriptor instead of
2053
creating a new one with socket.socket().
1740
2055
self.interface = interface
1742
2057
self.address_family = socket.AF_INET6
2058
if socketfd is not None:
2059
# Save the file descriptor
2060
self.socketfd = socketfd
2061
# Save the original socket.socket() function
2062
self.socket_socket = socket.socket
2063
# To implement --socket, we monkey patch socket.socket.
2065
# (When socketserver.TCPServer is a new-style class, we
2066
# could make self.socket into a property instead of monkey
2067
# patching socket.socket.)
2069
# Create a one-time-only replacement for socket.socket()
2070
@functools.wraps(socket.socket)
2071
def socket_wrapper(*args, **kwargs):
2072
# Restore original function so subsequent calls are
2074
socket.socket = self.socket_socket
2075
del self.socket_socket
2076
# This time only, return a new socket object from the
2077
# saved file descriptor.
2078
return socket.fromfd(self.socketfd, *args, **kwargs)
2079
# Replace socket.socket() function with wrapper
2080
socket.socket = socket_wrapper
2081
# The socketserver.TCPServer.__init__ will call
2082
# socket.socket(), which might be our replacement,
2083
# socket_wrapper(), if socketfd was set.
1743
2084
socketserver.TCPServer.__init__(self, server_address,
1744
2085
RequestHandlerClass)
1745
2087
def server_bind(self):
1746
2088
"""This overrides the normal server_bind() function
1747
2089
to bind to an interface if one was specified, and also NOT to
2249
def rfc3339_duration_to_delta(duration):
2250
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2252
>>> rfc3339_duration_to_delta("P7D")
2253
datetime.timedelta(7)
2254
>>> rfc3339_duration_to_delta("PT60S")
2255
datetime.timedelta(0, 60)
2256
>>> rfc3339_duration_to_delta("PT60M")
2257
datetime.timedelta(0, 3600)
2258
>>> rfc3339_duration_to_delta("PT24H")
2259
datetime.timedelta(1)
2260
>>> rfc3339_duration_to_delta("P1W")
2261
datetime.timedelta(7)
2262
>>> rfc3339_duration_to_delta("PT5M30S")
2263
datetime.timedelta(0, 330)
2264
>>> rfc3339_duration_to_delta("P1DT3M20S")
2265
datetime.timedelta(1, 200)
2268
# Parsing an RFC 3339 duration with regular expressions is not
2269
# possible - there would have to be multiple places for the same
2270
# values, like seconds. The current code, while more esoteric, is
2271
# cleaner without depending on a parsing library. If Python had a
2272
# built-in library for parsing we would use it, but we'd like to
2273
# avoid excessive use of external libraries.
2275
# New type for defining tokens, syntax, and semantics all-in-one
2276
Token = collections.namedtuple("Token", (
2277
"regexp", # To match token; if "value" is not None, must have
2278
# a "group" containing digits
2279
"value", # datetime.timedelta or None
2280
"followers")) # Tokens valid after this token
2281
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2282
# the "duration" ABNF definition in RFC 3339, Appendix A.
2283
token_end = Token(re.compile(r"$"), None, frozenset())
2284
token_second = Token(re.compile(r"(\d+)S"),
2285
datetime.timedelta(seconds=1),
2286
frozenset((token_end, )))
2287
token_minute = Token(re.compile(r"(\d+)M"),
2288
datetime.timedelta(minutes=1),
2289
frozenset((token_second, token_end)))
2290
token_hour = Token(re.compile(r"(\d+)H"),
2291
datetime.timedelta(hours=1),
2292
frozenset((token_minute, token_end)))
2293
token_time = Token(re.compile(r"T"),
2295
frozenset((token_hour, token_minute,
2297
token_day = Token(re.compile(r"(\d+)D"),
2298
datetime.timedelta(days=1),
2299
frozenset((token_time, token_end)))
2300
token_month = Token(re.compile(r"(\d+)M"),
2301
datetime.timedelta(weeks=4),
2302
frozenset((token_day, token_end)))
2303
token_year = Token(re.compile(r"(\d+)Y"),
2304
datetime.timedelta(weeks=52),
2305
frozenset((token_month, token_end)))
2306
token_week = Token(re.compile(r"(\d+)W"),
2307
datetime.timedelta(weeks=1),
2308
frozenset((token_end, )))
2309
token_duration = Token(re.compile(r"P"), None,
2310
frozenset((token_year, token_month,
2311
token_day, token_time,
2313
# Define starting values
2314
value = datetime.timedelta() # Value so far
2316
followers = frozenset((token_duration, )) # Following valid tokens
2317
s = duration # String left to parse
2318
# Loop until end token is found
2319
while found_token is not token_end:
2320
# Search for any currently valid tokens
2321
for token in followers:
2322
match = token.regexp.match(s)
2323
if match is not None:
2325
if token.value is not None:
2326
# Value found, parse digits
2327
factor = int(match.group(1), 10)
2328
# Add to value so far
2329
value += factor * token.value
2330
# Strip token from string
2331
s = token.regexp.sub("", s, 1)
2334
# Set valid next tokens
2335
followers = found_token.followers
2338
# No currently valid tokens were found
2339
raise ValueError("Invalid RFC 3339 duration: {!r}"
1912
2345
def string_to_delta(interval):
1913
2346
"""Parse a string and return a datetime.timedelta
2028
2476
"debug": "False",
2030
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2478
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2479
":+SIGN-DSA-SHA256",
2031
2480
"servicename": "Mandos",
2032
2481
"use_dbus": "True",
2033
2482
"use_ipv6": "True",
2034
2483
"debuglevel": "",
2035
2484
"restore": "True",
2036
"statedir": "/var/lib/mandos"
2486
"statedir": "/var/lib/mandos",
2487
"foreground": "False",
2039
2491
# Parse config file for server-global settings
2040
2492
server_config = configparser.SafeConfigParser(server_defaults)
2041
2493
del server_defaults
2042
server_config.read(os.path.join(options.configdir,
2494
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2044
2495
# Convert the SafeConfigParser object to a dict
2045
2496
server_settings = server_config.defaults()
2046
2497
# Use the appropriate methods on the non-string config options
2047
for option in ("debug", "use_dbus", "use_ipv6"):
2498
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2048
2499
server_settings[option] = server_config.getboolean("DEFAULT",
2050
2501
if server_settings["port"]:
2051
2502
server_settings["port"] = server_config.getint("DEFAULT",
2504
if server_settings["socket"]:
2505
server_settings["socket"] = server_config.getint("DEFAULT",
2507
# Later, stdin will, and stdout and stderr might, be dup'ed
2508
# over with an opened os.devnull. But we don't want this to
2509
# happen with a supplied network socket.
2510
if 0 <= server_settings["socket"] <= 2:
2511
server_settings["socket"] = os.dup(server_settings
2053
2513
del server_config
2055
2515
# Override the settings from the config file with command line
2056
2516
# options, if set.
2057
2517
for option in ("interface", "address", "port", "debug",
2058
"priority", "servicename", "configdir",
2059
"use_dbus", "use_ipv6", "debuglevel", "restore",
2518
"priority", "servicename", "configdir", "use_dbus",
2519
"use_ipv6", "debuglevel", "restore", "statedir",
2520
"socket", "foreground", "zeroconf"):
2061
2521
value = getattr(options, option)
2062
2522
if value is not None:
2063
2523
server_settings[option] = value
2065
2525
# Force all strings to be unicode
2066
2526
for option in server_settings.keys():
2067
if type(server_settings[option]) is str:
2068
server_settings[option] = unicode(server_settings[option])
2527
if isinstance(server_settings[option], bytes):
2528
server_settings[option] = (server_settings[option]
2530
# Force all boolean options to be boolean
2531
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2532
"foreground", "zeroconf"):
2533
server_settings[option] = bool(server_settings[option])
2534
# Debug implies foreground
2535
if server_settings["debug"]:
2536
server_settings["foreground"] = True
2069
2537
# Now we have our good server settings in "server_settings"
2071
2539
##################################################################
2541
if (not server_settings["zeroconf"]
2542
and not (server_settings["port"]
2543
or server_settings["socket"] != "")):
2544
parser.error("Needs port or socket to work without Zeroconf")
2073
2546
# For convenience
2074
2547
debug = server_settings["debug"]
2075
2548
debuglevel = server_settings["debuglevel"]
2088
2563
initlogger(debug, level)
2090
2565
if server_settings["servicename"] != "Mandos":
2091
syslogger.setFormatter(logging.Formatter
2092
('Mandos (%s) [%%(process)d]:'
2093
' %%(levelname)s: %%(message)s'
2094
% server_settings["servicename"]))
2566
syslogger.setFormatter(
2567
logging.Formatter('Mandos ({}) [%(process)d]:'
2568
' %(levelname)s: %(message)s'.format(
2569
server_settings["servicename"])))
2096
2571
# Parse config file with clients
2097
client_config = configparser.SafeConfigParser(Client.client_defaults)
2572
client_config = configparser.SafeConfigParser(Client
2098
2574
client_config.read(os.path.join(server_settings["configdir"],
2099
2575
"clients.conf"))
2101
2577
global mandos_dbus_service
2102
2578
mandos_dbus_service = None
2104
tcp_server = MandosServer((server_settings["address"],
2105
server_settings["port"]),
2107
interface=(server_settings["interface"]
2111
server_settings["priority"],
2114
pidfilename = "/var/run/mandos.pid"
2581
if server_settings["socket"] != "":
2582
socketfd = server_settings["socket"]
2583
tcp_server = MandosServer(
2584
(server_settings["address"], server_settings["port"]),
2586
interface=(server_settings["interface"] or None),
2588
gnutls_priority=server_settings["priority"],
2592
pidfilename = "/run/mandos.pid"
2593
if not os.path.isdir("/run/."):
2594
pidfilename = "/var/run/mandos.pid"
2116
pidfile = open(pidfilename, "w")
2118
logger.error("Could not open file %r", pidfilename)
2597
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2598
except IOError as e:
2599
logger.error("Could not open file %r", pidfilename,
2121
uid = pwd.getpwnam("_mandos").pw_uid
2122
gid = pwd.getpwnam("_mandos").pw_gid
2602
for name in ("_mandos", "mandos", "nobody"):
2125
uid = pwd.getpwnam("mandos").pw_uid
2126
gid = pwd.getpwnam("mandos").pw_gid
2604
uid = pwd.getpwnam(name).pw_uid
2605
gid = pwd.getpwnam(name).pw_gid
2127
2607
except KeyError:
2129
uid = pwd.getpwnam("nobody").pw_uid
2130
gid = pwd.getpwnam("nobody").pw_gid
2137
2615
except OSError as error:
2138
if error[0] != errno.EPERM:
2616
if error.errno != errno.EPERM:
2142
2620
# Enable all possible GnuTLS debugging
2149
2627
def debug_gnutls(level, string):
2150
2628
logger.debug("GnuTLS: %s", string[:-1])
2152
(gnutls.library.functions
2153
.gnutls_global_set_log_function(debug_gnutls))
2630
gnutls.library.functions.gnutls_global_set_log_function(
2155
2633
# Redirect stdin so all checkers get /dev/null
2156
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2634
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2157
2635
os.dup2(null, sys.stdin.fileno())
2161
2639
# Need to fork before connecting to D-Bus
2163
2641
# Close all input and output, do double fork, etc.
2644
# multiprocessing will use threads, so before we use gobject we
2645
# need to inform gobject that threads will be used.
2166
2646
gobject.threads_init()
2168
2648
global main_loop
2169
2649
# From the Avahi example code
2170
DBusGMainLoop(set_as_default=True )
2650
DBusGMainLoop(set_as_default=True)
2171
2651
main_loop = gobject.MainLoop()
2172
2652
bus = dbus.SystemBus()
2173
2653
# End of Avahi example code
2176
2656
bus_name = dbus.service.BusName("se.recompile.Mandos",
2177
bus, do_not_queue=True)
2178
old_bus_name = (dbus.service.BusName
2179
("se.bsnet.fukt.Mandos", bus,
2181
except dbus.exceptions.NameExistsException as e:
2182
logger.error(unicode(e) + ", disabling D-Bus")
2659
old_bus_name = dbus.service.BusName(
2660
"se.bsnet.fukt.Mandos", bus,
2662
except dbus.exceptions.DBusException as e:
2663
logger.error("Disabling D-Bus:", exc_info=e)
2183
2664
use_dbus = False
2184
2665
server_settings["use_dbus"] = False
2185
2666
tcp_server.use_dbus = False
2186
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2187
service = AvahiServiceToSyslog(name =
2188
server_settings["servicename"],
2189
servicetype = "_mandos._tcp",
2190
protocol = protocol, bus = bus)
2191
if server_settings["interface"]:
2192
service.interface = (if_nametoindex
2193
(str(server_settings["interface"])))
2668
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2669
service = AvahiServiceToSyslog(
2670
name = server_settings["servicename"],
2671
servicetype = "_mandos._tcp",
2672
protocol = protocol,
2674
if server_settings["interface"]:
2675
service.interface = if_nametoindex(
2676
server_settings["interface"].encode("utf-8"))
2195
2678
global multiprocessing_manager
2196
2679
multiprocessing_manager = multiprocessing.Manager()
2198
2681
client_class = Client
2200
client_class = functools.partial(ClientDBusTransitional,
2683
client_class = functools.partial(ClientDBus, bus = bus)
2203
2685
client_settings = Client.config_parser(client_config)
2204
2686
old_client_settings = {}
2205
2687
clients_data = {}
2689
# This is used to redirect stdout and stderr for checker processes
2691
wnull = open(os.devnull, "w") # A writable /dev/null
2692
# Only used if server is running in foreground but not in debug
2694
if debug or not foreground:
2207
2697
# Get client data and settings from last running state.
2208
2698
if server_settings["restore"]:
2210
2700
with open(stored_state_path, "rb") as stored_state:
2211
clients_data, old_client_settings = (pickle.load
2701
clients_data, old_client_settings = pickle.load(
2213
2703
os.remove(stored_state_path)
2214
2704
except IOError as e:
2215
logger.warning("Could not load persistent state: {0}"
2217
if e.errno != errno.ENOENT:
2705
if e.errno == errno.ENOENT:
2706
logger.warning("Could not load persistent state:"
2707
" {}".format(os.strerror(e.errno)))
2709
logger.critical("Could not load persistent state:",
2219
2712
except EOFError as e:
2220
2713
logger.warning("Could not load persistent state: "
2221
"EOFError: {0}".format(e))
2223
2717
with PGPEngine() as pgp:
2224
for client_name, client in clients_data.iteritems():
2718
for client_name, client in clients_data.items():
2719
# Skip removed clients
2720
if client_name not in client_settings:
2225
2723
# Decide which value to use after restoring saved state.
2226
2724
# We have three different values: Old config file,
2227
2725
# new config file, and saved state.
2232
2730
# For each value in new config, check if it
2233
2731
# differs from the old config value (Except for
2234
2732
# the "secret" attribute)
2235
if (name != "secret" and
2236
value != old_client_settings[client_name]
2733
if (name != "secret"
2735
old_client_settings[client_name][name])):
2238
2736
client[name] = value
2239
2737
except KeyError:
2242
2740
# Clients who has passed its expire date can still be
2243
# enabled if its last checker was successful. Clients
2244
# whose checker failed before we stored its state is
2245
# assumed to have failed all checkers during downtime.
2741
# enabled if its last checker was successful. A Client
2742
# whose checker succeeded before we stored its state is
2743
# assumed to have successfully run all checkers during
2246
2745
if client["enabled"]:
2247
2746
if datetime.datetime.utcnow() >= client["expires"]:
2248
2747
if not client["last_checked_ok"]:
2249
2748
logger.warning(
2250
"disabling client {0} - Client never "
2251
"performed a successfull checker"
2252
.format(client["name"]))
2749
"disabling client {} - Client never "
2750
"performed a successful checker".format(
2253
2752
client["enabled"] = False
2254
2753
elif client["last_checker_status"] != 0:
2255
2754
logger.warning(
2256
"disabling client {0} - Client "
2257
"last checker failed with error code {1}"
2258
.format(client["name"],
2259
client["last_checker_status"]))
2755
"disabling client {} - Client last"
2756
" checker failed with error code"
2759
client["last_checker_status"]))
2260
2760
client["enabled"] = False
2262
client["expires"] = (datetime.datetime
2264
+ client["timeout"])
2762
client["expires"] = (
2763
datetime.datetime.utcnow()
2764
+ client["timeout"])
2765
logger.debug("Last checker succeeded,"
2766
" keeping {} enabled".format(
2267
client["secret"] = (
2268
pgp.decrypt(client["encrypted_secret"],
2269
client_settings[client_name]
2769
client["secret"] = pgp.decrypt(
2770
client["encrypted_secret"],
2771
client_settings[client_name]["secret"])
2271
2772
except PGPError:
2272
2773
# If decryption fails, we use secret from new settings
2273
logger.debug("Failed to decrypt {0} old secret"
2274
.format(client_name))
2275
client["secret"] = (
2276
client_settings[client_name]["secret"])
2774
logger.debug("Failed to decrypt {} old secret".format(
2776
client["secret"] = (client_settings[client_name]
2279
2779
# Add/remove clients based on new changes made to config
2280
for client_name in set(old_client_settings) - set(client_settings):
2780
for client_name in (set(old_client_settings)
2781
- set(client_settings)):
2281
2782
del clients_data[client_name]
2282
for client_name in set(client_settings) - set(old_client_settings):
2783
for client_name in (set(client_settings)
2784
- set(old_client_settings)):
2283
2785
clients_data[client_name] = client_settings[client_name]
2285
# Create clients all clients
2286
for client_name, client in clients_data.iteritems():
2787
# Create all client objects
2788
for client_name, client in clients_data.items():
2287
2789
tcp_server.clients[client_name] = client_class(
2288
name = client_name, settings = client)
2792
server_settings = server_settings)
2290
2794
if not tcp_server.clients:
2291
2795
logger.warning("No clients defined")
2297
pidfile.write(str(pid) + "\n".encode("utf-8"))
2300
logger.error("Could not write to file %r with PID %d",
2303
# "pidfile" was never created
2798
if pidfile is not None:
2802
print(pid, file=pidfile)
2804
logger.error("Could not write to file %r with PID %d",
2305
2807
del pidfilename
2306
signal.signal(signal.SIGINT, signal.SIG_IGN)
2308
2809
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2309
2810
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2312
class MandosDBusService(dbus.service.Object):
2814
@alternate_dbus_interfaces(
2815
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2816
class MandosDBusService(DBusObjectWithAnnotations):
2313
2817
"""A D-Bus proxy object"""
2314
2819
def __init__(self):
2315
2820
dbus.service.Object.__init__(self, bus, "/")
2316
2822
_interface = "se.recompile.Mandos"
2318
2824
@dbus.service.signal(_interface, signature="o")