To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 729
- compare with another revision
- download diff
- download tarball
- view history from revision 729
- Committer: Teddy Hogeborn
- Date: 2014-08-09 13:12:55 UTC
- Revision ID: teddy@recompile.se-20140809131255-lp31j98u2pl0xpe6
mandos: Stop using str() and remove unnecessary unicode() calls.
* mandos (if_nametoindex): Use "bytes" literal instead of str().
(initlogger): Use a unicode string for log device.
(AvahiError.__unicode__): Removed.
(DBusPropertyException.__unicode__): - '' -
(ClientDBus.Secret_dbus_property): Use bytes() instead of str().
(IPv6_TCPServer.server_bind): Use .encode() instead of str().
(string_to_delta): Removed unnecessary unicode() call.
(main): Use "isinstance(x, bytes)" instead of "type(x) is str", use
.decode() instead of unicode(), and use .encode() instead of
str().
* mandos (if_nametoindex): Use "bytes" literal instead of str().
(initlogger): Use a unicode string for log device.
(AvahiError.__unicode__): Removed.
(DBusPropertyException.__unicode__): - '' -
(ClientDBus.Secret_dbus_property): Use bytes() instead of str().
(IPv6_TCPServer.server_bind): Use .encode() instead of str().
(string_to_delta): Removed unnecessary unicode() call.
(main): Use "isinstance(x, bytes)" instead of "type(x) is str", use
.decode() instead of unicode(), and use .encode() instead of
str().
- files added:
- debian/upstream
- files removed:
- debian/upstream-signing-key.pgp
- files modified:
- INSTALL
added
removed
mandos
1
#!/usr/bin/python
1
#!/usr/bin/python2.7
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
88
88
except ImportError:
89
89
SO_BINDTODEVICE = None
90
90
91
version = "1.6.4"
91
version = "1.6.8"
92
92
stored_state_file = "clients.pickle"
93
93
94
94
logger = logging.getLogger()
104
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
105
with contextlib.closing(socket.socket()) as s:
106
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
108
interface))
109
interface_index = struct.unpack(str("I"),
110
ifreq[16:20])[0]
107
struct.pack(b"16s16x", interface))
108
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
109
return interface_index
112
110
113
111
114
112
def initlogger(debug, level=logging.WARNING):
115
113
"""init logger and add loglevel"""
116
114
115
global syslogger
117
116
syslogger = (logging.handlers.SysLogHandler
118
117
(facility =
119
118
logging.handlers.SysLogHandler.LOG_DAEMON,
120
address = str("/dev/log")))
119
address = "/dev/log"))
121
120
syslogger.setFormatter(logging.Formatter
122
121
('Mandos [%(process)d]: %(levelname)s:'
123
122
' %(message)s'))
223
222
class AvahiError(Exception):
224
223
def __init__(self, value, *args, **kwargs):
225
224
self.value = value
226
super(AvahiError, self).__init__(value, *args, **kwargs)
227
def __unicode__(self):
228
return unicode(repr(self.value))
225
return super(AvahiError, self).__init__(value, *args,
226
**kwargs)
229
227
230
228
class AvahiServiceError(AvahiError):
231
229
pass
337
335
elif state == avahi.ENTRY_GROUP_FAILURE:
338
336
logger.critical("Avahi: Error in group state changed %s",
339
337
unicode(error))
340
raise AvahiGroupError("State changed: {0!s}"
338
raise AvahiGroupError("State changed: {!s}"
341
339
.format(error))
342
340
343
341
def cleanup(self):
394
392
"""Add the new name to the syslog messages"""
395
393
ret = AvahiService.rename(self)
396
394
syslogger.setFormatter(logging.Formatter
397
('Mandos ({0}) [%(process)d]:'
395
('Mandos ({}) [%(process)d]:'
398
396
' %(levelname)s: %(message)s'
399
397
.format(self.name)))
400
398
return ret
401
399
402
400
403
def timedelta_to_milliseconds(td):
404
"Convert a datetime.timedelta() to milliseconds"
405
return ((td.days * 24 * 60 * 60 * 1000)
406
+ (td.seconds * 1000)
407
+ (td.microseconds // 1000))
408
409
410
401
class Client(object):
411
402
"""A representation of a client host served by this server.
412
403
467
458
"enabled": "True",
468
459
}
469
460
470
def timeout_milliseconds(self):
471
"Return the 'timeout' attribute in milliseconds"
472
return timedelta_to_milliseconds(self.timeout)
473
474
def extended_timeout_milliseconds(self):
475
"Return the 'extended_timeout' attribute in milliseconds"
476
return timedelta_to_milliseconds(self.extended_timeout)
477
478
def interval_milliseconds(self):
479
"Return the 'interval' attribute in milliseconds"
480
return timedelta_to_milliseconds(self.interval)
481
482
def approval_delay_milliseconds(self):
483
return timedelta_to_milliseconds(self.approval_delay)
484
485
461
@staticmethod
486
462
def config_parser(config):
487
463
"""Construct a new dict of client settings of this form:
512
488
"rb") as secfile:
513
489
client["secret"] = secfile.read()
514
490
else:
515
raise TypeError("No secret or secfile for section {0}"
491
raise TypeError("No secret or secfile for section {}"
516
492
.format(section))
517
493
client["timeout"] = string_to_delta(section["timeout"])
518
494
client["extended_timeout"] = string_to_delta(
535
511
server_settings = {}
536
512
self.server_settings = server_settings
537
513
# adding all client settings
538
for setting, value in settings.iteritems():
514
for setting, value in settings.items():
539
515
setattr(self, setting, value)
540
516
541
517
if self.enabled:
624
600
if self.checker_initiator_tag is not None:
625
601
gobject.source_remove(self.checker_initiator_tag)
626
602
self.checker_initiator_tag = (gobject.timeout_add
627
(self.interval_milliseconds(),
603
(int(self.interval
604
.total_seconds() * 1000),
628
605
self.start_checker))
629
606
# Schedule a disable() when 'timeout' has passed
630
607
if self.disable_initiator_tag is not None:
631
608
gobject.source_remove(self.disable_initiator_tag)
632
609
self.disable_initiator_tag = (gobject.timeout_add
633
(self.timeout_milliseconds(),
634
self.disable))
610
(int(self.timeout
611
.total_seconds() * 1000),
612
self.disable))
635
613
# Also start a new checker *right now*.
636
614
self.start_checker()
637
615
668
646
self.disable_initiator_tag = None
669
647
if getattr(self, "enabled", False):
670
648
self.disable_initiator_tag = (gobject.timeout_add
671
(timedelta_to_milliseconds
672
(timeout), self.disable))
649
(int(timeout.total_seconds()
650
* 1000), self.disable))
673
651
self.expires = datetime.datetime.utcnow() + timeout
674
652
675
653
def need_approval(self):
706
684
# Start a new checker if needed
707
685
if self.checker is None:
708
686
# Escape attributes for the shell
709
escaped_attrs = dict(
710
(attr, re.escape(unicode(getattr(self, attr))))
711
for attr in
712
self.runtime_expansions)
687
escaped_attrs = { attr:
688
re.escape(unicode(getattr(self,
689
attr)))
690
for attr in self.runtime_expansions }
713
691
try:
714
692
command = self.checker_command % escaped_attrs
715
693
except TypeError as error:
796
774
# "Set" method, so we fail early here:
797
775
if byte_arrays and signature != "ay":
798
776
raise ValueError("Byte arrays not supported for non-'ay'"
799
" signature {0!r}".format(signature))
777
" signature {!r}".format(signature))
800
778
def decorator(func):
801
779
func._dbus_is_property = True
802
780
func._dbus_interface = dbus_interface
850
828
class DBusPropertyException(dbus.exceptions.DBusException):
851
829
"""A base class for D-Bus property-related exceptions
852
830
"""
853
def __unicode__(self):
854
return unicode(str(self))
855
831
pass
856
832
857
833
class DBusPropertyAccessException(DBusPropertyException):
858
834
"""A property's access permissions disallows an operation.
881
857
If called like _is_dbus_thing("method") it returns a function
882
858
suitable for use as predicate to inspect.getmembers().
883
859
"""
884
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
860
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
885
861
False)
886
862
887
863
def _get_all_dbus_things(self, thing):
937
913
# signatures other than "ay".
938
914
if prop._dbus_signature != "ay":
939
915
raise ValueError("Byte arrays not supported for non-"
940
"'ay' signature {0!r}"
916
"'ay' signature {!r}"
941
917
.format(prop._dbus_signature))
942
918
value = dbus.ByteArray(b''.join(chr(byte)
943
919
for byte in value))
1008
984
(prop,
1009
985
"_dbus_annotations",
1010
986
{}))
1011
for name, value in annots.iteritems():
987
for name, value in annots.items():
1012
988
ann_tag = document.createElement(
1013
989
"annotation")
1014
990
ann_tag.setAttribute("name", name)
1017
993
# Add interface annotation tags
1018
994
for annotation, value in dict(
1019
995
itertools.chain.from_iterable(
1020
annotations().iteritems()
996
annotations().items()
1021
997
for name, annotations in
1022
998
self._get_all_dbus_things("interface")
1023
999
if name == if_tag.getAttribute("name")
1024
)).iteritems():
1000
)).items():
1025
1001
ann_tag = document.createElement("annotation")
1026
1002
ann_tag.setAttribute("name", annotation)
1027
1003
ann_tag.setAttribute("value", value)
1083
1059
"""
1084
1060
def wrapper(cls):
1085
1061
for orig_interface_name, alt_interface_name in (
1086
alt_interface_names.iteritems()):
1062
alt_interface_names.items()):
1087
1063
attr = {}
1088
1064
interface_names = set()
1089
1065
# Go though all attributes of the class
1206
1182
attribute.func_closure)))
1207
1183
if deprecate:
1208
1184
# Deprecate all alternate interfaces
1209
iname="_AlternateDBusNames_interface_annotation{0}"
1185
iname="_AlternateDBusNames_interface_annotation{}"
1210
1186
for interface_name in interface_names:
1211
1187
@dbus_interface_annotations(interface_name)
1212
1188
def func(self):
1221
1197
if interface_names:
1222
1198
# Replace the class with a new subclass of it with
1223
1199
# methods, signals, etc. as created above.
1224
cls = type(b"{0}Alternate".format(cls.__name__),
1200
cls = type(b"{}Alternate".format(cls.__name__),
1225
1201
(cls,), attr)
1226
1202
return cls
1227
1203
return wrapper
1268
1244
to the D-Bus. Default: no transform
1269
1245
variant_level: D-Bus variant level. Default: 1
1270
1246
"""
1271
attrname = "_{0}".format(dbus_name)
1247
attrname = "_{}".format(dbus_name)
1272
1248
def setter(self, value):
1273
1249
if hasattr(self, "dbus_object_path"):
1274
1250
if (not hasattr(self, attrname) or
1304
1280
approval_delay = notifychangeproperty(dbus.UInt64,
1305
1281
"ApprovalDelay",
1306
1282
type_func =
1307
timedelta_to_milliseconds)
1283
lambda td: td.total_seconds()
1284
* 1000)
1308
1285
approval_duration = notifychangeproperty(
1309
1286
dbus.UInt64, "ApprovalDuration",
1310
type_func = timedelta_to_milliseconds)
1287
type_func = lambda td: td.total_seconds() * 1000)
1311
1288
host = notifychangeproperty(dbus.String, "Host")
1312
1289
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1313
type_func =
1314
timedelta_to_milliseconds)
1290
type_func = lambda td:
1291
td.total_seconds() * 1000)
1315
1292
extended_timeout = notifychangeproperty(
1316
1293
dbus.UInt64, "ExtendedTimeout",
1317
type_func = timedelta_to_milliseconds)
1294
type_func = lambda td: td.total_seconds() * 1000)
1318
1295
interval = notifychangeproperty(dbus.UInt64,
1319
1296
"Interval",
1320
1297
type_func =
1321
timedelta_to_milliseconds)
1298
lambda td: td.total_seconds()
1299
* 1000)
1322
1300
checker_command = notifychangeproperty(dbus.String, "Checker")
1323
1301
1324
1302
del notifychangeproperty
1367
1345
1368
1346
def approve(self, value=True):
1369
1347
self.approved = value
1370
gobject.timeout_add(timedelta_to_milliseconds
1371
(self.approval_duration),
1372
self._reset_approved)
1348
gobject.timeout_add(int(self.approval_duration.total_seconds()
1349
* 1000), self._reset_approved)
1373
1350
self.send_changedstate()
1374
1351
1375
1352
## D-Bus methods, signals & properties
1478
1455
access="readwrite")
1479
1456
def ApprovalDelay_dbus_property(self, value=None):
1480
1457
if value is None: # get
1481
return dbus.UInt64(self.approval_delay_milliseconds())
1458
return dbus.UInt64(self.approval_delay.total_seconds()
1459
* 1000)
1482
1460
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1483
1461
1484
1462
# ApprovalDuration - property
1486
1464
access="readwrite")
1487
1465
def ApprovalDuration_dbus_property(self, value=None):
1488
1466
if value is None: # get
1489
return dbus.UInt64(timedelta_to_milliseconds(
1490
self.approval_duration))
1467
return dbus.UInt64(self.approval_duration.total_seconds()
1468
* 1000)
1491
1469
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1492
1470
1493
1471
# Name - property
1559
1537
access="readwrite")
1560
1538
def Timeout_dbus_property(self, value=None):
1561
1539
if value is None: # get
1562
return dbus.UInt64(self.timeout_milliseconds())
1540
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1563
1541
old_timeout = self.timeout
1564
1542
self.timeout = datetime.timedelta(0, 0, 0, value)
1565
1543
# Reschedule disabling
1576
1554
gobject.source_remove(self.disable_initiator_tag)
1577
1555
self.disable_initiator_tag = (
1578
1556
gobject.timeout_add(
1579
timedelta_to_milliseconds(self.expires - now),
1580
self.disable))
1557
int((self.expires - now).total_seconds()
1558
* 1000), self.disable))
1581
1559
1582
1560
# ExtendedTimeout - property
1583
1561
@dbus_service_property(_interface, signature="t",
1584
1562
access="readwrite")
1585
1563
def ExtendedTimeout_dbus_property(self, value=None):
1586
1564
if value is None: # get
1587
return dbus.UInt64(self.extended_timeout_milliseconds())
1565
return dbus.UInt64(self.extended_timeout.total_seconds()
1566
* 1000)
1588
1567
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1589
1568
1590
1569
# Interval - property
1592
1571
access="readwrite")
1593
1572
def Interval_dbus_property(self, value=None):
1594
1573
if value is None: # get
1595
return dbus.UInt64(self.interval_milliseconds())
1574
return dbus.UInt64(self.interval.total_seconds() * 1000)
1596
1575
self.interval = datetime.timedelta(0, 0, 0, value)
1597
1576
if getattr(self, "checker_initiator_tag", None) is None:
1598
1577
return
1631
1610
@dbus_service_property(_interface, signature="ay",
1632
1611
access="write", byte_arrays=True)
1633
1612
def Secret_dbus_property(self, value):
1634
self.secret = str(value)
1613
self.secret = bytes(value)
1635
1614
1636
1615
del _interface
1637
1616
1758
1737
if self.server.use_dbus:
1759
1738
# Emit D-Bus signal
1760
1739
client.NeedApproval(
1761
client.approval_delay_milliseconds(),
1762
client.approved_by_default)
1740
client.approval_delay.total_seconds()
1741
* 1000, client.approved_by_default)
1763
1742
else:
1764
1743
logger.warning("Client %s was not approved",
1765
1744
client.name)
1771
1750
#wait until timeout or approved
1772
1751
time = datetime.datetime.now()
1773
1752
client.changedstate.acquire()
1774
client.changedstate.wait(
1775
float(timedelta_to_milliseconds(delay)
1776
/ 1000))
1753
client.changedstate.wait(delay.total_seconds())
1777
1754
client.changedstate.release()
1778
1755
time2 = datetime.datetime.now()
1779
1756
if (time2 - time) >= delay:
1978
1955
try:
1979
1956
self.socket.setsockopt(socket.SOL_SOCKET,
1980
1957
SO_BINDTODEVICE,
1981
str(self.interface + '\0'))
1958
(self.interface + "\0")
1959
.encode("utf-8"))
1982
1960
except socket.error as error:
1983
1961
if error.errno == errno.EPERM:
1984
1962
logger.error("No permission to bind to"
2187
2165
token_duration = Token(re.compile(r"P"), None,
2188
2166
frozenset((token_year, token_month,
2189
2167
token_day, token_time,
2190
token_week))),
2168
token_week)))
2191
2169
# Define starting values
2192
2170
value = datetime.timedelta() # Value so far
2193
2171
found_token = None
2194
followers = frozenset(token_duration,) # Following valid tokens
2172
followers = frozenset((token_duration,)) # Following valid tokens
2195
2173
s = duration # String left to parse
2196
2174
# Loop until end token is found
2197
2175
while found_token is not token_end:
2244
2222
timevalue = datetime.timedelta(0)
2245
2223
for s in interval.split():
2246
2224
try:
2247
suffix = unicode(s[-1])
2225
suffix = s[-1]
2248
2226
value = int(s[:-1])
2249
2227
if suffix == "d":
2250
2228
delta = datetime.timedelta(value)
2257
2235
elif suffix == "w":
2258
2236
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2259
2237
else:
2260
raise ValueError("Unknown suffix {0!r}"
2238
raise ValueError("Unknown suffix {!r}"
2261
2239
.format(suffix))
2262
2240
except IndexError as e:
2263
2241
raise ValueError(*(e.args))
2280
2258
# Close all standard open file descriptors
2281
2259
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2282
2260
if not stat.S_ISCHR(os.fstat(null).st_mode):
2283
raise OSError(errno.ENODEV,
2284
"{0} not a character device"
2261
raise OSError(errno.ENODEV, "{} not a character device"
2285
2262
.format(os.devnull))
2286
2263
os.dup2(null, sys.stdin.fileno())
2287
2264
os.dup2(null, sys.stdout.fileno())
2297
2274
2298
2275
parser = argparse.ArgumentParser()
2299
2276
parser.add_argument("-v", "--version", action="version",
2300
version = "%(prog)s {0}".format(version),
2277
version = "%(prog)s {}".format(version),
2301
2278
help="show version number and exit")
2302
2279
parser.add_argument("-i", "--interface", metavar="IF",
2303
2280
help="Bind to interface IF")
2336
2313
help="Directory to save/restore state in")
2337
2314
parser.add_argument("--foreground", action="store_true",
2338
2315
help="Run in foreground", default=None)
2316
parser.add_argument("--no-zeroconf", action="store_false",
2317
dest="zeroconf", help="Do not use Zeroconf",
2318
default=None)
2339
2319
2340
2320
options = parser.parse_args()
2341
2321
2359
2339
"socket": "",
2360
2340
"statedir": "/var/lib/mandos",
2361
2341
"foreground": "False",
2342
"zeroconf": "True",
2362
2343
}
2363
2344
2364
2345
# Parse config file for server-global settings
2391
2372
for option in ("interface", "address", "port", "debug",
2392
2373
"priority", "servicename", "configdir",
2393
2374
"use_dbus", "use_ipv6", "debuglevel", "restore",
2394
"statedir", "socket", "foreground"):
2375
"statedir", "socket", "foreground", "zeroconf"):
2395
2376
value = getattr(options, option)
2396
2377
if value is not None:
2397
2378
server_settings[option] = value
2398
2379
del options
2399
2380
# Force all strings to be unicode
2400
2381
for option in server_settings.keys():
2401
if type(server_settings[option]) is str:
2402
server_settings[option] = unicode(server_settings[option])
2382
if isinstance(server_settings[option], bytes):
2383
server_settings[option] = (server_settings[option]
2384
.decode("utf-8"))
2403
2385
# Force all boolean options to be boolean
2404
2386
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2405
"foreground"):
2387
"foreground", "zeroconf"):
2406
2388
server_settings[option] = bool(server_settings[option])
2407
2389
# Debug implies foreground
2408
2390
if server_settings["debug"]:
2411
2393
2412
2394
##################################################################
2413
2395
2396
if (not server_settings["zeroconf"] and
2397
not (server_settings["port"]
2398
or server_settings["socket"] != "")):
2399
parser.error("Needs port or socket to work without"
2400
" Zeroconf")
2401
2414
2402
# For convenience
2415
2403
debug = server_settings["debug"]
2416
2404
debuglevel = server_settings["debuglevel"]
2419
2407
stored_state_path = os.path.join(server_settings["statedir"],
2420
2408
stored_state_file)
2421
2409
foreground = server_settings["foreground"]
2410
zeroconf = server_settings["zeroconf"]
2422
2411
2423
2412
if debug:
2424
2413
initlogger(debug, logging.DEBUG)
2431
2420
2432
2421
if server_settings["servicename"] != "Mandos":
2433
2422
syslogger.setFormatter(logging.Formatter
2434
('Mandos ({0}) [%(process)d]:'
2423
('Mandos ({}) [%(process)d]:'
2435
2424
' %(levelname)s: %(message)s'
2436
2425
.format(server_settings
2437
2426
["servicename"])))
2445
2434
global mandos_dbus_service
2446
2435
mandos_dbus_service = None
2447
2436
2437
socketfd = None
2438
if server_settings["socket"] != "":
2439
socketfd = server_settings["socket"]
2448
2440
tcp_server = MandosServer((server_settings["address"],
2449
2441
server_settings["port"]),
2450
2442
ClientHandler,
2454
2446
gnutls_priority=
2455
2447
server_settings["priority"],
2456
2448
use_dbus=use_dbus,
2457
socketfd=(server_settings["socket"]
2458
or None))
2449
socketfd=socketfd)
2459
2450
if not foreground:
2460
2451
pidfilename = "/run/mandos.pid"
2461
2452
if not os.path.isdir("/run/."):
2531
2522
use_dbus = False
2532
2523
server_settings["use_dbus"] = False
2533
2524
tcp_server.use_dbus = False
2534
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2535
service = AvahiServiceToSyslog(name =
2536
server_settings["servicename"],
2537
servicetype = "_mandos._tcp",
2538
protocol = protocol, bus = bus)
2539
if server_settings["interface"]:
2540
service.interface = (if_nametoindex
2541
(str(server_settings["interface"])))
2525
if zeroconf:
2526
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2527
service = AvahiServiceToSyslog(name =
2528
server_settings["servicename"],
2529
servicetype = "_mandos._tcp",
2530
protocol = protocol, bus = bus)
2531
if server_settings["interface"]:
2532
service.interface = (if_nametoindex
2533
(server_settings["interface"]
2534
.encode("utf-8")))
2542
2535
2543
2536
global multiprocessing_manager
2544
2537
multiprocessing_manager = multiprocessing.Manager()
2568
2561
os.remove(stored_state_path)
2569
2562
except IOError as e:
2570
2563
if e.errno == errno.ENOENT:
2571
logger.warning("Could not load persistent state: {0}"
2564
logger.warning("Could not load persistent state: {}"
2572
2565
.format(os.strerror(e.errno)))
2573
2566
else:
2574
2567
logger.critical("Could not load persistent state:",
2579
2572
"EOFError:", exc_info=e)
2580
2573
2581
2574
with PGPEngine() as pgp:
2582
for client_name, client in clients_data.iteritems():
2575
for client_name, client in clients_data.items():
2583
2576
# Skip removed clients
2584
2577
if client_name not in client_settings:
2585
2578
continue
2610
2603
if datetime.datetime.utcnow() >= client["expires"]:
2611
2604
if not client["last_checked_ok"]:
2612
2605
logger.warning(
2613
"disabling client {0} - Client never "
2606
"disabling client {} - Client never "
2614
2607
"performed a successful checker"
2615
2608
.format(client_name))
2616
2609
client["enabled"] = False
2617
2610
elif client["last_checker_status"] != 0:
2618
2611
logger.warning(
2619
"disabling client {0} - Client "
2620
"last checker failed with error code {1}"
2612
"disabling client {} - Client last"
2613
" checker failed with error code {}"
2621
2614
.format(client_name,
2622
2615
client["last_checker_status"]))
2623
2616
client["enabled"] = False
2626
2619
.utcnow()
2627
2620
+ client["timeout"])
2628
2621
logger.debug("Last checker succeeded,"
2629
" keeping {0} enabled"
2622
" keeping {} enabled"
2630
2623
.format(client_name))
2631
2624
try:
2632
2625
client["secret"] = (
2635
2628
["secret"]))
2636
2629
except PGPError:
2637
2630
# If decryption fails, we use secret from new settings
2638
logger.debug("Failed to decrypt {0} old secret"
2631
logger.debug("Failed to decrypt {} old secret"
2639
2632
.format(client_name))
2640
2633
client["secret"] = (
2641
2634
client_settings[client_name]["secret"])
2649
2642
clients_data[client_name] = client_settings[client_name]
2650
2643
2651
2644
# Create all client objects
2652
for client_name, client in clients_data.iteritems():
2645
for client_name, client in clients_data.items():
2653
2646
tcp_server.clients[client_name] = client_class(
2654
2647
name = client_name, settings = client,
2655
2648
server_settings = server_settings)
2662
2655
try:
2663
2656
with pidfile:
2664
2657
pid = os.getpid()
2665
pidfile.write(str(pid) + "\n".encode("utf-8"))
2658
pidfile.write("{}\n".format(pid).encode("utf-8"))
2666
2659
except IOError:
2667
2660
logger.error("Could not write to file %r with PID %d",
2668
2661
pidfilename, pid)
2738
2731
2739
2732
def cleanup():
2740
2733
"Cleanup function; run on exit"
2741
service.cleanup()
2734
if zeroconf:
2735
service.cleanup()
2742
2736
2743
2737
multiprocessing.active_children()
2744
2738
wnull.close()
2758
2752
2759
2753
# A list of attributes that can not be pickled
2760
2754
# + secret.
2761
exclude = set(("bus", "changedstate", "secret",
2762
"checker", "server_settings"))
2755
exclude = { "bus", "changedstate", "secret",
2756
"checker", "server_settings" }
2763
2757
for name, typ in (inspect.getmembers
2764
2758
(dbus.service.Object)):
2765
2759
exclude.add(name)
2788
2782
except NameError:
2789
2783
pass
2790
2784
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2791
logger.warning("Could not save persistent state: {0}"
2785
logger.warning("Could not save persistent state: {}"
2792
2786
.format(os.strerror(e.errno)))
2793
2787
else:
2794
2788
logger.warning("Could not save persistent state:",
2823
2817
tcp_server.server_activate()
2824
2818
2825
2819
# Find out what port we got
2826
service.port = tcp_server.socket.getsockname()[1]
2820
if zeroconf:
2821
service.port = tcp_server.socket.getsockname()[1]
2827
2822
if use_ipv6:
2828
2823
logger.info("Now listening on address %r, port %d,"
2829
2824
" flowinfo %d, scope_id %d",
2835
2830
#service.interface = tcp_server.socket.getsockname()[3]
2836
2831
2837
2832
try:
2838
# From the Avahi example code
2839
try:
2840
service.activate()
2841
except dbus.exceptions.DBusException as error:
2842
logger.critical("D-Bus Exception", exc_info=error)
2843
cleanup()
2844
sys.exit(1)
2845
# End of Avahi example code
2833
if zeroconf:
2834
# From the Avahi example code
2835
try:
2836
service.activate()
2837
except dbus.exceptions.DBusException as error:
2838
logger.critical("D-Bus Exception", exc_info=error)
2839
cleanup()
2840
sys.exit(1)
2841
# End of Avahi example code
2846
2842
2847
2843
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2848
2844
lambda *args, **kwargs:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0