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
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"))
175
return b"mandos" + binascii.hexlify(password)
183
177
def encrypt(self, data, password):
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:
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
199
192
return ciphertext
201
194
def decrypt(self, data, password):
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:
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
218
209
return decrypted_plaintext
221
213
class AvahiError(Exception):
222
214
def __init__(self, value, *args, **kwargs):
223
215
self.value = value
386
370
self.server_state_changed)
387
371
self.server_state_changed(self.server.GetState())
390
373
class AvahiServiceToSyslog(AvahiService):
391
374
def rename(self):
392
375
"""Add the new name to the syslog messages"""
393
376
ret = AvahiService.rename(self)
394
377
syslogger.setFormatter(logging.Formatter
395
('Mandos ({0}) [%(process)d]:'
396
' %(levelname)s: %(message)s'
378
('Mandos (%s) [%%(process)d]:'
379
' %%(levelname)s: %%(message)s'
401
383
def timedelta_to_milliseconds(td):
402
384
"Convert a datetime.timedelta() to milliseconds"
403
385
return ((td.days * 24 * 60 * 60 * 1000)
404
386
+ (td.seconds * 1000)
405
387
+ (td.microseconds // 1000))
408
389
class Client(object):
409
390
"""A representation of a client host served by this server.
446
427
runtime_expansions: Allowed attributes for runtime expansion.
447
428
expires: datetime.datetime(); time (UTC) when a client will be
448
429
disabled, or None
449
server_settings: The server_settings dict from main()
452
432
runtime_expansions = ("approval_delay", "approval_duration",
453
"created", "enabled", "expires",
454
"fingerprint", "host", "interval",
455
"last_approval_request", "last_checked_ok",
433
"created", "enabled", "fingerprint",
434
"host", "interval", "last_checked_ok",
456
435
"last_enabled", "name", "timeout")
457
client_defaults = { "timeout": "PT5M",
458
"extended_timeout": "PT15M",
436
client_defaults = { "timeout": "5m",
437
"extended_timeout": "15m",
460
439
"checker": "fping -q -- %%(host)s",
462
"approval_delay": "PT0S",
463
"approval_duration": "PT1S",
441
"approval_delay": "0s",
442
"approval_duration": "1s",
464
443
"approved_by_default": "True",
465
444
"enabled": "True",
587
567
if getattr(self, "enabled", False):
588
568
# Already enabled
570
self.send_changedstate()
590
571
self.expires = datetime.datetime.utcnow() + self.timeout
591
572
self.enabled = True
592
573
self.last_enabled = datetime.datetime.utcnow()
593
574
self.init_checker()
594
self.send_changedstate()
596
576
def disable(self, quiet=True):
597
577
"""Disable this client."""
598
578
if not getattr(self, "enabled", False):
581
self.send_changedstate()
601
583
logger.info("Disabling client %s", self.name)
602
if getattr(self, "disable_initiator_tag", None) is not None:
584
if getattr(self, "disable_initiator_tag", False):
603
585
gobject.source_remove(self.disable_initiator_tag)
604
586
self.disable_initiator_tag = None
605
587
self.expires = None
606
if getattr(self, "checker_initiator_tag", None) is not None:
588
if getattr(self, "checker_initiator_tag", False):
607
589
gobject.source_remove(self.checker_initiator_tag)
608
590
self.checker_initiator_tag = None
609
591
self.stop_checker()
610
592
self.enabled = False
612
self.send_changedstate()
613
593
# Do not run this again if called by a gobject.timeout_add
679
654
If a checker already exists, leave it running and do
681
656
# The reason for not killing a running checker is that if we
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
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
686
661
# checkers alone, the checker would have to take more time
687
662
# than 'timeout' for the client to be disabled, which is as it
703
677
self.current_checker_command)
704
678
# Start a new checker if needed
705
679
if self.checker is None:
706
# Escape attributes for the shell
707
escaped_attrs = dict(
708
(attr, re.escape(unicode(getattr(self, attr))))
710
self.runtime_expansions)
712
command = self.checker_command % escaped_attrs
713
except TypeError as error:
714
logger.error('Could not format string "%s"',
715
self.checker_command, exc_info=error)
716
return True # Try again later
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
' %s', self.checker_command, error)
698
return True # Try again later
717
699
self.current_checker_command = command
719
701
logger.info("Starting checker %r for %s",
722
704
# in normal mode, that is already done by daemon(),
723
705
# and in debug mode we don't want to. (Stdin is
724
706
# always replaced by /dev/null.)
725
# The exception is when not debugging but nevertheless
726
# running in the foreground; use the previously
729
if (not self.server_settings["debug"]
730
and self.server_settings["foreground"]):
731
popen_args.update({"stdout": wnull,
733
707
self.checker = subprocess.Popen(command,
737
except OSError as error:
738
logger.error("Failed to start subprocess",
741
self.checker_callback_tag = (gobject.child_watch_add
743
self.checker_callback,
745
# The checker may have completed before the gobject
746
# watch was added. Check for this.
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.
748
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)
749
720
except OSError as error:
750
if error.errno == errno.ECHILD:
751
# This should never happen
752
logger.error("Child process vanished",
757
gobject.source_remove(self.checker_callback_tag)
758
self.checker_callback(pid, status, command)
721
logger.error("Failed to start subprocess: %s",
759
723
# Re-run this periodically if run by gobject.timeout_add
1054
1018
variant_level=variant_level)
1057
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1058
"""A class decorator; applied to a subclass of
1059
dbus.service.Object, it will add alternate D-Bus attributes with
1060
interface names according to the "alt_interface_names" mapping.
1063
@alternate_dbus_interfaces({"org.example.Interface":
1064
"net.example.AlternateInterface"})
1065
class SampleDBusObject(dbus.service.Object):
1066
@dbus.service.method("org.example.Interface")
1067
def SampleDBusMethod():
1070
The above "SampleDBusMethod" on "SampleDBusObject" will be
1071
reachable via two interfaces: "org.example.Interface" and
1072
"net.example.AlternateInterface", the latter of which will have
1073
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1074
"true", unless "deprecate" is passed with a False value.
1076
This works for methods and signals, and also for D-Bus properties
1077
(from DBusObjectWithProperties) and interfaces (from the
1078
dbus_interface_annotations decorator).
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.
1081
for orig_interface_name, alt_interface_name in (
1082
alt_interface_names.iteritems()):
1084
interface_names = set()
1085
# Go though all attributes of the class
1086
for attrname, attribute in inspect.getmembers(cls):
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):
1087
1034
# Ignore non-D-Bus attributes, and D-Bus attributes
1088
1035
# with the wrong interface name
1089
1036
if (not hasattr(attribute, "_dbus_interface")
1090
1037
or not attribute._dbus_interface
1091
.startswith(orig_interface_name)):
1038
.startswith("se.recompile.Mandos")):
1093
1040
# Create an alternate D-Bus interface name based on
1094
1041
# the current name
1095
1042
alt_interface = (attribute._dbus_interface
1096
.replace(orig_interface_name,
1097
alt_interface_name))
1098
interface_names.add(alt_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)
1099
1047
# Is this a D-Bus signal?
1100
1048
if getattr(attribute, "_dbus_is_signal", False):
1101
# Extract the original non-method undecorated
1102
# function by black magic
1049
# Extract the original non-method function by
1103
1051
nonmethod_func = (dict(
1104
1052
zip(attribute.func_code.co_freevars,
1105
1053
attribute.__closure__))["func"]
1200
1148
attribute.func_name,
1201
1149
attribute.func_defaults,
1202
1150
attribute.func_closure)))
1204
# Deprecate all alternate interfaces
1205
iname="_AlternateDBusNames_interface_annotation{0}"
1206
for interface_name in interface_names:
1207
@dbus_interface_annotations(interface_name)
1209
return { "org.freedesktop.DBus.Deprecated":
1211
# Find an unused name
1212
for aname in (iname.format(i)
1213
for i in itertools.count()):
1214
if aname not in attr:
1218
# Replace the class with a new subclass of it with
1219
# methods, signals, etc. as created above.
1220
cls = type(b"{0}Alternate".format(cls.__name__),
1226
@alternate_dbus_interfaces({"se.recompile.Mandos":
1227
"se.bsnet.fukt.Mandos"})
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)
1228
1166
class ClientDBus(Client, DBusObjectWithProperties):
1229
1167
"""A Client class using D-Bus
1560
1500
def Timeout_dbus_property(self, value=None):
1561
1501
if value is None: # get
1562
1502
return dbus.UInt64(self.timeout_milliseconds())
1563
old_timeout = self.timeout
1564
1503
self.timeout = datetime.timedelta(0, 0, 0, value)
1565
# Reschedule disabling
1504
# Reschedule timeout
1566
1505
if self.enabled:
1567
1506
now = datetime.datetime.utcnow()
1568
self.expires += self.timeout - old_timeout
1569
if self.expires <= now:
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
1570
1510
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1573
1516
if (getattr(self, "disable_initiator_tag", None)
1576
1519
gobject.source_remove(self.disable_initiator_tag)
1577
self.disable_initiator_tag = (
1578
gobject.timeout_add(
1579
timedelta_to_milliseconds(self.expires - now),
1520
self.disable_initiator_tag = (gobject.timeout_add
1582
1524
# ExtendedTimeout - property
1583
1525
@dbus_service_property(_interface, signature="t",
1929
1874
use_ipv6: Boolean; to use IPv6 or not
1931
1876
def __init__(self, server_address, RequestHandlerClass,
1932
interface=None, use_ipv6=True, socketfd=None):
1933
"""If socketfd is set, use that file descriptor instead of
1934
creating a new one with socket.socket().
1877
interface=None, use_ipv6=True):
1936
1878
self.interface = interface
1938
1880
self.address_family = socket.AF_INET6
1939
if socketfd is not None:
1940
# Save the file descriptor
1941
self.socketfd = socketfd
1942
# Save the original socket.socket() function
1943
self.socket_socket = socket.socket
1944
# To implement --socket, we monkey patch socket.socket.
1946
# (When socketserver.TCPServer is a new-style class, we
1947
# could make self.socket into a property instead of monkey
1948
# patching socket.socket.)
1950
# Create a one-time-only replacement for socket.socket()
1951
@functools.wraps(socket.socket)
1952
def socket_wrapper(*args, **kwargs):
1953
# Restore original function so subsequent calls are
1955
socket.socket = self.socket_socket
1956
del self.socket_socket
1957
# This time only, return a new socket object from the
1958
# saved file descriptor.
1959
return socket.fromfd(self.socketfd, *args, **kwargs)
1960
# Replace socket.socket() function with wrapper
1961
socket.socket = socket_wrapper
1962
# The socketserver.TCPServer.__init__ will call
1963
# socket.socket(), which might be our replacement,
1964
# socket_wrapper(), if socketfd was set.
1965
1881
socketserver.TCPServer.__init__(self, server_address,
1966
1882
RequestHandlerClass)
1968
1883
def server_bind(self):
1969
1884
"""This overrides the normal server_bind() function
1970
1885
to bind to an interface if one was specified, and also NOT to
1979
1894
self.socket.setsockopt(socket.SOL_SOCKET,
1980
1895
SO_BINDTODEVICE,
1981
str(self.interface + '\0'))
1982
1898
except socket.error as error:
1983
if error.errno == errno.EPERM:
1984
logger.error("No permission to bind to"
1985
" interface %s", self.interface)
1986
elif error.errno == errno.ENOPROTOOPT:
1899
if error[0] == errno.EPERM:
1900
logger.error("No permission to"
1901
" bind to interface %s",
1903
elif error[0] == errno.ENOPROTOOPT:
1987
1904
logger.error("SO_BINDTODEVICE not available;"
1988
1905
" cannot bind to interface %s",
1989
1906
self.interface)
1990
elif error.errno == errno.ENODEV:
1991
logger.error("Interface %s does not exist,"
1992
" cannot bind", self.interface)
1995
1909
# Only bind(2) the socket if we really need to.
2056
1969
def handle_ipc(self, source, condition, parent_pipe=None,
2057
1970
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)
2058
1985
# error, or the other end of multiprocessing.Pipe has closed
2059
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1986
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2060
1987
# Wait for other process to exit
2123
def rfc3339_duration_to_delta(duration):
2124
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2126
>>> rfc3339_duration_to_delta("P7D")
2127
datetime.timedelta(7)
2128
>>> rfc3339_duration_to_delta("PT60S")
2129
datetime.timedelta(0, 60)
2130
>>> rfc3339_duration_to_delta("PT60M")
2131
datetime.timedelta(0, 3600)
2132
>>> rfc3339_duration_to_delta("PT24H")
2133
datetime.timedelta(1)
2134
>>> rfc3339_duration_to_delta("P1W")
2135
datetime.timedelta(7)
2136
>>> rfc3339_duration_to_delta("PT5M30S")
2137
datetime.timedelta(0, 330)
2138
>>> rfc3339_duration_to_delta("P1DT3M20S")
2139
datetime.timedelta(1, 200)
2142
# Parsing an RFC 3339 duration with regular expressions is not
2143
# possible - there would have to be multiple places for the same
2144
# values, like seconds. The current code, while more esoteric, is
2145
# cleaner without depending on a parsing library. If Python had a
2146
# built-in library for parsing we would use it, but we'd like to
2147
# avoid excessive use of external libraries.
2149
# New type for defining tokens, syntax, and semantics all-in-one
2150
Token = collections.namedtuple("Token",
2151
("regexp", # To match token; if
2152
# "value" is not None,
2153
# must have a "group"
2155
"value", # datetime.timedelta or
2157
"followers")) # Tokens valid after
2159
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2160
# the "duration" ABNF definition in RFC 3339, Appendix A.
2161
token_end = Token(re.compile(r"$"), None, frozenset())
2162
token_second = Token(re.compile(r"(\d+)S"),
2163
datetime.timedelta(seconds=1),
2164
frozenset((token_end,)))
2165
token_minute = Token(re.compile(r"(\d+)M"),
2166
datetime.timedelta(minutes=1),
2167
frozenset((token_second, token_end)))
2168
token_hour = Token(re.compile(r"(\d+)H"),
2169
datetime.timedelta(hours=1),
2170
frozenset((token_minute, token_end)))
2171
token_time = Token(re.compile(r"T"),
2173
frozenset((token_hour, token_minute,
2175
token_day = Token(re.compile(r"(\d+)D"),
2176
datetime.timedelta(days=1),
2177
frozenset((token_time, token_end)))
2178
token_month = Token(re.compile(r"(\d+)M"),
2179
datetime.timedelta(weeks=4),
2180
frozenset((token_day, token_end)))
2181
token_year = Token(re.compile(r"(\d+)Y"),
2182
datetime.timedelta(weeks=52),
2183
frozenset((token_month, token_end)))
2184
token_week = Token(re.compile(r"(\d+)W"),
2185
datetime.timedelta(weeks=1),
2186
frozenset((token_end,)))
2187
token_duration = Token(re.compile(r"P"), None,
2188
frozenset((token_year, token_month,
2189
token_day, token_time,
2191
# Define starting values
2192
value = datetime.timedelta() # Value so far
2194
followers = frozenset(token_duration,) # Following valid tokens
2195
s = duration # String left to parse
2196
# Loop until end token is found
2197
while found_token is not token_end:
2198
# Search for any currently valid tokens
2199
for token in followers:
2200
match = token.regexp.match(s)
2201
if match is not None:
2203
if token.value is not None:
2204
# Value found, parse digits
2205
factor = int(match.group(1), 10)
2206
# Add to value so far
2207
value += factor * token.value
2208
# Strip token from string
2209
s = token.regexp.sub("", s, 1)
2212
# Set valid next tokens
2213
followers = found_token.followers
2216
# No currently valid tokens were found
2217
raise ValueError("Invalid RFC 3339 duration")
2222
2050
def string_to_delta(interval):
2223
2051
"""Parse a string and return a datetime.timedelta
2323
2144
parser.add_argument("--no-dbus", action="store_false",
2324
2145
dest="use_dbus", help="Do not provide D-Bus"
2325
" system bus interface", default=None)
2146
" system bus interface")
2326
2147
parser.add_argument("--no-ipv6", action="store_false",
2327
dest="use_ipv6", help="Do not use IPv6",
2148
dest="use_ipv6", help="Do not use IPv6")
2329
2149
parser.add_argument("--no-restore", action="store_false",
2330
2150
dest="restore", help="Do not restore stored"
2331
" state", default=None)
2332
parser.add_argument("--socket", type=int,
2333
help="Specify a file descriptor to a network"
2334
" socket to use instead of creating one")
2335
2152
parser.add_argument("--statedir", metavar="DIR",
2336
2153
help="Directory to save/restore state in")
2337
parser.add_argument("--foreground", action="store_true",
2338
help="Run in foreground", default=None)
2340
2155
options = parser.parse_args()
2369
2182
# Convert the SafeConfigParser object to a dict
2370
2183
server_settings = server_config.defaults()
2371
2184
# Use the appropriate methods on the non-string config options
2372
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2185
for option in ("debug", "use_dbus", "use_ipv6"):
2373
2186
server_settings[option] = server_config.getboolean("DEFAULT",
2375
2188
if server_settings["port"]:
2376
2189
server_settings["port"] = server_config.getint("DEFAULT",
2378
if server_settings["socket"]:
2379
server_settings["socket"] = server_config.getint("DEFAULT",
2381
# Later, stdin will, and stdout and stderr might, be dup'ed
2382
# over with an opened os.devnull. But we don't want this to
2383
# happen with a supplied network socket.
2384
if 0 <= server_settings["socket"] <= 2:
2385
server_settings["socket"] = os.dup(server_settings
2387
2191
del server_config
2389
2193
# Override the settings from the config file with command line
2453
2248
use_ipv6=use_ipv6,
2454
2249
gnutls_priority=
2455
2250
server_settings["priority"],
2457
socketfd=(server_settings["socket"]
2460
pidfilename = "/run/mandos.pid"
2461
if not os.path.isdir("/run/."):
2462
pidfilename = "/var/run/mandos.pid"
2253
pidfilename = "/var/run/mandos.pid"
2465
2255
pidfile = open(pidfilename, "w")
2466
except IOError as e:
2467
logger.error("Could not open file %r", pidfilename,
2257
logger.error("Could not open file %r", pidfilename)
2470
for name in ("_mandos", "mandos", "nobody"):
2260
uid = pwd.getpwnam("_mandos").pw_uid
2261
gid = pwd.getpwnam("_mandos").pw_gid
2472
uid = pwd.getpwnam(name).pw_uid
2473
gid = pwd.getpwnam(name).pw_gid
2264
uid = pwd.getpwnam("mandos").pw_uid
2265
gid = pwd.getpwnam("mandos").pw_gid
2475
2266
except KeyError:
2268
uid = pwd.getpwnam("nobody").pw_uid
2269
gid = pwd.getpwnam("nobody").pw_gid
2483
2276
except OSError as error:
2484
if error.errno != errno.EPERM:
2277
if error[0] != errno.EPERM:
2488
2281
# Enable all possible GnuTLS debugging
2567
2351
(stored_state))
2568
2352
os.remove(stored_state_path)
2569
2353
except IOError as e:
2570
if e.errno == errno.ENOENT:
2571
logger.warning("Could not load persistent state: {0}"
2572
.format(os.strerror(e.errno)))
2574
logger.critical("Could not load persistent state:",
2354
logger.warning("Could not load persistent state: {0}"
2356
if e.errno != errno.ENOENT:
2577
2358
except EOFError as e:
2578
2359
logger.warning("Could not load persistent state: "
2579
"EOFError:", exc_info=e)
2360
"EOFError: {0}".format(e))
2581
2362
with PGPEngine() as pgp:
2582
2363
for client_name, client in clients_data.iteritems():
2583
# Skip removed clients
2584
if client_name not in client_settings:
2587
2364
# Decide which value to use after restoring saved state.
2588
2365
# We have three different values: Old config file,
2589
2366
# new config file, and saved state.
2647
2425
for client_name in (set(client_settings)
2648
2426
- set(old_client_settings)):
2649
2427
clients_data[client_name] = client_settings[client_name]
2651
2429
# Create all client objects
2652
2430
for client_name, client in clients_data.iteritems():
2653
2431
tcp_server.clients[client_name] = client_class(
2654
name = client_name, settings = client,
2655
server_settings = server_settings)
2432
name = client_name, settings = client)
2657
2434
if not tcp_server.clients:
2658
2435
logger.warning("No clients defined")
2661
if pidfile is not None:
2665
pidfile.write(str(pid) + "\n".encode("utf-8"))
2667
logger.error("Could not write to file %r with PID %d",
2441
pidfile.write(str(pid) + "\n".encode("utf-8"))
2444
logger.error("Could not write to file %r with PID %d",
2447
# "pidfile" was never created
2670
2449
del pidfilename
2450
signal.signal(signal.SIGINT, signal.SIG_IGN)
2672
2452
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2673
2453
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2676
@alternate_dbus_interfaces({"se.recompile.Mandos":
2677
"se.bsnet.fukt.Mandos"})
2678
2456
class MandosDBusService(DBusObjectWithProperties):
2679
2457
"""A D-Bus proxy object"""
2680
2458
def __init__(self):
2774
2553
del client_settings[client.name]["secret"]
2777
with (tempfile.NamedTemporaryFile
2778
(mode='wb', suffix=".pickle", prefix='clients-',
2779
dir=os.path.dirname(stored_state_path),
2780
delete=False)) as stored_state:
2556
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2559
(stored_state_path))
2560
with os.fdopen(tempfd, "wb") as stored_state:
2781
2561
pickle.dump((clients, client_settings), stored_state)
2782
tempname=stored_state.name
2783
2562
os.rename(tempname, stored_state_path)
2784
2563
except (IOError, OSError) as e:
2564
logger.warning("Could not save persistent state: {0}"
2787
2568
os.remove(tempname)
2788
2569
except NameError:
2790
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2791
logger.warning("Could not save persistent state: {0}"
2792
.format(os.strerror(e.errno)))
2794
logger.warning("Could not save persistent state:",
2571
if e.errno not in set((errno.ENOENT, errno.EACCES,
2798
2575
# Delete all clients, and settings from config
2799
2576
while tcp_server.clients:
2826
2603
service.port = tcp_server.socket.getsockname()[1]
2828
2605
logger.info("Now listening on address %r, port %d,"
2829
" flowinfo %d, scope_id %d",
2830
*tcp_server.socket.getsockname())
2606
" flowinfo %d, scope_id %d"
2607
% tcp_server.socket.getsockname())
2832
logger.info("Now listening on address %r, port %d",
2833
*tcp_server.socket.getsockname())
2609
logger.info("Now listening on address %r, port %d"
2610
% tcp_server.socket.getsockname())
2835
2612
#service.interface = tcp_server.socket.getsockname()[3]