179
176
def encrypt(self, data, password):
180
177
self.gnupg.passphrase = self.password_encode(password)
181
with open(os.devnull, "w") as devnull:
178
with open(os.devnull) as devnull:
183
180
proc = self.gnupg.run(['--symmetric'],
184
181
create_fhs=['stdin', 'stdout'],
196
193
def decrypt(self, data, password):
197
194
self.gnupg.passphrase = self.password_encode(password)
198
with open(os.devnull, "w") as devnull:
195
with open(os.devnull) as devnull:
200
197
proc = self.gnupg.run(['--decrypt'],
201
198
create_fhs=['stdin', 'stdout'],
202
199
attach_fhs={'stderr': devnull})
203
with contextlib.closing(proc.handles['stdin']) as f:
200
with contextlib.closing(proc.handles['stdin'] ) as f:
205
202
with contextlib.closing(proc.handles['stdout']) as f:
206
203
decrypted_plaintext = f.read()
379
369
self.server_state_changed)
380
370
self.server_state_changed(self.server.GetState())
383
372
class AvahiServiceToSyslog(AvahiService):
384
373
def rename(self):
385
374
"""Add the new name to the syslog messages"""
386
375
ret = AvahiService.rename(self)
387
376
syslogger.setFormatter(logging.Formatter
388
('Mandos ({0}) [%(process)d]:'
389
' %(levelname)s: %(message)s'
377
('Mandos (%s) [%%(process)d]:'
378
' %%(levelname)s: %%(message)s'
394
382
def timedelta_to_milliseconds(td):
395
383
"Convert a datetime.timedelta() to milliseconds"
396
384
return ((td.days * 24 * 60 * 60 * 1000)
397
385
+ (td.seconds * 1000)
398
386
+ (td.microseconds // 1000))
401
388
class Client(object):
402
389
"""A representation of a client host served by this server.
444
431
runtime_expansions = ("approval_delay", "approval_duration",
445
"created", "enabled", "expires",
446
"fingerprint", "host", "interval",
447
"last_approval_request", "last_checked_ok",
432
"created", "enabled", "fingerprint",
433
"host", "interval", "last_checked_ok",
448
434
"last_enabled", "name", "timeout")
449
435
client_defaults = { "timeout": "5m",
450
436
"extended_timeout": "15m",
576
566
if getattr(self, "enabled", False):
577
567
# Already enabled
569
self.send_changedstate()
579
570
self.expires = datetime.datetime.utcnow() + self.timeout
580
571
self.enabled = True
581
572
self.last_enabled = datetime.datetime.utcnow()
582
573
self.init_checker()
583
self.send_changedstate()
585
575
def disable(self, quiet=True):
586
576
"""Disable this client."""
587
577
if not getattr(self, "enabled", False):
580
self.send_changedstate()
590
582
logger.info("Disabling client %s", self.name)
591
if getattr(self, "disable_initiator_tag", None) is not None:
583
if getattr(self, "disable_initiator_tag", False):
592
584
gobject.source_remove(self.disable_initiator_tag)
593
585
self.disable_initiator_tag = None
594
586
self.expires = None
595
if getattr(self, "checker_initiator_tag", None) is not None:
587
if getattr(self, "checker_initiator_tag", False):
596
588
gobject.source_remove(self.checker_initiator_tag)
597
589
self.checker_initiator_tag = None
598
590
self.stop_checker()
599
591
self.enabled = False
601
self.send_changedstate()
602
592
# Do not run this again if called by a gobject.timeout_add
608
598
def init_checker(self):
609
599
# Schedule a new checker to be started an 'interval' from now,
610
600
# and every interval from then on.
611
if self.checker_initiator_tag is not None:
612
gobject.source_remove(self.checker_initiator_tag)
613
601
self.checker_initiator_tag = (gobject.timeout_add
614
602
(self.interval_milliseconds(),
615
603
self.start_checker))
616
604
# Schedule a disable() when 'timeout' has passed
617
if self.disable_initiator_tag is not None:
618
gobject.source_remove(self.disable_initiator_tag)
619
605
self.disable_initiator_tag = (gobject.timeout_add
620
606
(self.timeout_milliseconds(),
668
653
If a checker already exists, leave it running and do
670
655
# 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
656
# did that, then if a checker (for some reason) started
657
# running slowly and taking more than 'interval' time, the
658
# client would inevitably timeout, since no checker would get
659
# a chance to run to completion. If we instead leave running
675
660
# checkers alone, the checker would have to take more time
676
661
# than 'timeout' for the client to be disabled, which is as it
691
676
self.current_checker_command)
692
677
# Start a new checker if needed
693
678
if self.checker is None:
694
# Escape attributes for the shell
695
escaped_attrs = dict(
696
(attr, re.escape(unicode(getattr(self, attr))))
698
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
680
# In case checker_command has exactly one % operator
681
command = self.checker_command % self.host
683
# Escape attributes for the shell
684
escaped_attrs = dict(
686
re.escape(unicode(str(getattr(self, attr, "")),
690
self.runtime_expansions)
693
command = self.checker_command % escaped_attrs
694
except TypeError as error:
695
logger.error('Could not format string "%s":'
696
' %s', self.checker_command, error)
697
return True # Try again later
705
698
self.current_checker_command = command
707
700
logger.info("Starting checker %r for %s",
713
706
self.checker = subprocess.Popen(command,
715
708
shell=True, cwd="/")
709
self.checker_callback_tag = (gobject.child_watch_add
711
self.checker_callback,
713
# The checker may have completed before the gobject
714
# watch was added. Check for this.
715
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
717
gobject.source_remove(self.checker_callback_tag)
718
self.checker_callback(pid, status, command)
716
719
except OSError as error:
717
logger.error("Failed to start subprocess",
719
self.checker_callback_tag = (gobject.child_watch_add
721
self.checker_callback,
723
# The checker may have completed before the gobject
724
# watch was added. Check for this.
725
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
727
gobject.source_remove(self.checker_callback_tag)
728
self.checker_callback(pid, status, command)
720
logger.error("Failed to start subprocess: %s",
729
722
# Re-run this periodically if run by gobject.timeout_add
781
def dbus_interface_annotations(dbus_interface):
782
"""Decorator for marking functions returning interface annotations
786
@dbus_interface_annotations("org.example.Interface")
787
def _foo(self): # Function name does not matter
788
return {"org.freedesktop.DBus.Deprecated": "true",
789
"org.freedesktop.DBus.Property.EmitsChangedSignal":
793
func._dbus_is_interface = True
794
func._dbus_interface = dbus_interface
795
func._dbus_name = dbus_interface
800
def dbus_annotations(annotations):
801
"""Decorator to annotate D-Bus methods, signals or properties
804
@dbus_service_property("org.example.Interface", signature="b",
806
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
807
"org.freedesktop.DBus.Property."
808
"EmitsChangedSignal": "false"})
809
def Property_dbus_property(self):
810
return dbus.Boolean(False)
813
func._dbus_annotations = annotations
818
774
class DBusPropertyException(dbus.exceptions.DBusException):
819
775
"""A base class for D-Bus property-related exceptions
846
def _is_dbus_thing(thing):
847
"""Returns a function testing if an attribute is a D-Bus thing
849
If called like _is_dbus_thing("method") it returns a function
850
suitable for use as predicate to inspect.getmembers().
852
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
802
def _is_dbus_property(obj):
803
return getattr(obj, "_dbus_is_property", False)
855
def _get_all_dbus_things(self, thing):
805
def _get_all_dbus_properties(self):
856
806
"""Returns a generator of (name, attribute) pairs
858
return ((getattr(athing.__get__(self), "_dbus_name",
860
athing.__get__(self))
808
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
861
809
for cls in self.__class__.__mro__
863
inspect.getmembers(cls,
864
self._is_dbus_thing(thing)))
811
inspect.getmembers(cls, self._is_dbus_property))
866
813
def _get_dbus_property(self, interface_name, property_name):
867
814
"""Returns a bound method if one exists which is a D-Bus
870
817
for cls in self.__class__.__mro__:
871
818
for name, value in (inspect.getmembers
873
self._is_dbus_thing("property"))):
819
(cls, self._is_dbus_property)):
874
820
if (value._dbus_name == property_name
875
821
and value._dbus_interface == interface_name):
876
822
return value.__get__(self)
939
885
path_keyword='object_path',
940
886
connection_keyword='connection')
941
887
def Introspect(self, object_path, connection):
942
"""Overloading of standard D-Bus method.
944
Inserts property tags and interface annotation tags.
888
"""Standard D-Bus method, overloaded to insert property tags.
946
890
xmlstring = dbus.service.Object.Introspect(self, object_path,
954
898
e.setAttribute("access", prop._dbus_access)
956
900
for if_tag in document.getElementsByTagName("interface"):
958
901
for tag in (make_tag(document, name, prop)
960
in self._get_all_dbus_things("property")
903
in self._get_all_dbus_properties()
961
904
if prop._dbus_interface
962
905
== if_tag.getAttribute("name")):
963
906
if_tag.appendChild(tag)
964
# Add annotation tags
965
for typ in ("method", "signal", "property"):
966
for tag in if_tag.getElementsByTagName(typ):
968
for name, prop in (self.
969
_get_all_dbus_things(typ)):
970
if (name == tag.getAttribute("name")
971
and prop._dbus_interface
972
== if_tag.getAttribute("name")):
973
annots.update(getattr
977
for name, value in annots.iteritems():
978
ann_tag = document.createElement(
980
ann_tag.setAttribute("name", name)
981
ann_tag.setAttribute("value", value)
982
tag.appendChild(ann_tag)
983
# Add interface annotation tags
984
for annotation, value in dict(
985
itertools.chain.from_iterable(
986
annotations().iteritems()
987
for name, annotations in
988
self._get_all_dbus_things("interface")
989
if name == if_tag.getAttribute("name")
991
ann_tag = document.createElement("annotation")
992
ann_tag.setAttribute("name", annotation)
993
ann_tag.setAttribute("value", value)
994
if_tag.appendChild(ann_tag)
995
907
# Add the names to the return values for the
996
908
# "org.freedesktop.DBus.Properties" methods
997
909
if (if_tag.getAttribute("name")
1024
936
variant_level=variant_level)
1027
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1028
"""A class decorator; applied to a subclass of
1029
dbus.service.Object, it will add alternate D-Bus attributes with
1030
interface names according to the "alt_interface_names" mapping.
1033
@alternate_dbus_names({"org.example.Interface":
1034
"net.example.AlternateInterface"})
1035
class SampleDBusObject(dbus.service.Object):
1036
@dbus.service.method("org.example.Interface")
1037
def SampleDBusMethod():
1040
The above "SampleDBusMethod" on "SampleDBusObject" will be
1041
reachable via two interfaces: "org.example.Interface" and
1042
"net.example.AlternateInterface", the latter of which will have
1043
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1044
"true", unless "deprecate" is passed with a False value.
1046
This works for methods and signals, and also for D-Bus properties
1047
(from DBusObjectWithProperties) and interfaces (from the
1048
dbus_interface_annotations decorator).
939
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
941
"""Applied to an empty subclass of a D-Bus object, this metaclass
942
will add additional D-Bus attributes matching a certain pattern.
1051
for orig_interface_name, alt_interface_name in (
1052
alt_interface_names.iteritems()):
1054
interface_names = set()
1055
# Go though all attributes of the class
1056
for attrname, attribute in inspect.getmembers(cls):
944
def __new__(mcs, name, bases, attr):
945
# Go through all the base classes which could have D-Bus
946
# methods, signals, or properties in them
947
for base in (b for b in bases
948
if issubclass(b, dbus.service.Object)):
949
# Go though all attributes of the base class
950
for attrname, attribute in inspect.getmembers(base):
1057
951
# Ignore non-D-Bus attributes, and D-Bus attributes
1058
952
# with the wrong interface name
1059
953
if (not hasattr(attribute, "_dbus_interface")
1060
954
or not attribute._dbus_interface
1061
.startswith(orig_interface_name)):
955
.startswith("se.recompile.Mandos")):
1063
957
# Create an alternate D-Bus interface name based on
1064
958
# the current name
1065
959
alt_interface = (attribute._dbus_interface
1066
.replace(orig_interface_name,
1067
alt_interface_name))
1068
interface_names.add(alt_interface)
960
.replace("se.recompile.Mandos",
961
"se.bsnet.fukt.Mandos"))
1069
962
# Is this a D-Bus signal?
1070
963
if getattr(attribute, "_dbus_is_signal", False):
1071
964
# Extract the original non-method function by
1086
979
nonmethod_func.func_name,
1087
980
nonmethod_func.func_defaults,
1088
981
nonmethod_func.func_closure)))
1089
# Copy annotations, if any
1091
new_function._dbus_annotations = (
1092
dict(attribute._dbus_annotations))
1093
except AttributeError:
1095
982
# Define a creator of a function to call both the
1096
# original and alternate functions, so both the
1097
# original and alternate signals gets sent when
1098
# the function is called
983
# old and new functions, so both the old and new
984
# signals gets sent when the function is called
1099
985
def fixscope(func1, func2):
1100
986
"""This function is a scope container to pass
1101
987
func1 and func2 to the "call_both" function
1108
994
return call_both
1109
995
# Create the "call_both" function and add it to
1111
attr[attrname] = fixscope(attribute, new_function)
997
attr[attrname] = fixscope(attribute,
1112
999
# Is this a D-Bus method?
1113
1000
elif getattr(attribute, "_dbus_is_method", False):
1114
1001
# Create a new, but exactly alike, function
1125
1012
attribute.func_name,
1126
1013
attribute.func_defaults,
1127
1014
attribute.func_closure)))
1128
# Copy annotations, if any
1130
attr[attrname]._dbus_annotations = (
1131
dict(attribute._dbus_annotations))
1132
except AttributeError:
1134
1015
# Is this a D-Bus property?
1135
1016
elif getattr(attribute, "_dbus_is_property", False):
1136
1017
# Create a new, but exactly alike, function
1150
1031
attribute.func_name,
1151
1032
attribute.func_defaults,
1152
1033
attribute.func_closure)))
1153
# Copy annotations, if any
1155
attr[attrname]._dbus_annotations = (
1156
dict(attribute._dbus_annotations))
1157
except AttributeError:
1159
# Is this a D-Bus interface?
1160
elif getattr(attribute, "_dbus_is_interface", False):
1161
# Create a new, but exactly alike, function
1162
# object. Decorate it to be a new D-Bus interface
1163
# with the alternate D-Bus interface name. Add it
1165
attr[attrname] = (dbus_interface_annotations
1168
(attribute.func_code,
1169
attribute.func_globals,
1170
attribute.func_name,
1171
attribute.func_defaults,
1172
attribute.func_closure)))
1174
# Deprecate all alternate interfaces
1175
iname="_AlternateDBusNames_interface_annotation{0}"
1176
for interface_name in interface_names:
1177
@dbus_interface_annotations(interface_name)
1179
return { "org.freedesktop.DBus.Deprecated":
1181
# Find an unused name
1182
for aname in (iname.format(i)
1183
for i in itertools.count()):
1184
if aname not in attr:
1188
# Replace the class with a new subclass of it with
1189
# methods, signals, etc. as created above.
1190
cls = type(b"{0}Alternate".format(cls.__name__),
1196
@alternate_dbus_interfaces({"se.recompile.Mandos":
1197
"se.bsnet.fukt.Mandos"})
1034
return type.__new__(mcs, name, bases, attr)
1198
1037
class ClientDBus(Client, DBusObjectWithProperties):
1199
1038
"""A Client class using D-Bus
1338
1178
def approve(self, value=True):
1179
self.send_changedstate()
1339
1180
self.approved = value
1340
1181
gobject.timeout_add(timedelta_to_milliseconds
1341
1182
(self.approval_duration),
1342
1183
self._reset_approved)
1343
self.send_changedstate()
1345
1186
## D-Bus methods, signals & properties
1346
1187
_interface = "se.recompile.Mandos.Client"
1350
@dbus_interface_annotations(_interface)
1352
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1357
1191
# CheckerCompleted - signal
1530
1364
def Timeout_dbus_property(self, value=None):
1531
1365
if value is None: # get
1532
1366
return dbus.UInt64(self.timeout_milliseconds())
1533
old_timeout = self.timeout
1534
1367
self.timeout = datetime.timedelta(0, 0, 0, value)
1535
# Reschedule disabling
1368
# Reschedule timeout
1536
1369
if self.enabled:
1537
1370
now = datetime.datetime.utcnow()
1538
self.expires += self.timeout - old_timeout
1539
if self.expires <= now:
1371
time_to_die = timedelta_to_milliseconds(
1372
(self.last_checked_ok + self.timeout) - now)
1373
if time_to_die <= 0:
1540
1374
# The timeout has passed
1377
self.expires = (now +
1378
datetime.timedelta(milliseconds =
1543
1380
if (getattr(self, "disable_initiator_tag", None)
1546
1383
gobject.source_remove(self.disable_initiator_tag)
1547
self.disable_initiator_tag = (
1548
gobject.timeout_add(
1549
timedelta_to_milliseconds(self.expires - now),
1384
self.disable_initiator_tag = (gobject.timeout_add
1552
1388
# ExtendedTimeout - property
1553
1389
@dbus_service_property(_interface, signature="t",
1741
1581
#wait until timeout or approved
1742
1582
time = datetime.datetime.now()
1743
1583
client.changedstate.acquire()
1744
client.changedstate.wait(
1745
float(timedelta_to_milliseconds(delay)
1584
(client.changedstate.wait
1585
(float(client.timedelta_to_milliseconds(delay)
1747
1587
client.changedstate.release()
1748
1588
time2 = datetime.datetime.now()
1749
1589
if (time2 - time) >= delay:
1921
1760
str(self.interface
1923
1762
except socket.error as error:
1924
if error.errno == errno.EPERM:
1763
if error[0] == errno.EPERM:
1925
1764
logger.error("No permission to"
1926
1765
" bind to interface %s",
1927
1766
self.interface)
1928
elif error.errno == errno.ENOPROTOOPT:
1767
elif error[0] == errno.ENOPROTOOPT:
1929
1768
logger.error("SO_BINDTODEVICE not available;"
1930
1769
" cannot bind to interface %s",
1931
1770
self.interface)
1932
elif error.errno == errno.ENODEV:
1933
logger.error("Interface %s does not"
1934
" exist, cannot bind",
1938
1773
# Only bind(2) the socket if we really need to.
1998
1833
def handle_ipc(self, source, condition, parent_pipe=None,
1999
1834
proc = None, client_object=None):
1836
gobject.IO_IN: "IN", # There is data to read.
1837
gobject.IO_OUT: "OUT", # Data can be written (without
1839
gobject.IO_PRI: "PRI", # There is urgent data to read.
1840
gobject.IO_ERR: "ERR", # Error condition.
1841
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1842
# broken, usually for pipes and
1845
conditions_string = ' | '.join(name
1847
condition_names.iteritems()
1848
if cond & condition)
2000
1849
# error, or the other end of multiprocessing.Pipe has closed
2001
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1850
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2002
1851
# Wait for other process to exit
2094
1943
elif suffix == "w":
2095
1944
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2097
raise ValueError("Unknown suffix {0!r}"
1946
raise ValueError("Unknown suffix %r" % suffix)
2099
1947
except (ValueError, IndexError) as e:
2100
1948
raise ValueError(*(e.args))
2101
1949
timevalue += delta
2116
1964
if not noclose:
2117
1965
# Close all standard open file descriptors
2118
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1966
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2119
1967
if not stat.S_ISCHR(os.fstat(null).st_mode):
2120
1968
raise OSError(errno.ENODEV,
2121
"{0} not a character device"
2122
.format(os.devnull))
1969
"%s not a character device"
2123
1971
os.dup2(null, sys.stdin.fileno())
2124
1972
os.dup2(null, sys.stdout.fileno())
2125
1973
os.dup2(null, sys.stderr.fileno())
2135
1983
parser = argparse.ArgumentParser()
2136
1984
parser.add_argument("-v", "--version", action="version",
2137
version = "%(prog)s {0}".format(version),
1985
version = "%%(prog)s %s" % version,
2138
1986
help="show version number and exit")
2139
1987
parser.add_argument("-i", "--interface", metavar="IF",
2140
1988
help="Bind to interface IF")
2244
2092
if server_settings["servicename"] != "Mandos":
2245
2093
syslogger.setFormatter(logging.Formatter
2246
('Mandos ({0}) [%(process)d]:'
2247
' %(levelname)s: %(message)s'
2248
.format(server_settings
2094
('Mandos (%s) [%%(process)d]:'
2095
' %%(levelname)s: %%(message)s'
2096
% server_settings["servicename"]))
2251
2098
# Parse config file with clients
2252
2099
client_config = configparser.SafeConfigParser(Client
2270
2117
pidfilename = "/var/run/mandos.pid"
2272
2119
pidfile = open(pidfilename, "w")
2273
except IOError as e:
2274
logger.error("Could not open file %r", pidfilename,
2121
logger.error("Could not open file %r", pidfilename)
2277
for name in ("_mandos", "mandos", "nobody"):
2124
uid = pwd.getpwnam("_mandos").pw_uid
2125
gid = pwd.getpwnam("_mandos").pw_gid
2279
uid = pwd.getpwnam(name).pw_uid
2280
gid = pwd.getpwnam(name).pw_gid
2128
uid = pwd.getpwnam("mandos").pw_uid
2129
gid = pwd.getpwnam("mandos").pw_gid
2282
2130
except KeyError:
2132
uid = pwd.getpwnam("nobody").pw_uid
2133
gid = pwd.getpwnam("nobody").pw_gid
2290
2140
except OSError as error:
2291
if error.errno != errno.EPERM:
2141
if error[0] != errno.EPERM:
2364
2215
(stored_state))
2365
2216
os.remove(stored_state_path)
2366
2217
except IOError as e:
2367
if e.errno == errno.ENOENT:
2368
logger.warning("Could not load persistent state: {0}"
2369
.format(os.strerror(e.errno)))
2371
logger.critical("Could not load persistent state:",
2218
logger.warning("Could not load persistent state: {0}"
2220
if e.errno != errno.ENOENT:
2374
2222
except EOFError as e:
2375
2223
logger.warning("Could not load persistent state: "
2376
"EOFError:", exc_info=e)
2224
"EOFError: {0}".format(e))
2378
2226
with PGPEngine() as pgp:
2379
2227
for client_name, client in clients_data.iteritems():
2462
2311
# "pidfile" was never created
2464
2313
del pidfilename
2314
signal.signal(signal.SIGINT, signal.SIG_IGN)
2466
2316
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2467
2317
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2470
@alternate_dbus_interfaces({"se.recompile.Mandos":
2471
"se.bsnet.fukt.Mandos"})
2472
class MandosDBusService(DBusObjectWithProperties):
2320
class MandosDBusService(dbus.service.Object):
2473
2321
"""A D-Bus proxy object"""
2474
2322
def __init__(self):
2475
2323
dbus.service.Object.__init__(self, bus, "/")
2476
2324
_interface = "se.recompile.Mandos"
2478
@dbus_interface_annotations(_interface)
2480
return { "org.freedesktop.DBus.Property"
2481
".EmitsChangedSignal":
2484
2326
@dbus.service.signal(_interface, signature="o")
2485
2327
def ClientAdded(self, objpath):
2567
2411
del client_settings[client.name]["secret"]
2570
with (tempfile.NamedTemporaryFile
2571
(mode='wb', suffix=".pickle", prefix='clients-',
2572
dir=os.path.dirname(stored_state_path),
2573
delete=False)) as stored_state:
2414
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2417
(stored_state_path))
2418
with os.fdopen(tempfd, "wb") as stored_state:
2574
2419
pickle.dump((clients, client_settings), stored_state)
2575
tempname=stored_state.name
2576
2420
os.rename(tempname, stored_state_path)
2577
2421
except (IOError, OSError) as e:
2422
logger.warning("Could not save persistent state: {0}"
2580
2426
os.remove(tempname)
2581
2427
except NameError:
2583
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2584
logger.warning("Could not save persistent state: {0}"
2585
.format(os.strerror(e.errno)))
2587
logger.warning("Could not save persistent state:",
2429
if e.errno not in set((errno.ENOENT, errno.EACCES,
2591
2433
# Delete all clients, and settings from config
2619
2461
service.port = tcp_server.socket.getsockname()[1]
2621
2463
logger.info("Now listening on address %r, port %d,"
2622
" flowinfo %d, scope_id %d",
2623
*tcp_server.socket.getsockname())
2464
" flowinfo %d, scope_id %d"
2465
% tcp_server.socket.getsockname())
2625
logger.info("Now listening on address %r, port %d",
2626
*tcp_server.socket.getsockname())
2467
logger.info("Now listening on address %r, port %d"
2468
% tcp_server.socket.getsockname())
2628
2470
#service.interface = tcp_server.socket.getsockname()[3]