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
177
174
def encrypt(self, data, password):
178
175
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
176
with open(os.devnull) as devnull:
181
178
proc = self.gnupg.run(['--symmetric'],
182
179
create_fhs=['stdin', 'stdout'],
194
191
def decrypt(self, data, password):
195
192
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
193
with open(os.devnull) as devnull:
198
195
proc = self.gnupg.run(['--decrypt'],
199
196
create_fhs=['stdin', 'stdout'],
200
197
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
198
with contextlib.closing(proc.handles['stdin'] ) as f:
203
200
with contextlib.closing(proc.handles['stdout']) as f:
204
201
decrypted_plaintext = f.read()
382
372
"""Add the new name to the syslog messages"""
383
373
ret = AvahiService.rename(self)
384
374
syslogger.setFormatter(logging.Formatter
385
('Mandos ({0}) [%(process)d]:'
386
' %(levelname)s: %(message)s'
375
('Mandos (%s) [%%(process)d]:'
376
' %%(levelname)s: %%(message)s'
390
380
def timedelta_to_milliseconds(td):
423
413
last_checked_ok: datetime.datetime(); (UTC) or None
424
414
last_checker_status: integer between 0 and 255 reflecting exit
425
415
status of last checker. -1 reflects crashed
426
checker, -2 means no checker completed yet.
427
417
last_enabled: datetime.datetime(); (UTC) or None
428
418
name: string; from the config file, used in log messages and
429
419
D-Bus identifiers
430
420
secret: bytestring; sent verbatim (over TLS) to client
431
421
timeout: datetime.timedelta(); How long from last_checked_ok
432
422
until this client is disabled
433
extended_timeout: extra long timeout when secret has been sent
423
extended_timeout: extra long timeout when password has been sent
434
424
runtime_expansions: Allowed attributes for runtime expansion.
435
425
expires: datetime.datetime(); time (UTC) when a client will be
436
426
disabled, or None
466
456
def approval_delay_milliseconds(self):
467
457
return timedelta_to_milliseconds(self.approval_delay)
470
460
def config_parser(config):
471
"""Construct a new dict of client settings of this form:
461
""" Construct a new dict of client settings of this form:
472
462
{ client_name: {setting_name: value, ...}, ...}
473
with exceptions for any special settings as defined above.
474
NOTE: Must be a pure function. Must return the same result
475
value given the same arguments.
463
with exceptions for any special settings as defined above"""
478
465
for client_name in config.sections():
479
466
section = dict(config.items(client_name))
509
495
client["checker_command"] = section["checker"]
510
496
client["last_approval_request"] = None
511
497
client["last_checked_ok"] = None
512
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
516
510
def __init__(self, settings, name = None):
511
"""Note: the 'checker' key in 'config' sets the
512
'checker_command' attribute and *not* the 'checker'
518
515
# adding all client settings
519
516
for setting, value in settings.iteritems():
520
517
setattr(self, setting, value)
523
if not hasattr(self, "last_enabled"):
524
self.last_enabled = datetime.datetime.utcnow()
525
if not hasattr(self, "expires"):
526
self.expires = (datetime.datetime.utcnow()
529
self.last_enabled = None
532
519
logger.debug("Creating client %r", self.name)
533
520
# Uppercase and remove spaces from fingerprint for later
534
521
# comparison purposes with return value from the fingerprint()
536
523
logger.debug(" Fingerprint: %s", self.fingerprint)
537
self.created = settings.get("created",
538
datetime.datetime.utcnow())
524
self.created = settings.get("created", datetime.datetime.utcnow())
540
526
# attributes specific for this server instance
541
527
self.checker = None
542
528
self.checker_initiator_tag = None
630
616
logger.warning("Checker for %(name)s crashed?",
633
def checked_ok(self):
634
"""Assert that the client has been seen, alive and well."""
635
self.last_checked_ok = datetime.datetime.utcnow()
636
self.last_checker_status = 0
639
def bump_timeout(self, timeout=None):
640
"""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,
641
625
if timeout is None:
642
626
timeout = self.timeout
627
self.last_checked_ok = datetime.datetime.utcnow()
643
628
if self.disable_initiator_tag is not None:
644
629
gobject.source_remove(self.disable_initiator_tag)
645
630
if getattr(self, "enabled", False):
697
682
command = self.checker_command % escaped_attrs
698
683
except TypeError as error:
699
logger.error('Could not format string "%s"',
700
self.checker_command, exc_info=error)
684
logger.error('Could not format string "%s":'
685
' %s', self.checker_command, error)
701
686
return True # Try again later
702
687
self.current_checker_command = command
778
def dbus_interface_annotations(dbus_interface):
779
"""Decorator for marking functions returning interface annotations
783
@dbus_interface_annotations("org.example.Interface")
784
def _foo(self): # Function name does not matter
785
return {"org.freedesktop.DBus.Deprecated": "true",
786
"org.freedesktop.DBus.Property.EmitsChangedSignal":
790
func._dbus_is_interface = True
791
func._dbus_interface = dbus_interface
792
func._dbus_name = dbus_interface
797
def dbus_annotations(annotations):
798
"""Decorator to annotate D-Bus methods, signals or properties
801
@dbus_service_property("org.example.Interface", signature="b",
803
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
804
"org.freedesktop.DBus.Property."
805
"EmitsChangedSignal": "false"})
806
def Property_dbus_property(self):
807
return dbus.Boolean(False)
810
func._dbus_annotations = annotations
815
763
class DBusPropertyException(dbus.exceptions.DBusException):
816
764
"""A base class for D-Bus property-related exceptions
843
def _is_dbus_thing(thing):
844
"""Returns a function testing if an attribute is a D-Bus thing
846
If called like _is_dbus_thing("method") it returns a function
847
suitable for use as predicate to inspect.getmembers().
849
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
791
def _is_dbus_property(obj):
792
return getattr(obj, "_dbus_is_property", False)
852
def _get_all_dbus_things(self, thing):
794
def _get_all_dbus_properties(self):
853
795
"""Returns a generator of (name, attribute) pairs
855
return ((getattr(athing.__get__(self), "_dbus_name",
857
athing.__get__(self))
797
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
858
798
for cls in self.__class__.__mro__
860
inspect.getmembers(cls,
861
self._is_dbus_thing(thing)))
800
inspect.getmembers(cls, self._is_dbus_property))
863
802
def _get_dbus_property(self, interface_name, property_name):
864
803
"""Returns a bound method if one exists which is a D-Bus
867
806
for cls in self.__class__.__mro__:
868
807
for name, value in (inspect.getmembers
870
self._is_dbus_thing("property"))):
808
(cls, self._is_dbus_property)):
871
809
if (value._dbus_name == property_name
872
810
and value._dbus_interface == interface_name):
873
811
return value.__get__(self)
936
874
path_keyword='object_path',
937
875
connection_keyword='connection')
938
876
def Introspect(self, object_path, connection):
939
"""Overloading of standard D-Bus method.
941
Inserts property tags and interface annotation tags.
877
"""Standard D-Bus method, overloaded to insert property tags.
943
879
xmlstring = dbus.service.Object.Introspect(self, object_path,
951
887
e.setAttribute("access", prop._dbus_access)
953
889
for if_tag in document.getElementsByTagName("interface"):
955
890
for tag in (make_tag(document, name, prop)
957
in self._get_all_dbus_things("property")
892
in self._get_all_dbus_properties()
958
893
if prop._dbus_interface
959
894
== if_tag.getAttribute("name")):
960
895
if_tag.appendChild(tag)
961
# Add annotation tags
962
for typ in ("method", "signal", "property"):
963
for tag in if_tag.getElementsByTagName(typ):
965
for name, prop in (self.
966
_get_all_dbus_things(typ)):
967
if (name == tag.getAttribute("name")
968
and prop._dbus_interface
969
== if_tag.getAttribute("name")):
970
annots.update(getattr
974
for name, value in annots.iteritems():
975
ann_tag = document.createElement(
977
ann_tag.setAttribute("name", name)
978
ann_tag.setAttribute("value", value)
979
tag.appendChild(ann_tag)
980
# Add interface annotation tags
981
for annotation, value in dict(
983
*(annotations().iteritems()
984
for name, annotations in
985
self._get_all_dbus_things("interface")
986
if name == if_tag.getAttribute("name")
988
ann_tag = document.createElement("annotation")
989
ann_tag.setAttribute("name", annotation)
990
ann_tag.setAttribute("value", value)
991
if_tag.appendChild(ann_tag)
992
896
# Add the names to the return values for the
993
897
# "org.freedesktop.DBus.Properties" methods
994
898
if (if_tag.getAttribute("name")
1021
925
variant_level=variant_level)
1024
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1025
"""A class decorator; applied to a subclass of
1026
dbus.service.Object, it will add alternate D-Bus attributes with
1027
interface names according to the "alt_interface_names" mapping.
1030
@alternate_dbus_names({"org.example.Interface":
1031
"net.example.AlternateInterface"})
1032
class SampleDBusObject(dbus.service.Object):
1033
@dbus.service.method("org.example.Interface")
1034
def SampleDBusMethod():
1037
The above "SampleDBusMethod" on "SampleDBusObject" will be
1038
reachable via two interfaces: "org.example.Interface" and
1039
"net.example.AlternateInterface", the latter of which will have
1040
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1041
"true", unless "deprecate" is passed with a False value.
1043
This works for methods and signals, and also for D-Bus properties
1044
(from DBusObjectWithProperties) and interfaces (from the
1045
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.
1048
for orig_interface_name, alt_interface_name in (
1049
alt_interface_names.iteritems()):
1051
interface_names = set()
1052
# Go though all attributes of the class
1053
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):
1054
940
# Ignore non-D-Bus attributes, and D-Bus attributes
1055
941
# with the wrong interface name
1056
942
if (not hasattr(attribute, "_dbus_interface")
1057
943
or not attribute._dbus_interface
1058
.startswith(orig_interface_name)):
944
.startswith("se.recompile.Mandos")):
1060
946
# Create an alternate D-Bus interface name based on
1061
947
# the current name
1062
948
alt_interface = (attribute._dbus_interface
1063
.replace(orig_interface_name,
1064
alt_interface_name))
1065
interface_names.add(alt_interface)
949
.replace("se.recompile.Mandos",
950
"se.bsnet.fukt.Mandos"))
1066
951
# Is this a D-Bus signal?
1067
952
if getattr(attribute, "_dbus_is_signal", False):
1068
953
# Extract the original non-method function by
1083
968
nonmethod_func.func_name,
1084
969
nonmethod_func.func_defaults,
1085
970
nonmethod_func.func_closure)))
1086
# Copy annotations, if any
1088
new_function._dbus_annotations = (
1089
dict(attribute._dbus_annotations))
1090
except AttributeError:
1092
971
# Define a creator of a function to call both the
1093
# original and alternate functions, so both the
1094
# original and alternate signals gets sent when
1095
# the function is called
972
# old and new functions, so both the old and new
973
# signals gets sent when the function is called
1096
974
def fixscope(func1, func2):
1097
975
"""This function is a scope container to pass
1098
976
func1 and func2 to the "call_both" function
1105
983
return call_both
1106
984
# Create the "call_both" function and add it to
1108
attr[attrname] = fixscope(attribute, new_function)
986
attr[attrname] = fixscope(attribute,
1109
988
# Is this a D-Bus method?
1110
989
elif getattr(attribute, "_dbus_is_method", False):
1111
990
# Create a new, but exactly alike, function
1122
1001
attribute.func_name,
1123
1002
attribute.func_defaults,
1124
1003
attribute.func_closure)))
1125
# Copy annotations, if any
1127
attr[attrname]._dbus_annotations = (
1128
dict(attribute._dbus_annotations))
1129
except AttributeError:
1131
1004
# Is this a D-Bus property?
1132
1005
elif getattr(attribute, "_dbus_is_property", False):
1133
1006
# Create a new, but exactly alike, function
1147
1020
attribute.func_name,
1148
1021
attribute.func_defaults,
1149
1022
attribute.func_closure)))
1150
# Copy annotations, if any
1152
attr[attrname]._dbus_annotations = (
1153
dict(attribute._dbus_annotations))
1154
except AttributeError:
1156
# Is this a D-Bus interface?
1157
elif getattr(attribute, "_dbus_is_interface", False):
1158
# Create a new, but exactly alike, function
1159
# object. Decorate it to be a new D-Bus interface
1160
# with the alternate D-Bus interface name. Add it
1162
attr[attrname] = (dbus_interface_annotations
1165
(attribute.func_code,
1166
attribute.func_globals,
1167
attribute.func_name,
1168
attribute.func_defaults,
1169
attribute.func_closure)))
1171
# Deprecate all alternate interfaces
1172
iname="_AlternateDBusNames_interface_annotation{0}"
1173
for interface_name in interface_names:
1174
@dbus_interface_annotations(interface_name)
1176
return { "org.freedesktop.DBus.Deprecated":
1178
# Find an unused name
1179
for aname in (iname.format(i)
1180
for i in itertools.count()):
1181
if aname not in attr:
1185
# Replace the class with a new subclass of it with
1186
# methods, signals, etc. as created above.
1187
cls = type(b"{0}Alternate".format(cls.__name__),
1193
@alternate_dbus_interfaces({"se.recompile.Mandos":
1194
"se.bsnet.fukt.Mandos"})
1023
return type.__new__(mcs, name, bases, attr)
1195
1026
class ClientDBus(Client, DBusObjectWithProperties):
1196
1027
"""A Client class using D-Bus
1208
1039
def __init__(self, bus = None, *args, **kwargs):
1210
1041
Client.__init__(self, *args, **kwargs)
1042
self._approvals_pending = 0
1044
self._approvals_pending = 0
1211
1045
# Only now, when this client is initialized, can it show up on
1213
1047
client_object_name = unicode(self.name).translate(
1506
1341
return datetime_to_dbus(self.last_checked_ok)
1508
# LastCheckerStatus - property
1509
@dbus_service_property(_interface, signature="n",
1511
def LastCheckerStatus_dbus_property(self):
1512
return dbus.Int16(self.last_checker_status)
1514
1343
# Expires - property
1515
1344
@dbus_service_property(_interface, signature="s", access="read")
1516
1345
def Expires_dbus_property(self):
1528
1357
if value is None: # get
1529
1358
return dbus.UInt64(self.timeout_milliseconds())
1530
1359
self.timeout = datetime.timedelta(0, 0, 0, value)
1360
if getattr(self, "disable_initiator_tag", None) is None:
1531
1362
# Reschedule timeout
1533
now = datetime.datetime.utcnow()
1534
time_to_die = timedelta_to_milliseconds(
1535
(self.last_checked_ok + self.timeout) - now)
1536
if time_to_die <= 0:
1537
# The timeout has passed
1540
self.expires = (now +
1541
datetime.timedelta(milliseconds =
1543
if (getattr(self, "disable_initiator_tag", None)
1546
gobject.source_remove(self.disable_initiator_tag)
1547
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))
1551
1381
# ExtendedTimeout - property
1552
1382
@dbus_service_property(_interface, signature="t",
2104
1940
elif suffix == "w":
2105
1941
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2107
raise ValueError("Unknown suffix {0!r}"
1943
raise ValueError("Unknown suffix %r" % suffix)
2109
1944
except (ValueError, IndexError) as e:
2110
1945
raise ValueError(*(e.args))
2111
1946
timevalue += delta
2126
1961
if not noclose:
2127
1962
# Close all standard open file descriptors
2128
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1963
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2129
1964
if not stat.S_ISCHR(os.fstat(null).st_mode):
2130
1965
raise OSError(errno.ENODEV,
2131
"{0} not a character device"
2132
.format(os.devnull))
1966
"%s not a character device"
2133
1968
os.dup2(null, sys.stdin.fileno())
2134
1969
os.dup2(null, sys.stdout.fileno())
2135
1970
os.dup2(null, sys.stderr.fileno())
2145
1980
parser = argparse.ArgumentParser()
2146
1981
parser.add_argument("-v", "--version", action="version",
2147
version = "%(prog)s {0}".format(version),
1982
version = "%%(prog)s %s" % version,
2148
1983
help="show version number and exit")
2149
1984
parser.add_argument("-i", "--interface", metavar="IF",
2150
1985
help="Bind to interface IF")
2243
2078
stored_state_file)
2246
initlogger(debug, logging.DEBUG)
2081
initlogger(logging.DEBUG)
2248
2083
if not debuglevel:
2251
2086
level = getattr(logging, debuglevel.upper())
2252
initlogger(debug, level)
2254
2089
if server_settings["servicename"] != "Mandos":
2255
2090
syslogger.setFormatter(logging.Formatter
2256
('Mandos ({0}) [%(process)d]:'
2257
' %(levelname)s: %(message)s'
2258
.format(server_settings
2091
('Mandos (%s) [%%(process)d]:'
2092
' %%(levelname)s: %%(message)s'
2093
% server_settings["servicename"]))
2261
2095
# Parse config file with clients
2262
client_config = configparser.SafeConfigParser(Client
2096
client_config = configparser.SafeConfigParser(Client.client_defaults)
2264
2097
client_config.read(os.path.join(server_settings["configdir"],
2265
2098
"clients.conf"))
2280
2113
pidfilename = "/var/run/mandos.pid"
2282
2115
pidfile = open(pidfilename, "w")
2283
except IOError as e:
2284
logger.error("Could not open file %r", pidfilename,
2117
logger.error("Could not open file %r", pidfilename)
2287
for name in ("_mandos", "mandos", "nobody"):
2120
uid = pwd.getpwnam("_mandos").pw_uid
2121
gid = pwd.getpwnam("_mandos").pw_gid
2289
uid = pwd.getpwnam(name).pw_uid
2290
gid = pwd.getpwnam(name).pw_gid
2124
uid = pwd.getpwnam("mandos").pw_uid
2125
gid = pwd.getpwnam("mandos").pw_gid
2292
2126
except KeyError:
2128
uid = pwd.getpwnam("nobody").pw_uid
2129
gid = pwd.getpwnam("nobody").pw_gid
2316
2152
.gnutls_global_set_log_function(debug_gnutls))
2318
2154
# Redirect stdin so all checkers get /dev/null
2319
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2155
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2320
2156
os.dup2(null, sys.stdin.fileno())
2160
# No console logging
2161
logger.removeHandler(console)
2324
2163
# Need to fork before connecting to D-Bus
2326
2165
# Close all input and output, do double fork, etc.
2329
gobject.threads_init()
2331
2168
global main_loop
2332
2169
# From the Avahi example code
2333
DBusGMainLoop(set_as_default=True)
2170
DBusGMainLoop(set_as_default=True )
2334
2171
main_loop = gobject.MainLoop()
2335
2172
bus = dbus.SystemBus()
2336
2173
# End of Avahi example code
2374
2212
(stored_state))
2375
2213
os.remove(stored_state_path)
2376
2214
except IOError as e:
2377
if e.errno == errno.ENOENT:
2378
logger.warning("Could not load persistent state: {0}"
2379
.format(os.strerror(e.errno)))
2381
logger.critical("Could not load persistent state:",
2215
logger.warning("Could not load persistent state: {0}"
2217
if e.errno != errno.ENOENT:
2384
except EOFError as e:
2385
logger.warning("Could not load persistent state: "
2386
"EOFError:", exc_info=e)
2388
2220
with PGPEngine() as pgp:
2389
2221
for client_name, client in clients_data.iteritems():
2407
2239
# Clients who has passed its expire date can still be
2408
2240
# enabled if its last checker was successful. Clients
2409
# whose checker succeeded before we stored its state is
2410
# 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.
2412
2243
if client["enabled"]:
2413
2244
if datetime.datetime.utcnow() >= client["expires"]:
2414
2245
if not client["last_checked_ok"]:
2415
2246
logger.warning(
2416
2247
"disabling client {0} - Client never "
2417
"performed a successful checker"
2418
.format(client_name))
2248
"performed a successfull checker"
2249
.format(client["name"]))
2419
2250
client["enabled"] = False
2420
2251
elif client["last_checker_status"] != 0:
2421
2252
logger.warning(
2422
2253
"disabling client {0} - Client "
2423
2254
"last checker failed with error code {1}"
2424
.format(client_name,
2255
.format(client["name"],
2425
2256
client["last_checker_status"]))
2426
2257
client["enabled"] = False
2428
2259
client["expires"] = (datetime.datetime
2430
2261
+ client["timeout"])
2431
logger.debug("Last checker succeeded,"
2432
" keeping {0} enabled"
2433
.format(client_name))
2435
2264
client["secret"] = (
2436
2265
pgp.decrypt(client["encrypted_secret"],
2442
2271
.format(client_name))
2443
2272
client["secret"] = (
2444
2273
client_settings[client_name]["secret"])
2446
2276
# Add/remove clients based on new changes made to config
2447
for client_name in (set(old_client_settings)
2448
- set(client_settings)):
2277
for client_name in set(old_client_settings) - set(client_settings):
2449
2278
del clients_data[client_name]
2450
for client_name in (set(client_settings)
2451
- set(old_client_settings)):
2279
for client_name in set(client_settings) - set(old_client_settings):
2452
2280
clients_data[client_name] = client_settings[client_name]
2454
# Create all client objects
2282
# Create clients all clients
2455
2283
for client_name, client in clients_data.iteritems():
2456
2284
tcp_server.clients[client_name] = client_class(
2457
2285
name = client_name, settings = client)
2459
2287
if not tcp_server.clients:
2460
2288
logger.warning("No clients defined")
2478
2306
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2481
@alternate_dbus_interfaces({"se.recompile.Mandos":
2482
"se.bsnet.fukt.Mandos"})
2483
class MandosDBusService(DBusObjectWithProperties):
2309
class MandosDBusService(dbus.service.Object):
2484
2310
"""A D-Bus proxy object"""
2485
2311
def __init__(self):
2486
2312
dbus.service.Object.__init__(self, bus, "/")
2487
2313
_interface = "se.recompile.Mandos"
2489
@dbus_interface_annotations(_interface)
2491
return { "org.freedesktop.DBus.Property"
2492
".EmitsChangedSignal":
2495
2315
@dbus.service.signal(_interface, signature="o")
2496
2316
def ClientAdded(self, objpath):
2578
2400
del client_settings[client.name]["secret"]
2581
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2584
(stored_state_path))
2585
with os.fdopen(tempfd, "wb") 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:
2586
2406
pickle.dump((clients, client_settings), stored_state)
2587
os.rename(tempname, stored_state_path)
2588
2407
except (IOError, OSError) as e:
2594
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2595
logger.warning("Could not save persistent state: {0}"
2596
.format(os.strerror(e.errno)))
2598
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):
2602
2413
# Delete all clients, and settings from config
2603
2414
while tcp_server.clients:
2630
2441
service.port = tcp_server.socket.getsockname()[1]
2632
2443
logger.info("Now listening on address %r, port %d,"
2633
" flowinfo %d, scope_id %d",
2634
*tcp_server.socket.getsockname())
2444
" flowinfo %d, scope_id %d"
2445
% tcp_server.socket.getsockname())
2636
logger.info("Now listening on address %r, port %d",
2637
*tcp_server.socket.getsockname())
2447
logger.info("Now listening on address %r, port %d"
2448
% tcp_server.socket.getsockname())
2639
2450
#service.interface = tcp_server.socket.getsockname()[3]