107
103
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
108
104
with contextlib.closing(socket.socket()) as s:
109
105
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
struct.pack(b"16s16x", interface))
111
interface_index = struct.unpack("I", ifreq[16:20])[0]
106
struct.pack(str("16s16x"),
108
interface_index = struct.unpack(str("I"),
112
110
return interface_index
115
113
def initlogger(debug, level=logging.WARNING):
116
114
"""init logger and add loglevel"""
119
syslogger = (logging.handlers.SysLogHandler
121
logging.handlers.SysLogHandler.LOG_DAEMON,
122
address = "/dev/log"))
123
116
syslogger.setFormatter(logging.Formatter
124
117
('Mandos [%(process)d]: %(levelname)s:'
176
170
def password_encode(self, password):
177
171
# Passphrase can not be empty and can not contain newlines or
178
172
# NUL bytes. So we prefix it and hex encode it.
179
encoded = b"mandos" + binascii.hexlify(password)
180
if len(encoded) > 2048:
181
# GnuPG can't handle long passwords, so encode differently
182
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
183
.replace(b"\n", b"\\n")
184
.replace(b"\0", b"\\x00"))
173
return b"mandos" + binascii.hexlify(password)
187
175
def encrypt(self, data, password):
188
passphrase = self.password_encode(password)
189
with tempfile.NamedTemporaryFile(dir=self.tempdir
191
passfile.write(passphrase)
193
proc = subprocess.Popen(['gpg', '--symmetric',
197
stdin = subprocess.PIPE,
198
stdout = subprocess.PIPE,
199
stderr = subprocess.PIPE)
200
ciphertext, err = proc.communicate(input = data)
201
if proc.returncode != 0:
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
203
190
return ciphertext
205
192
def decrypt(self, data, password):
206
passphrase = self.password_encode(password)
207
with tempfile.NamedTemporaryFile(dir = self.tempdir
209
passfile.write(passphrase)
211
proc = subprocess.Popen(['gpg', '--decrypt',
215
stdin = subprocess.PIPE,
216
stdout = subprocess.PIPE,
217
stderr = subprocess.PIPE)
218
decrypted_plaintext, err = proc.communicate(input
220
if proc.returncode != 0:
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
222
207
return decrypted_plaintext
225
211
class AvahiError(Exception):
226
212
def __init__(self, value, *args, **kwargs):
227
213
self.value = value
228
return super(AvahiError, self).__init__(value, *args,
214
super(AvahiError, self).__init__(value, *args, **kwargs)
215
def __unicode__(self):
216
return unicode(repr(self.value))
231
218
class AvahiServiceError(AvahiError):
274
260
self.server = None
276
262
self.entry_group_state_changed_match = None
278
def rename(self, remove=True):
279
264
"""Derived from the Avahi example code"""
280
265
if self.rename_count >= self.max_renames:
281
266
logger.critical("No suitable Zeroconf service name found"
282
267
" after %i retries, exiting.",
283
268
self.rename_count)
284
269
raise AvahiServiceError("Too many renames")
285
self.name = str(self.server
286
.GetAlternativeServiceName(self.name))
287
self.rename_count += 1
270
self.name = unicode(self.server
271
.GetAlternativeServiceName(self.name))
288
272
logger.info("Changing Zeroconf service name to %r ...",
294
277
except dbus.exceptions.DBusException as error:
295
if (error.get_dbus_name()
296
== "org.freedesktop.Avahi.CollisionError"):
297
logger.info("Local Zeroconf service name collision.")
298
return self.rename(remove=False)
300
logger.critical("D-Bus Exception", exc_info=error)
278
logger.critical("DBusException: %s", error)
281
self.rename_count += 1
304
282
def remove(self):
305
283
"""Derived from the Avahi example code"""
306
284
if self.entry_group_state_changed_match is not None:
395
368
self.server_state_changed)
396
369
self.server_state_changed(self.server.GetState())
399
371
class AvahiServiceToSyslog(AvahiService):
400
def rename(self, *args, **kwargs):
401
373
"""Add the new name to the syslog messages"""
402
ret = AvahiService.rename(self, *args, **kwargs)
374
ret = AvahiService.rename(self)
403
375
syslogger.setFormatter(logging.Formatter
404
('Mandos ({}) [%(process)d]:'
405
' %(levelname)s: %(message)s'
376
('Mandos (%s) [%%(process)d]:'
377
' %%(levelname)s: %%(message)s'
381
def timedelta_to_milliseconds(td):
382
"Convert a datetime.timedelta() to milliseconds"
383
return ((td.days * 24 * 60 * 60 * 1000)
384
+ (td.seconds * 1000)
385
+ (td.microseconds // 1000))
410
387
class Client(object):
411
388
"""A representation of a client host served by this server.
437
414
last_checked_ok: datetime.datetime(); (UTC) or None
438
415
last_checker_status: integer between 0 and 255 reflecting exit
439
416
status of last checker. -1 reflects crashed
440
checker, -2 means no checker completed yet.
441
418
last_enabled: datetime.datetime(); (UTC) or None
442
419
name: string; from the config file, used in log messages and
443
420
D-Bus identifiers
444
421
secret: bytestring; sent verbatim (over TLS) to client
445
422
timeout: datetime.timedelta(); How long from last_checked_ok
446
423
until this client is disabled
447
extended_timeout: extra long timeout when secret has been sent
424
extended_timeout: extra long timeout when password has been sent
448
425
runtime_expansions: Allowed attributes for runtime expansion.
449
426
expires: datetime.datetime(); time (UTC) when a client will be
450
427
disabled, or None
451
server_settings: The server_settings dict from main()
454
430
runtime_expansions = ("approval_delay", "approval_duration",
455
"created", "enabled", "expires",
456
"fingerprint", "host", "interval",
457
"last_approval_request", "last_checked_ok",
431
"created", "enabled", "fingerprint",
432
"host", "interval", "last_checked_ok",
458
433
"last_enabled", "name", "timeout")
459
client_defaults = { "timeout": "PT5M",
460
"extended_timeout": "PT15M",
434
client_defaults = { "timeout": "5m",
435
"extended_timeout": "15m",
462
437
"checker": "fping -q -- %%(host)s",
464
"approval_delay": "PT0S",
465
"approval_duration": "PT1S",
439
"approval_delay": "0s",
440
"approval_duration": "1s",
466
441
"approved_by_default": "True",
467
442
"enabled": "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)
471
461
def config_parser(config):
472
"""Construct a new dict of client settings of this form:
462
""" Construct a new dict of client settings of this form:
473
463
{ client_name: {setting_name: value, ...}, ...}
474
with exceptions for any special settings as defined above.
475
NOTE: Must be a pure function. Must return the same result
476
value given the same arguments.
464
with exceptions for any special settings as defined above"""
479
466
for client_name in config.sections():
480
467
section = dict(config.items(client_name))
510
496
client["checker_command"] = section["checker"]
511
497
client["last_approval_request"] = None
512
498
client["last_checked_ok"] = None
513
client["last_checker_status"] = -2
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
517
def __init__(self, settings, name = None, server_settings=None):
511
def __init__(self, settings, name = None):
512
"""Note: the 'checker' key in 'config' sets the
513
'checker_command' attribute and *not* the 'checker'
519
if server_settings is None:
521
self.server_settings = server_settings
522
516
# adding all client settings
523
for setting, value in settings.items():
517
for setting, value in settings.iteritems():
524
518
setattr(self, setting, value)
527
if not hasattr(self, "last_enabled"):
528
self.last_enabled = datetime.datetime.utcnow()
529
if not hasattr(self, "expires"):
530
self.expires = (datetime.datetime.utcnow()
533
self.last_enabled = None
536
520
logger.debug("Creating client %r", self.name)
537
521
# Uppercase and remove spaces from fingerprint for later
538
522
# comparison purposes with return value from the fingerprint()
540
524
logger.debug(" Fingerprint: %s", self.fingerprint)
541
self.created = settings.get("created",
542
datetime.datetime.utcnow())
525
self.created = settings.get("created", datetime.datetime.utcnow())
544
527
# attributes specific for this server instance
545
528
self.checker = None
546
529
self.checker_initiator_tag = None
574
557
if getattr(self, "enabled", False):
575
558
# Already enabled
560
self.send_changedstate()
577
561
self.expires = datetime.datetime.utcnow() + self.timeout
578
562
self.enabled = True
579
563
self.last_enabled = datetime.datetime.utcnow()
580
564
self.init_checker()
581
self.send_changedstate()
583
566
def disable(self, quiet=True):
584
567
"""Disable this client."""
585
568
if not getattr(self, "enabled", False):
571
self.send_changedstate()
588
573
logger.info("Disabling client %s", self.name)
589
if getattr(self, "disable_initiator_tag", None) is not None:
574
if getattr(self, "disable_initiator_tag", False):
590
575
gobject.source_remove(self.disable_initiator_tag)
591
576
self.disable_initiator_tag = None
592
577
self.expires = None
593
if getattr(self, "checker_initiator_tag", None) is not None:
578
if getattr(self, "checker_initiator_tag", False):
594
579
gobject.source_remove(self.checker_initiator_tag)
595
580
self.checker_initiator_tag = None
596
581
self.stop_checker()
597
582
self.enabled = False
599
self.send_changedstate()
600
583
# Do not run this again if called by a gobject.timeout_add
606
589
def init_checker(self):
607
590
# Schedule a new checker to be started an 'interval' from now,
608
591
# and every interval from then on.
609
if self.checker_initiator_tag is not None:
610
gobject.source_remove(self.checker_initiator_tag)
611
592
self.checker_initiator_tag = (gobject.timeout_add
613
.total_seconds() * 1000),
593
(self.interval_milliseconds(),
614
594
self.start_checker))
615
595
# Schedule a disable() when 'timeout' has passed
616
if self.disable_initiator_tag is not None:
617
gobject.source_remove(self.disable_initiator_tag)
618
596
self.disable_initiator_tag = (gobject.timeout_add
620
.total_seconds() * 1000),
597
(self.timeout_milliseconds(),
622
599
# Also start a new checker *right now*.
623
600
self.start_checker()
640
617
logger.warning("Checker for %(name)s crashed?",
643
def checked_ok(self):
644
"""Assert that the client has been seen, alive and well."""
645
self.last_checked_ok = datetime.datetime.utcnow()
646
self.last_checker_status = 0
649
def bump_timeout(self, timeout=None):
650
"""Bump up the timeout for this client."""
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,
651
626
if timeout is None:
652
627
timeout = self.timeout
628
self.last_checked_ok = datetime.datetime.utcnow()
653
629
if self.disable_initiator_tag is not None:
654
630
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = None
656
631
if getattr(self, "enabled", False):
657
632
self.disable_initiator_tag = (gobject.timeout_add
658
(int(timeout.total_seconds()
659
* 1000), self.disable))
633
(timedelta_to_milliseconds
634
(timeout), self.disable))
660
635
self.expires = datetime.datetime.utcnow() + timeout
662
637
def need_approval(self):
668
643
If a checker already exists, leave it running and do
670
645
# The reason for not killing a running checker is that if we
671
# did that, and if a checker (for some reason) started running
672
# slowly and taking more than 'interval' time, then the client
673
# would inevitably timeout, since no checker would get a
674
# chance to run to completion. If we instead leave running
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
675
650
# checkers alone, the checker would have to take more time
676
651
# than 'timeout' for the client to be disabled, which is as it
692
666
self.current_checker_command)
693
667
# Start a new checker if needed
694
668
if self.checker is None:
695
# Escape attributes for the shell
696
escaped_attrs = { attr:
697
re.escape(str(getattr(self, attr)))
698
for attr in self.runtime_expansions }
700
command = self.checker_command % escaped_attrs
701
except TypeError as error:
702
logger.error('Could not format string "%s"',
703
self.checker_command, exc_info=error)
704
return True # Try again later
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
705
688
self.current_checker_command = command
707
690
logger.info("Starting checker %r for %s",
710
693
# in normal mode, that is already done by daemon(),
711
694
# and in debug mode we don't want to. (Stdin is
712
695
# always replaced by /dev/null.)
713
# The exception is when not debugging but nevertheless
714
# running in the foreground; use the previously
717
if (not self.server_settings["debug"]
718
and self.server_settings["foreground"]):
719
popen_args.update({"stdout": wnull,
721
696
self.checker = subprocess.Popen(command,
725
except OSError as error:
726
logger.error("Failed to start subprocess",
729
self.checker_callback_tag = (gobject.child_watch_add
731
self.checker_callback,
733
# The checker may have completed before the gobject
734
# watch was added. Check for this.
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.
736
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)
737
709
except OSError as error:
738
if error.errno == errno.ECHILD:
739
# This should never happen
740
logger.error("Child process vanished",
745
gobject.source_remove(self.checker_callback_tag)
746
self.checker_callback(pid, status, command)
710
logger.error("Failed to start subprocess: %s",
747
712
# Re-run this periodically if run by gobject.timeout_add
799
def dbus_interface_annotations(dbus_interface):
800
"""Decorator for marking functions returning interface annotations
804
@dbus_interface_annotations("org.example.Interface")
805
def _foo(self): # Function name does not matter
806
return {"org.freedesktop.DBus.Deprecated": "true",
807
"org.freedesktop.DBus.Property.EmitsChangedSignal":
811
func._dbus_is_interface = True
812
func._dbus_interface = dbus_interface
813
func._dbus_name = dbus_interface
818
def dbus_annotations(annotations):
819
"""Decorator to annotate D-Bus methods, signals or properties
822
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
823
"org.freedesktop.DBus.Property."
824
"EmitsChangedSignal": "false"})
825
@dbus_service_property("org.example.Interface", signature="b",
827
def Property_dbus_property(self):
828
return dbus.Boolean(False)
831
func._dbus_annotations = annotations
836
764
class DBusPropertyException(dbus.exceptions.DBusException):
837
765
"""A base class for D-Bus property-related exceptions
767
def __unicode__(self):
768
return unicode(str(self))
841
771
class DBusPropertyAccessException(DBusPropertyException):
842
772
"""A property's access permissions disallows an operation.
862
def _is_dbus_thing(thing):
863
"""Returns a function testing if an attribute is a D-Bus thing
865
If called like _is_dbus_thing("method") it returns a function
866
suitable for use as predicate to inspect.getmembers().
868
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
792
def _is_dbus_property(obj):
793
return getattr(obj, "_dbus_is_property", False)
871
def _get_all_dbus_things(self, thing):
795
def _get_all_dbus_properties(self):
872
796
"""Returns a generator of (name, attribute) pairs
874
return ((getattr(athing.__get__(self), "_dbus_name",
876
athing.__get__(self))
798
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
877
799
for cls in self.__class__.__mro__
879
inspect.getmembers(cls,
880
self._is_dbus_thing(thing)))
801
inspect.getmembers(cls, self._is_dbus_property))
882
803
def _get_dbus_property(self, interface_name, property_name):
883
804
"""Returns a bound method if one exists which is a D-Bus
952
870
value.variant_level+1)
953
871
return dbus.Dictionary(properties, signature="sv")
955
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
956
def PropertiesChanged(self, interface_name, changed_properties,
957
invalidated_properties):
958
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
963
873
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
964
874
out_signature="s",
965
875
path_keyword='object_path',
966
876
connection_keyword='connection')
967
877
def Introspect(self, object_path, connection):
968
"""Overloading of standard D-Bus method.
970
Inserts property tags and interface annotation tags.
878
"""Standard D-Bus method, overloaded to insert property tags.
972
880
xmlstring = dbus.service.Object.Introspect(self, object_path,
980
888
e.setAttribute("access", prop._dbus_access)
982
890
for if_tag in document.getElementsByTagName("interface"):
984
891
for tag in (make_tag(document, name, prop)
986
in self._get_all_dbus_things("property")
893
in self._get_all_dbus_properties()
987
894
if prop._dbus_interface
988
895
== if_tag.getAttribute("name")):
989
896
if_tag.appendChild(tag)
990
# Add annotation tags
991
for typ in ("method", "signal", "property"):
992
for tag in if_tag.getElementsByTagName(typ):
994
for name, prop in (self.
995
_get_all_dbus_things(typ)):
996
if (name == tag.getAttribute("name")
997
and prop._dbus_interface
998
== if_tag.getAttribute("name")):
999
annots.update(getattr
1001
"_dbus_annotations",
1003
for name, value in annots.items():
1004
ann_tag = document.createElement(
1006
ann_tag.setAttribute("name", name)
1007
ann_tag.setAttribute("value", value)
1008
tag.appendChild(ann_tag)
1009
# Add interface annotation tags
1010
for annotation, value in dict(
1011
itertools.chain.from_iterable(
1012
annotations().items()
1013
for name, annotations in
1014
self._get_all_dbus_things("interface")
1015
if name == if_tag.getAttribute("name")
1017
ann_tag = document.createElement("annotation")
1018
ann_tag.setAttribute("name", annotation)
1019
ann_tag.setAttribute("value", value)
1020
if_tag.appendChild(ann_tag)
1021
897
# Add the names to the return values for the
1022
898
# "org.freedesktop.DBus.Properties" methods
1023
899
if (if_tag.getAttribute("name")
1050
926
variant_level=variant_level)
1053
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1054
"""A class decorator; applied to a subclass of
1055
dbus.service.Object, it will add alternate D-Bus attributes with
1056
interface names according to the "alt_interface_names" mapping.
1059
@alternate_dbus_interfaces({"org.example.Interface":
1060
"net.example.AlternateInterface"})
1061
class SampleDBusObject(dbus.service.Object):
1062
@dbus.service.method("org.example.Interface")
1063
def SampleDBusMethod():
1066
The above "SampleDBusMethod" on "SampleDBusObject" will be
1067
reachable via two interfaces: "org.example.Interface" and
1068
"net.example.AlternateInterface", the latter of which will have
1069
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1070
"true", unless "deprecate" is passed with a False value.
1072
This works for methods and signals, and also for D-Bus properties
1073
(from DBusObjectWithProperties) and interfaces (from the
1074
dbus_interface_annotations decorator).
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.
1077
for orig_interface_name, alt_interface_name in (
1078
alt_interface_names.items()):
1080
interface_names = set()
1081
# Go though all attributes of the class
1082
for attrname, attribute in inspect.getmembers(cls):
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):
1083
941
# Ignore non-D-Bus attributes, and D-Bus attributes
1084
942
# with the wrong interface name
1085
943
if (not hasattr(attribute, "_dbus_interface")
1086
944
or not attribute._dbus_interface
1087
.startswith(orig_interface_name)):
945
.startswith("se.recompile.Mandos")):
1089
947
# Create an alternate D-Bus interface name based on
1090
948
# the current name
1091
949
alt_interface = (attribute._dbus_interface
1092
.replace(orig_interface_name,
1093
alt_interface_name))
1094
interface_names.add(alt_interface)
950
.replace("se.recompile.Mandos",
951
"se.bsnet.fukt.Mandos"))
1095
952
# Is this a D-Bus signal?
1096
953
if getattr(attribute, "_dbus_is_signal", False):
1097
# Extract the original non-method undecorated
1098
# function by black magic
954
# Extract the original non-method function by
1099
956
nonmethod_func = (dict(
1100
957
zip(attribute.func_code.co_freevars,
1101
958
attribute.__closure__))["func"]
1112
969
nonmethod_func.func_name,
1113
970
nonmethod_func.func_defaults,
1114
971
nonmethod_func.func_closure)))
1115
# Copy annotations, if any
1117
new_function._dbus_annotations = (
1118
dict(attribute._dbus_annotations))
1119
except AttributeError:
1121
972
# Define a creator of a function to call both the
1122
# original and alternate functions, so both the
1123
# original and alternate signals gets sent when
1124
# the function is called
973
# old and new functions, so both the old and new
974
# signals gets sent when the function is called
1125
975
def fixscope(func1, func2):
1126
976
"""This function is a scope container to pass
1127
977
func1 and func2 to the "call_both" function
1176
1021
attribute.func_name,
1177
1022
attribute.func_defaults,
1178
1023
attribute.func_closure)))
1179
# Copy annotations, if any
1181
attr[attrname]._dbus_annotations = (
1182
dict(attribute._dbus_annotations))
1183
except AttributeError:
1185
# Is this a D-Bus interface?
1186
elif getattr(attribute, "_dbus_is_interface", False):
1187
# Create a new, but exactly alike, function
1188
# object. Decorate it to be a new D-Bus interface
1189
# with the alternate D-Bus interface name. Add it
1191
attr[attrname] = (dbus_interface_annotations
1194
(attribute.func_code,
1195
attribute.func_globals,
1196
attribute.func_name,
1197
attribute.func_defaults,
1198
attribute.func_closure)))
1200
# Deprecate all alternate interfaces
1201
iname="_AlternateDBusNames_interface_annotation{}"
1202
for interface_name in interface_names:
1203
@dbus_interface_annotations(interface_name)
1205
return { "org.freedesktop.DBus.Deprecated":
1207
# Find an unused name
1208
for aname in (iname.format(i)
1209
for i in itertools.count()):
1210
if aname not in attr:
1214
# Replace the class with a new subclass of it with
1215
# methods, signals, etc. as created above.
1216
cls = type(b"{}Alternate".format(cls.__name__),
1222
@alternate_dbus_interfaces({"se.recompile.Mandos":
1223
"se.bsnet.fukt.Mandos"})
1024
return type.__new__(mcs, name, bases, attr)
1224
1027
class ClientDBus(Client, DBusObjectWithProperties):
1225
1028
"""A Client class using D-Bus
1232
1035
runtime_expansions = (Client.runtime_expansions
1233
1036
+ ("dbus_object_path",))
1235
_interface = "se.recompile.Mandos.Client"
1237
1038
# dbus.service.Object doesn't use super(), so we can't either.
1239
1040
def __init__(self, bus = None, *args, **kwargs):
1241
1042
Client.__init__(self, *args, **kwargs)
1043
self._approvals_pending = 0
1045
self._approvals_pending = 0
1242
1046
# Only now, when this client is initialized, can it show up on
1244
client_object_name = str(self.name).translate(
1048
client_object_name = unicode(self.name).translate(
1245
1049
{ord("."): ord("_"),
1246
1050
ord("-"): ord("_")})
1247
1051
self.dbus_object_path = (dbus.ObjectPath
1248
1052
("/clients/" + client_object_name))
1249
1053
DBusObjectWithProperties.__init__(self, self.bus,
1250
1054
self.dbus_object_path)
1252
1056
def notifychangeproperty(transform_func,
1253
1057
dbus_name, type_func=lambda x: x,
1254
variant_level=1, invalidate_only=False,
1255
_interface=_interface):
1256
1059
""" Modify a variable so that it's a property which announces
1257
1060
its changes to DBus.
1263
1066
to the D-Bus. Default: no transform
1264
1067
variant_level: D-Bus variant level. Default: 1
1266
attrname = "_{}".format(dbus_name)
1069
attrname = "_{0}".format(dbus_name)
1267
1070
def setter(self, value):
1268
1071
if hasattr(self, "dbus_object_path"):
1269
1072
if (not hasattr(self, attrname) or
1270
1073
type_func(getattr(self, attrname, None))
1271
1074
!= type_func(value)):
1273
self.PropertiesChanged(_interface,
1278
dbus_value = transform_func(type_func(value),
1281
self.PropertyChanged(dbus.String(dbus_name),
1283
self.PropertiesChanged(_interface,
1285
dbus.String(dbus_name):
1286
dbus_value }), dbus.Array())
1075
dbus_value = transform_func(type_func(value),
1078
self.PropertyChanged(dbus.String(dbus_name),
1287
1080
setattr(self, attrname, value)
1289
1082
return property(lambda self: getattr(self, attrname), setter)
1291
1085
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1292
1086
approvals_pending = notifychangeproperty(dbus.Boolean,
1293
1087
"ApprovalPending",
1309
1101
approval_delay = notifychangeproperty(dbus.UInt64,
1310
1102
"ApprovalDelay",
1312
lambda td: td.total_seconds()
1104
timedelta_to_milliseconds)
1314
1105
approval_duration = notifychangeproperty(
1315
1106
dbus.UInt64, "ApprovalDuration",
1316
type_func = lambda td: td.total_seconds() * 1000)
1107
type_func = timedelta_to_milliseconds)
1317
1108
host = notifychangeproperty(dbus.String, "Host")
1318
1109
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1319
type_func = lambda td:
1320
td.total_seconds() * 1000)
1111
timedelta_to_milliseconds)
1321
1112
extended_timeout = notifychangeproperty(
1322
1113
dbus.UInt64, "ExtendedTimeout",
1323
type_func = lambda td: td.total_seconds() * 1000)
1114
type_func = timedelta_to_milliseconds)
1324
1115
interval = notifychangeproperty(dbus.UInt64,
1327
lambda td: td.total_seconds()
1118
timedelta_to_milliseconds)
1329
1119
checker_command = notifychangeproperty(dbus.String, "Checker")
1330
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1331
invalidate_only=True)
1333
1121
del notifychangeproperty
1563
1356
access="readwrite")
1564
1357
def Timeout_dbus_property(self, value=None):
1565
1358
if value is None: # get
1566
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1567
old_timeout = self.timeout
1359
return dbus.UInt64(self.timeout_milliseconds())
1568
1360
self.timeout = datetime.timedelta(0, 0, 0, value)
1569
# Reschedule disabling
1571
now = datetime.datetime.utcnow()
1572
self.expires += self.timeout - old_timeout
1573
if self.expires <= now:
1574
# The timeout has passed
1577
if (getattr(self, "disable_initiator_tag", None)
1580
gobject.source_remove(self.disable_initiator_tag)
1581
self.disable_initiator_tag = (
1582
gobject.timeout_add(
1583
int((self.expires - now).total_seconds()
1584
* 1000), self.disable))
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))
1586
1382
# ExtendedTimeout - property
1587
1383
@dbus_service_property(_interface, signature="t",
1588
1384
access="readwrite")
1589
1385
def ExtendedTimeout_dbus_property(self, value=None):
1590
1386
if value is None: # get
1591
return dbus.UInt64(self.extended_timeout.total_seconds()
1387
return dbus.UInt64(self.extended_timeout_milliseconds())
1593
1388
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1595
1390
# Interval - property
1932
1736
use_ipv6: Boolean; to use IPv6 or not
1934
1738
def __init__(self, server_address, RequestHandlerClass,
1935
interface=None, use_ipv6=True, socketfd=None):
1936
"""If socketfd is set, use that file descriptor instead of
1937
creating a new one with socket.socket().
1739
interface=None, use_ipv6=True):
1939
1740
self.interface = interface
1941
1742
self.address_family = socket.AF_INET6
1942
if socketfd is not None:
1943
# Save the file descriptor
1944
self.socketfd = socketfd
1945
# Save the original socket.socket() function
1946
self.socket_socket = socket.socket
1947
# To implement --socket, we monkey patch socket.socket.
1949
# (When socketserver.TCPServer is a new-style class, we
1950
# could make self.socket into a property instead of monkey
1951
# patching socket.socket.)
1953
# Create a one-time-only replacement for socket.socket()
1954
@functools.wraps(socket.socket)
1955
def socket_wrapper(*args, **kwargs):
1956
# Restore original function so subsequent calls are
1958
socket.socket = self.socket_socket
1959
del self.socket_socket
1960
# This time only, return a new socket object from the
1961
# saved file descriptor.
1962
return socket.fromfd(self.socketfd, *args, **kwargs)
1963
# Replace socket.socket() function with wrapper
1964
socket.socket = socket_wrapper
1965
# The socketserver.TCPServer.__init__ will call
1966
# socket.socket(), which might be our replacement,
1967
# socket_wrapper(), if socketfd was set.
1968
1743
socketserver.TCPServer.__init__(self, server_address,
1969
1744
RequestHandlerClass)
1971
1745
def server_bind(self):
1972
1746
"""This overrides the normal server_bind() function
1973
1747
to bind to an interface if one was specified, and also NOT to
1982
1756
self.socket.setsockopt(socket.SOL_SOCKET,
1983
1757
SO_BINDTODEVICE,
1984
(self.interface + "\0")
1986
1760
except socket.error as error:
1987
if error.errno == errno.EPERM:
1988
logger.error("No permission to bind to"
1989
" interface %s", self.interface)
1990
elif error.errno == errno.ENOPROTOOPT:
1761
if error[0] == errno.EPERM:
1762
logger.error("No permission to"
1763
" bind to interface %s",
1765
elif error[0] == errno.ENOPROTOOPT:
1991
1766
logger.error("SO_BINDTODEVICE not available;"
1992
1767
" cannot bind to interface %s",
1993
1768
self.interface)
1994
elif error.errno == errno.ENODEV:
1995
logger.error("Interface %s does not exist,"
1996
" cannot bind", self.interface)
1999
1771
# Only bind(2) the socket if we really need to.
2060
1831
def handle_ipc(self, source, condition, parent_pipe=None,
2061
1832
proc = None, client_object=None):
1834
gobject.IO_IN: "IN", # There is data to read.
1835
gobject.IO_OUT: "OUT", # Data can be written (without
1837
gobject.IO_PRI: "PRI", # There is urgent data to read.
1838
gobject.IO_ERR: "ERR", # Error condition.
1839
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1840
# broken, usually for pipes and
1843
conditions_string = ' | '.join(name
1845
condition_names.iteritems()
1846
if cond & condition)
2062
1847
# error, or the other end of multiprocessing.Pipe has closed
2063
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1848
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2064
1849
# Wait for other process to exit
2127
def rfc3339_duration_to_delta(duration):
2128
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2130
>>> rfc3339_duration_to_delta("P7D")
2131
datetime.timedelta(7)
2132
>>> rfc3339_duration_to_delta("PT60S")
2133
datetime.timedelta(0, 60)
2134
>>> rfc3339_duration_to_delta("PT60M")
2135
datetime.timedelta(0, 3600)
2136
>>> rfc3339_duration_to_delta("PT24H")
2137
datetime.timedelta(1)
2138
>>> rfc3339_duration_to_delta("P1W")
2139
datetime.timedelta(7)
2140
>>> rfc3339_duration_to_delta("PT5M30S")
2141
datetime.timedelta(0, 330)
2142
>>> rfc3339_duration_to_delta("P1DT3M20S")
2143
datetime.timedelta(1, 200)
2146
# Parsing an RFC 3339 duration with regular expressions is not
2147
# possible - there would have to be multiple places for the same
2148
# values, like seconds. The current code, while more esoteric, is
2149
# cleaner without depending on a parsing library. If Python had a
2150
# built-in library for parsing we would use it, but we'd like to
2151
# avoid excessive use of external libraries.
2153
# New type for defining tokens, syntax, and semantics all-in-one
2154
Token = collections.namedtuple("Token",
2155
("regexp", # To match token; if
2156
# "value" is not None,
2157
# must have a "group"
2159
"value", # datetime.timedelta or
2161
"followers")) # Tokens valid after
2163
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2164
# the "duration" ABNF definition in RFC 3339, Appendix A.
2165
token_end = Token(re.compile(r"$"), None, frozenset())
2166
token_second = Token(re.compile(r"(\d+)S"),
2167
datetime.timedelta(seconds=1),
2168
frozenset((token_end,)))
2169
token_minute = Token(re.compile(r"(\d+)M"),
2170
datetime.timedelta(minutes=1),
2171
frozenset((token_second, token_end)))
2172
token_hour = Token(re.compile(r"(\d+)H"),
2173
datetime.timedelta(hours=1),
2174
frozenset((token_minute, token_end)))
2175
token_time = Token(re.compile(r"T"),
2177
frozenset((token_hour, token_minute,
2179
token_day = Token(re.compile(r"(\d+)D"),
2180
datetime.timedelta(days=1),
2181
frozenset((token_time, token_end)))
2182
token_month = Token(re.compile(r"(\d+)M"),
2183
datetime.timedelta(weeks=4),
2184
frozenset((token_day, token_end)))
2185
token_year = Token(re.compile(r"(\d+)Y"),
2186
datetime.timedelta(weeks=52),
2187
frozenset((token_month, token_end)))
2188
token_week = Token(re.compile(r"(\d+)W"),
2189
datetime.timedelta(weeks=1),
2190
frozenset((token_end,)))
2191
token_duration = Token(re.compile(r"P"), None,
2192
frozenset((token_year, token_month,
2193
token_day, token_time,
2195
# Define starting values
2196
value = datetime.timedelta() # Value so far
2198
followers = frozenset((token_duration,)) # Following valid tokens
2199
s = duration # String left to parse
2200
# Loop until end token is found
2201
while found_token is not token_end:
2202
# Search for any currently valid tokens
2203
for token in followers:
2204
match = token.regexp.match(s)
2205
if match is not None:
2207
if token.value is not None:
2208
# Value found, parse digits
2209
factor = int(match.group(1), 10)
2210
# Add to value so far
2211
value += factor * token.value
2212
# Strip token from string
2213
s = token.regexp.sub("", s, 1)
2216
# Set valid next tokens
2217
followers = found_token.followers
2220
# No currently valid tokens were found
2221
raise ValueError("Invalid RFC 3339 duration")
2226
1912
def string_to_delta(interval):
2227
1913
"""Parse a string and return a datetime.timedelta
2326
2006
parser.add_argument("--no-dbus", action="store_false",
2327
2007
dest="use_dbus", help="Do not provide D-Bus"
2328
" system bus interface", default=None)
2008
" system bus interface")
2329
2009
parser.add_argument("--no-ipv6", action="store_false",
2330
dest="use_ipv6", help="Do not use IPv6",
2010
dest="use_ipv6", help="Do not use IPv6")
2332
2011
parser.add_argument("--no-restore", action="store_false",
2333
2012
dest="restore", help="Do not restore stored"
2334
" state", default=None)
2335
parser.add_argument("--socket", type=int,
2336
help="Specify a file descriptor to a network"
2337
" socket to use instead of creating one")
2338
2014
parser.add_argument("--statedir", metavar="DIR",
2339
2015
help="Directory to save/restore state in")
2340
parser.add_argument("--foreground", action="store_true",
2341
help="Run in foreground", default=None)
2342
parser.add_argument("--no-zeroconf", action="store_false",
2343
dest="zeroconf", help="Do not use Zeroconf",
2346
2017
options = parser.parse_args()
2348
2019
if options.check:
2350
fail_count, test_count = doctest.testmod()
2351
sys.exit(os.EX_OK if fail_count == 0 else 1)
2353
2024
# Default values for config file for server-global settings
2354
2025
server_defaults = { "interface": "",
2376
2044
# Convert the SafeConfigParser object to a dict
2377
2045
server_settings = server_config.defaults()
2378
2046
# Use the appropriate methods on the non-string config options
2379
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2047
for option in ("debug", "use_dbus", "use_ipv6"):
2380
2048
server_settings[option] = server_config.getboolean("DEFAULT",
2382
2050
if server_settings["port"]:
2383
2051
server_settings["port"] = server_config.getint("DEFAULT",
2385
if server_settings["socket"]:
2386
server_settings["socket"] = server_config.getint("DEFAULT",
2388
# Later, stdin will, and stdout and stderr might, be dup'ed
2389
# over with an opened os.devnull. But we don't want this to
2390
# happen with a supplied network socket.
2391
if 0 <= server_settings["socket"] <= 2:
2392
server_settings["socket"] = os.dup(server_settings
2394
2053
del server_config
2396
2055
# Override the settings from the config file with command line
2398
2057
for option in ("interface", "address", "port", "debug",
2399
2058
"priority", "servicename", "configdir",
2400
2059
"use_dbus", "use_ipv6", "debuglevel", "restore",
2401
"statedir", "socket", "foreground", "zeroconf"):
2402
2061
value = getattr(options, option)
2403
2062
if value is not None:
2404
2063
server_settings[option] = value
2406
2065
# Force all strings to be unicode
2407
2066
for option in server_settings.keys():
2408
if isinstance(server_settings[option], bytes):
2409
server_settings[option] = (server_settings[option]
2411
# Force all boolean options to be boolean
2412
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2413
"foreground", "zeroconf"):
2414
server_settings[option] = bool(server_settings[option])
2415
# Debug implies foreground
2416
if server_settings["debug"]:
2417
server_settings["foreground"] = True
2067
if type(server_settings[option]) is str:
2068
server_settings[option] = unicode(server_settings[option])
2418
2069
# Now we have our good server settings in "server_settings"
2420
2071
##################################################################
2422
if (not server_settings["zeroconf"] and
2423
not (server_settings["port"]
2424
or server_settings["socket"] != "")):
2425
parser.error("Needs port or socket to work without"
2428
2073
# For convenience
2429
2074
debug = server_settings["debug"]
2430
2075
debuglevel = server_settings["debuglevel"]
2447
2090
if server_settings["servicename"] != "Mandos":
2448
2091
syslogger.setFormatter(logging.Formatter
2449
('Mandos ({}) [%(process)d]:'
2450
' %(levelname)s: %(message)s'
2451
.format(server_settings
2092
('Mandos (%s) [%%(process)d]:'
2093
' %%(levelname)s: %%(message)s'
2094
% server_settings["servicename"]))
2454
2096
# Parse config file with clients
2455
client_config = configparser.SafeConfigParser(Client
2097
client_config = configparser.SafeConfigParser(Client.client_defaults)
2457
2098
client_config.read(os.path.join(server_settings["configdir"],
2458
2099
"clients.conf"))
2460
2101
global mandos_dbus_service
2461
2102
mandos_dbus_service = None
2464
if server_settings["socket"] != "":
2465
socketfd = server_settings["socket"]
2466
2104
tcp_server = MandosServer((server_settings["address"],
2467
2105
server_settings["port"]),
2471
2109
use_ipv6=use_ipv6,
2472
2110
gnutls_priority=
2473
2111
server_settings["priority"],
2477
pidfilename = "/run/mandos.pid"
2478
if not os.path.isdir("/run/."):
2479
pidfilename = "/var/run/mandos.pid"
2114
pidfilename = "/var/run/mandos.pid"
2482
2116
pidfile = open(pidfilename, "w")
2483
except IOError as e:
2484
logger.error("Could not open file %r", pidfilename,
2118
logger.error("Could not open file %r", pidfilename)
2487
for name in ("_mandos", "mandos", "nobody"):
2121
uid = pwd.getpwnam("_mandos").pw_uid
2122
gid = pwd.getpwnam("_mandos").pw_gid
2489
uid = pwd.getpwnam(name).pw_uid
2490
gid = pwd.getpwnam(name).pw_gid
2125
uid = pwd.getpwnam("mandos").pw_uid
2126
gid = pwd.getpwnam("mandos").pw_gid
2492
2127
except KeyError:
2129
uid = pwd.getpwnam("nobody").pw_uid
2130
gid = pwd.getpwnam("nobody").pw_gid
2500
2137
except OSError as error:
2501
if error.errno != errno.EPERM:
2138
if error[0] != errno.EPERM:
2505
2142
# Enable all possible GnuTLS debugging
2516
2153
.gnutls_global_set_log_function(debug_gnutls))
2518
2155
# Redirect stdin so all checkers get /dev/null
2519
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2156
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2520
2157
os.dup2(null, sys.stdin.fileno())
2524
2161
# Need to fork before connecting to D-Bus
2526
2163
# Close all input and output, do double fork, etc.
2529
# multiprocessing will use threads, so before we use gobject we
2530
# need to inform gobject that threads will be used.
2531
2166
gobject.threads_init()
2533
2168
global main_loop
2534
2169
# From the Avahi example code
2535
DBusGMainLoop(set_as_default=True)
2170
DBusGMainLoop(set_as_default=True )
2536
2171
main_loop = gobject.MainLoop()
2537
2172
bus = dbus.SystemBus()
2538
2173
# End of Avahi example code
2544
2179
("se.bsnet.fukt.Mandos", bus,
2545
2180
do_not_queue=True))
2546
2181
except dbus.exceptions.NameExistsException as e:
2547
logger.error("Disabling D-Bus:", exc_info=e)
2182
logger.error(unicode(e) + ", disabling D-Bus")
2548
2183
use_dbus = False
2549
2184
server_settings["use_dbus"] = False
2550
2185
tcp_server.use_dbus = False
2552
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2553
service = AvahiServiceToSyslog(name =
2554
server_settings["servicename"],
2555
servicetype = "_mandos._tcp",
2556
protocol = protocol, bus = bus)
2557
if server_settings["interface"]:
2558
service.interface = (if_nametoindex
2559
(server_settings["interface"]
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"])))
2562
2195
global multiprocessing_manager
2563
2196
multiprocessing_manager = multiprocessing.Manager()
2565
2198
client_class = Client
2567
client_class = functools.partial(ClientDBus, bus = bus)
2200
client_class = functools.partial(ClientDBusTransitional,
2569
2203
client_settings = Client.config_parser(client_config)
2570
2204
old_client_settings = {}
2571
2205
clients_data = {}
2573
# This is used to redirect stdout and stderr for checker processes
2575
wnull = open(os.devnull, "w") # A writable /dev/null
2576
# Only used if server is running in foreground but not in debug
2578
if debug or not foreground:
2581
2207
# Get client data and settings from last running state.
2582
2208
if server_settings["restore"]:
2586
2212
(stored_state))
2587
2213
os.remove(stored_state_path)
2588
2214
except IOError as e:
2589
if e.errno == errno.ENOENT:
2590
logger.warning("Could not load persistent state: {}"
2591
.format(os.strerror(e.errno)))
2593
logger.critical("Could not load persistent state:",
2215
logger.warning("Could not load persistent state: {0}"
2217
if e.errno != errno.ENOENT:
2596
2219
except EOFError as e:
2597
2220
logger.warning("Could not load persistent state: "
2598
"EOFError:", exc_info=e)
2221
"EOFError: {0}".format(e))
2600
2223
with PGPEngine() as pgp:
2601
for client_name, client in clients_data.items():
2602
# Skip removed clients
2603
if client_name not in client_settings:
2224
for client_name, client in clients_data.iteritems():
2606
2225
# Decide which value to use after restoring saved state.
2607
2226
# We have three different values: Old config file,
2608
2227
# new config file, and saved state.
2623
2242
# Clients who has passed its expire date can still be
2624
2243
# enabled if its last checker was successful. Clients
2625
# whose checker succeeded before we stored its state is
2626
# assumed to have successfully run all checkers during
2244
# whose checker failed before we stored its state is
2245
# assumed to have failed all checkers during downtime.
2628
2246
if client["enabled"]:
2629
2247
if datetime.datetime.utcnow() >= client["expires"]:
2630
2248
if not client["last_checked_ok"]:
2631
2249
logger.warning(
2632
"disabling client {} - Client never "
2633
"performed a successful checker"
2634
.format(client_name))
2250
"disabling client {0} - Client never "
2251
"performed a successfull checker"
2252
.format(client["name"]))
2635
2253
client["enabled"] = False
2636
2254
elif client["last_checker_status"] != 0:
2637
2255
logger.warning(
2638
"disabling client {} - Client last"
2639
" checker failed with error code {}"
2640
.format(client_name,
2256
"disabling client {0} - Client "
2257
"last checker failed with error code {1}"
2258
.format(client["name"],
2641
2259
client["last_checker_status"]))
2642
2260
client["enabled"] = False
2644
2262
client["expires"] = (datetime.datetime
2646
2264
+ client["timeout"])
2647
logger.debug("Last checker succeeded,"
2648
" keeping {} enabled"
2649
.format(client_name))
2651
2267
client["secret"] = (
2652
2268
pgp.decrypt(client["encrypted_secret"],
2655
2271
except PGPError:
2656
2272
# If decryption fails, we use secret from new settings
2657
logger.debug("Failed to decrypt {} old secret"
2273
logger.debug("Failed to decrypt {0} old secret"
2658
2274
.format(client_name))
2659
2275
client["secret"] = (
2660
2276
client_settings[client_name]["secret"])
2662
2279
# Add/remove clients based on new changes made to config
2663
for client_name in (set(old_client_settings)
2664
- set(client_settings)):
2280
for client_name in set(old_client_settings) - set(client_settings):
2665
2281
del clients_data[client_name]
2666
for client_name in (set(client_settings)
2667
- set(old_client_settings)):
2282
for client_name in set(client_settings) - set(old_client_settings):
2668
2283
clients_data[client_name] = client_settings[client_name]
2670
# Create all client objects
2671
for client_name, client in clients_data.items():
2285
# Create clients all clients
2286
for client_name, client in clients_data.iteritems():
2672
2287
tcp_server.clients[client_name] = client_class(
2673
name = client_name, settings = client,
2674
server_settings = server_settings)
2288
name = client_name, settings = client)
2676
2290
if not tcp_server.clients:
2677
2291
logger.warning("No clients defined")
2680
if pidfile is not None:
2684
pidfile.write("{}\n".format(pid).encode("utf-8"))
2686
logger.error("Could not write to file %r with PID %d",
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
2689
2305
del pidfilename
2306
signal.signal(signal.SIGINT, signal.SIG_IGN)
2691
2308
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2692
2309
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2695
@alternate_dbus_interfaces({"se.recompile.Mandos":
2696
"se.bsnet.fukt.Mandos"})
2697
class MandosDBusService(DBusObjectWithProperties):
2312
class MandosDBusService(dbus.service.Object):
2698
2313
"""A D-Bus proxy object"""
2699
2314
def __init__(self):
2700
2315
dbus.service.Object.__init__(self, bus, "/")
2701
2316
_interface = "se.recompile.Mandos"
2703
@dbus_interface_annotations(_interface)
2705
return { "org.freedesktop.DBus.Property"
2706
".EmitsChangedSignal":
2709
2318
@dbus.service.signal(_interface, signature="o")
2710
2319
def ClientAdded(self, objpath):
2794
2403
del client_settings[client.name]["secret"]
2797
with (tempfile.NamedTemporaryFile
2798
(mode='wb', suffix=".pickle", prefix='clients-',
2799
dir=os.path.dirname(stored_state_path),
2800
delete=False)) as stored_state:
2406
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2409
(stored_state_path))
2410
with os.fdopen(tempfd, "wb") as stored_state:
2801
2411
pickle.dump((clients, client_settings), stored_state)
2802
tempname=stored_state.name
2803
2412
os.rename(tempname, stored_state_path)
2804
2413
except (IOError, OSError) as e:
2414
logger.warning("Could not save persistent state: {0}"
2807
2418
os.remove(tempname)
2808
2419
except NameError:
2810
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2811
logger.warning("Could not save persistent state: {}"
2812
.format(os.strerror(e.errno)))
2814
logger.warning("Could not save persistent state:",
2421
if e.errno not in set((errno.ENOENT, errno.EACCES,
2818
2425
# Delete all clients, and settings from config
2819
2426
while tcp_server.clients:
2843
2450
tcp_server.server_activate()
2845
2452
# Find out what port we got
2847
service.port = tcp_server.socket.getsockname()[1]
2453
service.port = tcp_server.socket.getsockname()[1]
2849
2455
logger.info("Now listening on address %r, port %d,"
2850
" flowinfo %d, scope_id %d",
2851
*tcp_server.socket.getsockname())
2456
" flowinfo %d, scope_id %d"
2457
% tcp_server.socket.getsockname())
2853
logger.info("Now listening on address %r, port %d",
2854
*tcp_server.socket.getsockname())
2459
logger.info("Now listening on address %r, port %d"
2460
% tcp_server.socket.getsockname())
2856
2462
#service.interface = tcp_server.socket.getsockname()[3]
2860
# From the Avahi example code
2863
except dbus.exceptions.DBusException as error:
2864
logger.critical("D-Bus Exception", exc_info=error)
2867
# End of Avahi example code
2465
# From the Avahi example code
2468
except dbus.exceptions.DBusException as error:
2469
logger.critical("DBusException: %s", error)
2472
# End of Avahi example code
2869
2474
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2870
2475
lambda *args, **kwargs: