176
179
def encrypt(self, data, password):
177
180
self.gnupg.passphrase = self.password_encode(password)
178
with open(os.devnull) as devnull:
181
with open(os.devnull, "w") as devnull:
180
183
proc = self.gnupg.run(['--symmetric'],
181
184
create_fhs=['stdin', 'stdout'],
193
196
def decrypt(self, data, password):
194
197
self.gnupg.passphrase = self.password_encode(password)
195
with open(os.devnull) as devnull:
198
with open(os.devnull, "w") as devnull:
197
200
proc = self.gnupg.run(['--decrypt'],
198
201
create_fhs=['stdin', 'stdout'],
199
202
attach_fhs={'stderr': devnull})
200
with contextlib.closing(proc.handles['stdin'] ) as f:
203
with contextlib.closing(proc.handles['stdin']) as f:
202
205
with contextlib.closing(proc.handles['stdout']) as f:
203
206
decrypted_plaintext = f.read()
374
384
"""Add the new name to the syslog messages"""
375
385
ret = AvahiService.rename(self)
376
386
syslogger.setFormatter(logging.Formatter
377
('Mandos (%s) [%%(process)d]:'
378
' %%(levelname)s: %%(message)s'
387
('Mandos ({0}) [%(process)d]:'
388
' %(levelname)s: %(message)s'
382
392
def timedelta_to_milliseconds(td):
653
659
If a checker already exists, leave it running and do
655
661
# The reason for not killing a running checker is that if we
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
662
# did that, and if a checker (for some reason) started running
663
# slowly and taking more than 'interval' time, then the client
664
# would inevitably timeout, since no checker would get a
665
# chance to run to completion. If we instead leave running
660
666
# checkers alone, the checker would have to take more time
661
667
# than 'timeout' for the client to be disabled, which is as it
693
699
command = self.checker_command % escaped_attrs
694
700
except TypeError as error:
695
logger.error('Could not format string "%s":'
696
' %s', self.checker_command, error)
701
logger.error('Could not format string "%s"',
702
self.checker_command, exc_info=error)
697
703
return True # Try again later
698
704
self.current_checker_command = command
780
def dbus_interface_annotations(dbus_interface):
781
"""Decorator for marking functions returning interface annotations
785
@dbus_interface_annotations("org.example.Interface")
786
def _foo(self): # Function name does not matter
787
return {"org.freedesktop.DBus.Deprecated": "true",
788
"org.freedesktop.DBus.Property.EmitsChangedSignal":
792
func._dbus_is_interface = True
793
func._dbus_interface = dbus_interface
794
func._dbus_name = dbus_interface
799
def dbus_annotations(annotations):
800
"""Decorator to annotate D-Bus methods, signals or properties
803
@dbus_service_property("org.example.Interface", signature="b",
805
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
806
"org.freedesktop.DBus.Property."
807
"EmitsChangedSignal": "false"})
808
def Property_dbus_property(self):
809
return dbus.Boolean(False)
812
func._dbus_annotations = annotations
774
817
class DBusPropertyException(dbus.exceptions.DBusException):
775
818
"""A base class for D-Bus property-related exceptions
802
def _is_dbus_property(obj):
803
return getattr(obj, "_dbus_is_property", False)
845
def _is_dbus_thing(thing):
846
"""Returns a function testing if an attribute is a D-Bus thing
848
If called like _is_dbus_thing("method") it returns a function
849
suitable for use as predicate to inspect.getmembers().
851
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
805
def _get_all_dbus_properties(self):
854
def _get_all_dbus_things(self, thing):
806
855
"""Returns a generator of (name, attribute) pairs
808
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
857
return ((getattr(athing.__get__(self), "_dbus_name",
859
athing.__get__(self))
809
860
for cls in self.__class__.__mro__
811
inspect.getmembers(cls, self._is_dbus_property))
862
inspect.getmembers(cls,
863
self._is_dbus_thing(thing)))
813
865
def _get_dbus_property(self, interface_name, property_name):
814
866
"""Returns a bound method if one exists which is a D-Bus
817
869
for cls in self.__class__.__mro__:
818
870
for name, value in (inspect.getmembers
819
(cls, self._is_dbus_property)):
872
self._is_dbus_thing("property"))):
820
873
if (value._dbus_name == property_name
821
874
and value._dbus_interface == interface_name):
822
875
return value.__get__(self)
885
938
path_keyword='object_path',
886
939
connection_keyword='connection')
887
940
def Introspect(self, object_path, connection):
888
"""Standard D-Bus method, overloaded to insert property tags.
941
"""Overloading of standard D-Bus method.
943
Inserts property tags and interface annotation tags.
890
945
xmlstring = dbus.service.Object.Introspect(self, object_path,
898
953
e.setAttribute("access", prop._dbus_access)
900
955
for if_tag in document.getElementsByTagName("interface"):
901
957
for tag in (make_tag(document, name, prop)
903
in self._get_all_dbus_properties()
959
in self._get_all_dbus_things("property")
904
960
if prop._dbus_interface
905
961
== if_tag.getAttribute("name")):
906
962
if_tag.appendChild(tag)
963
# Add annotation tags
964
for typ in ("method", "signal", "property"):
965
for tag in if_tag.getElementsByTagName(typ):
967
for name, prop in (self.
968
_get_all_dbus_things(typ)):
969
if (name == tag.getAttribute("name")
970
and prop._dbus_interface
971
== if_tag.getAttribute("name")):
972
annots.update(getattr
976
for name, value in annots.iteritems():
977
ann_tag = document.createElement(
979
ann_tag.setAttribute("name", name)
980
ann_tag.setAttribute("value", value)
981
tag.appendChild(ann_tag)
982
# Add interface annotation tags
983
for annotation, value in dict(
984
itertools.chain.from_iterable(
985
annotations().iteritems()
986
for name, annotations in
987
self._get_all_dbus_things("interface")
988
if name == if_tag.getAttribute("name")
990
ann_tag = document.createElement("annotation")
991
ann_tag.setAttribute("name", annotation)
992
ann_tag.setAttribute("value", value)
993
if_tag.appendChild(ann_tag)
907
994
# Add the names to the return values for the
908
995
# "org.freedesktop.DBus.Properties" methods
909
996
if (if_tag.getAttribute("name")
936
1023
variant_level=variant_level)
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.
1026
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1027
"""A class decorator; applied to a subclass of
1028
dbus.service.Object, it will add alternate D-Bus attributes with
1029
interface names according to the "alt_interface_names" mapping.
1032
@alternate_dbus_names({"org.example.Interface":
1033
"net.example.AlternateInterface"})
1034
class SampleDBusObject(dbus.service.Object):
1035
@dbus.service.method("org.example.Interface")
1036
def SampleDBusMethod():
1039
The above "SampleDBusMethod" on "SampleDBusObject" will be
1040
reachable via two interfaces: "org.example.Interface" and
1041
"net.example.AlternateInterface", the latter of which will have
1042
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1043
"true", unless "deprecate" is passed with a False value.
1045
This works for methods and signals, and also for D-Bus properties
1046
(from DBusObjectWithProperties) and interfaces (from the
1047
dbus_interface_annotations decorator).
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):
1050
for orig_interface_name, alt_interface_name in (
1051
alt_interface_names.iteritems()):
1053
interface_names = set()
1054
# Go though all attributes of the class
1055
for attrname, attribute in inspect.getmembers(cls):
951
1056
# Ignore non-D-Bus attributes, and D-Bus attributes
952
1057
# with the wrong interface name
953
1058
if (not hasattr(attribute, "_dbus_interface")
954
1059
or not attribute._dbus_interface
955
.startswith("se.recompile.Mandos")):
1060
.startswith(orig_interface_name)):
957
1062
# Create an alternate D-Bus interface name based on
958
1063
# the current name
959
1064
alt_interface = (attribute._dbus_interface
960
.replace("se.recompile.Mandos",
961
"se.bsnet.fukt.Mandos"))
1065
.replace(orig_interface_name,
1066
alt_interface_name))
1067
interface_names.add(alt_interface)
962
1068
# Is this a D-Bus signal?
963
1069
if getattr(attribute, "_dbus_is_signal", False):
964
1070
# Extract the original non-method function by
979
1085
nonmethod_func.func_name,
980
1086
nonmethod_func.func_defaults,
981
1087
nonmethod_func.func_closure)))
1088
# Copy annotations, if any
1090
new_function._dbus_annotations = (
1091
dict(attribute._dbus_annotations))
1092
except AttributeError:
982
1094
# Define a creator of a function to call both the
983
# old and new functions, so both the old and new
984
# signals gets sent when the function is called
1095
# original and alternate functions, so both the
1096
# original and alternate signals gets sent when
1097
# the function is called
985
1098
def fixscope(func1, func2):
986
1099
"""This function is a scope container to pass
987
1100
func1 and func2 to the "call_both" function
994
1107
return call_both
995
1108
# Create the "call_both" function and add it to
997
attr[attrname] = fixscope(attribute,
1110
attr[attrname] = fixscope(attribute, new_function)
999
1111
# Is this a D-Bus method?
1000
1112
elif getattr(attribute, "_dbus_is_method", False):
1001
1113
# Create a new, but exactly alike, function
1012
1124
attribute.func_name,
1013
1125
attribute.func_defaults,
1014
1126
attribute.func_closure)))
1127
# Copy annotations, if any
1129
attr[attrname]._dbus_annotations = (
1130
dict(attribute._dbus_annotations))
1131
except AttributeError:
1015
1133
# Is this a D-Bus property?
1016
1134
elif getattr(attribute, "_dbus_is_property", False):
1017
1135
# Create a new, but exactly alike, function
1031
1149
attribute.func_name,
1032
1150
attribute.func_defaults,
1033
1151
attribute.func_closure)))
1034
return type.__new__(mcs, name, bases, attr)
1152
# Copy annotations, if any
1154
attr[attrname]._dbus_annotations = (
1155
dict(attribute._dbus_annotations))
1156
except AttributeError:
1158
# Is this a D-Bus interface?
1159
elif getattr(attribute, "_dbus_is_interface", False):
1160
# Create a new, but exactly alike, function
1161
# object. Decorate it to be a new D-Bus interface
1162
# with the alternate D-Bus interface name. Add it
1164
attr[attrname] = (dbus_interface_annotations
1167
(attribute.func_code,
1168
attribute.func_globals,
1169
attribute.func_name,
1170
attribute.func_defaults,
1171
attribute.func_closure)))
1173
# Deprecate all alternate interfaces
1174
iname="_AlternateDBusNames_interface_annotation{0}"
1175
for interface_name in interface_names:
1176
@dbus_interface_annotations(interface_name)
1178
return { "org.freedesktop.DBus.Deprecated":
1180
# Find an unused name
1181
for aname in (iname.format(i)
1182
for i in itertools.count()):
1183
if aname not in attr:
1187
# Replace the class with a new subclass of it with
1188
# methods, signals, etc. as created above.
1189
cls = type(b"{0}Alternate".format(cls.__name__),
1195
@alternate_dbus_interfaces({"se.recompile.Mandos":
1196
"se.bsnet.fukt.Mandos"})
1037
1197
class ClientDBus(Client, DBusObjectWithProperties):
1038
1198
"""A Client class using D-Bus
1833
1995
def handle_ipc(self, source, condition, parent_pipe=None,
1834
1996
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)
1849
1997
# error, or the other end of multiprocessing.Pipe has closed
1850
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1998
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1851
1999
# Wait for other process to exit
1943
2091
elif suffix == "w":
1944
2092
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1946
raise ValueError("Unknown suffix %r" % suffix)
2094
raise ValueError("Unknown suffix {0!r}"
1947
2096
except (ValueError, IndexError) as e:
1948
2097
raise ValueError(*(e.args))
1949
2098
timevalue += delta
1964
2113
if not noclose:
1965
2114
# Close all standard open file descriptors
1966
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2115
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1967
2116
if not stat.S_ISCHR(os.fstat(null).st_mode):
1968
2117
raise OSError(errno.ENODEV,
1969
"%s not a character device"
2118
"{0} not a character device"
2119
.format(os.devnull))
1971
2120
os.dup2(null, sys.stdin.fileno())
1972
2121
os.dup2(null, sys.stdout.fileno())
1973
2122
os.dup2(null, sys.stderr.fileno())
1983
2132
parser = argparse.ArgumentParser()
1984
2133
parser.add_argument("-v", "--version", action="version",
1985
version = "%%(prog)s %s" % version,
2134
version = "%(prog)s {0}".format(version),
1986
2135
help="show version number and exit")
1987
2136
parser.add_argument("-i", "--interface", metavar="IF",
1988
2137
help="Bind to interface IF")
2092
2241
if server_settings["servicename"] != "Mandos":
2093
2242
syslogger.setFormatter(logging.Formatter
2094
('Mandos (%s) [%%(process)d]:'
2095
' %%(levelname)s: %%(message)s'
2096
% server_settings["servicename"]))
2243
('Mandos ({0}) [%(process)d]:'
2244
' %(levelname)s: %(message)s'
2245
.format(server_settings
2098
2248
# Parse config file with clients
2099
2249
client_config = configparser.SafeConfigParser(Client
2117
2267
pidfilename = "/var/run/mandos.pid"
2119
2269
pidfile = open(pidfilename, "w")
2121
logger.error("Could not open file %r", pidfilename)
2270
except IOError as e:
2271
logger.error("Could not open file %r", pidfilename,
2124
uid = pwd.getpwnam("_mandos").pw_uid
2125
gid = pwd.getpwnam("_mandos").pw_gid
2274
for name in ("_mandos", "mandos", "nobody"):
2128
uid = pwd.getpwnam("mandos").pw_uid
2129
gid = pwd.getpwnam("mandos").pw_gid
2276
uid = pwd.getpwnam(name).pw_uid
2277
gid = pwd.getpwnam(name).pw_gid
2130
2279
except KeyError:
2132
uid = pwd.getpwnam("nobody").pw_uid
2133
gid = pwd.getpwnam("nobody").pw_gid
2215
2361
(stored_state))
2216
2362
os.remove(stored_state_path)
2217
2363
except IOError as e:
2218
logger.warning("Could not load persistent state: {0}"
2220
if e.errno != errno.ENOENT:
2364
if e.errno == errno.ENOENT:
2365
logger.warning("Could not load persistent state: {0}"
2366
.format(os.strerror(e.errno)))
2368
logger.critical("Could not load persistent state:",
2222
2371
except EOFError as e:
2223
2372
logger.warning("Could not load persistent state: "
2224
"EOFError: {0}".format(e))
2373
"EOFError:", exc_info=e)
2226
2375
with PGPEngine() as pgp:
2227
2376
for client_name, client in clients_data.iteritems():
2317
2465
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2320
class MandosDBusService(dbus.service.Object):
2468
@alternate_dbus_interfaces({"se.recompile.Mandos":
2469
"se.bsnet.fukt.Mandos"})
2470
class MandosDBusService(DBusObjectWithProperties):
2321
2471
"""A D-Bus proxy object"""
2322
2472
def __init__(self):
2323
2473
dbus.service.Object.__init__(self, bus, "/")
2324
2474
_interface = "se.recompile.Mandos"
2476
@dbus_interface_annotations(_interface)
2478
return { "org.freedesktop.DBus.Property"
2479
".EmitsChangedSignal":
2326
2482
@dbus.service.signal(_interface, signature="o")
2327
2483
def ClientAdded(self, objpath):
2411
2565
del client_settings[client.name]["secret"]
2414
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2417
(stored_state_path))
2418
with os.fdopen(tempfd, "wb") as stored_state:
2568
with (tempfile.NamedTemporaryFile
2569
(mode='wb', suffix=".pickle", prefix='clients-',
2570
dir=os.path.dirname(stored_state_path),
2571
delete=False)) as stored_state:
2419
2572
pickle.dump((clients, client_settings), stored_state)
2573
tempname=stored_state.name
2420
2574
os.rename(tempname, stored_state_path)
2421
2575
except (IOError, OSError) as e:
2422
logger.warning("Could not save persistent state: {0}"
2426
2578
os.remove(tempname)
2427
2579
except NameError:
2429
if e.errno not in set((errno.ENOENT, errno.EACCES,
2581
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2582
logger.warning("Could not save persistent state: {0}"
2583
.format(os.strerror(e.errno)))
2585
logger.warning("Could not save persistent state:",
2433
2589
# Delete all clients, and settings from config
2461
2617
service.port = tcp_server.socket.getsockname()[1]
2463
2619
logger.info("Now listening on address %r, port %d,"
2464
" flowinfo %d, scope_id %d"
2465
% tcp_server.socket.getsockname())
2620
" flowinfo %d, scope_id %d",
2621
*tcp_server.socket.getsockname())
2467
logger.info("Now listening on address %r, port %d"
2468
% tcp_server.socket.getsockname())
2623
logger.info("Now listening on address %r, port %d",
2624
*tcp_server.socket.getsockname())
2470
2626
#service.interface = tcp_server.socket.getsockname()[3]