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 636
- compare with another revision
- download diff
- download tarball
- view history from revision 636
- Committer: Teddy Hogeborn
- Date: 2013-10-26 19:05:21 UTC
- Revision ID: teddy@recompile.se-20131026190521-giagilisbyciox2h
Fall back to /var/run for pidfile if /run is not a directory.
This is for old (possibly non-Debian) systems which have not migrated
from /var/run to /run yet.
* init.d-mandos (PIDFILE): Fall back to /var/run/mandos.pid if /run is
not a directory.
* mandos (pidfilename): - '' -
* mandos.xml (FILES): Document fallback to /var/run/mandos.pid if /run
is not a directory.
Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>
This is for old (possibly non-Debian) systems which have not migrated
from /var/run to /run yet.
* init.d-mandos (PIDFILE): Fall back to /var/run/mandos.pid if /run is
not a directory.
* mandos (pidfilename): - '' -
* mandos.xml (FILES): Document fallback to /var/run/mandos.pid if /run
is not a directory.
Reported-by: Nathanael D. Noblet <nathanael@gnat.ca>
Suggested-by: Nathanael D. Noblet <nathanael@gnat.ca>
- 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.
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2014 Teddy Hogeborn
15
# Copyright © 2008-2014 Björn Påhlsson
14
# Copyright © 2008-2013 Teddy Hogeborn
15
# Copyright © 2008-2013 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
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.2"
95
92
stored_state_file = "clients.pickle"
96
93
97
94
logger = logging.getLogger()
98
syslogger = None
95
syslogger = (logging.handlers.SysLogHandler
96
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
97
address = str("/dev/log")))
99
98
100
99
try:
101
100
if_nametoindex = (ctypes.cdll.LoadLibrary
107
106
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
108
107
with contextlib.closing(socket.socket()) as s:
109
108
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
struct.pack(b"16s16x", interface))
111
interface_index = struct.unpack("I", ifreq[16:20])[0]
109
struct.pack(str("16s16x"),
110
interface))
111
interface_index = struct.unpack(str("I"),
112
ifreq[16:20])[0]
112
113
return interface_index
113
114
114
115
115
116
def initlogger(debug, level=logging.WARNING):
116
117
"""init logger and add loglevel"""
117
118
118
global syslogger
119
syslogger = (logging.handlers.SysLogHandler
120
(facility =
121
logging.handlers.SysLogHandler.LOG_DAEMON,
122
address = "/dev/log"))
123
119
syslogger.setFormatter(logging.Formatter
124
120
('Mandos [%(process)d]: %(levelname)s:'
125
121
' %(message)s'))
225
221
class AvahiError(Exception):
226
222
def __init__(self, value, *args, **kwargs):
227
223
self.value = value
228
return super(AvahiError, self).__init__(value, *args,
229
**kwargs)
224
super(AvahiError, self).__init__(value, *args, **kwargs)
225
def __unicode__(self):
226
return unicode(repr(self.value))
230
227
231
228
class AvahiServiceError(AvahiError):
232
229
pass
275
272
self.bus = bus
276
273
self.entry_group_state_changed_match = None
277
274
278
def rename(self, remove=True):
275
def rename(self):
279
276
"""Derived from the Avahi example code"""
280
277
if self.rename_count >= self.max_renames:
281
278
logger.critical("No suitable Zeroconf service name found"
282
279
" after %i retries, exiting.",
283
280
self.rename_count)
284
281
raise AvahiServiceError("Too many renames")
285
self.name = str(self.server
286
.GetAlternativeServiceName(self.name))
287
self.rename_count += 1
282
self.name = unicode(self.server
283
.GetAlternativeServiceName(self.name))
288
284
logger.info("Changing Zeroconf service name to %r ...",
289
285
self.name)
290
if remove:
291
self.remove()
286
self.remove()
292
287
try:
293
288
self.add()
294
289
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)
290
logger.critical("D-Bus Exception", exc_info=error)
291
self.cleanup()
292
os._exit(1)
293
self.rename_count += 1
303
294
304
295
def remove(self):
305
296
"""Derived from the Avahi example code"""
343
334
self.rename()
344
335
elif state == avahi.ENTRY_GROUP_FAILURE:
345
336
logger.critical("Avahi: Error in group state changed %s",
346
str(error))
347
raise AvahiGroupError("State changed: {!s}"
337
unicode(error))
338
raise AvahiGroupError("State changed: {0!s}"
348
339
.format(error))
349
340
350
341
def cleanup(self):
397
388
398
389
399
390
class AvahiServiceToSyslog(AvahiService):
400
def rename(self, *args, **kwargs):
391
def rename(self):
401
392
"""Add the new name to the syslog messages"""
402
ret = AvahiService.rename(self, *args, **kwargs)
393
ret = AvahiService.rename(self)
403
394
syslogger.setFormatter(logging.Formatter
404
('Mandos ({}) [%(process)d]:'
395
('Mandos ({0}) [%(process)d]:'
405
396
' %(levelname)s: %(message)s'
406
397
.format(self.name)))
407
398
return ret
408
399
409
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
410
408
class Client(object):
411
409
"""A representation of a client host served by this server.
412
410
467
465
"enabled": "True",
468
466
}
469
467
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
470
483
@staticmethod
471
484
def config_parser(config):
472
485
"""Construct a new dict of client settings of this form:
497
510
"rb") as secfile:
498
511
client["secret"] = secfile.read()
499
512
else:
500
raise TypeError("No secret or secfile for section {}"
513
raise TypeError("No secret or secfile for section {0}"
501
514
.format(section))
502
515
client["timeout"] = string_to_delta(section["timeout"])
503
516
client["extended_timeout"] = string_to_delta(
520
533
server_settings = {}
521
534
self.server_settings = server_settings
522
535
# adding all client settings
523
for setting, value in settings.items():
536
for setting, value in settings.iteritems():
524
537
setattr(self, setting, value)
525
538
526
539
if self.enabled:
609
622
if self.checker_initiator_tag is not None:
610
623
gobject.source_remove(self.checker_initiator_tag)
611
624
self.checker_initiator_tag = (gobject.timeout_add
612
(int(self.interval
613
.total_seconds() * 1000),
625
(self.interval_milliseconds(),
614
626
self.start_checker))
615
627
# Schedule a disable() when 'timeout' has passed
616
628
if self.disable_initiator_tag is not None:
617
629
gobject.source_remove(self.disable_initiator_tag)
618
630
self.disable_initiator_tag = (gobject.timeout_add
619
(int(self.timeout
620
.total_seconds() * 1000),
621
self.disable))
631
(self.timeout_milliseconds(),
632
self.disable))
622
633
# Also start a new checker *right now*.
623
634
self.start_checker()
624
635
655
666
self.disable_initiator_tag = None
656
667
if getattr(self, "enabled", False):
657
668
self.disable_initiator_tag = (gobject.timeout_add
658
(int(timeout.total_seconds()
659
* 1000), self.disable))
669
(timedelta_to_milliseconds
670
(timeout), self.disable))
660
671
self.expires = datetime.datetime.utcnow() + timeout
661
672
662
673
def need_approval(self):
679
690
# If a checker exists, make sure it is not a zombie
680
691
try:
681
692
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
682
except AttributeError:
683
pass
684
except OSError as error:
685
if error.errno != errno.ECHILD:
686
raise
693
except (AttributeError, OSError) as error:
694
if (isinstance(error, OSError)
695
and error.errno != errno.ECHILD):
696
raise error
687
697
else:
688
698
if pid:
689
699
logger.warning("Checker was a zombie")
693
703
# Start a new checker if needed
694
704
if self.checker is None:
695
705
# Escape attributes for the shell
696
escaped_attrs = { attr:
697
re.escape(str(getattr(self, attr)))
698
for attr in self.runtime_expansions }
706
escaped_attrs = dict(
707
(attr, re.escape(unicode(getattr(self, attr))))
708
for attr in
709
self.runtime_expansions)
699
710
try:
700
711
command = self.checker_command % escaped_attrs
701
712
except TypeError as error:
782
793
# "Set" method, so we fail early here:
783
794
if byte_arrays and signature != "ay":
784
795
raise ValueError("Byte arrays not supported for non-'ay'"
785
" signature {!r}".format(signature))
796
" signature {0!r}".format(signature))
786
797
def decorator(func):
787
798
func._dbus_is_property = True
788
799
func._dbus_interface = dbus_interface
819
830
"""Decorator to annotate D-Bus methods, signals or properties
820
831
Usage:
821
832
822
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
823
"org.freedesktop.DBus.Property."
824
"EmitsChangedSignal": "false"})
825
833
@dbus_service_property("org.example.Interface", signature="b",
826
834
access="r")
835
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
836
"org.freedesktop.DBus.Property."
837
"EmitsChangedSignal": "false"})
827
838
def Property_dbus_property(self):
828
839
return dbus.Boolean(False)
829
840
"""
836
847
class DBusPropertyException(dbus.exceptions.DBusException):
837
848
"""A base class for D-Bus property-related exceptions
838
849
"""
839
pass
850
def __unicode__(self):
851
return unicode(str(self))
852
840
853
841
854
class DBusPropertyAccessException(DBusPropertyException):
842
855
"""A property's access permissions disallows an operation.
865
878
If called like _is_dbus_thing("method") it returns a function
866
879
suitable for use as predicate to inspect.getmembers().
867
880
"""
868
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
881
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
869
882
False)
870
883
871
884
def _get_all_dbus_things(self, thing):
920
933
# The byte_arrays option is not supported yet on
921
934
# signatures other than "ay".
922
935
if prop._dbus_signature != "ay":
923
raise ValueError("Byte arrays not supported for non-"
924
"'ay' signature {!r}"
925
.format(prop._dbus_signature))
936
raise ValueError
926
937
value = dbus.ByteArray(b''.join(chr(byte)
927
938
for byte in value))
928
939
prop(value)
952
963
value.variant_level+1)
953
964
return dbus.Dictionary(properties, signature="sv")
954
965
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
966
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
964
967
out_signature="s",
965
968
path_keyword='object_path',
1000
1003
(prop,
1001
1004
"_dbus_annotations",
1002
1005
{}))
1003
for name, value in annots.items():
1006
for name, value in annots.iteritems():
1004
1007
ann_tag = document.createElement(
1005
1008
"annotation")
1006
1009
ann_tag.setAttribute("name", name)
1009
1012
# Add interface annotation tags
1010
1013
for annotation, value in dict(
1011
1014
itertools.chain.from_iterable(
1012
annotations().items()
1015
annotations().iteritems()
1013
1016
for name, annotations in
1014
1017
self._get_all_dbus_things("interface")
1015
1018
if name == if_tag.getAttribute("name")
1016
)).items():
1019
)).iteritems():
1017
1020
ann_tag = document.createElement("annotation")
1018
1021
ann_tag.setAttribute("name", annotation)
1019
1022
ann_tag.setAttribute("value", value)
1075
1078
"""
1076
1079
def wrapper(cls):
1077
1080
for orig_interface_name, alt_interface_name in (
1078
alt_interface_names.items()):
1081
alt_interface_names.iteritems()):
1079
1082
attr = {}
1080
1083
interface_names = set()
1081
1084
# Go though all attributes of the class
1198
1201
attribute.func_closure)))
1199
1202
if deprecate:
1200
1203
# Deprecate all alternate interfaces
1201
iname="_AlternateDBusNames_interface_annotation{}"
1204
iname="_AlternateDBusNames_interface_annotation{0}"
1202
1205
for interface_name in interface_names:
1203
1206
@dbus_interface_annotations(interface_name)
1204
1207
def func(self):
1213
1216
if interface_names:
1214
1217
# Replace the class with a new subclass of it with
1215
1218
# methods, signals, etc. as created above.
1216
cls = type(b"{}Alternate".format(cls.__name__),
1219
cls = type(b"{0}Alternate".format(cls.__name__),
1217
1220
(cls,), attr)
1218
1221
return cls
1219
1222
return wrapper
1232
1235
runtime_expansions = (Client.runtime_expansions
1233
1236
+ ("dbus_object_path",))
1234
1237
1235
_interface = "se.recompile.Mandos.Client"
1236
1237
1238
# dbus.service.Object doesn't use super(), so we can't either.
1238
1239
1239
1240
def __init__(self, bus = None, *args, **kwargs):
1241
1242
Client.__init__(self, *args, **kwargs)
1242
1243
# Only now, when this client is initialized, can it show up on
1243
1244
# the D-Bus
1244
client_object_name = str(self.name).translate(
1245
client_object_name = unicode(self.name).translate(
1245
1246
{ord("."): ord("_"),
1246
1247
ord("-"): ord("_")})
1247
1248
self.dbus_object_path = (dbus.ObjectPath
1251
1252
1252
1253
def notifychangeproperty(transform_func,
1253
1254
dbus_name, type_func=lambda x: x,
1254
variant_level=1, invalidate_only=False,
1255
_interface=_interface):
1255
variant_level=1):
1256
1256
""" Modify a variable so that it's a property which announces
1257
1257
its changes to DBus.
1258
1258
1263
1263
to the D-Bus. Default: no transform
1264
1264
variant_level: D-Bus variant level. Default: 1
1265
1265
"""
1266
attrname = "_{}".format(dbus_name)
1266
attrname = "_{0}".format(dbus_name)
1267
1267
def setter(self, value):
1268
1268
if hasattr(self, "dbus_object_path"):
1269
1269
if (not hasattr(self, attrname) or
1270
1270
type_func(getattr(self, attrname, None))
1271
1271
!= 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())
1272
dbus_value = transform_func(type_func(value),
1273
variant_level
1274
=variant_level)
1275
self.PropertyChanged(dbus.String(dbus_name),
1276
dbus_value)
1287
1277
setattr(self, attrname, value)
1288
1278
1289
1279
return property(lambda self: getattr(self, attrname), setter)
1309
1299
approval_delay = notifychangeproperty(dbus.UInt64,
1310
1300
"ApprovalDelay",
1311
1301
type_func =
1312
lambda td: td.total_seconds()
1313
* 1000)
1302
timedelta_to_milliseconds)
1314
1303
approval_duration = notifychangeproperty(
1315
1304
dbus.UInt64, "ApprovalDuration",
1316
type_func = lambda td: td.total_seconds() * 1000)
1305
type_func = timedelta_to_milliseconds)
1317
1306
host = notifychangeproperty(dbus.String, "Host")
1318
1307
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1319
type_func = lambda td:
1320
td.total_seconds() * 1000)
1308
type_func =
1309
timedelta_to_milliseconds)
1321
1310
extended_timeout = notifychangeproperty(
1322
1311
dbus.UInt64, "ExtendedTimeout",
1323
type_func = lambda td: td.total_seconds() * 1000)
1312
type_func = timedelta_to_milliseconds)
1324
1313
interval = notifychangeproperty(dbus.UInt64,
1325
1314
"Interval",
1326
1315
type_func =
1327
lambda td: td.total_seconds()
1328
* 1000)
1316
timedelta_to_milliseconds)
1329
1317
checker_command = notifychangeproperty(dbus.String, "Checker")
1330
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1331
invalidate_only=True)
1332
1318
1333
1319
del notifychangeproperty
1334
1320
1361
1347
*args, **kwargs)
1362
1348
1363
1349
def start_checker(self, *args, **kwargs):
1364
old_checker_pid = getattr(self.checker, "pid", None)
1350
old_checker = self.checker
1351
if self.checker is not None:
1352
old_checker_pid = self.checker.pid
1353
else:
1354
old_checker_pid = None
1365
1355
r = Client.start_checker(self, *args, **kwargs)
1366
1356
# Only if new checker process was started
1367
1357
if (self.checker is not None
1376
1366
1377
1367
def approve(self, value=True):
1378
1368
self.approved = value
1379
gobject.timeout_add(int(self.approval_duration.total_seconds()
1380
* 1000), self._reset_approved)
1369
gobject.timeout_add(timedelta_to_milliseconds
1370
(self.approval_duration),
1371
self._reset_approved)
1381
1372
self.send_changedstate()
1382
1373
1383
1374
## D-Bus methods, signals & properties
1375
_interface = "se.recompile.Mandos.Client"
1384
1376
1385
1377
## Interfaces
1386
1378
1379
@dbus_interface_annotations(_interface)
1380
def _foo(self):
1381
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1382
"false"}
1383
1387
1384
## Signals
1388
1385
1389
1386
# CheckerCompleted - signal
1399
1396
pass
1400
1397
1401
1398
# PropertyChanged - signal
1402
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1403
1399
@dbus.service.signal(_interface, signature="sv")
1404
1400
def PropertyChanged(self, property, value):
1405
1401
"D-Bus signal"
1481
1477
access="readwrite")
1482
1478
def ApprovalDelay_dbus_property(self, value=None):
1483
1479
if value is None: # get
1484
return dbus.UInt64(self.approval_delay.total_seconds()
1485
* 1000)
1480
return dbus.UInt64(self.approval_delay_milliseconds())
1486
1481
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1487
1482
1488
1483
# ApprovalDuration - property
1490
1485
access="readwrite")
1491
1486
def ApprovalDuration_dbus_property(self, value=None):
1492
1487
if value is None: # get
1493
return dbus.UInt64(self.approval_duration.total_seconds()
1494
* 1000)
1488
return dbus.UInt64(timedelta_to_milliseconds(
1489
self.approval_duration))
1495
1490
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1496
1491
1497
1492
# Name - property
1510
1505
def Host_dbus_property(self, value=None):
1511
1506
if value is None: # get
1512
1507
return dbus.String(self.host)
1513
self.host = str(value)
1508
self.host = unicode(value)
1514
1509
1515
1510
# Created - property
1516
1511
@dbus_service_property(_interface, signature="s", access="read")
1563
1558
access="readwrite")
1564
1559
def Timeout_dbus_property(self, value=None):
1565
1560
if value is None: # get
1566
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1561
return dbus.UInt64(self.timeout_milliseconds())
1567
1562
old_timeout = self.timeout
1568
1563
self.timeout = datetime.timedelta(0, 0, 0, value)
1569
1564
# Reschedule disabling
1580
1575
gobject.source_remove(self.disable_initiator_tag)
1581
1576
self.disable_initiator_tag = (
1582
1577
gobject.timeout_add(
1583
int((self.expires - now).total_seconds()
1584
* 1000), self.disable))
1578
timedelta_to_milliseconds(self.expires - now),
1579
self.disable))
1585
1580
1586
1581
# ExtendedTimeout - property
1587
1582
@dbus_service_property(_interface, signature="t",
1588
1583
access="readwrite")
1589
1584
def ExtendedTimeout_dbus_property(self, value=None):
1590
1585
if value is None: # get
1591
return dbus.UInt64(self.extended_timeout.total_seconds()
1592
* 1000)
1586
return dbus.UInt64(self.extended_timeout_milliseconds())
1593
1587
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1594
1588
1595
1589
# Interval - property
1597
1591
access="readwrite")
1598
1592
def Interval_dbus_property(self, value=None):
1599
1593
if value is None: # get
1600
return dbus.UInt64(self.interval.total_seconds() * 1000)
1594
return dbus.UInt64(self.interval_milliseconds())
1601
1595
self.interval = datetime.timedelta(0, 0, 0, value)
1602
1596
if getattr(self, "checker_initiator_tag", None) is None:
1603
1597
return
1614
1608
def Checker_dbus_property(self, value=None):
1615
1609
if value is None: # get
1616
1610
return dbus.String(self.checker_command)
1617
self.checker_command = str(value)
1611
self.checker_command = unicode(value)
1618
1612
1619
1613
# CheckerRunning - property
1620
1614
@dbus_service_property(_interface, signature="b",
1636
1630
@dbus_service_property(_interface, signature="ay",
1637
1631
access="write", byte_arrays=True)
1638
1632
def Secret_dbus_property(self, value):
1639
self.secret = bytes(value)
1633
self.secret = str(value)
1640
1634
1641
1635
del _interface
1642
1636
1676
1670
def handle(self):
1677
1671
with contextlib.closing(self.server.child_pipe) as child_pipe:
1678
1672
logger.info("TCP connection from: %s",
1679
str(self.client_address))
1673
unicode(self.client_address))
1680
1674
logger.debug("Pipe FD: %d",
1681
1675
self.server.child_pipe.fileno())
1682
1676
1708
1702
logger.debug("Protocol version: %r", line)
1709
1703
try:
1710
1704
if int(line.strip().split()[0]) > 1:
1711
raise RuntimeError(line)
1705
raise RuntimeError
1712
1706
except (ValueError, IndexError, RuntimeError) as error:
1713
1707
logger.error("Unknown protocol version: %s", error)
1714
1708
return
1763
1757
if self.server.use_dbus:
1764
1758
# Emit D-Bus signal
1765
1759
client.NeedApproval(
1766
client.approval_delay.total_seconds()
1767
* 1000, client.approved_by_default)
1760
client.approval_delay_milliseconds(),
1761
client.approved_by_default)
1768
1762
else:
1769
1763
logger.warning("Client %s was not approved",
1770
1764
client.name)
1776
1770
#wait until timeout or approved
1777
1771
time = datetime.datetime.now()
1778
1772
client.changedstate.acquire()
1779
client.changedstate.wait(delay.total_seconds())
1773
client.changedstate.wait(
1774
float(timedelta_to_milliseconds(delay)
1775
/ 1000))
1780
1776
client.changedstate.release()
1781
1777
time2 = datetime.datetime.now()
1782
1778
if (time2 - time) >= delay:
1919
1915
1920
1916
def add_pipe(self, parent_pipe, proc):
1921
1917
"""Dummy function; override as necessary"""
1922
raise NotImplementedError()
1918
raise NotImplementedError
1923
1919
1924
1920
1925
1921
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1981
1977
try:
1982
1978
self.socket.setsockopt(socket.SOL_SOCKET,
1983
1979
SO_BINDTODEVICE,
1984
(self.interface + "\0")
1985
.encode("utf-8"))
1980
str(self.interface + '\0'))
1986
1981
except socket.error as error:
1987
1982
if error.errno == errno.EPERM:
1988
1983
logger.error("No permission to bind to"
2191
2186
token_duration = Token(re.compile(r"P"), None,
2192
2187
frozenset((token_year, token_month,
2193
2188
token_day, token_time,
2194
token_week)))
2189
token_week))),
2195
2190
# Define starting values
2196
2191
value = datetime.timedelta() # Value so far
2197
2192
found_token = None
2198
followers = frozenset((token_duration,)) # Following valid tokens
2193
followers = frozenset(token_duration,) # Following valid tokens
2199
2194
s = duration # String left to parse
2200
2195
# Loop until end token is found
2201
2196
while found_token is not token_end:
2248
2243
timevalue = datetime.timedelta(0)
2249
2244
for s in interval.split():
2250
2245
try:
2251
suffix = s[-1]
2246
suffix = unicode(s[-1])
2252
2247
value = int(s[:-1])
2253
2248
if suffix == "d":
2254
2249
delta = datetime.timedelta(value)
2261
2256
elif suffix == "w":
2262
2257
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2263
2258
else:
2264
raise ValueError("Unknown suffix {!r}"
2259
raise ValueError("Unknown suffix {0!r}"
2265
2260
.format(suffix))
2266
except IndexError as e:
2261
except (ValueError, IndexError) as e:
2267
2262
raise ValueError(*(e.args))
2268
2263
timevalue += delta
2269
2264
return timevalue
2284
2279
# Close all standard open file descriptors
2285
2280
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2286
2281
if not stat.S_ISCHR(os.fstat(null).st_mode):
2287
raise OSError(errno.ENODEV, "{} not a character device"
2282
raise OSError(errno.ENODEV,
2283
"{0} not a character device"
2288
2284
.format(os.devnull))
2289
2285
os.dup2(null, sys.stdin.fileno())
2290
2286
os.dup2(null, sys.stdout.fileno())
2300
2296
2301
2297
parser = argparse.ArgumentParser()
2302
2298
parser.add_argument("-v", "--version", action="version",
2303
version = "%(prog)s {}".format(version),
2299
version = "%(prog)s {0}".format(version),
2304
2300
help="show version number and exit")
2305
2301
parser.add_argument("-i", "--interface", metavar="IF",
2306
2302
help="Bind to interface IF")
2339
2335
help="Directory to save/restore state in")
2340
2336
parser.add_argument("--foreground", action="store_true",
2341
2337
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
2338
2346
2339
options = parser.parse_args()
2347
2340
2348
2341
if options.check:
2349
2342
import doctest
2350
fail_count, test_count = doctest.testmod()
2351
sys.exit(os.EX_OK if fail_count == 0 else 1)
2343
doctest.testmod()
2344
sys.exit()
2352
2345
2353
2346
# Default values for config file for server-global settings
2354
2347
server_defaults = { "interface": "",
2365
2358
"socket": "",
2366
2359
"statedir": "/var/lib/mandos",
2367
2360
"foreground": "False",
2368
"zeroconf": "True",
2369
2361
}
2370
2362
2371
2363
# Parse config file for server-global settings
2398
2390
for option in ("interface", "address", "port", "debug",
2399
2391
"priority", "servicename", "configdir",
2400
2392
"use_dbus", "use_ipv6", "debuglevel", "restore",
2401
"statedir", "socket", "foreground", "zeroconf"):
2393
"statedir", "socket", "foreground"):
2402
2394
value = getattr(options, option)
2403
2395
if value is not None:
2404
2396
server_settings[option] = value
2405
2397
del options
2406
2398
# Force all strings to be unicode
2407
2399
for option in server_settings.keys():
2408
if isinstance(server_settings[option], bytes):
2409
server_settings[option] = (server_settings[option]
2410
.decode("utf-8"))
2400
if type(server_settings[option]) is str:
2401
server_settings[option] = unicode(server_settings[option])
2411
2402
# Force all boolean options to be boolean
2412
2403
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2413
"foreground", "zeroconf"):
2404
"foreground"):
2414
2405
server_settings[option] = bool(server_settings[option])
2415
2406
# Debug implies foreground
2416
2407
if server_settings["debug"]:
2419
2410
2420
2411
##################################################################
2421
2412
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
2413
# For convenience
2429
2414
debug = server_settings["debug"]
2430
2415
debuglevel = server_settings["debuglevel"]
2433
2418
stored_state_path = os.path.join(server_settings["statedir"],
2434
2419
stored_state_file)
2435
2420
foreground = server_settings["foreground"]
2436
zeroconf = server_settings["zeroconf"]
2437
2421
2438
2422
if debug:
2439
2423
initlogger(debug, logging.DEBUG)
2446
2430
2447
2431
if server_settings["servicename"] != "Mandos":
2448
2432
syslogger.setFormatter(logging.Formatter
2449
('Mandos ({}) [%(process)d]:'
2433
('Mandos ({0}) [%(process)d]:'
2450
2434
' %(levelname)s: %(message)s'
2451
2435
.format(server_settings
2452
2436
["servicename"])))
2460
2444
global mandos_dbus_service
2461
2445
mandos_dbus_service = None
2462
2446
2463
socketfd = None
2464
if server_settings["socket"] != "":
2465
socketfd = server_settings["socket"]
2466
2447
tcp_server = MandosServer((server_settings["address"],
2467
2448
server_settings["port"]),
2468
2449
ClientHandler,
2472
2453
gnutls_priority=
2473
2454
server_settings["priority"],
2474
2455
use_dbus=use_dbus,
2475
socketfd=socketfd)
2456
socketfd=(server_settings["socket"]
2457
or None))
2476
2458
if not foreground:
2477
2459
pidfilename = "/run/mandos.pid"
2478
2460
if not os.path.isdir("/run/."):
2499
2481
os.setuid(uid)
2500
2482
except OSError as error:
2501
2483
if error.errno != errno.EPERM:
2502
raise
2484
raise error
2503
2485
2504
2486
if debug:
2505
2487
# Enable all possible GnuTLS debugging
2548
2530
use_dbus = False
2549
2531
server_settings["use_dbus"] = False
2550
2532
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")))
2533
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2534
service = AvahiServiceToSyslog(name =
2535
server_settings["servicename"],
2536
servicetype = "_mandos._tcp",
2537
protocol = protocol, bus = bus)
2538
if server_settings["interface"]:
2539
service.interface = (if_nametoindex
2540
(str(server_settings["interface"])))
2561
2541
2562
2542
global multiprocessing_manager
2563
2543
multiprocessing_manager = multiprocessing.Manager()
2587
2567
os.remove(stored_state_path)
2588
2568
except IOError as e:
2589
2569
if e.errno == errno.ENOENT:
2590
logger.warning("Could not load persistent state: {}"
2570
logger.warning("Could not load persistent state: {0}"
2591
2571
.format(os.strerror(e.errno)))
2592
2572
else:
2593
2573
logger.critical("Could not load persistent state:",
2598
2578
"EOFError:", exc_info=e)
2599
2579
2600
2580
with PGPEngine() as pgp:
2601
for client_name, client in clients_data.items():
2581
for client_name, client in clients_data.iteritems():
2602
2582
# Skip removed clients
2603
2583
if client_name not in client_settings:
2604
2584
continue
2629
2609
if datetime.datetime.utcnow() >= client["expires"]:
2630
2610
if not client["last_checked_ok"]:
2631
2611
logger.warning(
2632
"disabling client {} - Client never "
2612
"disabling client {0} - Client never "
2633
2613
"performed a successful checker"
2634
2614
.format(client_name))
2635
2615
client["enabled"] = False
2636
2616
elif client["last_checker_status"] != 0:
2637
2617
logger.warning(
2638
"disabling client {} - Client last"
2639
" checker failed with error code {}"
2618
"disabling client {0} - Client "
2619
"last checker failed with error code {1}"
2640
2620
.format(client_name,
2641
2621
client["last_checker_status"]))
2642
2622
client["enabled"] = False
2645
2625
.utcnow()
2646
2626
+ client["timeout"])
2647
2627
logger.debug("Last checker succeeded,"
2648
" keeping {} enabled"
2628
" keeping {0} enabled"
2649
2629
.format(client_name))
2650
2630
try:
2651
2631
client["secret"] = (
2654
2634
["secret"]))
2655
2635
except PGPError:
2656
2636
# If decryption fails, we use secret from new settings
2657
logger.debug("Failed to decrypt {} old secret"
2637
logger.debug("Failed to decrypt {0} old secret"
2658
2638
.format(client_name))
2659
2639
client["secret"] = (
2660
2640
client_settings[client_name]["secret"])
2668
2648
clients_data[client_name] = client_settings[client_name]
2669
2649
2670
2650
# Create all client objects
2671
for client_name, client in clients_data.items():
2651
for client_name, client in clients_data.iteritems():
2672
2652
tcp_server.clients[client_name] = client_class(
2673
2653
name = client_name, settings = client,
2674
2654
server_settings = server_settings)
2681
2661
try:
2682
2662
with pidfile:
2683
2663
pid = os.getpid()
2684
pidfile.write("{}\n".format(pid).encode("utf-8"))
2664
pidfile.write(str(pid) + "\n".encode("utf-8"))
2685
2665
except IOError:
2686
2666
logger.error("Could not write to file %r with PID %d",
2687
2667
pidfilename, pid)
2733
2713
def GetAllClientsWithProperties(self):
2734
2714
"D-Bus method"
2735
2715
return dbus.Dictionary(
2736
{ c.dbus_object_path: c.GetAll("")
2737
for c in tcp_server.clients.itervalues() },
2716
((c.dbus_object_path, c.GetAll(""))
2717
for c in tcp_server.clients.itervalues()),
2738
2718
signature="oa{sv}")
2739
2719
2740
2720
@dbus.service.method(_interface, in_signature="o")
2757
2737
2758
2738
def cleanup():
2759
2739
"Cleanup function; run on exit"
2760
if zeroconf:
2761
service.cleanup()
2740
service.cleanup()
2762
2741
2763
2742
multiprocessing.active_children()
2764
2743
wnull.close()
2778
2757
2779
2758
# A list of attributes that can not be pickled
2780
2759
# + secret.
2781
exclude = { "bus", "changedstate", "secret",
2782
"checker", "server_settings" }
2760
exclude = set(("bus", "changedstate", "secret",
2761
"checker", "server_settings"))
2783
2762
for name, typ in (inspect.getmembers
2784
2763
(dbus.service.Object)):
2785
2764
exclude.add(name)
2808
2787
except NameError:
2809
2788
pass
2810
2789
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2811
logger.warning("Could not save persistent state: {}"
2790
logger.warning("Could not save persistent state: {0}"
2812
2791
.format(os.strerror(e.errno)))
2813
2792
else:
2814
2793
logger.warning("Could not save persistent state:",
2815
2794
exc_info=e)
2816
raise
2795
raise e
2817
2796
2818
2797
# Delete all clients, and settings from config
2819
2798
while tcp_server.clients:
2843
2822
tcp_server.server_activate()
2844
2823
2845
2824
# Find out what port we got
2846
if zeroconf:
2847
service.port = tcp_server.socket.getsockname()[1]
2825
service.port = tcp_server.socket.getsockname()[1]
2848
2826
if use_ipv6:
2849
2827
logger.info("Now listening on address %r, port %d,"
2850
2828
" flowinfo %d, scope_id %d",
2856
2834
#service.interface = tcp_server.socket.getsockname()[3]
2857
2835
2858
2836
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
2837
# From the Avahi example code
2838
try:
2839
service.activate()
2840
except dbus.exceptions.DBusException as error:
2841
logger.critical("D-Bus Exception", exc_info=error)
2842
cleanup()
2843
sys.exit(1)
2844
# End of Avahi example code
2868
2845
2869
2846
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2870
2847
lambda *args, **kwargs:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0