444
439
runtime_expansions = ("approval_delay", "approval_duration",
445
"created", "enabled", "expires",
446
"fingerprint", "host", "interval",
447
"last_approval_request", "last_checked_ok",
440
"created", "enabled", "fingerprint",
441
"host", "interval", "last_checked_ok",
448
442
"last_enabled", "name", "timeout")
449
443
client_defaults = { "timeout": "5m",
450
444
"extended_timeout": "15m",
576
570
if getattr(self, "enabled", False):
577
571
# Already enabled
573
self.send_changedstate()
579
574
self.expires = datetime.datetime.utcnow() + self.timeout
580
575
self.enabled = True
581
576
self.last_enabled = datetime.datetime.utcnow()
582
577
self.init_checker()
583
self.send_changedstate()
585
579
def disable(self, quiet=True):
586
580
"""Disable this client."""
587
581
if not getattr(self, "enabled", False):
584
self.send_changedstate()
590
586
logger.info("Disabling client %s", self.name)
591
if getattr(self, "disable_initiator_tag", None) is not None:
587
if getattr(self, "disable_initiator_tag", False):
592
588
gobject.source_remove(self.disable_initiator_tag)
593
589
self.disable_initiator_tag = None
594
590
self.expires = None
595
if getattr(self, "checker_initiator_tag", None) is not None:
591
if getattr(self, "checker_initiator_tag", False):
596
592
gobject.source_remove(self.checker_initiator_tag)
597
593
self.checker_initiator_tag = None
598
594
self.stop_checker()
599
595
self.enabled = False
601
self.send_changedstate()
602
596
# Do not run this again if called by a gobject.timeout_add
608
602
def init_checker(self):
609
603
# Schedule a new checker to be started an 'interval' from now,
610
604
# and every interval from then on.
611
if self.checker_initiator_tag is not None:
612
gobject.source_remove(self.checker_initiator_tag)
613
605
self.checker_initiator_tag = (gobject.timeout_add
614
606
(self.interval_milliseconds(),
615
607
self.start_checker))
616
608
# 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
609
self.disable_initiator_tag = (gobject.timeout_add
620
610
(self.timeout_milliseconds(),
668
657
If a checker already exists, leave it running and do
670
659
# 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
660
# did that, then if a checker (for some reason) started
661
# running slowly and taking more than 'interval' time, the
662
# client would inevitably timeout, since no checker would get
663
# a chance to run to completion. If we instead leave running
675
664
# checkers alone, the checker would have to take more time
676
665
# than 'timeout' for the client to be disabled, which is as it
691
680
self.current_checker_command)
692
681
# Start a new checker if needed
693
682
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
684
# In case checker_command has exactly one % operator
685
command = self.checker_command % self.host
687
# Escape attributes for the shell
688
escaped_attrs = dict(
690
re.escape(unicode(str(getattr(self, attr, "")),
694
self.runtime_expansions)
697
command = self.checker_command % escaped_attrs
698
except TypeError as error:
699
logger.error('Could not format string "%s"',
700
self.checker_command, exc_info=error)
701
return True # Try again later
705
702
self.current_checker_command = command
707
704
logger.info("Starting checker %r for %s",
713
710
self.checker = subprocess.Popen(command,
715
712
shell=True, cwd="/")
713
self.checker_callback_tag = (gobject.child_watch_add
715
self.checker_callback,
717
# The checker may have completed before the gobject
718
# watch was added. Check for this.
719
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
721
gobject.source_remove(self.checker_callback_tag)
722
self.checker_callback(pid, status, command)
716
723
except OSError as error:
717
724
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)
729
726
# Re-run this periodically if run by gobject.timeout_add
982
979
tag.appendChild(ann_tag)
983
980
# Add interface annotation tags
984
981
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")
983
*(annotations().iteritems()
984
for name, annotations in
985
self._get_all_dbus_things("interface")
986
if name == if_tag.getAttribute("name")
991
988
ann_tag = document.createElement("annotation")
992
989
ann_tag.setAttribute("name", annotation)
993
990
ann_tag.setAttribute("value", value)
1024
1021
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_interfaces({"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).
1024
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1026
"""Applied to an empty subclass of a D-Bus object, this metaclass
1027
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):
1029
def __new__(mcs, name, bases, attr):
1030
# Go through all the base classes which could have D-Bus
1031
# methods, signals, or properties in them
1032
old_interface_names = []
1033
for base in (b for b in bases
1034
if issubclass(b, dbus.service.Object)):
1035
# Go though all attributes of the base class
1036
for attrname, attribute in inspect.getmembers(base):
1057
1037
# Ignore non-D-Bus attributes, and D-Bus attributes
1058
1038
# with the wrong interface name
1059
1039
if (not hasattr(attribute, "_dbus_interface")
1060
1040
or not attribute._dbus_interface
1061
.startswith(orig_interface_name)):
1041
.startswith("se.recompile.Mandos")):
1063
1043
# Create an alternate D-Bus interface name based on
1064
1044
# the current name
1065
1045
alt_interface = (attribute._dbus_interface
1066
.replace(orig_interface_name,
1067
alt_interface_name))
1068
interface_names.add(alt_interface)
1046
.replace("se.recompile.Mandos",
1047
"se.bsnet.fukt.Mandos"))
1048
if alt_interface != attribute._dbus_interface:
1049
old_interface_names.append(alt_interface)
1069
1050
# Is this a D-Bus signal?
1070
1051
if getattr(attribute, "_dbus_is_signal", False):
1071
1052
# Extract the original non-method function by
1093
1074
except AttributeError:
1095
1076
# 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
1077
# old and new functions, so both the old and new
1078
# signals gets sent when the function is called
1099
1079
def fixscope(func1, func2):
1100
1080
"""This function is a scope container to pass
1101
1081
func1 and func2 to the "call_both" function
1108
1088
return call_both
1109
1089
# Create the "call_both" function and add it to
1111
attr[attrname] = fixscope(attribute, new_function)
1091
attr[attrname] = fixscope(attribute,
1112
1093
# Is this a D-Bus method?
1113
1094
elif getattr(attribute, "_dbus_is_method", False):
1114
1095
# Create a new, but exactly alike, function
1170
1151
attribute.func_name,
1171
1152
attribute.func_defaults,
1172
1153
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"})
1154
# Deprecate all old interfaces
1155
iname="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1156
for old_interface_name in old_interface_names:
1157
@dbus_interface_annotations(old_interface_name)
1159
return { "org.freedesktop.DBus.Deprecated": "true" }
1160
# Find an unused name
1161
for aname in (iname.format(i) for i in itertools.count()):
1162
if aname not in attr:
1165
return type.__new__(mcs, name, bases, attr)
1198
1168
class ClientDBus(Client, DBusObjectWithProperties):
1199
1169
"""A Client class using D-Bus
1530
1500
def Timeout_dbus_property(self, value=None):
1531
1501
if value is None: # get
1532
1502
return dbus.UInt64(self.timeout_milliseconds())
1533
old_timeout = self.timeout
1534
1503
self.timeout = datetime.timedelta(0, 0, 0, value)
1535
# Reschedule disabling
1504
# Reschedule timeout
1536
1505
if self.enabled:
1537
1506
now = datetime.datetime.utcnow()
1538
self.expires += self.timeout - old_timeout
1539
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:
1540
1510
# The timeout has passed
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1543
1516
if (getattr(self, "disable_initiator_tag", None)
1546
1519
gobject.source_remove(self.disable_initiator_tag)
1547
self.disable_initiator_tag = (
1548
gobject.timeout_add(
1549
timedelta_to_milliseconds(self.expires - now),
1520
self.disable_initiator_tag = (gobject.timeout_add
1552
1524
# ExtendedTimeout - property
1553
1525
@dbus_service_property(_interface, signature="t",
1741
1717
#wait until timeout or approved
1742
1718
time = datetime.datetime.now()
1743
1719
client.changedstate.acquire()
1744
client.changedstate.wait(
1745
float(timedelta_to_milliseconds(delay)
1720
(client.changedstate.wait
1721
(float(client.timedelta_to_milliseconds(delay)
1747
1723
client.changedstate.release()
1748
1724
time2 = datetime.datetime.now()
1749
1725
if (time2 - time) >= delay:
1899
1876
use_ipv6: Boolean; to use IPv6 or not
1901
1878
def __init__(self, server_address, RequestHandlerClass,
1902
interface=None, use_ipv6=True, socketfd=None):
1903
"""If socketfd is set, use that file descriptor instead of
1904
creating a new one with socket.socket().
1879
interface=None, use_ipv6=True):
1906
1880
self.interface = interface
1908
1882
self.address_family = socket.AF_INET6
1909
if socketfd is not None:
1910
# Save the file descriptor
1911
self.socketfd = socketfd
1912
# Save the original socket.socket() function
1913
self.socket_socket = socket.socket
1914
# To implement --socket, we monkey patch socket.socket.
1916
# (When socketserver.TCPServer is a new-style class, we
1917
# could make self.socket into a property instead of monkey
1918
# patching socket.socket.)
1920
# Create a one-time-only replacement for socket.socket()
1921
@functools.wraps(socket.socket)
1922
def socket_wrapper(*args, **kwargs):
1923
# Restore original function so subsequent calls are
1925
socket.socket = self.socket_socket
1926
del self.socket_socket
1927
# This time only, return a new socket object from the
1928
# saved file descriptor.
1929
return socket.fromfd(self.socketfd, *args, **kwargs)
1930
# Replace socket.socket() function with wrapper
1931
socket.socket = socket_wrapper
1932
# The socketserver.TCPServer.__init__ will call
1933
# socket.socket(), which might be our replacement,
1934
# socket_wrapper(), if socketfd was set.
1935
1883
socketserver.TCPServer.__init__(self, server_address,
1936
1884
RequestHandlerClass)
1938
1885
def server_bind(self):
1939
1886
"""This overrides the normal server_bind() function
1940
1887
to bind to an interface if one was specified, and also NOT to
1951
1898
str(self.interface
1953
1900
except socket.error as error:
1954
if error.errno == errno.EPERM:
1901
if error[0] == errno.EPERM:
1955
1902
logger.error("No permission to"
1956
1903
" bind to interface %s",
1957
1904
self.interface)
1958
elif error.errno == errno.ENOPROTOOPT:
1905
elif error[0] == errno.ENOPROTOOPT:
1959
1906
logger.error("SO_BINDTODEVICE not available;"
1960
1907
" cannot bind to interface %s",
1961
1908
self.interface)
1962
elif error.errno == errno.ENODEV:
1963
logger.error("Interface %s does not"
1964
" exist, cannot bind",
1968
1911
# Only bind(2) the socket if we really need to.
2029
1971
def handle_ipc(self, source, condition, parent_pipe=None,
2030
1972
proc = None, client_object=None):
1974
gobject.IO_IN: "IN", # There is data to read.
1975
gobject.IO_OUT: "OUT", # Data can be written (without
1977
gobject.IO_PRI: "PRI", # There is urgent data to read.
1978
gobject.IO_ERR: "ERR", # Error condition.
1979
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1980
# broken, usually for pipes and
1983
conditions_string = ' | '.join(name
1985
condition_names.iteritems()
1986
if cond & condition)
2031
1987
# error, or the other end of multiprocessing.Pipe has closed
2032
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1988
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2033
1989
# Wait for other process to exit
2196
2152
parser.add_argument("--no-restore", action="store_false",
2197
2153
dest="restore", help="Do not restore stored"
2199
parser.add_argument("--socket", type=int,
2200
help="Specify a file descriptor to a network"
2201
" socket to use instead of creating one")
2202
2155
parser.add_argument("--statedir", metavar="DIR",
2203
2156
help="Directory to save/restore state in")
2239
2191
if server_settings["port"]:
2240
2192
server_settings["port"] = server_config.getint("DEFAULT",
2242
if server_settings["socket"]:
2243
server_settings["socket"] = server_config.getint("DEFAULT",
2245
# Later, stdin will, and stdout and stderr might, be dup'ed
2246
# over with an opened os.devnull. But we don't want this to
2247
# happen with a supplied network socket.
2248
if 0 <= server_settings["socket"] <= 2:
2249
server_settings["socket"] = os.dup(server_settings
2251
2194
del server_config
2253
2196
# Override the settings from the config file with command line
2255
2198
for option in ("interface", "address", "port", "debug",
2256
2199
"priority", "servicename", "configdir",
2257
2200
"use_dbus", "use_ipv6", "debuglevel", "restore",
2258
"statedir", "socket"):
2259
2202
value = getattr(options, option)
2260
2203
if value is not None:
2261
2204
server_settings[option] = value
2510
2450
# "pidfile" was never created
2512
2452
del pidfilename
2453
signal.signal(signal.SIGINT, signal.SIG_IGN)
2514
2455
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2515
2456
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2518
@alternate_dbus_interfaces({"se.recompile.Mandos":
2519
"se.bsnet.fukt.Mandos"})
2520
2459
class MandosDBusService(DBusObjectWithProperties):
2521
2460
"""A D-Bus proxy object"""
2522
2461
def __init__(self):
2615
2556
del client_settings[client.name]["secret"]
2618
with (tempfile.NamedTemporaryFile
2619
(mode='wb', suffix=".pickle", prefix='clients-',
2620
dir=os.path.dirname(stored_state_path),
2621
delete=False)) as stored_state:
2559
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2562
(stored_state_path))
2563
with os.fdopen(tempfd, "wb") as stored_state:
2622
2564
pickle.dump((clients, client_settings), stored_state)
2623
tempname=stored_state.name
2624
2565
os.rename(tempname, stored_state_path)
2625
2566
except (IOError, OSError) as e: