88
88
except ImportError:
89
89
SO_BINDTODEVICE = None
91
if sys.version_info.major == 2:
95
92
stored_state_file = "clients.pickle"
97
94
logger = logging.getLogger()
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
101
100
if_nametoindex = (ctypes.cdll.LoadLibrary
107
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
108
107
with contextlib.closing(socket.socket()) as s:
109
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
struct.pack(b"16s16x", interface))
111
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
111
interface_index = struct.unpack(str("I"),
112
113
return interface_index
115
116
def initlogger(debug, level=logging.WARNING):
116
117
"""init logger and add loglevel"""
119
syslogger = (logging.handlers.SysLogHandler
121
logging.handlers.SysLogHandler.LOG_DAEMON,
122
address = "/dev/log"))
123
119
syslogger.setFormatter(logging.Formatter
124
120
('Mandos [%(process)d]: %(levelname)s:'
225
221
class AvahiError(Exception):
226
222
def __init__(self, value, *args, **kwargs):
227
223
self.value = value
228
return super(AvahiError, self).__init__(value, *args,
224
super(AvahiError, self).__init__(value, *args, **kwargs)
225
def __unicode__(self):
226
return unicode(repr(self.value))
231
228
class AvahiServiceError(AvahiError):
282
279
" after %i retries, exiting.",
283
280
self.rename_count)
284
281
raise AvahiServiceError("Too many renames")
285
self.name = str(self.server
286
.GetAlternativeServiceName(self.name))
282
self.name = unicode(self.server
283
.GetAlternativeServiceName(self.name))
287
284
logger.info("Changing Zeroconf service name to %r ...",
338
335
elif state == avahi.ENTRY_GROUP_FAILURE:
339
336
logger.critical("Avahi: Error in group state changed %s",
341
raise AvahiGroupError("State changed: {!s}"
338
raise AvahiGroupError("State changed: {0!s}"
344
341
def cleanup(self):
395
392
"""Add the new name to the syslog messages"""
396
393
ret = AvahiService.rename(self)
397
394
syslogger.setFormatter(logging.Formatter
398
('Mandos ({}) [%(process)d]:'
395
('Mandos ({0}) [%(process)d]:'
399
396
' %(levelname)s: %(message)s'
400
397
.format(self.name)))
401
def timedelta_to_milliseconds(td):
402
"Convert a datetime.timedelta() to milliseconds"
403
return ((td.days * 24 * 60 * 60 * 1000)
404
+ (td.seconds * 1000)
405
+ (td.microseconds // 1000))
404
408
class Client(object):
405
409
"""A representation of a client host served by this server.
461
465
"enabled": "True",
468
def timeout_milliseconds(self):
469
"Return the 'timeout' attribute in milliseconds"
470
return timedelta_to_milliseconds(self.timeout)
472
def extended_timeout_milliseconds(self):
473
"Return the 'extended_timeout' attribute in milliseconds"
474
return timedelta_to_milliseconds(self.extended_timeout)
476
def interval_milliseconds(self):
477
"Return the 'interval' attribute in milliseconds"
478
return timedelta_to_milliseconds(self.interval)
480
def approval_delay_milliseconds(self):
481
return timedelta_to_milliseconds(self.approval_delay)
465
484
def config_parser(config):
466
485
"""Construct a new dict of client settings of this form:
491
510
"rb") as secfile:
492
511
client["secret"] = secfile.read()
494
raise TypeError("No secret or secfile for section {}"
513
raise TypeError("No secret or secfile for section {0}"
495
514
.format(section))
496
515
client["timeout"] = string_to_delta(section["timeout"])
497
516
client["extended_timeout"] = string_to_delta(
514
533
server_settings = {}
515
534
self.server_settings = server_settings
516
535
# adding all client settings
517
for setting, value in settings.items():
536
for setting, value in settings.iteritems():
518
537
setattr(self, setting, value)
603
622
if self.checker_initiator_tag is not None:
604
623
gobject.source_remove(self.checker_initiator_tag)
605
624
self.checker_initiator_tag = (gobject.timeout_add
607
.total_seconds() * 1000),
625
(self.interval_milliseconds(),
608
626
self.start_checker))
609
627
# Schedule a disable() when 'timeout' has passed
610
628
if self.disable_initiator_tag is not None:
611
629
gobject.source_remove(self.disable_initiator_tag)
612
630
self.disable_initiator_tag = (gobject.timeout_add
614
.total_seconds() * 1000),
631
(self.timeout_milliseconds(),
616
633
# Also start a new checker *right now*.
617
634
self.start_checker()
649
666
self.disable_initiator_tag = None
650
667
if getattr(self, "enabled", False):
651
668
self.disable_initiator_tag = (gobject.timeout_add
652
(int(timeout.total_seconds()
653
* 1000), self.disable))
669
(timedelta_to_milliseconds
670
(timeout), self.disable))
654
671
self.expires = datetime.datetime.utcnow() + timeout
656
673
def need_approval(self):
687
704
# Start a new checker if needed
688
705
if self.checker is None:
689
706
# Escape attributes for the shell
690
escaped_attrs = { attr:
691
re.escape(str(getattr(self, attr)))
692
for attr in self.runtime_expansions }
707
escaped_attrs = dict(
708
(attr, re.escape(unicode(getattr(self, attr))))
710
self.runtime_expansions)
694
712
command = self.checker_command % escaped_attrs
695
713
except TypeError as error:
776
794
# "Set" method, so we fail early here:
777
795
if byte_arrays and signature != "ay":
778
796
raise ValueError("Byte arrays not supported for non-'ay'"
779
" signature {!r}".format(signature))
797
" signature {0!r}".format(signature))
780
798
def decorator(func):
781
799
func._dbus_is_property = True
782
800
func._dbus_interface = dbus_interface
813
831
"""Decorator to annotate D-Bus methods, signals or properties
816
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
817
"org.freedesktop.DBus.Property."
818
"EmitsChangedSignal": "false"})
819
834
@dbus_service_property("org.example.Interface", signature="b",
836
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
837
"org.freedesktop.DBus.Property."
838
"EmitsChangedSignal": "false"})
821
839
def Property_dbus_property(self):
822
840
return dbus.Boolean(False)
830
848
class DBusPropertyException(dbus.exceptions.DBusException):
831
849
"""A base class for D-Bus property-related exceptions
851
def __unicode__(self):
852
return unicode(str(self))
835
855
class DBusPropertyAccessException(DBusPropertyException):
836
856
"""A property's access permissions disallows an operation.
859
879
If called like _is_dbus_thing("method") it returns a function
860
880
suitable for use as predicate to inspect.getmembers().
862
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
882
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
865
885
def _get_all_dbus_things(self, thing):
915
935
# signatures other than "ay".
916
936
if prop._dbus_signature != "ay":
917
937
raise ValueError("Byte arrays not supported for non-"
918
"'ay' signature {!r}"
938
"'ay' signature {0!r}"
919
939
.format(prop._dbus_signature))
920
940
value = dbus.ByteArray(b''.join(chr(byte)
921
941
for byte in value))
946
966
value.variant_level+1)
947
967
return dbus.Dictionary(properties, signature="sv")
949
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
950
def PropertiesChanged(self, interface_name, changed_properties,
951
invalidated_properties):
952
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
957
969
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
958
970
out_signature="s",
959
971
path_keyword='object_path',
995
1007
"_dbus_annotations",
997
for name, value in annots.items():
1009
for name, value in annots.iteritems():
998
1010
ann_tag = document.createElement(
1000
1012
ann_tag.setAttribute("name", name)
1003
1015
# Add interface annotation tags
1004
1016
for annotation, value in dict(
1005
1017
itertools.chain.from_iterable(
1006
annotations().items()
1018
annotations().iteritems()
1007
1019
for name, annotations in
1008
1020
self._get_all_dbus_things("interface")
1009
1021
if name == if_tag.getAttribute("name")
1011
1023
ann_tag = document.createElement("annotation")
1012
1024
ann_tag.setAttribute("name", annotation)
1013
1025
ann_tag.setAttribute("value", value)
1070
1082
def wrapper(cls):
1071
1083
for orig_interface_name, alt_interface_name in (
1072
alt_interface_names.items()):
1084
alt_interface_names.iteritems()):
1074
1086
interface_names = set()
1075
1087
# Go though all attributes of the class
1192
1204
attribute.func_closure)))
1194
1206
# Deprecate all alternate interfaces
1195
iname="_AlternateDBusNames_interface_annotation{}"
1207
iname="_AlternateDBusNames_interface_annotation{0}"
1196
1208
for interface_name in interface_names:
1197
1209
@dbus_interface_annotations(interface_name)
1198
1210
def func(self):
1207
1219
if interface_names:
1208
1220
# Replace the class with a new subclass of it with
1209
1221
# methods, signals, etc. as created above.
1210
cls = type(b"{}Alternate".format(cls.__name__),
1222
cls = type(b"{0}Alternate".format(cls.__name__),
1226
1238
runtime_expansions = (Client.runtime_expansions
1227
1239
+ ("dbus_object_path",))
1229
_interface = "se.recompile.Mandos.Client"
1231
1241
# dbus.service.Object doesn't use super(), so we can't either.
1233
1243
def __init__(self, bus = None, *args, **kwargs):
1235
1245
Client.__init__(self, *args, **kwargs)
1236
1246
# Only now, when this client is initialized, can it show up on
1238
client_object_name = str(self.name).translate(
1248
client_object_name = unicode(self.name).translate(
1239
1249
{ord("."): ord("_"),
1240
1250
ord("-"): ord("_")})
1241
1251
self.dbus_object_path = (dbus.ObjectPath
1246
1256
def notifychangeproperty(transform_func,
1247
1257
dbus_name, type_func=lambda x: x,
1248
variant_level=1, invalidate_only=False,
1249
_interface=_interface):
1250
1259
""" Modify a variable so that it's a property which announces
1251
1260
its changes to DBus.
1257
1266
to the D-Bus. Default: no transform
1258
1267
variant_level: D-Bus variant level. Default: 1
1260
attrname = "_{}".format(dbus_name)
1269
attrname = "_{0}".format(dbus_name)
1261
1270
def setter(self, value):
1262
1271
if hasattr(self, "dbus_object_path"):
1263
1272
if (not hasattr(self, attrname) or
1264
1273
type_func(getattr(self, attrname, None))
1265
1274
!= type_func(value)):
1267
self.PropertiesChanged(_interface,
1272
dbus_value = transform_func(type_func(value),
1275
self.PropertyChanged(dbus.String(dbus_name),
1277
self.PropertiesChanged(_interface,
1279
dbus.String(dbus_name):
1280
dbus_value }), dbus.Array())
1275
dbus_value = transform_func(type_func(value),
1278
self.PropertyChanged(dbus.String(dbus_name),
1281
1280
setattr(self, attrname, value)
1283
1282
return property(lambda self: getattr(self, attrname), setter)
1303
1302
approval_delay = notifychangeproperty(dbus.UInt64,
1304
1303
"ApprovalDelay",
1306
lambda td: td.total_seconds()
1305
timedelta_to_milliseconds)
1308
1306
approval_duration = notifychangeproperty(
1309
1307
dbus.UInt64, "ApprovalDuration",
1310
type_func = lambda td: td.total_seconds() * 1000)
1308
type_func = timedelta_to_milliseconds)
1311
1309
host = notifychangeproperty(dbus.String, "Host")
1312
1310
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1313
type_func = lambda td:
1314
td.total_seconds() * 1000)
1312
timedelta_to_milliseconds)
1315
1313
extended_timeout = notifychangeproperty(
1316
1314
dbus.UInt64, "ExtendedTimeout",
1317
type_func = lambda td: td.total_seconds() * 1000)
1315
type_func = timedelta_to_milliseconds)
1318
1316
interval = notifychangeproperty(dbus.UInt64,
1321
lambda td: td.total_seconds()
1319
timedelta_to_milliseconds)
1323
1320
checker_command = notifychangeproperty(dbus.String, "Checker")
1324
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1325
invalidate_only=True)
1327
1322
del notifychangeproperty
1355
1350
*args, **kwargs)
1357
1352
def start_checker(self, *args, **kwargs):
1358
old_checker_pid = getattr(self.checker, "pid", None)
1353
old_checker = self.checker
1354
if self.checker is not None:
1355
old_checker_pid = self.checker.pid
1357
old_checker_pid = None
1359
1358
r = Client.start_checker(self, *args, **kwargs)
1360
1359
# Only if new checker process was started
1361
1360
if (self.checker is not None
1371
1370
def approve(self, value=True):
1372
1371
self.approved = value
1373
gobject.timeout_add(int(self.approval_duration.total_seconds()
1374
* 1000), self._reset_approved)
1372
gobject.timeout_add(timedelta_to_milliseconds
1373
(self.approval_duration),
1374
self._reset_approved)
1375
1375
self.send_changedstate()
1377
1377
## D-Bus methods, signals & properties
1378
_interface = "se.recompile.Mandos.Client"
1382
@dbus_interface_annotations(_interface)
1384
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1383
1389
# CheckerCompleted - signal
1395
1401
# PropertyChanged - signal
1396
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1397
1402
@dbus.service.signal(_interface, signature="sv")
1398
1403
def PropertyChanged(self, property, value):
1475
1480
access="readwrite")
1476
1481
def ApprovalDelay_dbus_property(self, value=None):
1477
1482
if value is None: # get
1478
return dbus.UInt64(self.approval_delay.total_seconds()
1483
return dbus.UInt64(self.approval_delay_milliseconds())
1480
1484
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1482
1486
# ApprovalDuration - property
1484
1488
access="readwrite")
1485
1489
def ApprovalDuration_dbus_property(self, value=None):
1486
1490
if value is None: # get
1487
return dbus.UInt64(self.approval_duration.total_seconds()
1491
return dbus.UInt64(timedelta_to_milliseconds(
1492
self.approval_duration))
1489
1493
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1491
1495
# Name - property
1504
1508
def Host_dbus_property(self, value=None):
1505
1509
if value is None: # get
1506
1510
return dbus.String(self.host)
1507
self.host = str(value)
1511
self.host = unicode(value)
1509
1513
# Created - property
1510
1514
@dbus_service_property(_interface, signature="s", access="read")
1557
1561
access="readwrite")
1558
1562
def Timeout_dbus_property(self, value=None):
1559
1563
if value is None: # get
1560
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1564
return dbus.UInt64(self.timeout_milliseconds())
1561
1565
old_timeout = self.timeout
1562
1566
self.timeout = datetime.timedelta(0, 0, 0, value)
1563
1567
# Reschedule disabling
1574
1578
gobject.source_remove(self.disable_initiator_tag)
1575
1579
self.disable_initiator_tag = (
1576
1580
gobject.timeout_add(
1577
int((self.expires - now).total_seconds()
1578
* 1000), self.disable))
1581
timedelta_to_milliseconds(self.expires - now),
1580
1584
# ExtendedTimeout - property
1581
1585
@dbus_service_property(_interface, signature="t",
1582
1586
access="readwrite")
1583
1587
def ExtendedTimeout_dbus_property(self, value=None):
1584
1588
if value is None: # get
1585
return dbus.UInt64(self.extended_timeout.total_seconds()
1589
return dbus.UInt64(self.extended_timeout_milliseconds())
1587
1590
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1589
1592
# Interval - property
1591
1594
access="readwrite")
1592
1595
def Interval_dbus_property(self, value=None):
1593
1596
if value is None: # get
1594
return dbus.UInt64(self.interval.total_seconds() * 1000)
1597
return dbus.UInt64(self.interval_milliseconds())
1595
1598
self.interval = datetime.timedelta(0, 0, 0, value)
1596
1599
if getattr(self, "checker_initiator_tag", None) is None:
1608
1611
def Checker_dbus_property(self, value=None):
1609
1612
if value is None: # get
1610
1613
return dbus.String(self.checker_command)
1611
self.checker_command = str(value)
1614
self.checker_command = unicode(value)
1613
1616
# CheckerRunning - property
1614
1617
@dbus_service_property(_interface, signature="b",
1630
1633
@dbus_service_property(_interface, signature="ay",
1631
1634
access="write", byte_arrays=True)
1632
1635
def Secret_dbus_property(self, value):
1633
self.secret = bytes(value)
1636
self.secret = str(value)
1670
1673
def handle(self):
1671
1674
with contextlib.closing(self.server.child_pipe) as child_pipe:
1672
1675
logger.info("TCP connection from: %s",
1673
str(self.client_address))
1676
unicode(self.client_address))
1674
1677
logger.debug("Pipe FD: %d",
1675
1678
self.server.child_pipe.fileno())
1757
1760
if self.server.use_dbus:
1758
1761
# Emit D-Bus signal
1759
1762
client.NeedApproval(
1760
client.approval_delay.total_seconds()
1761
* 1000, client.approved_by_default)
1763
client.approval_delay_milliseconds(),
1764
client.approved_by_default)
1763
1766
logger.warning("Client %s was not approved",
1770
1773
#wait until timeout or approved
1771
1774
time = datetime.datetime.now()
1772
1775
client.changedstate.acquire()
1773
client.changedstate.wait(delay.total_seconds())
1776
client.changedstate.wait(
1777
float(timedelta_to_milliseconds(delay)
1774
1779
client.changedstate.release()
1775
1780
time2 = datetime.datetime.now()
1776
1781
if (time2 - time) >= delay:
1976
1981
self.socket.setsockopt(socket.SOL_SOCKET,
1977
1982
SO_BINDTODEVICE,
1978
(self.interface + "\0")
1983
str(self.interface + '\0'))
1980
1984
except socket.error as error:
1981
1985
if error.errno == errno.EPERM:
1982
1986
logger.error("No permission to bind to"
2185
2189
token_duration = Token(re.compile(r"P"), None,
2186
2190
frozenset((token_year, token_month,
2187
2191
token_day, token_time,
2189
2193
# Define starting values
2190
2194
value = datetime.timedelta() # Value so far
2191
2195
found_token = None
2192
followers = frozenset((token_duration,)) # Following valid tokens
2196
followers = frozenset(token_duration,) # Following valid tokens
2193
2197
s = duration # String left to parse
2194
2198
# Loop until end token is found
2195
2199
while found_token is not token_end:
2255
2259
elif suffix == "w":
2256
2260
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2258
raise ValueError("Unknown suffix {!r}"
2262
raise ValueError("Unknown suffix {0!r}"
2259
2263
.format(suffix))
2260
2264
except IndexError as e:
2261
2265
raise ValueError(*(e.args))
2278
2282
# Close all standard open file descriptors
2279
2283
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2280
2284
if not stat.S_ISCHR(os.fstat(null).st_mode):
2281
raise OSError(errno.ENODEV, "{} not a character device"
2285
raise OSError(errno.ENODEV,
2286
"{0} not a character device"
2282
2287
.format(os.devnull))
2283
2288
os.dup2(null, sys.stdin.fileno())
2284
2289
os.dup2(null, sys.stdout.fileno())
2295
2300
parser = argparse.ArgumentParser()
2296
2301
parser.add_argument("-v", "--version", action="version",
2297
version = "%(prog)s {}".format(version),
2302
version = "%(prog)s {0}".format(version),
2298
2303
help="show version number and exit")
2299
2304
parser.add_argument("-i", "--interface", metavar="IF",
2300
2305
help="Bind to interface IF")
2333
2338
help="Directory to save/restore state in")
2334
2339
parser.add_argument("--foreground", action="store_true",
2335
2340
help="Run in foreground", default=None)
2336
parser.add_argument("--no-zeroconf", action="store_false",
2337
dest="zeroconf", help="Do not use Zeroconf",
2340
2342
options = parser.parse_args()
2392
2393
for option in ("interface", "address", "port", "debug",
2393
2394
"priority", "servicename", "configdir",
2394
2395
"use_dbus", "use_ipv6", "debuglevel", "restore",
2395
"statedir", "socket", "foreground", "zeroconf"):
2396
"statedir", "socket", "foreground"):
2396
2397
value = getattr(options, option)
2397
2398
if value is not None:
2398
2399
server_settings[option] = value
2400
2401
# Force all strings to be unicode
2401
2402
for option in server_settings.keys():
2402
if isinstance(server_settings[option], bytes):
2403
server_settings[option] = (server_settings[option]
2403
if type(server_settings[option]) is str:
2404
server_settings[option] = unicode(server_settings[option])
2405
2405
# Force all boolean options to be boolean
2406
2406
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2407
"foreground", "zeroconf"):
2408
2408
server_settings[option] = bool(server_settings[option])
2409
2409
# Debug implies foreground
2410
2410
if server_settings["debug"]:
2414
2414
##################################################################
2416
if (not server_settings["zeroconf"] and
2417
not (server_settings["port"]
2418
or server_settings["socket"] != "")):
2419
parser.error("Needs port or socket to work without"
2422
2416
# For convenience
2423
2417
debug = server_settings["debug"]
2424
2418
debuglevel = server_settings["debuglevel"]
2427
2421
stored_state_path = os.path.join(server_settings["statedir"],
2428
2422
stored_state_file)
2429
2423
foreground = server_settings["foreground"]
2430
zeroconf = server_settings["zeroconf"]
2433
2426
initlogger(debug, logging.DEBUG)
2441
2434
if server_settings["servicename"] != "Mandos":
2442
2435
syslogger.setFormatter(logging.Formatter
2443
('Mandos ({}) [%(process)d]:'
2436
('Mandos ({0}) [%(process)d]:'
2444
2437
' %(levelname)s: %(message)s'
2445
2438
.format(server_settings
2446
2439
["servicename"])))
2454
2447
global mandos_dbus_service
2455
2448
mandos_dbus_service = None
2458
if server_settings["socket"] != "":
2459
socketfd = server_settings["socket"]
2460
2450
tcp_server = MandosServer((server_settings["address"],
2461
2451
server_settings["port"]),
2466
2456
gnutls_priority=
2467
2457
server_settings["priority"],
2468
2458
use_dbus=use_dbus,
2459
socketfd=(server_settings["socket"]
2470
2461
if not foreground:
2471
2462
pidfilename = "/run/mandos.pid"
2472
2463
if not os.path.isdir("/run/."):
2542
2533
use_dbus = False
2543
2534
server_settings["use_dbus"] = False
2544
2535
tcp_server.use_dbus = False
2546
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2547
service = AvahiServiceToSyslog(name =
2548
server_settings["servicename"],
2549
servicetype = "_mandos._tcp",
2550
protocol = protocol, bus = bus)
2551
if server_settings["interface"]:
2552
service.interface = (if_nametoindex
2553
(server_settings["interface"]
2536
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2537
service = AvahiServiceToSyslog(name =
2538
server_settings["servicename"],
2539
servicetype = "_mandos._tcp",
2540
protocol = protocol, bus = bus)
2541
if server_settings["interface"]:
2542
service.interface = (if_nametoindex
2543
(str(server_settings["interface"])))
2556
2545
global multiprocessing_manager
2557
2546
multiprocessing_manager = multiprocessing.Manager()
2581
2570
os.remove(stored_state_path)
2582
2571
except IOError as e:
2583
2572
if e.errno == errno.ENOENT:
2584
logger.warning("Could not load persistent state: {}"
2573
logger.warning("Could not load persistent state: {0}"
2585
2574
.format(os.strerror(e.errno)))
2587
2576
logger.critical("Could not load persistent state:",
2623
2612
if datetime.datetime.utcnow() >= client["expires"]:
2624
2613
if not client["last_checked_ok"]:
2625
2614
logger.warning(
2626
"disabling client {} - Client never "
2615
"disabling client {0} - Client never "
2627
2616
"performed a successful checker"
2628
2617
.format(client_name))
2629
2618
client["enabled"] = False
2630
2619
elif client["last_checker_status"] != 0:
2631
2620
logger.warning(
2632
"disabling client {} - Client last"
2633
" checker failed with error code {}"
2621
"disabling client {0} - Client "
2622
"last checker failed with error code {1}"
2634
2623
.format(client_name,
2635
2624
client["last_checker_status"]))
2636
2625
client["enabled"] = False
2649
2638
except PGPError:
2650
2639
# If decryption fails, we use secret from new settings
2651
logger.debug("Failed to decrypt {} old secret"
2640
logger.debug("Failed to decrypt {0} old secret"
2652
2641
.format(client_name))
2653
2642
client["secret"] = (
2654
2643
client_settings[client_name]["secret"])
2662
2651
clients_data[client_name] = client_settings[client_name]
2664
2653
# Create all client objects
2665
for client_name, client in clients_data.items():
2654
for client_name, client in clients_data.iteritems():
2666
2655
tcp_server.clients[client_name] = client_class(
2667
2656
name = client_name, settings = client,
2668
2657
server_settings = server_settings)
2727
2716
def GetAllClientsWithProperties(self):
2729
2718
return dbus.Dictionary(
2730
{ c.dbus_object_path: c.GetAll("")
2731
for c in tcp_server.clients.itervalues() },
2719
((c.dbus_object_path, c.GetAll(""))
2720
for c in tcp_server.clients.itervalues()),
2732
2721
signature="oa{sv}")
2734
2723
@dbus.service.method(_interface, in_signature="o")
2773
2761
# A list of attributes that can not be pickled
2775
exclude = { "bus", "changedstate", "secret",
2776
"checker", "server_settings" }
2763
exclude = set(("bus", "changedstate", "secret",
2764
"checker", "server_settings"))
2777
2765
for name, typ in (inspect.getmembers
2778
2766
(dbus.service.Object)):
2779
2767
exclude.add(name)
2802
2790
except NameError:
2804
2792
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2805
logger.warning("Could not save persistent state: {}"
2793
logger.warning("Could not save persistent state: {0}"
2806
2794
.format(os.strerror(e.errno)))
2808
2796
logger.warning("Could not save persistent state:",
2837
2825
tcp_server.server_activate()
2839
2827
# Find out what port we got
2841
service.port = tcp_server.socket.getsockname()[1]
2828
service.port = tcp_server.socket.getsockname()[1]
2843
2830
logger.info("Now listening on address %r, port %d,"
2844
2831
" flowinfo %d, scope_id %d",
2850
2837
#service.interface = tcp_server.socket.getsockname()[3]
2854
# From the Avahi example code
2857
except dbus.exceptions.DBusException as error:
2858
logger.critical("D-Bus Exception", exc_info=error)
2861
# End of Avahi example code
2840
# From the Avahi example code
2843
except dbus.exceptions.DBusException as error:
2844
logger.critical("D-Bus Exception", exc_info=error)
2847
# End of Avahi example code
2863
2849
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2864
2850
lambda *args, **kwargs: