107
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
108
105
with contextlib.closing(socket.socket()) as s:
109
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
struct.pack(b"16s16x", interface))
111
interface_index = struct.unpack("I", ifreq[16:20])[0]
107
struct.pack(str("16s16x"),
109
interface_index = struct.unpack(str("I"),
112
111
return interface_index
119
118
syslogger = (logging.handlers.SysLogHandler
121
120
logging.handlers.SysLogHandler.LOG_DAEMON,
122
address = "/dev/log"))
121
address = str("/dev/log")))
123
122
syslogger.setFormatter(logging.Formatter
124
123
('Mandos [%(process)d]: %(levelname)s:'
225
224
class AvahiError(Exception):
226
225
def __init__(self, value, *args, **kwargs):
227
226
self.value = value
228
return super(AvahiError, self).__init__(value, *args,
227
super(AvahiError, self).__init__(value, *args, **kwargs)
228
def __unicode__(self):
229
return unicode(repr(self.value))
231
231
class AvahiServiceError(AvahiError):
276
276
self.entry_group_state_changed_match = None
278
def rename(self, remove=True):
279
279
"""Derived from the Avahi example code"""
280
280
if self.rename_count >= self.max_renames:
281
281
logger.critical("No suitable Zeroconf service name found"
282
282
" after %i retries, exiting.",
283
283
self.rename_count)
284
284
raise AvahiServiceError("Too many renames")
285
self.name = str(self.server
286
.GetAlternativeServiceName(self.name))
287
self.rename_count += 1
285
self.name = unicode(self.server
286
.GetAlternativeServiceName(self.name))
288
287
logger.info("Changing Zeroconf service name to %r ...",
294
292
except dbus.exceptions.DBusException as error:
295
if (error.get_dbus_name()
296
== "org.freedesktop.Avahi.CollisionError"):
297
logger.info("Local Zeroconf service name collision.")
298
return self.rename(remove=False)
300
logger.critical("D-Bus Exception", exc_info=error)
293
logger.critical("D-Bus Exception", exc_info=error)
296
self.rename_count += 1
304
298
def remove(self):
305
299
"""Derived from the Avahi example code"""
344
338
elif state == avahi.ENTRY_GROUP_FAILURE:
345
339
logger.critical("Avahi: Error in group state changed %s",
347
raise AvahiGroupError("State changed: {!s}"
341
raise AvahiGroupError("State changed: {0!s}"
350
344
def cleanup(self):
399
393
class AvahiServiceToSyslog(AvahiService):
400
def rename(self, *args, **kwargs):
401
395
"""Add the new name to the syslog messages"""
402
ret = AvahiService.rename(self, *args, **kwargs)
396
ret = AvahiService.rename(self)
403
397
syslogger.setFormatter(logging.Formatter
404
('Mandos ({}) [%(process)d]:'
398
('Mandos ({0}) [%(process)d]:'
405
399
' %(levelname)s: %(message)s'
406
400
.format(self.name)))
404
def timedelta_to_milliseconds(td):
405
"Convert a datetime.timedelta() to milliseconds"
406
return ((td.days * 24 * 60 * 60 * 1000)
407
+ (td.seconds * 1000)
408
+ (td.microseconds // 1000))
410
411
class Client(object):
411
412
"""A representation of a client host served by this server.
467
468
"enabled": "True",
471
def timeout_milliseconds(self):
472
"Return the 'timeout' attribute in milliseconds"
473
return timedelta_to_milliseconds(self.timeout)
475
def extended_timeout_milliseconds(self):
476
"Return the 'extended_timeout' attribute in milliseconds"
477
return timedelta_to_milliseconds(self.extended_timeout)
479
def interval_milliseconds(self):
480
"Return the 'interval' attribute in milliseconds"
481
return timedelta_to_milliseconds(self.interval)
483
def approval_delay_milliseconds(self):
484
return timedelta_to_milliseconds(self.approval_delay)
471
487
def config_parser(config):
472
488
"""Construct a new dict of client settings of this form:
497
513
"rb") as secfile:
498
514
client["secret"] = secfile.read()
500
raise TypeError("No secret or secfile for section {}"
516
raise TypeError("No secret or secfile for section {0}"
501
517
.format(section))
502
518
client["timeout"] = string_to_delta(section["timeout"])
503
519
client["extended_timeout"] = string_to_delta(
520
536
server_settings = {}
521
537
self.server_settings = server_settings
522
538
# adding all client settings
523
for setting, value in settings.items():
539
for setting, value in settings.iteritems():
524
540
setattr(self, setting, value)
609
625
if self.checker_initiator_tag is not None:
610
626
gobject.source_remove(self.checker_initiator_tag)
611
627
self.checker_initiator_tag = (gobject.timeout_add
613
.total_seconds() * 1000),
628
(self.interval_milliseconds(),
614
629
self.start_checker))
615
630
# Schedule a disable() when 'timeout' has passed
616
631
if self.disable_initiator_tag is not None:
617
632
gobject.source_remove(self.disable_initiator_tag)
618
633
self.disable_initiator_tag = (gobject.timeout_add
620
.total_seconds() * 1000),
634
(self.timeout_milliseconds(),
622
636
# Also start a new checker *right now*.
623
637
self.start_checker()
655
669
self.disable_initiator_tag = None
656
670
if getattr(self, "enabled", False):
657
671
self.disable_initiator_tag = (gobject.timeout_add
658
(int(timeout.total_seconds()
659
* 1000), self.disable))
672
(timedelta_to_milliseconds
673
(timeout), self.disable))
660
674
self.expires = datetime.datetime.utcnow() + timeout
662
676
def need_approval(self):
693
707
# Start a new checker if needed
694
708
if self.checker is None:
695
709
# Escape attributes for the shell
696
escaped_attrs = { attr:
697
re.escape(str(getattr(self, attr)))
698
for attr in self.runtime_expansions }
710
escaped_attrs = dict(
711
(attr, re.escape(unicode(getattr(self, attr))))
713
self.runtime_expansions)
700
715
command = self.checker_command % escaped_attrs
701
716
except TypeError as error:
782
797
# "Set" method, so we fail early here:
783
798
if byte_arrays and signature != "ay":
784
799
raise ValueError("Byte arrays not supported for non-'ay'"
785
" signature {!r}".format(signature))
800
" signature {0!r}".format(signature))
786
801
def decorator(func):
787
802
func._dbus_is_property = True
788
803
func._dbus_interface = dbus_interface
819
834
"""Decorator to annotate D-Bus methods, signals or properties
822
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
823
"org.freedesktop.DBus.Property."
824
"EmitsChangedSignal": "false"})
825
837
@dbus_service_property("org.example.Interface", signature="b",
839
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
840
"org.freedesktop.DBus.Property."
841
"EmitsChangedSignal": "false"})
827
842
def Property_dbus_property(self):
828
843
return dbus.Boolean(False)
836
851
class DBusPropertyException(dbus.exceptions.DBusException):
837
852
"""A base class for D-Bus property-related exceptions
854
def __unicode__(self):
855
return unicode(str(self))
841
858
class DBusPropertyAccessException(DBusPropertyException):
842
859
"""A property's access permissions disallows an operation.
865
882
If called like _is_dbus_thing("method") it returns a function
866
883
suitable for use as predicate to inspect.getmembers().
868
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
885
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
871
888
def _get_all_dbus_things(self, thing):
921
938
# signatures other than "ay".
922
939
if prop._dbus_signature != "ay":
923
940
raise ValueError("Byte arrays not supported for non-"
924
"'ay' signature {!r}"
941
"'ay' signature {0!r}"
925
942
.format(prop._dbus_signature))
926
943
value = dbus.ByteArray(b''.join(chr(byte)
927
944
for byte in value))
952
969
value.variant_level+1)
953
970
return dbus.Dictionary(properties, signature="sv")
955
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
956
def PropertiesChanged(self, interface_name, changed_properties,
957
invalidated_properties):
958
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
963
972
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
964
973
out_signature="s",
965
974
path_keyword='object_path',
1001
1010
"_dbus_annotations",
1003
for name, value in annots.items():
1012
for name, value in annots.iteritems():
1004
1013
ann_tag = document.createElement(
1006
1015
ann_tag.setAttribute("name", name)
1009
1018
# Add interface annotation tags
1010
1019
for annotation, value in dict(
1011
1020
itertools.chain.from_iterable(
1012
annotations().items()
1021
annotations().iteritems()
1013
1022
for name, annotations in
1014
1023
self._get_all_dbus_things("interface")
1015
1024
if name == if_tag.getAttribute("name")
1017
1026
ann_tag = document.createElement("annotation")
1018
1027
ann_tag.setAttribute("name", annotation)
1019
1028
ann_tag.setAttribute("value", value)
1076
1085
def wrapper(cls):
1077
1086
for orig_interface_name, alt_interface_name in (
1078
alt_interface_names.items()):
1087
alt_interface_names.iteritems()):
1080
1089
interface_names = set()
1081
1090
# Go though all attributes of the class
1198
1207
attribute.func_closure)))
1200
1209
# Deprecate all alternate interfaces
1201
iname="_AlternateDBusNames_interface_annotation{}"
1210
iname="_AlternateDBusNames_interface_annotation{0}"
1202
1211
for interface_name in interface_names:
1203
1212
@dbus_interface_annotations(interface_name)
1204
1213
def func(self):
1213
1222
if interface_names:
1214
1223
# Replace the class with a new subclass of it with
1215
1224
# methods, signals, etc. as created above.
1216
cls = type(b"{}Alternate".format(cls.__name__),
1225
cls = type(b"{0}Alternate".format(cls.__name__),
1232
1241
runtime_expansions = (Client.runtime_expansions
1233
1242
+ ("dbus_object_path",))
1235
_interface = "se.recompile.Mandos.Client"
1237
1244
# dbus.service.Object doesn't use super(), so we can't either.
1239
1246
def __init__(self, bus = None, *args, **kwargs):
1241
1248
Client.__init__(self, *args, **kwargs)
1242
1249
# Only now, when this client is initialized, can it show up on
1244
client_object_name = str(self.name).translate(
1251
client_object_name = unicode(self.name).translate(
1245
1252
{ord("."): ord("_"),
1246
1253
ord("-"): ord("_")})
1247
1254
self.dbus_object_path = (dbus.ObjectPath
1252
1259
def notifychangeproperty(transform_func,
1253
1260
dbus_name, type_func=lambda x: x,
1254
variant_level=1, invalidate_only=False,
1255
_interface=_interface):
1256
1262
""" Modify a variable so that it's a property which announces
1257
1263
its changes to DBus.
1263
1269
to the D-Bus. Default: no transform
1264
1270
variant_level: D-Bus variant level. Default: 1
1266
attrname = "_{}".format(dbus_name)
1272
attrname = "_{0}".format(dbus_name)
1267
1273
def setter(self, value):
1268
1274
if hasattr(self, "dbus_object_path"):
1269
1275
if (not hasattr(self, attrname) or
1270
1276
type_func(getattr(self, attrname, None))
1271
1277
!= type_func(value)):
1273
self.PropertiesChanged(_interface,
1278
dbus_value = transform_func(type_func(value),
1281
self.PropertyChanged(dbus.String(dbus_name),
1283
self.PropertiesChanged(_interface,
1285
dbus.String(dbus_name):
1286
dbus_value }), dbus.Array())
1278
dbus_value = transform_func(type_func(value),
1281
self.PropertyChanged(dbus.String(dbus_name),
1287
1283
setattr(self, attrname, value)
1289
1285
return property(lambda self: getattr(self, attrname), setter)
1309
1305
approval_delay = notifychangeproperty(dbus.UInt64,
1310
1306
"ApprovalDelay",
1312
lambda td: td.total_seconds()
1308
timedelta_to_milliseconds)
1314
1309
approval_duration = notifychangeproperty(
1315
1310
dbus.UInt64, "ApprovalDuration",
1316
type_func = lambda td: td.total_seconds() * 1000)
1311
type_func = timedelta_to_milliseconds)
1317
1312
host = notifychangeproperty(dbus.String, "Host")
1318
1313
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1319
type_func = lambda td:
1320
td.total_seconds() * 1000)
1315
timedelta_to_milliseconds)
1321
1316
extended_timeout = notifychangeproperty(
1322
1317
dbus.UInt64, "ExtendedTimeout",
1323
type_func = lambda td: td.total_seconds() * 1000)
1318
type_func = timedelta_to_milliseconds)
1324
1319
interval = notifychangeproperty(dbus.UInt64,
1327
lambda td: td.total_seconds()
1322
timedelta_to_milliseconds)
1329
1323
checker_command = notifychangeproperty(dbus.String, "Checker")
1330
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1331
invalidate_only=True)
1333
1325
del notifychangeproperty
1377
1369
def approve(self, value=True):
1378
1370
self.approved = value
1379
gobject.timeout_add(int(self.approval_duration.total_seconds()
1380
* 1000), self._reset_approved)
1371
gobject.timeout_add(timedelta_to_milliseconds
1372
(self.approval_duration),
1373
self._reset_approved)
1381
1374
self.send_changedstate()
1383
1376
## D-Bus methods, signals & properties
1377
_interface = "se.recompile.Mandos.Client"
1381
@dbus_interface_annotations(_interface)
1383
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1389
1388
# CheckerCompleted - signal
1401
1400
# PropertyChanged - signal
1402
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1403
1401
@dbus.service.signal(_interface, signature="sv")
1404
1402
def PropertyChanged(self, property, value):
1481
1479
access="readwrite")
1482
1480
def ApprovalDelay_dbus_property(self, value=None):
1483
1481
if value is None: # get
1484
return dbus.UInt64(self.approval_delay.total_seconds()
1482
return dbus.UInt64(self.approval_delay_milliseconds())
1486
1483
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1488
1485
# ApprovalDuration - property
1490
1487
access="readwrite")
1491
1488
def ApprovalDuration_dbus_property(self, value=None):
1492
1489
if value is None: # get
1493
return dbus.UInt64(self.approval_duration.total_seconds()
1490
return dbus.UInt64(timedelta_to_milliseconds(
1491
self.approval_duration))
1495
1492
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1497
1494
# Name - property
1510
1507
def Host_dbus_property(self, value=None):
1511
1508
if value is None: # get
1512
1509
return dbus.String(self.host)
1513
self.host = str(value)
1510
self.host = unicode(value)
1515
1512
# Created - property
1516
1513
@dbus_service_property(_interface, signature="s", access="read")
1563
1560
access="readwrite")
1564
1561
def Timeout_dbus_property(self, value=None):
1565
1562
if value is None: # get
1566
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1563
return dbus.UInt64(self.timeout_milliseconds())
1567
1564
old_timeout = self.timeout
1568
1565
self.timeout = datetime.timedelta(0, 0, 0, value)
1569
1566
# Reschedule disabling
1580
1577
gobject.source_remove(self.disable_initiator_tag)
1581
1578
self.disable_initiator_tag = (
1582
1579
gobject.timeout_add(
1583
int((self.expires - now).total_seconds()
1584
* 1000), self.disable))
1580
timedelta_to_milliseconds(self.expires - now),
1586
1583
# ExtendedTimeout - property
1587
1584
@dbus_service_property(_interface, signature="t",
1588
1585
access="readwrite")
1589
1586
def ExtendedTimeout_dbus_property(self, value=None):
1590
1587
if value is None: # get
1591
return dbus.UInt64(self.extended_timeout.total_seconds()
1588
return dbus.UInt64(self.extended_timeout_milliseconds())
1593
1589
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1595
1591
# Interval - property
1597
1593
access="readwrite")
1598
1594
def Interval_dbus_property(self, value=None):
1599
1595
if value is None: # get
1600
return dbus.UInt64(self.interval.total_seconds() * 1000)
1596
return dbus.UInt64(self.interval_milliseconds())
1601
1597
self.interval = datetime.timedelta(0, 0, 0, value)
1602
1598
if getattr(self, "checker_initiator_tag", None) is None:
1614
1610
def Checker_dbus_property(self, value=None):
1615
1611
if value is None: # get
1616
1612
return dbus.String(self.checker_command)
1617
self.checker_command = str(value)
1613
self.checker_command = unicode(value)
1619
1615
# CheckerRunning - property
1620
1616
@dbus_service_property(_interface, signature="b",
1636
1632
@dbus_service_property(_interface, signature="ay",
1637
1633
access="write", byte_arrays=True)
1638
1634
def Secret_dbus_property(self, value):
1639
self.secret = bytes(value)
1635
self.secret = str(value)
1676
1672
def handle(self):
1677
1673
with contextlib.closing(self.server.child_pipe) as child_pipe:
1678
1674
logger.info("TCP connection from: %s",
1679
str(self.client_address))
1675
unicode(self.client_address))
1680
1676
logger.debug("Pipe FD: %d",
1681
1677
self.server.child_pipe.fileno())
1763
1759
if self.server.use_dbus:
1764
1760
# Emit D-Bus signal
1765
1761
client.NeedApproval(
1766
client.approval_delay.total_seconds()
1767
* 1000, client.approved_by_default)
1762
client.approval_delay_milliseconds(),
1763
client.approved_by_default)
1769
1765
logger.warning("Client %s was not approved",
1776
1772
#wait until timeout or approved
1777
1773
time = datetime.datetime.now()
1778
1774
client.changedstate.acquire()
1779
client.changedstate.wait(delay.total_seconds())
1775
client.changedstate.wait(
1776
float(timedelta_to_milliseconds(delay)
1780
1778
client.changedstate.release()
1781
1779
time2 = datetime.datetime.now()
1782
1780
if (time2 - time) >= delay:
1982
1980
self.socket.setsockopt(socket.SOL_SOCKET,
1983
1981
SO_BINDTODEVICE,
1984
(self.interface + "\0")
1982
str(self.interface + '\0'))
1986
1983
except socket.error as error:
1987
1984
if error.errno == errno.EPERM:
1988
1985
logger.error("No permission to bind to"
2191
2188
token_duration = Token(re.compile(r"P"), None,
2192
2189
frozenset((token_year, token_month,
2193
2190
token_day, token_time,
2195
2192
# Define starting values
2196
2193
value = datetime.timedelta() # Value so far
2197
2194
found_token = None
2198
followers = frozenset((token_duration,)) # Following valid tokens
2195
followers = frozenset(token_duration,) # Following valid tokens
2199
2196
s = duration # String left to parse
2200
2197
# Loop until end token is found
2201
2198
while found_token is not token_end:
2261
2258
elif suffix == "w":
2262
2259
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2264
raise ValueError("Unknown suffix {!r}"
2261
raise ValueError("Unknown suffix {0!r}"
2265
2262
.format(suffix))
2266
2263
except IndexError as e:
2267
2264
raise ValueError(*(e.args))
2284
2281
# Close all standard open file descriptors
2285
2282
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2286
2283
if not stat.S_ISCHR(os.fstat(null).st_mode):
2287
raise OSError(errno.ENODEV, "{} not a character device"
2284
raise OSError(errno.ENODEV,
2285
"{0} not a character device"
2288
2286
.format(os.devnull))
2289
2287
os.dup2(null, sys.stdin.fileno())
2290
2288
os.dup2(null, sys.stdout.fileno())
2301
2299
parser = argparse.ArgumentParser()
2302
2300
parser.add_argument("-v", "--version", action="version",
2303
version = "%(prog)s {}".format(version),
2301
version = "%(prog)s {0}".format(version),
2304
2302
help="show version number and exit")
2305
2303
parser.add_argument("-i", "--interface", metavar="IF",
2306
2304
help="Bind to interface IF")
2339
2337
help="Directory to save/restore state in")
2340
2338
parser.add_argument("--foreground", action="store_true",
2341
2339
help="Run in foreground", default=None)
2342
parser.add_argument("--no-zeroconf", action="store_false",
2343
dest="zeroconf", help="Do not use Zeroconf",
2346
2341
options = parser.parse_args()
2398
2392
for option in ("interface", "address", "port", "debug",
2399
2393
"priority", "servicename", "configdir",
2400
2394
"use_dbus", "use_ipv6", "debuglevel", "restore",
2401
"statedir", "socket", "foreground", "zeroconf"):
2395
"statedir", "socket", "foreground"):
2402
2396
value = getattr(options, option)
2403
2397
if value is not None:
2404
2398
server_settings[option] = value
2406
2400
# Force all strings to be unicode
2407
2401
for option in server_settings.keys():
2408
if isinstance(server_settings[option], bytes):
2409
server_settings[option] = (server_settings[option]
2402
if type(server_settings[option]) is str:
2403
server_settings[option] = unicode(server_settings[option])
2411
2404
# Force all boolean options to be boolean
2412
2405
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2413
"foreground", "zeroconf"):
2414
2407
server_settings[option] = bool(server_settings[option])
2415
2408
# Debug implies foreground
2416
2409
if server_settings["debug"]:
2420
2413
##################################################################
2422
if (not server_settings["zeroconf"] and
2423
not (server_settings["port"]
2424
or server_settings["socket"] != "")):
2425
parser.error("Needs port or socket to work without"
2428
2415
# For convenience
2429
2416
debug = server_settings["debug"]
2430
2417
debuglevel = server_settings["debuglevel"]
2433
2420
stored_state_path = os.path.join(server_settings["statedir"],
2434
2421
stored_state_file)
2435
2422
foreground = server_settings["foreground"]
2436
zeroconf = server_settings["zeroconf"]
2439
2425
initlogger(debug, logging.DEBUG)
2447
2433
if server_settings["servicename"] != "Mandos":
2448
2434
syslogger.setFormatter(logging.Formatter
2449
('Mandos ({}) [%(process)d]:'
2435
('Mandos ({0}) [%(process)d]:'
2450
2436
' %(levelname)s: %(message)s'
2451
2437
.format(server_settings
2452
2438
["servicename"])))
2460
2446
global mandos_dbus_service
2461
2447
mandos_dbus_service = None
2464
if server_settings["socket"] != "":
2465
socketfd = server_settings["socket"]
2466
2449
tcp_server = MandosServer((server_settings["address"],
2467
2450
server_settings["port"]),
2472
2455
gnutls_priority=
2473
2456
server_settings["priority"],
2474
2457
use_dbus=use_dbus,
2458
socketfd=(server_settings["socket"]
2476
2460
if not foreground:
2477
2461
pidfilename = "/run/mandos.pid"
2478
2462
if not os.path.isdir("/run/."):
2548
2532
use_dbus = False
2549
2533
server_settings["use_dbus"] = False
2550
2534
tcp_server.use_dbus = False
2552
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2553
service = AvahiServiceToSyslog(name =
2554
server_settings["servicename"],
2555
servicetype = "_mandos._tcp",
2556
protocol = protocol, bus = bus)
2557
if server_settings["interface"]:
2558
service.interface = (if_nametoindex
2559
(server_settings["interface"]
2535
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2536
service = AvahiServiceToSyslog(name =
2537
server_settings["servicename"],
2538
servicetype = "_mandos._tcp",
2539
protocol = protocol, bus = bus)
2540
if server_settings["interface"]:
2541
service.interface = (if_nametoindex
2542
(str(server_settings["interface"])))
2562
2544
global multiprocessing_manager
2563
2545
multiprocessing_manager = multiprocessing.Manager()
2587
2569
os.remove(stored_state_path)
2588
2570
except IOError as e:
2589
2571
if e.errno == errno.ENOENT:
2590
logger.warning("Could not load persistent state: {}"
2572
logger.warning("Could not load persistent state: {0}"
2591
2573
.format(os.strerror(e.errno)))
2593
2575
logger.critical("Could not load persistent state:",
2629
2611
if datetime.datetime.utcnow() >= client["expires"]:
2630
2612
if not client["last_checked_ok"]:
2631
2613
logger.warning(
2632
"disabling client {} - Client never "
2614
"disabling client {0} - Client never "
2633
2615
"performed a successful checker"
2634
2616
.format(client_name))
2635
2617
client["enabled"] = False
2636
2618
elif client["last_checker_status"] != 0:
2637
2619
logger.warning(
2638
"disabling client {} - Client last"
2639
" checker failed with error code {}"
2620
"disabling client {0} - Client "
2621
"last checker failed with error code {1}"
2640
2622
.format(client_name,
2641
2623
client["last_checker_status"]))
2642
2624
client["enabled"] = False
2655
2637
except PGPError:
2656
2638
# If decryption fails, we use secret from new settings
2657
logger.debug("Failed to decrypt {} old secret"
2639
logger.debug("Failed to decrypt {0} old secret"
2658
2640
.format(client_name))
2659
2641
client["secret"] = (
2660
2642
client_settings[client_name]["secret"])
2668
2650
clients_data[client_name] = client_settings[client_name]
2670
2652
# Create all client objects
2671
for client_name, client in clients_data.items():
2653
for client_name, client in clients_data.iteritems():
2672
2654
tcp_server.clients[client_name] = client_class(
2673
2655
name = client_name, settings = client,
2674
2656
server_settings = server_settings)
2733
2715
def GetAllClientsWithProperties(self):
2735
2717
return dbus.Dictionary(
2736
{ c.dbus_object_path: c.GetAll("")
2737
for c in tcp_server.clients.itervalues() },
2718
((c.dbus_object_path, c.GetAll(""))
2719
for c in tcp_server.clients.itervalues()),
2738
2720
signature="oa{sv}")
2740
2722
@dbus.service.method(_interface, in_signature="o")
2779
2760
# A list of attributes that can not be pickled
2781
exclude = { "bus", "changedstate", "secret",
2782
"checker", "server_settings" }
2762
exclude = set(("bus", "changedstate", "secret",
2763
"checker", "server_settings"))
2783
2764
for name, typ in (inspect.getmembers
2784
2765
(dbus.service.Object)):
2785
2766
exclude.add(name)
2808
2789
except NameError:
2810
2791
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2811
logger.warning("Could not save persistent state: {}"
2792
logger.warning("Could not save persistent state: {0}"
2812
2793
.format(os.strerror(e.errno)))
2814
2795
logger.warning("Could not save persistent state:",
2843
2824
tcp_server.server_activate()
2845
2826
# Find out what port we got
2847
service.port = tcp_server.socket.getsockname()[1]
2827
service.port = tcp_server.socket.getsockname()[1]
2849
2829
logger.info("Now listening on address %r, port %d,"
2850
2830
" flowinfo %d, scope_id %d",
2856
2836
#service.interface = tcp_server.socket.getsockname()[3]
2860
# From the Avahi example code
2863
except dbus.exceptions.DBusException as error:
2864
logger.critical("D-Bus Exception", exc_info=error)
2867
# End of Avahi example code
2839
# From the Avahi example code
2842
except dbus.exceptions.DBusException as error:
2843
logger.critical("D-Bus Exception", exc_info=error)
2846
# End of Avahi example code
2869
2848
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2870
2849
lambda *args, **kwargs: