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()
369
379
self.server_state_changed)
370
380
self.server_state_changed(self.server.GetState())
372
383
class AvahiServiceToSyslog(AvahiService):
373
384
def rename(self):
374
385
"""Add the new name to the syslog messages"""
375
386
ret = AvahiService.rename(self)
376
387
syslogger.setFormatter(logging.Formatter
377
('Mandos (%s) [%%(process)d]:'
378
' %%(levelname)s: %%(message)s'
388
('Mandos ({0}) [%(process)d]:'
389
' %(levelname)s: %(message)s'
382
394
def timedelta_to_milliseconds(td):
383
395
"Convert a datetime.timedelta() to milliseconds"
384
396
return ((td.days * 24 * 60 * 60 * 1000)
385
397
+ (td.seconds * 1000)
386
398
+ (td.microseconds // 1000))
388
401
class Client(object):
389
402
"""A representation of a client host served by this server.
431
444
runtime_expansions = ("approval_delay", "approval_duration",
432
"created", "enabled", "fingerprint",
433
"host", "interval", "last_checked_ok",
445
"created", "enabled", "expires",
446
"fingerprint", "host", "interval",
447
"last_approval_request", "last_checked_ok",
434
448
"last_enabled", "name", "timeout")
435
449
client_defaults = { "timeout": "5m",
436
450
"extended_timeout": "15m",
566
576
if getattr(self, "enabled", False):
567
577
# Already enabled
569
self.send_changedstate()
570
579
self.expires = datetime.datetime.utcnow() + self.timeout
571
580
self.enabled = True
572
581
self.last_enabled = datetime.datetime.utcnow()
573
582
self.init_checker()
583
self.send_changedstate()
575
585
def disable(self, quiet=True):
576
586
"""Disable this client."""
577
587
if not getattr(self, "enabled", False):
580
self.send_changedstate()
582
590
logger.info("Disabling client %s", self.name)
583
if getattr(self, "disable_initiator_tag", False):
591
if getattr(self, "disable_initiator_tag", None) is not None:
584
592
gobject.source_remove(self.disable_initiator_tag)
585
593
self.disable_initiator_tag = None
586
594
self.expires = None
587
if getattr(self, "checker_initiator_tag", False):
595
if getattr(self, "checker_initiator_tag", None) is not None:
588
596
gobject.source_remove(self.checker_initiator_tag)
589
597
self.checker_initiator_tag = None
590
598
self.stop_checker()
591
599
self.enabled = False
601
self.send_changedstate()
592
602
# Do not run this again if called by a gobject.timeout_add
598
608
def init_checker(self):
599
609
# Schedule a new checker to be started an 'interval' from now,
600
610
# and every interval from then on.
611
if self.checker_initiator_tag is not None:
612
gobject.source_remove(self.checker_initiator_tag)
601
613
self.checker_initiator_tag = (gobject.timeout_add
602
614
(self.interval_milliseconds(),
603
615
self.start_checker))
604
616
# Schedule a disable() when 'timeout' has passed
617
if self.disable_initiator_tag is not None:
618
gobject.source_remove(self.disable_initiator_tag)
605
619
self.disable_initiator_tag = (gobject.timeout_add
606
620
(self.timeout_milliseconds(),
653
668
If a checker already exists, leave it running and do
655
670
# 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
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
675
# checkers alone, the checker would have to take more time
661
676
# than 'timeout' for the client to be disabled, which is as it
676
691
self.current_checker_command)
677
692
# Start a new checker if needed
678
693
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)
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
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
698
705
self.current_checker_command = command
700
707
logger.info("Starting checker %r for %s",
706
713
self.checker = subprocess.Popen(command,
708
715
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)
719
716
except OSError as error:
720
logger.error("Failed to start subprocess: %s",
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)
722
729
# 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
774
818
class DBusPropertyException(dbus.exceptions.DBusException):
775
819
"""A base class for D-Bus property-related exceptions
802
def _is_dbus_property(obj):
803
return getattr(obj, "_dbus_is_property", False)
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),
805
def _get_all_dbus_properties(self):
855
def _get_all_dbus_things(self, thing):
806
856
"""Returns a generator of (name, attribute) pairs
808
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
858
return ((getattr(athing.__get__(self), "_dbus_name",
860
athing.__get__(self))
809
861
for cls in self.__class__.__mro__
811
inspect.getmembers(cls, self._is_dbus_property))
863
inspect.getmembers(cls,
864
self._is_dbus_thing(thing)))
813
866
def _get_dbus_property(self, interface_name, property_name):
814
867
"""Returns a bound method if one exists which is a D-Bus
817
870
for cls in self.__class__.__mro__:
818
871
for name, value in (inspect.getmembers
819
(cls, self._is_dbus_property)):
873
self._is_dbus_thing("property"))):
820
874
if (value._dbus_name == property_name
821
875
and value._dbus_interface == interface_name):
822
876
return value.__get__(self)
885
939
path_keyword='object_path',
886
940
connection_keyword='connection')
887
941
def Introspect(self, object_path, connection):
888
"""Standard D-Bus method, overloaded to insert property tags.
942
"""Overloading of standard D-Bus method.
944
Inserts property tags and interface annotation tags.
890
946
xmlstring = dbus.service.Object.Introspect(self, object_path,
898
954
e.setAttribute("access", prop._dbus_access)
900
956
for if_tag in document.getElementsByTagName("interface"):
901
958
for tag in (make_tag(document, name, prop)
903
in self._get_all_dbus_properties()
960
in self._get_all_dbus_things("property")
904
961
if prop._dbus_interface
905
962
== if_tag.getAttribute("name")):
906
963
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)
907
995
# Add the names to the return values for the
908
996
# "org.freedesktop.DBus.Properties" methods
909
997
if (if_tag.getAttribute("name")
924
1012
except (AttributeError, xml.dom.DOMException,
925
1013
xml.parsers.expat.ExpatError) as error:
926
1014
logger.error("Failed to override Introspection method",
928
1016
return xmlstring
931
def datetime_to_dbus (dt, variant_level=0):
1019
def datetime_to_dbus(dt, variant_level=0):
932
1020
"""Convert a UTC datetime.datetime() to a D-Bus type."""
934
1022
return dbus.String("", variant_level = variant_level)
936
1024
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.
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).
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):
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):
951
1057
# Ignore non-D-Bus attributes, and D-Bus attributes
952
1058
# with the wrong interface name
953
1059
if (not hasattr(attribute, "_dbus_interface")
954
1060
or not attribute._dbus_interface
955
.startswith("se.recompile.Mandos")):
1061
.startswith(orig_interface_name)):
957
1063
# Create an alternate D-Bus interface name based on
958
1064
# the current name
959
1065
alt_interface = (attribute._dbus_interface
960
.replace("se.recompile.Mandos",
961
"se.bsnet.fukt.Mandos"))
1066
.replace(orig_interface_name,
1067
alt_interface_name))
1068
interface_names.add(alt_interface)
962
1069
# Is this a D-Bus signal?
963
1070
if getattr(attribute, "_dbus_is_signal", False):
964
1071
# Extract the original non-method function by
979
1086
nonmethod_func.func_name,
980
1087
nonmethod_func.func_defaults,
981
1088
nonmethod_func.func_closure)))
1089
# Copy annotations, if any
1091
new_function._dbus_annotations = (
1092
dict(attribute._dbus_annotations))
1093
except AttributeError:
982
1095
# 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
1096
# original and alternate functions, so both the
1097
# original and alternate signals gets sent when
1098
# the function is called
985
1099
def fixscope(func1, func2):
986
1100
"""This function is a scope container to pass
987
1101
func1 and func2 to the "call_both" function
994
1108
return call_both
995
1109
# Create the "call_both" function and add it to
997
attr[attrname] = fixscope(attribute,
1111
attr[attrname] = fixscope(attribute, new_function)
999
1112
# Is this a D-Bus method?
1000
1113
elif getattr(attribute, "_dbus_is_method", False):
1001
1114
# Create a new, but exactly alike, function
1012
1125
attribute.func_name,
1013
1126
attribute.func_defaults,
1014
1127
attribute.func_closure)))
1128
# Copy annotations, if any
1130
attr[attrname]._dbus_annotations = (
1131
dict(attribute._dbus_annotations))
1132
except AttributeError:
1015
1134
# Is this a D-Bus property?
1016
1135
elif getattr(attribute, "_dbus_is_property", False):
1017
1136
# Create a new, but exactly alike, function
1031
1150
attribute.func_name,
1032
1151
attribute.func_defaults,
1033
1152
attribute.func_closure)))
1034
return type.__new__(mcs, name, bases, attr)
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"})
1037
1198
class ClientDBus(Client, DBusObjectWithProperties):
1038
1199
"""A Client class using D-Bus
1178
1338
def approve(self, value=True):
1179
self.send_changedstate()
1180
1339
self.approved = value
1181
1340
gobject.timeout_add(timedelta_to_milliseconds
1182
1341
(self.approval_duration),
1183
1342
self._reset_approved)
1343
self.send_changedstate()
1186
1345
## D-Bus methods, signals & properties
1187
1346
_interface = "se.recompile.Mandos.Client"
1350
@dbus_interface_annotations(_interface)
1352
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1191
1357
# CheckerCompleted - signal
1364
1530
def Timeout_dbus_property(self, value=None):
1365
1531
if value is None: # get
1366
1532
return dbus.UInt64(self.timeout_milliseconds())
1533
old_timeout = self.timeout
1367
1534
self.timeout = datetime.timedelta(0, 0, 0, value)
1368
# Reschedule timeout
1535
# Reschedule disabling
1369
1536
if self.enabled:
1370
1537
now = datetime.datetime.utcnow()
1371
time_to_die = timedelta_to_milliseconds(
1372
(self.last_checked_ok + self.timeout) - now)
1373
if time_to_die <= 0:
1538
self.expires += self.timeout - old_timeout
1539
if self.expires <= now:
1374
1540
# The timeout has passed
1377
self.expires = (now +
1378
datetime.timedelta(milliseconds =
1380
1543
if (getattr(self, "disable_initiator_tag", None)
1383
1546
gobject.source_remove(self.disable_initiator_tag)
1384
self.disable_initiator_tag = (gobject.timeout_add
1547
self.disable_initiator_tag = (
1548
gobject.timeout_add(
1549
timedelta_to_milliseconds(self.expires - now),
1388
1552
# ExtendedTimeout - property
1389
1553
@dbus_service_property(_interface, signature="t",
1581
1741
#wait until timeout or approved
1582
1742
time = datetime.datetime.now()
1583
1743
client.changedstate.acquire()
1584
(client.changedstate.wait
1585
(float(client.timedelta_to_milliseconds(delay)
1744
client.changedstate.wait(
1745
float(timedelta_to_milliseconds(delay)
1587
1747
client.changedstate.release()
1588
1748
time2 = datetime.datetime.now()
1589
1749
if (time2 - time) >= delay:
1760
1921
str(self.interface
1762
1923
except socket.error as error:
1763
if error[0] == errno.EPERM:
1924
if error.errno == errno.EPERM:
1764
1925
logger.error("No permission to"
1765
1926
" bind to interface %s",
1766
1927
self.interface)
1767
elif error[0] == errno.ENOPROTOOPT:
1928
elif error.errno == errno.ENOPROTOOPT:
1768
1929
logger.error("SO_BINDTODEVICE not available;"
1769
1930
" cannot bind to interface %s",
1770
1931
self.interface)
1932
elif error.errno == errno.ENODEV:
1933
logger.error("Interface %s does not"
1934
" exist, cannot bind",
1773
1938
# Only bind(2) the socket if we really need to.
1833
1998
def handle_ipc(self, source, condition, parent_pipe=None,
1834
1999
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
2000
# error, or the other end of multiprocessing.Pipe has closed
1850
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2001
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1851
2002
# Wait for other process to exit
1943
2094
elif suffix == "w":
1944
2095
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1946
raise ValueError("Unknown suffix %r" % suffix)
2097
raise ValueError("Unknown suffix {0!r}"
1947
2099
except (ValueError, IndexError) as e:
1948
2100
raise ValueError(*(e.args))
1949
2101
timevalue += delta
1964
2116
if not noclose:
1965
2117
# Close all standard open file descriptors
1966
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2118
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1967
2119
if not stat.S_ISCHR(os.fstat(null).st_mode):
1968
2120
raise OSError(errno.ENODEV,
1969
"%s not a character device"
2121
"{0} not a character device"
2122
.format(os.devnull))
1971
2123
os.dup2(null, sys.stdin.fileno())
1972
2124
os.dup2(null, sys.stdout.fileno())
1973
2125
os.dup2(null, sys.stderr.fileno())
1983
2135
parser = argparse.ArgumentParser()
1984
2136
parser.add_argument("-v", "--version", action="version",
1985
version = "%%(prog)s %s" % version,
2137
version = "%(prog)s {0}".format(version),
1986
2138
help="show version number and exit")
1987
2139
parser.add_argument("-i", "--interface", metavar="IF",
1988
2140
help="Bind to interface IF")
2092
2244
if server_settings["servicename"] != "Mandos":
2093
2245
syslogger.setFormatter(logging.Formatter
2094
('Mandos (%s) [%%(process)d]:'
2095
' %%(levelname)s: %%(message)s'
2096
% server_settings["servicename"]))
2246
('Mandos ({0}) [%(process)d]:'
2247
' %(levelname)s: %(message)s'
2248
.format(server_settings
2098
2251
# Parse config file with clients
2099
2252
client_config = configparser.SafeConfigParser(Client
2117
2270
pidfilename = "/var/run/mandos.pid"
2119
2272
pidfile = open(pidfilename, "w")
2121
logger.error("Could not open file %r", pidfilename)
2273
except IOError as e:
2274
logger.error("Could not open file %r", pidfilename,
2124
uid = pwd.getpwnam("_mandos").pw_uid
2125
gid = pwd.getpwnam("_mandos").pw_gid
2277
for name in ("_mandos", "mandos", "nobody"):
2128
uid = pwd.getpwnam("mandos").pw_uid
2129
gid = pwd.getpwnam("mandos").pw_gid
2279
uid = pwd.getpwnam(name).pw_uid
2280
gid = pwd.getpwnam(name).pw_gid
2130
2282
except KeyError:
2132
uid = pwd.getpwnam("nobody").pw_uid
2133
gid = pwd.getpwnam("nobody").pw_gid
2140
2290
except OSError as error:
2141
if error[0] != errno.EPERM:
2291
if error.errno != errno.EPERM:
2166
2316
# Close all input and output, do double fork, etc.
2319
# multiprocessing will use threads, so before we use gobject we
2320
# need to inform gobject that threads will be used.
2169
2321
gobject.threads_init()
2171
2323
global main_loop
2172
2324
# From the Avahi example code
2173
DBusGMainLoop(set_as_default=True )
2325
DBusGMainLoop(set_as_default=True)
2174
2326
main_loop = gobject.MainLoop()
2175
2327
bus = dbus.SystemBus()
2176
2328
# End of Avahi example code
2215
2366
(stored_state))
2216
2367
os.remove(stored_state_path)
2217
2368
except IOError as e:
2218
logger.warning("Could not load persistent state: {0}"
2220
if e.errno != errno.ENOENT:
2369
if e.errno == errno.ENOENT:
2370
logger.warning("Could not load persistent state: {0}"
2371
.format(os.strerror(e.errno)))
2373
logger.critical("Could not load persistent state:",
2222
2376
except EOFError as e:
2223
2377
logger.warning("Could not load persistent state: "
2224
"EOFError: {0}".format(e))
2378
"EOFError:", exc_info=e)
2226
2380
with PGPEngine() as pgp:
2227
2381
for client_name, client in clients_data.iteritems():
2311
2464
# "pidfile" was never created
2313
2466
del pidfilename
2314
signal.signal(signal.SIGINT, signal.SIG_IGN)
2316
2468
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2317
2469
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2320
class MandosDBusService(dbus.service.Object):
2472
@alternate_dbus_interfaces({"se.recompile.Mandos":
2473
"se.bsnet.fukt.Mandos"})
2474
class MandosDBusService(DBusObjectWithProperties):
2321
2475
"""A D-Bus proxy object"""
2322
2476
def __init__(self):
2323
2477
dbus.service.Object.__init__(self, bus, "/")
2324
2478
_interface = "se.recompile.Mandos"
2480
@dbus_interface_annotations(_interface)
2482
return { "org.freedesktop.DBus.Property"
2483
".EmitsChangedSignal":
2326
2486
@dbus.service.signal(_interface, signature="o")
2327
2487
def ClientAdded(self, objpath):
2411
2569
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:
2572
with (tempfile.NamedTemporaryFile
2573
(mode='wb', suffix=".pickle", prefix='clients-',
2574
dir=os.path.dirname(stored_state_path),
2575
delete=False)) as stored_state:
2419
2576
pickle.dump((clients, client_settings), stored_state)
2577
tempname=stored_state.name
2420
2578
os.rename(tempname, stored_state_path)
2421
2579
except (IOError, OSError) as e:
2422
logger.warning("Could not save persistent state: {0}"
2426
2582
os.remove(tempname)
2427
2583
except NameError:
2429
if e.errno not in set((errno.ENOENT, errno.EACCES,
2585
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2586
logger.warning("Could not save persistent state: {0}"
2587
.format(os.strerror(e.errno)))
2589
logger.warning("Could not save persistent state:",
2433
2593
# Delete all clients, and settings from config
2461
2621
service.port = tcp_server.socket.getsockname()[1]
2463
2623
logger.info("Now listening on address %r, port %d,"
2464
" flowinfo %d, scope_id %d"
2465
% tcp_server.socket.getsockname())
2624
" flowinfo %d, scope_id %d",
2625
*tcp_server.socket.getsockname())
2467
logger.info("Now listening on address %r, port %d"
2468
% tcp_server.socket.getsockname())
2627
logger.info("Now listening on address %r, port %d",
2628
*tcp_server.socket.getsockname())
2470
2630
#service.interface = tcp_server.socket.getsockname()[3]