11
11
# "AvahiService" class, and some lines in "main".
13
13
# Everything else is
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
179
174
def encrypt(self, data, password):
180
175
self.gnupg.passphrase = self.password_encode(password)
181
with open(os.devnull, "w") as devnull:
176
with open(os.devnull) as devnull:
183
178
proc = self.gnupg.run(['--symmetric'],
184
179
create_fhs=['stdin', 'stdout'],
196
191
def decrypt(self, data, password):
197
192
self.gnupg.passphrase = self.password_encode(password)
198
with open(os.devnull, "w") as devnull:
193
with open(os.devnull) as devnull:
200
195
proc = self.gnupg.run(['--decrypt'],
201
196
create_fhs=['stdin', 'stdout'],
202
197
attach_fhs={'stderr': devnull})
203
with contextlib.closing(proc.handles['stdin']) as f:
198
with contextlib.closing(proc.handles['stdin'] ) as f:
205
200
with contextlib.closing(proc.handles['stdout']) as f:
206
201
decrypted_plaintext = f.read()
384
372
"""Add the new name to the syslog messages"""
385
373
ret = AvahiService.rename(self)
386
374
syslogger.setFormatter(logging.Formatter
387
('Mandos ({0}) [%(process)d]:'
388
' %(levelname)s: %(message)s'
375
('Mandos (%s) [%%(process)d]:'
376
' %%(levelname)s: %%(message)s'
392
380
def timedelta_to_milliseconds(td):
425
413
last_checked_ok: datetime.datetime(); (UTC) or None
426
414
last_checker_status: integer between 0 and 255 reflecting exit
427
415
status of last checker. -1 reflects crashed
428
checker, -2 means no checker completed yet.
429
417
last_enabled: datetime.datetime(); (UTC) or None
430
418
name: string; from the config file, used in log messages and
431
419
D-Bus identifiers
432
420
secret: bytestring; sent verbatim (over TLS) to client
433
421
timeout: datetime.timedelta(); How long from last_checked_ok
434
422
until this client is disabled
435
extended_timeout: extra long timeout when secret has been sent
423
extended_timeout: extra long timeout when password has been sent
436
424
runtime_expansions: Allowed attributes for runtime expansion.
437
425
expires: datetime.datetime(); time (UTC) when a client will be
438
426
disabled, or None
468
456
def approval_delay_milliseconds(self):
469
457
return timedelta_to_milliseconds(self.approval_delay)
472
460
def config_parser(config):
473
"""Construct a new dict of client settings of this form:
461
""" Construct a new dict of client settings of this form:
474
462
{ client_name: {setting_name: value, ...}, ...}
475
with exceptions for any special settings as defined above.
476
NOTE: Must be a pure function. Must return the same result
477
value given the same arguments.
463
with exceptions for any special settings as defined above"""
480
465
for client_name in config.sections():
481
466
section = dict(config.items(client_name))
511
495
client["checker_command"] = section["checker"]
512
496
client["last_approval_request"] = None
513
497
client["last_checked_ok"] = None
514
client["last_checker_status"] = -2
498
client["last_checker_status"] = None
499
if client["enabled"]:
500
client["last_enabled"] = datetime.datetime.utcnow()
501
client["expires"] = (datetime.datetime.utcnow()
504
client["last_enabled"] = None
505
client["expires"] = None
518
510
def __init__(self, settings, name = None):
511
"""Note: the 'checker' key in 'config' sets the
512
'checker_command' attribute and *not* the 'checker'
520
515
# adding all client settings
521
516
for setting, value in settings.iteritems():
522
517
setattr(self, setting, value)
525
if not hasattr(self, "last_enabled"):
526
self.last_enabled = datetime.datetime.utcnow()
527
if not hasattr(self, "expires"):
528
self.expires = (datetime.datetime.utcnow()
531
self.last_enabled = None
534
519
logger.debug("Creating client %r", self.name)
535
520
# Uppercase and remove spaces from fingerprint for later
536
521
# comparison purposes with return value from the fingerprint()
538
523
logger.debug(" Fingerprint: %s", self.fingerprint)
539
self.created = settings.get("created",
540
datetime.datetime.utcnow())
524
self.created = settings.get("created", datetime.datetime.utcnow())
542
526
# attributes specific for this server instance
543
527
self.checker = None
544
528
self.checker_initiator_tag = None
632
616
logger.warning("Checker for %(name)s crashed?",
635
def checked_ok(self):
636
"""Assert that the client has been seen, alive and well."""
637
self.last_checked_ok = datetime.datetime.utcnow()
638
self.last_checker_status = 0
641
def bump_timeout(self, timeout=None):
642
"""Bump up the timeout for this client."""
619
def checked_ok(self, timeout=None):
620
"""Bump up the timeout for this client.
622
This should only be called when the client has been seen,
643
625
if timeout is None:
644
626
timeout = self.timeout
627
self.last_checked_ok = datetime.datetime.utcnow()
645
628
if self.disable_initiator_tag is not None:
646
629
gobject.source_remove(self.disable_initiator_tag)
647
630
if getattr(self, "enabled", False):
659
642
If a checker already exists, leave it running and do
661
644
# The reason for not killing a running checker is that if we
662
# did that, and if a checker (for some reason) started running
663
# slowly and taking more than 'interval' time, then the client
664
# would inevitably timeout, since no checker would get a
665
# chance to run to completion. If we instead leave running
645
# did that, then if a checker (for some reason) started
646
# running slowly and taking more than 'interval' time, the
647
# client would inevitably timeout, since no checker would get
648
# a chance to run to completion. If we instead leave running
666
649
# checkers alone, the checker would have to take more time
667
650
# than 'timeout' for the client to be disabled, which is as it
699
682
command = self.checker_command % escaped_attrs
700
683
except TypeError as error:
701
logger.error('Could not format string "%s"',
702
self.checker_command, exc_info=error)
684
logger.error('Could not format string "%s":'
685
' %s', self.checker_command, error)
703
686
return True # Try again later
704
687
self.current_checker_command = command
780
def dbus_interface_annotations(dbus_interface):
781
"""Decorator for marking functions returning interface annotations
785
@dbus_interface_annotations("org.example.Interface")
786
def _foo(self): # Function name does not matter
787
return {"org.freedesktop.DBus.Deprecated": "true",
788
"org.freedesktop.DBus.Property.EmitsChangedSignal":
792
func._dbus_is_interface = True
793
func._dbus_interface = dbus_interface
794
func._dbus_name = dbus_interface
799
def dbus_annotations(annotations):
800
"""Decorator to annotate D-Bus methods, signals or properties
803
@dbus_service_property("org.example.Interface", signature="b",
805
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
806
"org.freedesktop.DBus.Property."
807
"EmitsChangedSignal": "false"})
808
def Property_dbus_property(self):
809
return dbus.Boolean(False)
812
func._dbus_annotations = annotations
817
763
class DBusPropertyException(dbus.exceptions.DBusException):
818
764
"""A base class for D-Bus property-related exceptions
845
def _is_dbus_thing(thing):
846
"""Returns a function testing if an attribute is a D-Bus thing
848
If called like _is_dbus_thing("method") it returns a function
849
suitable for use as predicate to inspect.getmembers().
851
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
791
def _is_dbus_property(obj):
792
return getattr(obj, "_dbus_is_property", False)
854
def _get_all_dbus_things(self, thing):
794
def _get_all_dbus_properties(self):
855
795
"""Returns a generator of (name, attribute) pairs
857
return ((getattr(athing.__get__(self), "_dbus_name",
859
athing.__get__(self))
797
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
860
798
for cls in self.__class__.__mro__
862
inspect.getmembers(cls,
863
self._is_dbus_thing(thing)))
800
inspect.getmembers(cls, self._is_dbus_property))
865
802
def _get_dbus_property(self, interface_name, property_name):
866
803
"""Returns a bound method if one exists which is a D-Bus
869
806
for cls in self.__class__.__mro__:
870
807
for name, value in (inspect.getmembers
872
self._is_dbus_thing("property"))):
808
(cls, self._is_dbus_property)):
873
809
if (value._dbus_name == property_name
874
810
and value._dbus_interface == interface_name):
875
811
return value.__get__(self)
938
874
path_keyword='object_path',
939
875
connection_keyword='connection')
940
876
def Introspect(self, object_path, connection):
941
"""Overloading of standard D-Bus method.
943
Inserts property tags and interface annotation tags.
877
"""Standard D-Bus method, overloaded to insert property tags.
945
879
xmlstring = dbus.service.Object.Introspect(self, object_path,
953
887
e.setAttribute("access", prop._dbus_access)
955
889
for if_tag in document.getElementsByTagName("interface"):
957
890
for tag in (make_tag(document, name, prop)
959
in self._get_all_dbus_things("property")
892
in self._get_all_dbus_properties()
960
893
if prop._dbus_interface
961
894
== if_tag.getAttribute("name")):
962
895
if_tag.appendChild(tag)
963
# Add annotation tags
964
for typ in ("method", "signal", "property"):
965
for tag in if_tag.getElementsByTagName(typ):
967
for name, prop in (self.
968
_get_all_dbus_things(typ)):
969
if (name == tag.getAttribute("name")
970
and prop._dbus_interface
971
== if_tag.getAttribute("name")):
972
annots.update(getattr
976
for name, value in annots.iteritems():
977
ann_tag = document.createElement(
979
ann_tag.setAttribute("name", name)
980
ann_tag.setAttribute("value", value)
981
tag.appendChild(ann_tag)
982
# Add interface annotation tags
983
for annotation, value in dict(
984
itertools.chain.from_iterable(
985
annotations().iteritems()
986
for name, annotations in
987
self._get_all_dbus_things("interface")
988
if name == if_tag.getAttribute("name")
990
ann_tag = document.createElement("annotation")
991
ann_tag.setAttribute("name", annotation)
992
ann_tag.setAttribute("value", value)
993
if_tag.appendChild(ann_tag)
994
896
# Add the names to the return values for the
995
897
# "org.freedesktop.DBus.Properties" methods
996
898
if (if_tag.getAttribute("name")
1023
925
variant_level=variant_level)
1026
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1027
"""A class decorator; applied to a subclass of
1028
dbus.service.Object, it will add alternate D-Bus attributes with
1029
interface names according to the "alt_interface_names" mapping.
1032
@alternate_dbus_names({"org.example.Interface":
1033
"net.example.AlternateInterface"})
1034
class SampleDBusObject(dbus.service.Object):
1035
@dbus.service.method("org.example.Interface")
1036
def SampleDBusMethod():
1039
The above "SampleDBusMethod" on "SampleDBusObject" will be
1040
reachable via two interfaces: "org.example.Interface" and
1041
"net.example.AlternateInterface", the latter of which will have
1042
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1043
"true", unless "deprecate" is passed with a False value.
1045
This works for methods and signals, and also for D-Bus properties
1046
(from DBusObjectWithProperties) and interfaces (from the
1047
dbus_interface_annotations decorator).
928
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
930
"""Applied to an empty subclass of a D-Bus object, this metaclass
931
will add additional D-Bus attributes matching a certain pattern.
1050
for orig_interface_name, alt_interface_name in (
1051
alt_interface_names.iteritems()):
1053
interface_names = set()
1054
# Go though all attributes of the class
1055
for attrname, attribute in inspect.getmembers(cls):
933
def __new__(mcs, name, bases, attr):
934
# Go through all the base classes which could have D-Bus
935
# methods, signals, or properties in them
936
for base in (b for b in bases
937
if issubclass(b, dbus.service.Object)):
938
# Go though all attributes of the base class
939
for attrname, attribute in inspect.getmembers(base):
1056
940
# Ignore non-D-Bus attributes, and D-Bus attributes
1057
941
# with the wrong interface name
1058
942
if (not hasattr(attribute, "_dbus_interface")
1059
943
or not attribute._dbus_interface
1060
.startswith(orig_interface_name)):
944
.startswith("se.recompile.Mandos")):
1062
946
# Create an alternate D-Bus interface name based on
1063
947
# the current name
1064
948
alt_interface = (attribute._dbus_interface
1065
.replace(orig_interface_name,
1066
alt_interface_name))
1067
interface_names.add(alt_interface)
949
.replace("se.recompile.Mandos",
950
"se.bsnet.fukt.Mandos"))
1068
951
# Is this a D-Bus signal?
1069
952
if getattr(attribute, "_dbus_is_signal", False):
1070
953
# Extract the original non-method function by
1085
968
nonmethod_func.func_name,
1086
969
nonmethod_func.func_defaults,
1087
970
nonmethod_func.func_closure)))
1088
# Copy annotations, if any
1090
new_function._dbus_annotations = (
1091
dict(attribute._dbus_annotations))
1092
except AttributeError:
1094
971
# Define a creator of a function to call both the
1095
# original and alternate functions, so both the
1096
# original and alternate signals gets sent when
1097
# the function is called
972
# old and new functions, so both the old and new
973
# signals gets sent when the function is called
1098
974
def fixscope(func1, func2):
1099
975
"""This function is a scope container to pass
1100
976
func1 and func2 to the "call_both" function
1107
983
return call_both
1108
984
# Create the "call_both" function and add it to
1110
attr[attrname] = fixscope(attribute, new_function)
986
attr[attrname] = fixscope(attribute,
1111
988
# Is this a D-Bus method?
1112
989
elif getattr(attribute, "_dbus_is_method", False):
1113
990
# Create a new, but exactly alike, function
1124
1001
attribute.func_name,
1125
1002
attribute.func_defaults,
1126
1003
attribute.func_closure)))
1127
# Copy annotations, if any
1129
attr[attrname]._dbus_annotations = (
1130
dict(attribute._dbus_annotations))
1131
except AttributeError:
1133
1004
# Is this a D-Bus property?
1134
1005
elif getattr(attribute, "_dbus_is_property", False):
1135
1006
# Create a new, but exactly alike, function
1149
1020
attribute.func_name,
1150
1021
attribute.func_defaults,
1151
1022
attribute.func_closure)))
1152
# Copy annotations, if any
1154
attr[attrname]._dbus_annotations = (
1155
dict(attribute._dbus_annotations))
1156
except AttributeError:
1158
# Is this a D-Bus interface?
1159
elif getattr(attribute, "_dbus_is_interface", False):
1160
# Create a new, but exactly alike, function
1161
# object. Decorate it to be a new D-Bus interface
1162
# with the alternate D-Bus interface name. Add it
1164
attr[attrname] = (dbus_interface_annotations
1167
(attribute.func_code,
1168
attribute.func_globals,
1169
attribute.func_name,
1170
attribute.func_defaults,
1171
attribute.func_closure)))
1173
# Deprecate all alternate interfaces
1174
iname="_AlternateDBusNames_interface_annotation{0}"
1175
for interface_name in interface_names:
1176
@dbus_interface_annotations(interface_name)
1178
return { "org.freedesktop.DBus.Deprecated":
1180
# Find an unused name
1181
for aname in (iname.format(i)
1182
for i in itertools.count()):
1183
if aname not in attr:
1187
# Replace the class with a new subclass of it with
1188
# methods, signals, etc. as created above.
1189
cls = type(b"{0}Alternate".format(cls.__name__),
1195
@alternate_dbus_interfaces({"se.recompile.Mandos":
1196
"se.bsnet.fukt.Mandos"})
1023
return type.__new__(mcs, name, bases, attr)
1197
1026
class ClientDBus(Client, DBusObjectWithProperties):
1198
1027
"""A Client class using D-Bus
1210
1039
def __init__(self, bus = None, *args, **kwargs):
1212
1041
Client.__init__(self, *args, **kwargs)
1042
self._approvals_pending = 0
1044
self._approvals_pending = 0
1213
1045
# Only now, when this client is initialized, can it show up on
1215
1047
client_object_name = unicode(self.name).translate(
1508
1341
return datetime_to_dbus(self.last_checked_ok)
1510
# LastCheckerStatus - property
1511
@dbus_service_property(_interface, signature="n",
1513
def LastCheckerStatus_dbus_property(self):
1514
return dbus.Int16(self.last_checker_status)
1516
1343
# Expires - property
1517
1344
@dbus_service_property(_interface, signature="s", access="read")
1518
1345
def Expires_dbus_property(self):
1530
1357
if value is None: # get
1531
1358
return dbus.UInt64(self.timeout_milliseconds())
1532
1359
self.timeout = datetime.timedelta(0, 0, 0, value)
1360
if getattr(self, "disable_initiator_tag", None) is None:
1533
1362
# Reschedule timeout
1535
now = datetime.datetime.utcnow()
1536
time_to_die = timedelta_to_milliseconds(
1537
(self.last_checked_ok + self.timeout) - now)
1538
if time_to_die <= 0:
1539
# The timeout has passed
1542
self.expires = (now +
1543
datetime.timedelta(milliseconds =
1545
if (getattr(self, "disable_initiator_tag", None)
1548
gobject.source_remove(self.disable_initiator_tag)
1549
self.disable_initiator_tag = (gobject.timeout_add
1363
gobject.source_remove(self.disable_initiator_tag)
1364
self.disable_initiator_tag = None
1366
time_to_die = timedelta_to_milliseconds((self
1371
if time_to_die <= 0:
1372
# The timeout has passed
1375
self.expires = (datetime.datetime.utcnow()
1376
+ datetime.timedelta(milliseconds =
1378
self.disable_initiator_tag = (gobject.timeout_add
1379
(time_to_die, self.disable))
1553
1381
# ExtendedTimeout - property
1554
1382
@dbus_service_property(_interface, signature="t",
1995
1830
def handle_ipc(self, source, condition, parent_pipe=None,
1996
1831
proc = None, client_object=None):
1833
gobject.IO_IN: "IN", # There is data to read.
1834
gobject.IO_OUT: "OUT", # Data can be written (without
1836
gobject.IO_PRI: "PRI", # There is urgent data to read.
1837
gobject.IO_ERR: "ERR", # Error condition.
1838
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1839
# broken, usually for pipes and
1842
conditions_string = ' | '.join(name
1844
condition_names.iteritems()
1845
if cond & condition)
1997
1846
# error, or the other end of multiprocessing.Pipe has closed
1998
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1847
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1999
1848
# Wait for other process to exit
2091
1940
elif suffix == "w":
2092
1941
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2094
raise ValueError("Unknown suffix {0!r}"
1943
raise ValueError("Unknown suffix %r" % suffix)
2096
1944
except (ValueError, IndexError) as e:
2097
1945
raise ValueError(*(e.args))
2098
1946
timevalue += delta
2113
1961
if not noclose:
2114
1962
# Close all standard open file descriptors
2115
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1963
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2116
1964
if not stat.S_ISCHR(os.fstat(null).st_mode):
2117
1965
raise OSError(errno.ENODEV,
2118
"{0} not a character device"
2119
.format(os.devnull))
1966
"%s not a character device"
2120
1968
os.dup2(null, sys.stdin.fileno())
2121
1969
os.dup2(null, sys.stdout.fileno())
2122
1970
os.dup2(null, sys.stderr.fileno())
2132
1980
parser = argparse.ArgumentParser()
2133
1981
parser.add_argument("-v", "--version", action="version",
2134
version = "%(prog)s {0}".format(version),
1982
version = "%%(prog)s %s" % version,
2135
1983
help="show version number and exit")
2136
1984
parser.add_argument("-i", "--interface", metavar="IF",
2137
1985
help="Bind to interface IF")
2230
2078
stored_state_file)
2233
initlogger(debug, logging.DEBUG)
2081
initlogger(logging.DEBUG)
2235
2083
if not debuglevel:
2238
2086
level = getattr(logging, debuglevel.upper())
2239
initlogger(debug, level)
2241
2089
if server_settings["servicename"] != "Mandos":
2242
2090
syslogger.setFormatter(logging.Formatter
2243
('Mandos ({0}) [%(process)d]:'
2244
' %(levelname)s: %(message)s'
2245
.format(server_settings
2091
('Mandos (%s) [%%(process)d]:'
2092
' %%(levelname)s: %%(message)s'
2093
% server_settings["servicename"]))
2248
2095
# Parse config file with clients
2249
client_config = configparser.SafeConfigParser(Client
2096
client_config = configparser.SafeConfigParser(Client.client_defaults)
2251
2097
client_config.read(os.path.join(server_settings["configdir"],
2252
2098
"clients.conf"))
2267
2113
pidfilename = "/var/run/mandos.pid"
2269
2115
pidfile = open(pidfilename, "w")
2270
except IOError as e:
2271
logger.error("Could not open file %r", pidfilename,
2117
logger.error("Could not open file %r", pidfilename)
2274
for name in ("_mandos", "mandos", "nobody"):
2120
uid = pwd.getpwnam("_mandos").pw_uid
2121
gid = pwd.getpwnam("_mandos").pw_gid
2276
uid = pwd.getpwnam(name).pw_uid
2277
gid = pwd.getpwnam(name).pw_gid
2124
uid = pwd.getpwnam("mandos").pw_uid
2125
gid = pwd.getpwnam("mandos").pw_gid
2279
2126
except KeyError:
2128
uid = pwd.getpwnam("nobody").pw_uid
2129
gid = pwd.getpwnam("nobody").pw_gid
2303
2152
.gnutls_global_set_log_function(debug_gnutls))
2305
2154
# Redirect stdin so all checkers get /dev/null
2306
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2155
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2307
2156
os.dup2(null, sys.stdin.fileno())
2160
# No console logging
2161
logger.removeHandler(console)
2311
2163
# Need to fork before connecting to D-Bus
2313
2165
# Close all input and output, do double fork, etc.
2316
gobject.threads_init()
2318
2168
global main_loop
2319
2169
# From the Avahi example code
2320
DBusGMainLoop(set_as_default=True)
2170
DBusGMainLoop(set_as_default=True )
2321
2171
main_loop = gobject.MainLoop()
2322
2172
bus = dbus.SystemBus()
2323
2173
# End of Avahi example code
2361
2212
(stored_state))
2362
2213
os.remove(stored_state_path)
2363
2214
except IOError as e:
2364
if e.errno == errno.ENOENT:
2365
logger.warning("Could not load persistent state: {0}"
2366
.format(os.strerror(e.errno)))
2368
logger.critical("Could not load persistent state:",
2215
logger.warning("Could not load persistent state: {0}"
2217
if e.errno != errno.ENOENT:
2371
except EOFError as e:
2372
logger.warning("Could not load persistent state: "
2373
"EOFError:", exc_info=e)
2375
2220
with PGPEngine() as pgp:
2376
2221
for client_name, client in clients_data.iteritems():
2394
2239
# Clients who has passed its expire date can still be
2395
2240
# enabled if its last checker was successful. Clients
2396
# whose checker succeeded before we stored its state is
2397
# assumed to have successfully run all checkers during
2241
# whose checker failed before we stored its state is
2242
# assumed to have failed all checkers during downtime.
2399
2243
if client["enabled"]:
2400
2244
if datetime.datetime.utcnow() >= client["expires"]:
2401
2245
if not client["last_checked_ok"]:
2402
2246
logger.warning(
2403
2247
"disabling client {0} - Client never "
2404
"performed a successful checker"
2405
.format(client_name))
2248
"performed a successfull checker"
2249
.format(client["name"]))
2406
2250
client["enabled"] = False
2407
2251
elif client["last_checker_status"] != 0:
2408
2252
logger.warning(
2409
2253
"disabling client {0} - Client "
2410
2254
"last checker failed with error code {1}"
2411
.format(client_name,
2255
.format(client["name"],
2412
2256
client["last_checker_status"]))
2413
2257
client["enabled"] = False
2415
2259
client["expires"] = (datetime.datetime
2417
2261
+ client["timeout"])
2418
logger.debug("Last checker succeeded,"
2419
" keeping {0} enabled"
2420
.format(client_name))
2422
2264
client["secret"] = (
2423
2265
pgp.decrypt(client["encrypted_secret"],
2429
2271
.format(client_name))
2430
2272
client["secret"] = (
2431
2273
client_settings[client_name]["secret"])
2433
2276
# Add/remove clients based on new changes made to config
2434
for client_name in (set(old_client_settings)
2435
- set(client_settings)):
2277
for client_name in set(old_client_settings) - set(client_settings):
2436
2278
del clients_data[client_name]
2437
for client_name in (set(client_settings)
2438
- set(old_client_settings)):
2279
for client_name in set(client_settings) - set(old_client_settings):
2439
2280
clients_data[client_name] = client_settings[client_name]
2441
# Create all client objects
2282
# Create clients all clients
2442
2283
for client_name, client in clients_data.iteritems():
2443
2284
tcp_server.clients[client_name] = client_class(
2444
2285
name = client_name, settings = client)
2446
2287
if not tcp_server.clients:
2447
2288
logger.warning("No clients defined")
2465
2306
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2468
@alternate_dbus_interfaces({"se.recompile.Mandos":
2469
"se.bsnet.fukt.Mandos"})
2470
class MandosDBusService(DBusObjectWithProperties):
2309
class MandosDBusService(dbus.service.Object):
2471
2310
"""A D-Bus proxy object"""
2472
2311
def __init__(self):
2473
2312
dbus.service.Object.__init__(self, bus, "/")
2474
2313
_interface = "se.recompile.Mandos"
2476
@dbus_interface_annotations(_interface)
2478
return { "org.freedesktop.DBus.Property"
2479
".EmitsChangedSignal":
2482
2315
@dbus.service.signal(_interface, signature="o")
2483
2316
def ClientAdded(self, objpath):
2565
2400
del client_settings[client.name]["secret"]
2568
with (tempfile.NamedTemporaryFile
2569
(mode='wb', suffix=".pickle", prefix='clients-',
2570
dir=os.path.dirname(stored_state_path),
2571
delete=False)) as stored_state:
2403
with os.fdopen(os.open(stored_state_path,
2404
os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2405
0600), "wb") as stored_state:
2572
2406
pickle.dump((clients, client_settings), stored_state)
2573
tempname=stored_state.name
2574
os.rename(tempname, stored_state_path)
2575
2407
except (IOError, OSError) as e:
2581
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2582
logger.warning("Could not save persistent state: {0}"
2583
.format(os.strerror(e.errno)))
2585
logger.warning("Could not save persistent state:",
2408
logger.warning("Could not save persistent state: {0}"
2410
if e.errno not in (errno.ENOENT, errno.EACCES):
2589
2413
# Delete all clients, and settings from config
2590
2414
while tcp_server.clients:
2617
2441
service.port = tcp_server.socket.getsockname()[1]
2619
2443
logger.info("Now listening on address %r, port %d,"
2620
" flowinfo %d, scope_id %d",
2621
*tcp_server.socket.getsockname())
2444
" flowinfo %d, scope_id %d"
2445
% tcp_server.socket.getsockname())
2623
logger.info("Now listening on address %r, port %d",
2624
*tcp_server.socket.getsockname())
2447
logger.info("Now listening on address %r, port %d"
2448
% tcp_server.socket.getsockname())
2626
2450
#service.interface = tcp_server.socket.getsockname()[3]