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