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