172
172
def password_encode(self, password):
173
173
# Passphrase can not be empty and can not contain newlines or
174
174
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
175
encoded = b"mandos" + binascii.hexlify(password)
176
if len(encoded) > 2048:
177
# GnuPG can't handle long passwords, so encode differently
178
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
179
.replace(b"\n", b"\\n")
180
.replace(b"\0", b"\\x00"))
177
183
def encrypt(self, data, password):
178
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
181
proc = self.gnupg.run(['--symmetric'],
182
create_fhs=['stdin', 'stdout'],
183
attach_fhs={'stderr': devnull})
184
with contextlib.closing(proc.handles['stdin']) as f:
186
with contextlib.closing(proc.handles['stdout']) as f:
187
ciphertext = f.read()
191
self.gnupg.passphrase = None
184
passphrase = self.password_encode(password)
185
with tempfile.NamedTemporaryFile(dir=self.tempdir
187
passfile.write(passphrase)
189
proc = subprocess.Popen(['gpg', '--symmetric',
193
stdin = subprocess.PIPE,
194
stdout = subprocess.PIPE,
195
stderr = subprocess.PIPE)
196
ciphertext, err = proc.communicate(input = data)
197
if proc.returncode != 0:
192
199
return ciphertext
194
201
def decrypt(self, data, password):
195
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
198
proc = self.gnupg.run(['--decrypt'],
199
create_fhs=['stdin', 'stdout'],
200
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
203
with contextlib.closing(proc.handles['stdout']) as f:
204
decrypted_plaintext = f.read()
208
self.gnupg.passphrase = None
202
passphrase = self.password_encode(password)
203
with tempfile.NamedTemporaryFile(dir = self.tempdir
205
passfile.write(passphrase)
207
proc = subprocess.Popen(['gpg', '--decrypt',
211
stdin = subprocess.PIPE,
212
stdout = subprocess.PIPE,
213
stderr = subprocess.PIPE)
214
decrypted_plaintext, err = proc.communicate(input
216
if proc.returncode != 0:
209
218
return decrypted_plaintext
213
221
class AvahiError(Exception):
214
222
def __init__(self, value, *args, **kwargs):
215
223
self.value = value
427
446
runtime_expansions: Allowed attributes for runtime expansion.
428
447
expires: datetime.datetime(); time (UTC) when a client will be
429
448
disabled, or None
449
server_settings: The server_settings dict from main()
432
452
runtime_expansions = ("approval_delay", "approval_duration",
433
"created", "enabled", "fingerprint",
434
"host", "interval", "last_checked_ok",
453
"created", "enabled", "expires",
454
"fingerprint", "host", "interval",
455
"last_approval_request", "last_checked_ok",
435
456
"last_enabled", "name", "timeout")
436
client_defaults = { "timeout": "5m",
437
"extended_timeout": "15m",
457
client_defaults = { "timeout": "PT5M",
458
"extended_timeout": "PT15M",
439
460
"checker": "fping -q -- %%(host)s",
441
"approval_delay": "0s",
442
"approval_duration": "1s",
462
"approval_delay": "PT0S",
463
"approval_duration": "PT1S",
443
464
"approved_by_default": "True",
444
465
"enabled": "True",
567
587
if getattr(self, "enabled", False):
568
588
# Already enabled
570
self.send_changedstate()
571
590
self.expires = datetime.datetime.utcnow() + self.timeout
572
591
self.enabled = True
573
592
self.last_enabled = datetime.datetime.utcnow()
574
593
self.init_checker()
594
self.send_changedstate()
576
596
def disable(self, quiet=True):
577
597
"""Disable this client."""
578
598
if not getattr(self, "enabled", False):
581
self.send_changedstate()
583
601
logger.info("Disabling client %s", self.name)
584
if getattr(self, "disable_initiator_tag", False):
602
if getattr(self, "disable_initiator_tag", None) is not None:
585
603
gobject.source_remove(self.disable_initiator_tag)
586
604
self.disable_initiator_tag = None
587
605
self.expires = None
588
if getattr(self, "checker_initiator_tag", False):
606
if getattr(self, "checker_initiator_tag", None) is not None:
589
607
gobject.source_remove(self.checker_initiator_tag)
590
608
self.checker_initiator_tag = None
591
609
self.stop_checker()
592
610
self.enabled = False
612
self.send_changedstate()
593
613
# Do not run this again if called by a gobject.timeout_add
654
679
If a checker already exists, leave it running and do
656
681
# The reason for not killing a running checker is that if we
657
# did that, then if a checker (for some reason) started
658
# running slowly and taking more than 'interval' time, the
659
# client would inevitably timeout, since no checker would get
660
# a chance to run to completion. If we instead leave running
682
# did that, and if a checker (for some reason) started running
683
# slowly and taking more than 'interval' time, then the client
684
# would inevitably timeout, since no checker would get a
685
# chance to run to completion. If we instead leave running
661
686
# checkers alone, the checker would have to take more time
662
687
# than 'timeout' for the client to be disabled, which is as it
677
702
self.current_checker_command)
678
703
# Start a new checker if needed
679
704
if self.checker is None:
705
# Escape attributes for the shell
706
escaped_attrs = dict(
707
(attr, re.escape(unicode(getattr(self, attr))))
709
self.runtime_expansions)
681
# In case checker_command has exactly one % operator
682
command = self.checker_command % self.host
684
# Escape attributes for the shell
685
escaped_attrs = dict(
687
re.escape(unicode(str(getattr(self, attr, "")),
691
self.runtime_expansions)
694
command = self.checker_command % escaped_attrs
695
except TypeError as error:
696
logger.error('Could not format string "%s"',
697
self.checker_command, exc_info=error)
698
return True # Try again later
711
command = self.checker_command % escaped_attrs
712
except TypeError as error:
713
logger.error('Could not format string "%s"',
714
self.checker_command, exc_info=error)
715
return True # Try again later
699
716
self.current_checker_command = command
701
718
logger.info("Starting checker %r for %s",
704
721
# in normal mode, that is already done by daemon(),
705
722
# and in debug mode we don't want to. (Stdin is
706
723
# always replaced by /dev/null.)
724
# The exception is when not debugging but nevertheless
725
# running in the foreground; use the previously
728
if (not self.server_settings["debug"]
729
and self.server_settings["foreground"]):
730
popen_args.update({"stdout": wnull,
707
732
self.checker = subprocess.Popen(command,
710
self.checker_callback_tag = (gobject.child_watch_add
712
self.checker_callback,
714
# The checker may have completed before the gobject
715
# watch was added. Check for this.
716
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
718
gobject.source_remove(self.checker_callback_tag)
719
self.checker_callback(pid, status, command)
720
736
except OSError as error:
721
737
logger.error("Failed to start subprocess",
740
self.checker_callback_tag = (gobject.child_watch_add
742
self.checker_callback,
744
# The checker may have completed before the gobject
745
# watch was added. Check for this.
747
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
748
except OSError as error:
749
if error.errno == errno.ECHILD:
750
# This should never happen
751
logger.error("Child process vanished",
756
gobject.source_remove(self.checker_callback_tag)
757
self.checker_callback(pid, status, command)
723
758
# Re-run this periodically if run by gobject.timeout_add
1018
1053
variant_level=variant_level)
1021
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1023
"""Applied to an empty subclass of a D-Bus object, this metaclass
1024
will add additional D-Bus attributes matching a certain pattern.
1056
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1057
"""A class decorator; applied to a subclass of
1058
dbus.service.Object, it will add alternate D-Bus attributes with
1059
interface names according to the "alt_interface_names" mapping.
1062
@alternate_dbus_interfaces({"org.example.Interface":
1063
"net.example.AlternateInterface"})
1064
class SampleDBusObject(dbus.service.Object):
1065
@dbus.service.method("org.example.Interface")
1066
def SampleDBusMethod():
1069
The above "SampleDBusMethod" on "SampleDBusObject" will be
1070
reachable via two interfaces: "org.example.Interface" and
1071
"net.example.AlternateInterface", the latter of which will have
1072
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1073
"true", unless "deprecate" is passed with a False value.
1075
This works for methods and signals, and also for D-Bus properties
1076
(from DBusObjectWithProperties) and interfaces (from the
1077
dbus_interface_annotations decorator).
1026
def __new__(mcs, name, bases, attr):
1027
# Go through all the base classes which could have D-Bus
1028
# methods, signals, or properties in them
1029
old_interface_names = []
1030
for base in (b for b in bases
1031
if issubclass(b, dbus.service.Object)):
1032
# Go though all attributes of the base class
1033
for attrname, attribute in inspect.getmembers(base):
1080
for orig_interface_name, alt_interface_name in (
1081
alt_interface_names.iteritems()):
1083
interface_names = set()
1084
# Go though all attributes of the class
1085
for attrname, attribute in inspect.getmembers(cls):
1034
1086
# Ignore non-D-Bus attributes, and D-Bus attributes
1035
1087
# with the wrong interface name
1036
1088
if (not hasattr(attribute, "_dbus_interface")
1037
1089
or not attribute._dbus_interface
1038
.startswith("se.recompile.Mandos")):
1090
.startswith(orig_interface_name)):
1040
1092
# Create an alternate D-Bus interface name based on
1041
1093
# the current name
1042
1094
alt_interface = (attribute._dbus_interface
1043
.replace("se.recompile.Mandos",
1044
"se.bsnet.fukt.Mandos"))
1045
if alt_interface != attribute._dbus_interface:
1046
old_interface_names.append(alt_interface)
1095
.replace(orig_interface_name,
1096
alt_interface_name))
1097
interface_names.add(alt_interface)
1047
1098
# Is this a D-Bus signal?
1048
1099
if getattr(attribute, "_dbus_is_signal", False):
1049
# Extract the original non-method function by
1100
# Extract the original non-method undecorated
1101
# function by black magic
1051
1102
nonmethod_func = (dict(
1052
1103
zip(attribute.func_code.co_freevars,
1053
1104
attribute.__closure__))["func"]
1148
1199
attribute.func_name,
1149
1200
attribute.func_defaults,
1150
1201
attribute.func_closure)))
1151
# Deprecate all old interfaces
1152
basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
for old_interface_name in old_interface_names:
1154
@dbus_interface_annotations(old_interface_name)
1156
return { "org.freedesktop.DBus.Deprecated": "true" }
1157
# Find an unused name
1158
for aname in (basename.format(i) for i in
1160
if aname not in attr:
1163
return type.__new__(mcs, name, bases, attr)
1203
# Deprecate all alternate interfaces
1204
iname="_AlternateDBusNames_interface_annotation{0}"
1205
for interface_name in interface_names:
1206
@dbus_interface_annotations(interface_name)
1208
return { "org.freedesktop.DBus.Deprecated":
1210
# Find an unused name
1211
for aname in (iname.format(i)
1212
for i in itertools.count()):
1213
if aname not in attr:
1217
# Replace the class with a new subclass of it with
1218
# methods, signals, etc. as created above.
1219
cls = type(b"{0}Alternate".format(cls.__name__),
1225
@alternate_dbus_interfaces({"se.recompile.Mandos":
1226
"se.bsnet.fukt.Mandos"})
1166
1227
class ClientDBus(Client, DBusObjectWithProperties):
1167
1228
"""A Client class using D-Bus
1500
1559
def Timeout_dbus_property(self, value=None):
1501
1560
if value is None: # get
1502
1561
return dbus.UInt64(self.timeout_milliseconds())
1562
old_timeout = self.timeout
1503
1563
self.timeout = datetime.timedelta(0, 0, 0, value)
1504
# Reschedule timeout
1564
# Reschedule disabling
1505
1565
if self.enabled:
1506
1566
now = datetime.datetime.utcnow()
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
1567
self.expires += self.timeout - old_timeout
1568
if self.expires <= now:
1510
1569
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1516
1572
if (getattr(self, "disable_initiator_tag", None)
1519
1575
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
1576
self.disable_initiator_tag = (
1577
gobject.timeout_add(
1578
timedelta_to_milliseconds(self.expires - now),
1524
1581
# ExtendedTimeout - property
1525
1582
@dbus_service_property(_interface, signature="t",
1874
1928
use_ipv6: Boolean; to use IPv6 or not
1876
1930
def __init__(self, server_address, RequestHandlerClass,
1877
interface=None, use_ipv6=True):
1931
interface=None, use_ipv6=True, socketfd=None):
1932
"""If socketfd is set, use that file descriptor instead of
1933
creating a new one with socket.socket().
1878
1935
self.interface = interface
1880
1937
self.address_family = socket.AF_INET6
1938
if socketfd is not None:
1939
# Save the file descriptor
1940
self.socketfd = socketfd
1941
# Save the original socket.socket() function
1942
self.socket_socket = socket.socket
1943
# To implement --socket, we monkey patch socket.socket.
1945
# (When socketserver.TCPServer is a new-style class, we
1946
# could make self.socket into a property instead of monkey
1947
# patching socket.socket.)
1949
# Create a one-time-only replacement for socket.socket()
1950
@functools.wraps(socket.socket)
1951
def socket_wrapper(*args, **kwargs):
1952
# Restore original function so subsequent calls are
1954
socket.socket = self.socket_socket
1955
del self.socket_socket
1956
# This time only, return a new socket object from the
1957
# saved file descriptor.
1958
return socket.fromfd(self.socketfd, *args, **kwargs)
1959
# Replace socket.socket() function with wrapper
1960
socket.socket = socket_wrapper
1961
# The socketserver.TCPServer.__init__ will call
1962
# socket.socket(), which might be our replacement,
1963
# socket_wrapper(), if socketfd was set.
1881
1964
socketserver.TCPServer.__init__(self, server_address,
1882
1965
RequestHandlerClass)
1883
1967
def server_bind(self):
1884
1968
"""This overrides the normal server_bind() function
1885
1969
to bind to an interface if one was specified, and also NOT to
1894
1978
self.socket.setsockopt(socket.SOL_SOCKET,
1895
1979
SO_BINDTODEVICE,
1980
str(self.interface + '\0'))
1898
1981
except socket.error as error:
1899
if error[0] == errno.EPERM:
1900
logger.error("No permission to"
1901
" bind to interface %s",
1903
elif error[0] == errno.ENOPROTOOPT:
1982
if error.errno == errno.EPERM:
1983
logger.error("No permission to bind to"
1984
" interface %s", self.interface)
1985
elif error.errno == errno.ENOPROTOOPT:
1904
1986
logger.error("SO_BINDTODEVICE not available;"
1905
1987
" cannot bind to interface %s",
1906
1988
self.interface)
1989
elif error.errno == errno.ENODEV:
1990
logger.error("Interface %s does not exist,"
1991
" cannot bind", self.interface)
1909
1994
# Only bind(2) the socket if we really need to.
1969
2055
def handle_ipc(self, source, condition, parent_pipe=None,
1970
2056
proc = None, client_object=None):
1972
gobject.IO_IN: "IN", # There is data to read.
1973
gobject.IO_OUT: "OUT", # Data can be written (without
1975
gobject.IO_PRI: "PRI", # There is urgent data to read.
1976
gobject.IO_ERR: "ERR", # Error condition.
1977
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1978
# broken, usually for pipes and
1981
conditions_string = ' | '.join(name
1983
condition_names.iteritems()
1984
if cond & condition)
1985
2057
# error, or the other end of multiprocessing.Pipe has closed
1986
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2058
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1987
2059
# Wait for other process to exit
2122
def rfc3339_duration_to_delta(duration):
2123
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2125
>>> rfc3339_duration_to_delta("P7D")
2126
datetime.timedelta(7)
2127
>>> rfc3339_duration_to_delta("PT60S")
2128
datetime.timedelta(0, 60)
2129
>>> rfc3339_duration_to_delta("PT60M")
2130
datetime.timedelta(0, 3600)
2131
>>> rfc3339_duration_to_delta("PT24H")
2132
datetime.timedelta(1)
2133
>>> rfc3339_duration_to_delta("P1W")
2134
datetime.timedelta(7)
2135
>>> rfc3339_duration_to_delta("PT5M30S")
2136
datetime.timedelta(0, 330)
2137
>>> rfc3339_duration_to_delta("P1DT3M20S")
2138
datetime.timedelta(1, 200)
2141
# Parsing an RFC 3339 duration with regular expressions is not
2142
# possible - there would have to be multiple places for the same
2143
# values, like seconds. The current code, while more esoteric, is
2144
# cleaner without depending on a parsing library. If Python had a
2145
# built-in library for parsing we would use it, but we'd like to
2146
# avoid excessive use of external libraries.
2148
# New type for defining tokens, syntax, and semantics all-in-one
2149
Token = collections.namedtuple("Token",
2150
("regexp", # To match token; if
2151
# "value" is not None,
2152
# must have a "group"
2154
"value", # datetime.timedelta or
2156
"followers")) # Tokens valid after
2158
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2159
# the "duration" ABNF definition in RFC 3339, Appendix A.
2160
token_end = Token(re.compile(r"$"), None, frozenset())
2161
token_second = Token(re.compile(r"(\d+)S"),
2162
datetime.timedelta(seconds=1),
2163
frozenset((token_end,)))
2164
token_minute = Token(re.compile(r"(\d+)M"),
2165
datetime.timedelta(minutes=1),
2166
frozenset((token_second, token_end)))
2167
token_hour = Token(re.compile(r"(\d+)H"),
2168
datetime.timedelta(hours=1),
2169
frozenset((token_minute, token_end)))
2170
token_time = Token(re.compile(r"T"),
2172
frozenset((token_hour, token_minute,
2174
token_day = Token(re.compile(r"(\d+)D"),
2175
datetime.timedelta(days=1),
2176
frozenset((token_time, token_end)))
2177
token_month = Token(re.compile(r"(\d+)M"),
2178
datetime.timedelta(weeks=4),
2179
frozenset((token_day, token_end)))
2180
token_year = Token(re.compile(r"(\d+)Y"),
2181
datetime.timedelta(weeks=52),
2182
frozenset((token_month, token_end)))
2183
token_week = Token(re.compile(r"(\d+)W"),
2184
datetime.timedelta(weeks=1),
2185
frozenset((token_end,)))
2186
token_duration = Token(re.compile(r"P"), None,
2187
frozenset((token_year, token_month,
2188
token_day, token_time,
2190
# Define starting values
2191
value = datetime.timedelta() # Value so far
2193
followers = frozenset(token_duration,) # Following valid tokens
2194
s = duration # String left to parse
2195
# Loop until end token is found
2196
while found_token is not token_end:
2197
# Search for any currently valid tokens
2198
for token in followers:
2199
match = token.regexp.match(s)
2200
if match is not None:
2202
if token.value is not None:
2203
# Value found, parse digits
2204
factor = int(match.group(1), 10)
2205
# Add to value so far
2206
value += factor * token.value
2207
# Strip token from string
2208
s = token.regexp.sub("", s, 1)
2211
# Set valid next tokens
2212
followers = found_token.followers
2215
# No currently valid tokens were found
2216
raise ValueError("Invalid RFC 3339 duration")
2050
2221
def string_to_delta(interval):
2051
2222
"""Parse a string and return a datetime.timedelta
2145
2322
parser.add_argument("--no-dbus", action="store_false",
2146
2323
dest="use_dbus", help="Do not provide D-Bus"
2147
" system bus interface")
2324
" system bus interface", default=None)
2148
2325
parser.add_argument("--no-ipv6", action="store_false",
2149
dest="use_ipv6", help="Do not use IPv6")
2326
dest="use_ipv6", help="Do not use IPv6",
2150
2328
parser.add_argument("--no-restore", action="store_false",
2151
2329
dest="restore", help="Do not restore stored"
2330
" state", default=None)
2331
parser.add_argument("--socket", type=int,
2332
help="Specify a file descriptor to a network"
2333
" socket to use instead of creating one")
2153
2334
parser.add_argument("--statedir", metavar="DIR",
2154
2335
help="Directory to save/restore state in")
2336
parser.add_argument("--foreground", action="store_true",
2337
help="Run in foreground", default=None)
2156
2339
options = parser.parse_args()
2183
2368
# Convert the SafeConfigParser object to a dict
2184
2369
server_settings = server_config.defaults()
2185
2370
# Use the appropriate methods on the non-string config options
2186
for option in ("debug", "use_dbus", "use_ipv6"):
2371
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2187
2372
server_settings[option] = server_config.getboolean("DEFAULT",
2189
2374
if server_settings["port"]:
2190
2375
server_settings["port"] = server_config.getint("DEFAULT",
2377
if server_settings["socket"]:
2378
server_settings["socket"] = server_config.getint("DEFAULT",
2380
# Later, stdin will, and stdout and stderr might, be dup'ed
2381
# over with an opened os.devnull. But we don't want this to
2382
# happen with a supplied network socket.
2383
if 0 <= server_settings["socket"] <= 2:
2384
server_settings["socket"] = os.dup(server_settings
2192
2386
del server_config
2194
2388
# Override the settings from the config file with command line
2349
2566
(stored_state))
2350
2567
os.remove(stored_state_path)
2351
2568
except IOError as e:
2352
logger.warning("Could not load persistent state: {0}"
2354
if e.errno != errno.ENOENT:
2569
if e.errno == errno.ENOENT:
2570
logger.warning("Could not load persistent state: {0}"
2571
.format(os.strerror(e.errno)))
2573
logger.critical("Could not load persistent state:",
2356
2576
except EOFError as e:
2357
2577
logger.warning("Could not load persistent state: "
2358
"EOFError: {0}".format(e))
2578
"EOFError:", exc_info=e)
2360
2580
with PGPEngine() as pgp:
2361
2581
for client_name, client in clients_data.iteritems():
2582
# Skip removed clients
2583
if client_name not in client_settings:
2362
2586
# Decide which value to use after restoring saved state.
2363
2587
# We have three different values: Old config file,
2364
2588
# new config file, and saved state.
2423
2646
for client_name in (set(client_settings)
2424
2647
- set(old_client_settings)):
2425
2648
clients_data[client_name] = client_settings[client_name]
2427
2650
# Create all client objects
2428
2651
for client_name, client in clients_data.iteritems():
2429
2652
tcp_server.clients[client_name] = client_class(
2430
name = client_name, settings = client)
2653
name = client_name, settings = client,
2654
server_settings = server_settings)
2432
2656
if not tcp_server.clients:
2433
2657
logger.warning("No clients defined")
2439
pidfile.write(str(pid) + "\n".encode("utf-8"))
2442
logger.error("Could not write to file %r with PID %d",
2445
# "pidfile" was never created
2660
if pidfile is not None:
2664
pidfile.write(str(pid) + "\n".encode("utf-8"))
2666
logger.error("Could not write to file %r with PID %d",
2447
2669
del pidfilename
2448
signal.signal(signal.SIGINT, signal.SIG_IGN)
2450
2671
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2451
2672
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2675
@alternate_dbus_interfaces({"se.recompile.Mandos":
2676
"se.bsnet.fukt.Mandos"})
2454
2677
class MandosDBusService(DBusObjectWithProperties):
2455
2678
"""A D-Bus proxy object"""
2456
2679
def __init__(self):
2551
2773
del client_settings[client.name]["secret"]
2554
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2557
(stored_state_path))
2558
with os.fdopen(tempfd, "wb") as stored_state:
2776
with (tempfile.NamedTemporaryFile
2777
(mode='wb', suffix=".pickle", prefix='clients-',
2778
dir=os.path.dirname(stored_state_path),
2779
delete=False)) as stored_state:
2559
2780
pickle.dump((clients, client_settings), stored_state)
2781
tempname=stored_state.name
2560
2782
os.rename(tempname, stored_state_path)
2561
2783
except (IOError, OSError) as e:
2562
logger.warning("Could not save persistent state: {0}"
2566
2786
os.remove(tempname)
2567
2787
except NameError:
2569
if e.errno not in set((errno.ENOENT, errno.EACCES,
2789
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2790
logger.warning("Could not save persistent state: {0}"
2791
.format(os.strerror(e.errno)))
2793
logger.warning("Could not save persistent state:",
2573
2797
# Delete all clients, and settings from config