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 738
- compare with another revision
- download diff
- download tarball
- view history from revision 738
- Committer: Teddy Hogeborn
- Date: 2014-10-08 21:07:10 UTC
- Revision ID: teddy@recompile.se-20141008210710-x0rg80z2aabdg05d
Handle local Zeroconf service name collisions.
Service name collisions from other servers have always been handled,
but not *local* name collisions from services on the same host.
* mandos (AvahiService/rename): Handle local Zeroconf service name
collision.
(AvahiServiceToSyslog.rename): Pass on any extra arguments.
Service name collisions from other servers have always been handled,
but not *local* name collisions from services on the same host.
* mandos (AvahiService/rename): Handle local Zeroconf service name
collision.
(AvahiServiceToSyslog.rename): Pass on any extra arguments.
- files modified:
- DBUS-API
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.5"
91
if sys.version_info.major == 2:
92
str = unicode
93
94
version = "1.6.9"
92
95
stored_state_file = "clients.pickle"
93
96
94
97
logger = logging.getLogger()
104
107
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
108
with contextlib.closing(socket.socket()) as s:
106
109
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
108
interface))
109
interface_index = struct.unpack(str("I"),
110
ifreq[16:20])[0]
110
struct.pack(b"16s16x", interface))
111
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
112
return interface_index
112
113
113
114
114
115
def initlogger(debug, level=logging.WARNING):
115
116
"""init logger and add loglevel"""
116
117
118
global syslogger
117
119
syslogger = (logging.handlers.SysLogHandler
118
120
(facility =
119
121
logging.handlers.SysLogHandler.LOG_DAEMON,
120
address = str("/dev/log")))
122
address = "/dev/log"))
121
123
syslogger.setFormatter(logging.Formatter
122
124
('Mandos [%(process)d]: %(levelname)s:'
123
125
' %(message)s'))
223
225
class AvahiError(Exception):
224
226
def __init__(self, value, *args, **kwargs):
225
227
self.value = value
226
super(AvahiError, self).__init__(value, *args, **kwargs)
227
def __unicode__(self):
228
return unicode(repr(self.value))
228
return super(AvahiError, self).__init__(value, *args,
229
**kwargs)
229
230
230
231
class AvahiServiceError(AvahiError):
231
232
pass
274
275
self.bus = bus
275
276
self.entry_group_state_changed_match = None
276
277
277
def rename(self):
278
def rename(self, remove=True):
278
279
"""Derived from the Avahi example code"""
279
280
if self.rename_count >= self.max_renames:
280
281
logger.critical("No suitable Zeroconf service name found"
281
282
" after %i retries, exiting.",
282
283
self.rename_count)
283
284
raise AvahiServiceError("Too many renames")
284
self.name = unicode(self.server
285
.GetAlternativeServiceName(self.name))
285
self.name = str(self.server
286
.GetAlternativeServiceName(self.name))
287
self.rename_count += 1
286
288
logger.info("Changing Zeroconf service name to %r ...",
287
289
self.name)
288
self.remove()
290
if remove:
291
self.remove()
289
292
try:
290
293
self.add()
291
294
except dbus.exceptions.DBusException as error:
292
logger.critical("D-Bus Exception", exc_info=error)
293
self.cleanup()
294
os._exit(1)
295
self.rename_count += 1
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)
299
else:
300
logger.critical("D-Bus Exception", exc_info=error)
301
self.cleanup()
302
os._exit(1)
296
303
297
304
def remove(self):
298
305
"""Derived from the Avahi example code"""
336
343
self.rename()
337
344
elif state == avahi.ENTRY_GROUP_FAILURE:
338
345
logger.critical("Avahi: Error in group state changed %s",
339
unicode(error))
340
raise AvahiGroupError("State changed: {0!s}"
346
str(error))
347
raise AvahiGroupError("State changed: {!s}"
341
348
.format(error))
342
349
343
350
def cleanup(self):
390
397
391
398
392
399
class AvahiServiceToSyslog(AvahiService):
393
def rename(self):
400
def rename(self, *args, **kwargs):
394
401
"""Add the new name to the syslog messages"""
395
ret = AvahiService.rename(self)
402
ret = AvahiService.rename(self, *args, **kwargs)
396
403
syslogger.setFormatter(logging.Formatter
397
('Mandos ({0}) [%(process)d]:'
404
('Mandos ({}) [%(process)d]:'
398
405
' %(levelname)s: %(message)s'
399
406
.format(self.name)))
400
407
return ret
401
408
402
409
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
410
class Client(object):
411
411
"""A representation of a client host served by this server.
412
412
467
467
"enabled": "True",
468
468
}
469
469
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
470
@staticmethod
486
471
def config_parser(config):
487
472
"""Construct a new dict of client settings of this form:
512
497
"rb") as secfile:
513
498
client["secret"] = secfile.read()
514
499
else:
515
raise TypeError("No secret or secfile for section {0}"
500
raise TypeError("No secret or secfile for section {}"
516
501
.format(section))
517
502
client["timeout"] = string_to_delta(section["timeout"])
518
503
client["extended_timeout"] = string_to_delta(
535
520
server_settings = {}
536
521
self.server_settings = server_settings
537
522
# adding all client settings
538
for setting, value in settings.iteritems():
523
for setting, value in settings.items():
539
524
setattr(self, setting, value)
540
525
541
526
if self.enabled:
624
609
if self.checker_initiator_tag is not None:
625
610
gobject.source_remove(self.checker_initiator_tag)
626
611
self.checker_initiator_tag = (gobject.timeout_add
627
(self.interval_milliseconds(),
612
(int(self.interval
613
.total_seconds() * 1000),
628
614
self.start_checker))
629
615
# Schedule a disable() when 'timeout' has passed
630
616
if self.disable_initiator_tag is not None:
631
617
gobject.source_remove(self.disable_initiator_tag)
632
618
self.disable_initiator_tag = (gobject.timeout_add
633
(self.timeout_milliseconds(),
634
self.disable))
619
(int(self.timeout
620
.total_seconds() * 1000),
621
self.disable))
635
622
# Also start a new checker *right now*.
636
623
self.start_checker()
637
624
668
655
self.disable_initiator_tag = None
669
656
if getattr(self, "enabled", False):
670
657
self.disable_initiator_tag = (gobject.timeout_add
671
(timedelta_to_milliseconds
672
(timeout), self.disable))
658
(int(timeout.total_seconds()
659
* 1000), self.disable))
673
660
self.expires = datetime.datetime.utcnow() + timeout
674
661
675
662
def need_approval(self):
706
693
# Start a new checker if needed
707
694
if self.checker is None:
708
695
# 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)
696
escaped_attrs = { attr:
697
re.escape(str(getattr(self, attr)))
698
for attr in self.runtime_expansions }
713
699
try:
714
700
command = self.checker_command % escaped_attrs
715
701
except TypeError as error:
796
782
# "Set" method, so we fail early here:
797
783
if byte_arrays and signature != "ay":
798
784
raise ValueError("Byte arrays not supported for non-'ay'"
799
" signature {0!r}".format(signature))
785
" signature {!r}".format(signature))
800
786
def decorator(func):
801
787
func._dbus_is_property = True
802
788
func._dbus_interface = dbus_interface
833
819
"""Decorator to annotate D-Bus methods, signals or properties
834
820
Usage:
835
821
822
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
823
"org.freedesktop.DBus.Property."
824
"EmitsChangedSignal": "false"})
836
825
@dbus_service_property("org.example.Interface", signature="b",
837
826
access="r")
838
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
841
827
def Property_dbus_property(self):
842
828
return dbus.Boolean(False)
843
829
"""
850
836
class DBusPropertyException(dbus.exceptions.DBusException):
851
837
"""A base class for D-Bus property-related exceptions
852
838
"""
853
def __unicode__(self):
854
return unicode(str(self))
855
839
pass
856
840
857
841
class DBusPropertyAccessException(DBusPropertyException):
858
842
"""A property's access permissions disallows an operation.
881
865
If called like _is_dbus_thing("method") it returns a function
882
866
suitable for use as predicate to inspect.getmembers().
883
867
"""
884
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
868
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
885
869
False)
886
870
887
871
def _get_all_dbus_things(self, thing):
937
921
# signatures other than "ay".
938
922
if prop._dbus_signature != "ay":
939
923
raise ValueError("Byte arrays not supported for non-"
940
"'ay' signature {0!r}"
924
"'ay' signature {!r}"
941
925
.format(prop._dbus_signature))
942
926
value = dbus.ByteArray(b''.join(chr(byte)
943
927
for byte in value))
968
952
value.variant_level+1)
969
953
return dbus.Dictionary(properties, signature="sv")
970
954
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
959
standard.
960
"""
961
pass
962
971
963
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
972
964
out_signature="s",
973
965
path_keyword='object_path',
1008
1000
(prop,
1009
1001
"_dbus_annotations",
1010
1002
{}))
1011
for name, value in annots.iteritems():
1003
for name, value in annots.items():
1012
1004
ann_tag = document.createElement(
1013
1005
"annotation")
1014
1006
ann_tag.setAttribute("name", name)
1017
1009
# Add interface annotation tags
1018
1010
for annotation, value in dict(
1019
1011
itertools.chain.from_iterable(
1020
annotations().iteritems()
1012
annotations().items()
1021
1013
for name, annotations in
1022
1014
self._get_all_dbus_things("interface")
1023
1015
if name == if_tag.getAttribute("name")
1024
)).iteritems():
1016
)).items():
1025
1017
ann_tag = document.createElement("annotation")
1026
1018
ann_tag.setAttribute("name", annotation)
1027
1019
ann_tag.setAttribute("value", value)
1083
1075
"""
1084
1076
def wrapper(cls):
1085
1077
for orig_interface_name, alt_interface_name in (
1086
alt_interface_names.iteritems()):
1078
alt_interface_names.items()):
1087
1079
attr = {}
1088
1080
interface_names = set()
1089
1081
# Go though all attributes of the class
1206
1198
attribute.func_closure)))
1207
1199
if deprecate:
1208
1200
# Deprecate all alternate interfaces
1209
iname="_AlternateDBusNames_interface_annotation{0}"
1201
iname="_AlternateDBusNames_interface_annotation{}"
1210
1202
for interface_name in interface_names:
1211
1203
@dbus_interface_annotations(interface_name)
1212
1204
def func(self):
1221
1213
if interface_names:
1222
1214
# Replace the class with a new subclass of it with
1223
1215
# methods, signals, etc. as created above.
1224
cls = type(b"{0}Alternate".format(cls.__name__),
1216
cls = type(b"{}Alternate".format(cls.__name__),
1225
1217
(cls,), attr)
1226
1218
return cls
1227
1219
return wrapper
1240
1232
runtime_expansions = (Client.runtime_expansions
1241
1233
+ ("dbus_object_path",))
1242
1234
1235
_interface = "se.recompile.Mandos.Client"
1236
1243
1237
# dbus.service.Object doesn't use super(), so we can't either.
1244
1238
1245
1239
def __init__(self, bus = None, *args, **kwargs):
1247
1241
Client.__init__(self, *args, **kwargs)
1248
1242
# Only now, when this client is initialized, can it show up on
1249
1243
# the D-Bus
1250
client_object_name = unicode(self.name).translate(
1244
client_object_name = str(self.name).translate(
1251
1245
{ord("."): ord("_"),
1252
1246
ord("-"): ord("_")})
1253
1247
self.dbus_object_path = (dbus.ObjectPath
1257
1251
1258
1252
def notifychangeproperty(transform_func,
1259
1253
dbus_name, type_func=lambda x: x,
1260
variant_level=1):
1254
variant_level=1, invalidate_only=False,
1255
_interface=_interface):
1261
1256
""" Modify a variable so that it's a property which announces
1262
1257
its changes to DBus.
1263
1258
1268
1263
to the D-Bus. Default: no transform
1269
1264
variant_level: D-Bus variant level. Default: 1
1270
1265
"""
1271
attrname = "_{0}".format(dbus_name)
1266
attrname = "_{}".format(dbus_name)
1272
1267
def setter(self, value):
1273
1268
if hasattr(self, "dbus_object_path"):
1274
1269
if (not hasattr(self, attrname) or
1275
1270
type_func(getattr(self, attrname, None))
1276
1271
!= type_func(value)):
1277
dbus_value = transform_func(type_func(value),
1278
variant_level
1279
=variant_level)
1280
self.PropertyChanged(dbus.String(dbus_name),
1281
dbus_value)
1272
if invalidate_only:
1273
self.PropertiesChanged(_interface,
1274
dbus.Dictionary(),
1275
dbus.Array
1276
((dbus_name,)))
1277
else:
1278
dbus_value = transform_func(type_func(value),
1279
variant_level
1280
=variant_level)
1281
self.PropertyChanged(dbus.String(dbus_name),
1282
dbus_value)
1283
self.PropertiesChanged(_interface,
1284
dbus.Dictionary({
1285
dbus.String(dbus_name):
1286
dbus_value }), dbus.Array())
1282
1287
setattr(self, attrname, value)
1283
1288
1284
1289
return property(lambda self: getattr(self, attrname), setter)
1304
1309
approval_delay = notifychangeproperty(dbus.UInt64,
1305
1310
"ApprovalDelay",
1306
1311
type_func =
1307
timedelta_to_milliseconds)
1312
lambda td: td.total_seconds()
1313
* 1000)
1308
1314
approval_duration = notifychangeproperty(
1309
1315
dbus.UInt64, "ApprovalDuration",
1310
type_func = timedelta_to_milliseconds)
1316
type_func = lambda td: td.total_seconds() * 1000)
1311
1317
host = notifychangeproperty(dbus.String, "Host")
1312
1318
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1313
type_func =
1314
timedelta_to_milliseconds)
1319
type_func = lambda td:
1320
td.total_seconds() * 1000)
1315
1321
extended_timeout = notifychangeproperty(
1316
1322
dbus.UInt64, "ExtendedTimeout",
1317
type_func = timedelta_to_milliseconds)
1323
type_func = lambda td: td.total_seconds() * 1000)
1318
1324
interval = notifychangeproperty(dbus.UInt64,
1319
1325
"Interval",
1320
1326
type_func =
1321
timedelta_to_milliseconds)
1327
lambda td: td.total_seconds()
1328
* 1000)
1322
1329
checker_command = notifychangeproperty(dbus.String, "Checker")
1330
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1331
invalidate_only=True)
1323
1332
1324
1333
del notifychangeproperty
1325
1334
1367
1376
1368
1377
def approve(self, value=True):
1369
1378
self.approved = value
1370
gobject.timeout_add(timedelta_to_milliseconds
1371
(self.approval_duration),
1372
self._reset_approved)
1379
gobject.timeout_add(int(self.approval_duration.total_seconds()
1380
* 1000), self._reset_approved)
1373
1381
self.send_changedstate()
1374
1382
1375
1383
## D-Bus methods, signals & properties
1376
_interface = "se.recompile.Mandos.Client"
1377
1384
1378
1385
## Interfaces
1379
1386
1380
@dbus_interface_annotations(_interface)
1381
def _foo(self):
1382
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1383
"false"}
1384
1385
1387
## Signals
1386
1388
1387
1389
# CheckerCompleted - signal
1397
1399
pass
1398
1400
1399
1401
# PropertyChanged - signal
1402
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1400
1403
@dbus.service.signal(_interface, signature="sv")
1401
1404
def PropertyChanged(self, property, value):
1402
1405
"D-Bus signal"
1478
1481
access="readwrite")
1479
1482
def ApprovalDelay_dbus_property(self, value=None):
1480
1483
if value is None: # get
1481
return dbus.UInt64(self.approval_delay_milliseconds())
1484
return dbus.UInt64(self.approval_delay.total_seconds()
1485
* 1000)
1482
1486
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1483
1487
1484
1488
# ApprovalDuration - property
1486
1490
access="readwrite")
1487
1491
def ApprovalDuration_dbus_property(self, value=None):
1488
1492
if value is None: # get
1489
return dbus.UInt64(timedelta_to_milliseconds(
1490
self.approval_duration))
1493
return dbus.UInt64(self.approval_duration.total_seconds()
1494
* 1000)
1491
1495
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1492
1496
1493
1497
# Name - property
1506
1510
def Host_dbus_property(self, value=None):
1507
1511
if value is None: # get
1508
1512
return dbus.String(self.host)
1509
self.host = unicode(value)
1513
self.host = str(value)
1510
1514
1511
1515
# Created - property
1512
1516
@dbus_service_property(_interface, signature="s", access="read")
1559
1563
access="readwrite")
1560
1564
def Timeout_dbus_property(self, value=None):
1561
1565
if value is None: # get
1562
return dbus.UInt64(self.timeout_milliseconds())
1566
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1563
1567
old_timeout = self.timeout
1564
1568
self.timeout = datetime.timedelta(0, 0, 0, value)
1565
1569
# Reschedule disabling
1576
1580
gobject.source_remove(self.disable_initiator_tag)
1577
1581
self.disable_initiator_tag = (
1578
1582
gobject.timeout_add(
1579
timedelta_to_milliseconds(self.expires - now),
1580
self.disable))
1583
int((self.expires - now).total_seconds()
1584
* 1000), self.disable))
1581
1585
1582
1586
# ExtendedTimeout - property
1583
1587
@dbus_service_property(_interface, signature="t",
1584
1588
access="readwrite")
1585
1589
def ExtendedTimeout_dbus_property(self, value=None):
1586
1590
if value is None: # get
1587
return dbus.UInt64(self.extended_timeout_milliseconds())
1591
return dbus.UInt64(self.extended_timeout.total_seconds()
1592
* 1000)
1588
1593
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1589
1594
1590
1595
# Interval - property
1592
1597
access="readwrite")
1593
1598
def Interval_dbus_property(self, value=None):
1594
1599
if value is None: # get
1595
return dbus.UInt64(self.interval_milliseconds())
1600
return dbus.UInt64(self.interval.total_seconds() * 1000)
1596
1601
self.interval = datetime.timedelta(0, 0, 0, value)
1597
1602
if getattr(self, "checker_initiator_tag", None) is None:
1598
1603
return
1609
1614
def Checker_dbus_property(self, value=None):
1610
1615
if value is None: # get
1611
1616
return dbus.String(self.checker_command)
1612
self.checker_command = unicode(value)
1617
self.checker_command = str(value)
1613
1618
1614
1619
# CheckerRunning - property
1615
1620
@dbus_service_property(_interface, signature="b",
1631
1636
@dbus_service_property(_interface, signature="ay",
1632
1637
access="write", byte_arrays=True)
1633
1638
def Secret_dbus_property(self, value):
1634
self.secret = str(value)
1639
self.secret = bytes(value)
1635
1640
1636
1641
del _interface
1637
1642
1671
1676
def handle(self):
1672
1677
with contextlib.closing(self.server.child_pipe) as child_pipe:
1673
1678
logger.info("TCP connection from: %s",
1674
unicode(self.client_address))
1679
str(self.client_address))
1675
1680
logger.debug("Pipe FD: %d",
1676
1681
self.server.child_pipe.fileno())
1677
1682
1758
1763
if self.server.use_dbus:
1759
1764
# Emit D-Bus signal
1760
1765
client.NeedApproval(
1761
client.approval_delay_milliseconds(),
1762
client.approved_by_default)
1766
client.approval_delay.total_seconds()
1767
* 1000, client.approved_by_default)
1763
1768
else:
1764
1769
logger.warning("Client %s was not approved",
1765
1770
client.name)
1771
1776
#wait until timeout or approved
1772
1777
time = datetime.datetime.now()
1773
1778
client.changedstate.acquire()
1774
client.changedstate.wait(
1775
float(timedelta_to_milliseconds(delay)
1776
/ 1000))
1779
client.changedstate.wait(delay.total_seconds())
1777
1780
client.changedstate.release()
1778
1781
time2 = datetime.datetime.now()
1779
1782
if (time2 - time) >= delay:
1978
1981
try:
1979
1982
self.socket.setsockopt(socket.SOL_SOCKET,
1980
1983
SO_BINDTODEVICE,
1981
str(self.interface + '\0'))
1984
(self.interface + "\0")
1985
.encode("utf-8"))
1982
1986
except socket.error as error:
1983
1987
if error.errno == errno.EPERM:
1984
1988
logger.error("No permission to bind to"
2187
2191
token_duration = Token(re.compile(r"P"), None,
2188
2192
frozenset((token_year, token_month,
2189
2193
token_day, token_time,
2190
token_week))),
2194
token_week)))
2191
2195
# Define starting values
2192
2196
value = datetime.timedelta() # Value so far
2193
2197
found_token = None
2194
followers = frozenset(token_duration,) # Following valid tokens
2198
followers = frozenset((token_duration,)) # Following valid tokens
2195
2199
s = duration # String left to parse
2196
2200
# Loop until end token is found
2197
2201
while found_token is not token_end:
2244
2248
timevalue = datetime.timedelta(0)
2245
2249
for s in interval.split():
2246
2250
try:
2247
suffix = unicode(s[-1])
2251
suffix = s[-1]
2248
2252
value = int(s[:-1])
2249
2253
if suffix == "d":
2250
2254
delta = datetime.timedelta(value)
2257
2261
elif suffix == "w":
2258
2262
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2259
2263
else:
2260
raise ValueError("Unknown suffix {0!r}"
2264
raise ValueError("Unknown suffix {!r}"
2261
2265
.format(suffix))
2262
2266
except IndexError as e:
2263
2267
raise ValueError(*(e.args))
2280
2284
# Close all standard open file descriptors
2281
2285
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2282
2286
if not stat.S_ISCHR(os.fstat(null).st_mode):
2283
raise OSError(errno.ENODEV,
2284
"{0} not a character device"
2287
raise OSError(errno.ENODEV, "{} not a character device"
2285
2288
.format(os.devnull))
2286
2289
os.dup2(null, sys.stdin.fileno())
2287
2290
os.dup2(null, sys.stdout.fileno())
2297
2300
2298
2301
parser = argparse.ArgumentParser()
2299
2302
parser.add_argument("-v", "--version", action="version",
2300
version = "%(prog)s {0}".format(version),
2303
version = "%(prog)s {}".format(version),
2301
2304
help="show version number and exit")
2302
2305
parser.add_argument("-i", "--interface", metavar="IF",
2303
2306
help="Bind to interface IF")
2336
2339
help="Directory to save/restore state in")
2337
2340
parser.add_argument("--foreground", action="store_true",
2338
2341
help="Run in foreground", default=None)
2342
parser.add_argument("--no-zeroconf", action="store_false",
2343
dest="zeroconf", help="Do not use Zeroconf",
2344
default=None)
2339
2345
2340
2346
options = parser.parse_args()
2341
2347
2359
2365
"socket": "",
2360
2366
"statedir": "/var/lib/mandos",
2361
2367
"foreground": "False",
2368
"zeroconf": "True",
2362
2369
}
2363
2370
2364
2371
# Parse config file for server-global settings
2391
2398
for option in ("interface", "address", "port", "debug",
2392
2399
"priority", "servicename", "configdir",
2393
2400
"use_dbus", "use_ipv6", "debuglevel", "restore",
2394
"statedir", "socket", "foreground"):
2401
"statedir", "socket", "foreground", "zeroconf"):
2395
2402
value = getattr(options, option)
2396
2403
if value is not None:
2397
2404
server_settings[option] = value
2398
2405
del options
2399
2406
# Force all strings to be unicode
2400
2407
for option in server_settings.keys():
2401
if type(server_settings[option]) is str:
2402
server_settings[option] = unicode(server_settings[option])
2408
if isinstance(server_settings[option], bytes):
2409
server_settings[option] = (server_settings[option]
2410
.decode("utf-8"))
2403
2411
# Force all boolean options to be boolean
2404
2412
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2405
"foreground"):
2413
"foreground", "zeroconf"):
2406
2414
server_settings[option] = bool(server_settings[option])
2407
2415
# Debug implies foreground
2408
2416
if server_settings["debug"]:
2411
2419
2412
2420
##################################################################
2413
2421
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"
2426
" Zeroconf")
2427
2414
2428
# For convenience
2415
2429
debug = server_settings["debug"]
2416
2430
debuglevel = server_settings["debuglevel"]
2419
2433
stored_state_path = os.path.join(server_settings["statedir"],
2420
2434
stored_state_file)
2421
2435
foreground = server_settings["foreground"]
2436
zeroconf = server_settings["zeroconf"]
2422
2437
2423
2438
if debug:
2424
2439
initlogger(debug, logging.DEBUG)
2431
2446
2432
2447
if server_settings["servicename"] != "Mandos":
2433
2448
syslogger.setFormatter(logging.Formatter
2434
('Mandos ({0}) [%(process)d]:'
2449
('Mandos ({}) [%(process)d]:'
2435
2450
' %(levelname)s: %(message)s'
2436
2451
.format(server_settings
2437
2452
["servicename"])))
2445
2460
global mandos_dbus_service
2446
2461
mandos_dbus_service = None
2447
2462
2463
socketfd = None
2464
if server_settings["socket"] != "":
2465
socketfd = server_settings["socket"]
2448
2466
tcp_server = MandosServer((server_settings["address"],
2449
2467
server_settings["port"]),
2450
2468
ClientHandler,
2454
2472
gnutls_priority=
2455
2473
server_settings["priority"],
2456
2474
use_dbus=use_dbus,
2457
socketfd=(server_settings["socket"]
2458
or None))
2475
socketfd=socketfd)
2459
2476
if not foreground:
2460
2477
pidfilename = "/run/mandos.pid"
2461
2478
if not os.path.isdir("/run/."):
2531
2548
use_dbus = False
2532
2549
server_settings["use_dbus"] = False
2533
2550
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"])))
2551
if zeroconf:
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"]
2560
.encode("utf-8")))
2542
2561
2543
2562
global multiprocessing_manager
2544
2563
multiprocessing_manager = multiprocessing.Manager()
2568
2587
os.remove(stored_state_path)
2569
2588
except IOError as e:
2570
2589
if e.errno == errno.ENOENT:
2571
logger.warning("Could not load persistent state: {0}"
2590
logger.warning("Could not load persistent state: {}"
2572
2591
.format(os.strerror(e.errno)))
2573
2592
else:
2574
2593
logger.critical("Could not load persistent state:",
2579
2598
"EOFError:", exc_info=e)
2580
2599
2581
2600
with PGPEngine() as pgp:
2582
for client_name, client in clients_data.iteritems():
2601
for client_name, client in clients_data.items():
2583
2602
# Skip removed clients
2584
2603
if client_name not in client_settings:
2585
2604
continue
2610
2629
if datetime.datetime.utcnow() >= client["expires"]:
2611
2630
if not client["last_checked_ok"]:
2612
2631
logger.warning(
2613
"disabling client {0} - Client never "
2632
"disabling client {} - Client never "
2614
2633
"performed a successful checker"
2615
2634
.format(client_name))
2616
2635
client["enabled"] = False
2617
2636
elif client["last_checker_status"] != 0:
2618
2637
logger.warning(
2619
"disabling client {0} - Client "
2620
"last checker failed with error code {1}"
2638
"disabling client {} - Client last"
2639
" checker failed with error code {}"
2621
2640
.format(client_name,
2622
2641
client["last_checker_status"]))
2623
2642
client["enabled"] = False
2626
2645
.utcnow()
2627
2646
+ client["timeout"])
2628
2647
logger.debug("Last checker succeeded,"
2629
" keeping {0} enabled"
2648
" keeping {} enabled"
2630
2649
.format(client_name))
2631
2650
try:
2632
2651
client["secret"] = (
2635
2654
["secret"]))
2636
2655
except PGPError:
2637
2656
# If decryption fails, we use secret from new settings
2638
logger.debug("Failed to decrypt {0} old secret"
2657
logger.debug("Failed to decrypt {} old secret"
2639
2658
.format(client_name))
2640
2659
client["secret"] = (
2641
2660
client_settings[client_name]["secret"])
2649
2668
clients_data[client_name] = client_settings[client_name]
2650
2669
2651
2670
# Create all client objects
2652
for client_name, client in clients_data.iteritems():
2671
for client_name, client in clients_data.items():
2653
2672
tcp_server.clients[client_name] = client_class(
2654
2673
name = client_name, settings = client,
2655
2674
server_settings = server_settings)
2662
2681
try:
2663
2682
with pidfile:
2664
2683
pid = os.getpid()
2665
pidfile.write(str(pid) + "\n".encode("utf-8"))
2684
pidfile.write("{}\n".format(pid).encode("utf-8"))
2666
2685
except IOError:
2667
2686
logger.error("Could not write to file %r with PID %d",
2668
2687
pidfilename, pid)
2714
2733
def GetAllClientsWithProperties(self):
2715
2734
"D-Bus method"
2716
2735
return dbus.Dictionary(
2717
((c.dbus_object_path, c.GetAll(""))
2718
for c in tcp_server.clients.itervalues()),
2736
{ c.dbus_object_path: c.GetAll("")
2737
for c in tcp_server.clients.itervalues() },
2719
2738
signature="oa{sv}")
2720
2739
2721
2740
@dbus.service.method(_interface, in_signature="o")
2738
2757
2739
2758
def cleanup():
2740
2759
"Cleanup function; run on exit"
2741
service.cleanup()
2760
if zeroconf:
2761
service.cleanup()
2742
2762
2743
2763
multiprocessing.active_children()
2744
2764
wnull.close()
2758
2778
2759
2779
# A list of attributes that can not be pickled
2760
2780
# + secret.
2761
exclude = set(("bus", "changedstate", "secret",
2762
"checker", "server_settings"))
2781
exclude = { "bus", "changedstate", "secret",
2782
"checker", "server_settings" }
2763
2783
for name, typ in (inspect.getmembers
2764
2784
(dbus.service.Object)):
2765
2785
exclude.add(name)
2788
2808
except NameError:
2789
2809
pass
2790
2810
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2791
logger.warning("Could not save persistent state: {0}"
2811
logger.warning("Could not save persistent state: {}"
2792
2812
.format(os.strerror(e.errno)))
2793
2813
else:
2794
2814
logger.warning("Could not save persistent state:",
2823
2843
tcp_server.server_activate()
2824
2844
2825
2845
# Find out what port we got
2826
service.port = tcp_server.socket.getsockname()[1]
2846
if zeroconf:
2847
service.port = tcp_server.socket.getsockname()[1]
2827
2848
if use_ipv6:
2828
2849
logger.info("Now listening on address %r, port %d,"
2829
2850
" flowinfo %d, scope_id %d",
2835
2856
#service.interface = tcp_server.socket.getsockname()[3]
2836
2857
2837
2858
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
2859
if zeroconf:
2860
# From the Avahi example code
2861
try:
2862
service.activate()
2863
except dbus.exceptions.DBusException as error:
2864
logger.critical("D-Bus Exception", exc_info=error)
2865
cleanup()
2866
sys.exit(1)
2867
# End of Avahi example code
2846
2868
2847
2869
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2848
2870
lambda *args, **kwargs:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0