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
- 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.8"
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
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))
282
self.name = unicode(self.server
283
.GetAlternativeServiceName(self.name))
287
284
logger.info("Changing Zeroconf service name to %r ...",
288
285
self.name)
289
286
self.remove()
337
334
self.rename()
338
335
elif state == avahi.ENTRY_GROUP_FAILURE:
339
336
logger.critical("Avahi: Error in group state changed %s",
340
str(error))
341
raise AvahiGroupError("State changed: {!s}"
337
unicode(error))
338
raise AvahiGroupError("State changed: {0!s}"
342
339
.format(error))
343
340
344
341
def cleanup(self):
395
392
"""Add the new name to the syslog messages"""
396
393
ret = AvahiService.rename(self)
397
394
syslogger.setFormatter(logging.Formatter
398
('Mandos ({}) [%(process)d]:'
395
('Mandos ({0}) [%(process)d]:'
399
396
' %(levelname)s: %(message)s'
400
397
.format(self.name)))
401
398
return ret
402
399
403
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
404
408
class Client(object):
405
409
"""A representation of a client host served by this server.
406
410
461
465
"enabled": "True",
462
466
}
463
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
464
483
@staticmethod
465
484
def config_parser(config):
466
485
"""Construct a new dict of client settings of this form:
491
510
"rb") as secfile:
492
511
client["secret"] = secfile.read()
493
512
else:
494
raise TypeError("No secret or secfile for section {}"
513
raise TypeError("No secret or secfile for section {0}"
495
514
.format(section))
496
515
client["timeout"] = string_to_delta(section["timeout"])
497
516
client["extended_timeout"] = string_to_delta(
514
533
server_settings = {}
515
534
self.server_settings = server_settings
516
535
# adding all client settings
517
for setting, value in settings.items():
536
for setting, value in settings.iteritems():
518
537
setattr(self, setting, value)
519
538
520
539
if self.enabled:
603
622
if self.checker_initiator_tag is not None:
604
623
gobject.source_remove(self.checker_initiator_tag)
605
624
self.checker_initiator_tag = (gobject.timeout_add
606
(int(self.interval
607
.total_seconds() * 1000),
625
(self.interval_milliseconds(),
608
626
self.start_checker))
609
627
# Schedule a disable() when 'timeout' has passed
610
628
if self.disable_initiator_tag is not None:
611
629
gobject.source_remove(self.disable_initiator_tag)
612
630
self.disable_initiator_tag = (gobject.timeout_add
613
(int(self.timeout
614
.total_seconds() * 1000),
615
self.disable))
631
(self.timeout_milliseconds(),
632
self.disable))
616
633
# Also start a new checker *right now*.
617
634
self.start_checker()
618
635
649
666
self.disable_initiator_tag = None
650
667
if getattr(self, "enabled", False):
651
668
self.disable_initiator_tag = (gobject.timeout_add
652
(int(timeout.total_seconds()
653
* 1000), self.disable))
669
(timedelta_to_milliseconds
670
(timeout), self.disable))
654
671
self.expires = datetime.datetime.utcnow() + timeout
655
672
656
673
def need_approval(self):
673
690
# If a checker exists, make sure it is not a zombie
674
691
try:
675
692
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
676
except AttributeError:
677
pass
678
except OSError as error:
679
if error.errno != errno.ECHILD:
680
raise
693
except (AttributeError, OSError) as error:
694
if (isinstance(error, OSError)
695
and error.errno != errno.ECHILD):
696
raise error
681
697
else:
682
698
if pid:
683
699
logger.warning("Checker was a zombie")
687
703
# Start a new checker if needed
688
704
if self.checker is None:
689
705
# Escape attributes for the shell
690
escaped_attrs = { attr:
691
re.escape(str(getattr(self, attr)))
692
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)
693
710
try:
694
711
command = self.checker_command % escaped_attrs
695
712
except TypeError as error:
776
793
# "Set" method, so we fail early here:
777
794
if byte_arrays and signature != "ay":
778
795
raise ValueError("Byte arrays not supported for non-'ay'"
779
" signature {!r}".format(signature))
796
" signature {0!r}".format(signature))
780
797
def decorator(func):
781
798
func._dbus_is_property = True
782
799
func._dbus_interface = dbus_interface
813
830
"""Decorator to annotate D-Bus methods, signals or properties
814
831
Usage:
815
832
816
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
817
"org.freedesktop.DBus.Property."
818
"EmitsChangedSignal": "false"})
819
833
@dbus_service_property("org.example.Interface", signature="b",
820
834
access="r")
835
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
836
"org.freedesktop.DBus.Property."
837
"EmitsChangedSignal": "false"})
821
838
def Property_dbus_property(self):
822
839
return dbus.Boolean(False)
823
840
"""
830
847
class DBusPropertyException(dbus.exceptions.DBusException):
831
848
"""A base class for D-Bus property-related exceptions
832
849
"""
833
pass
850
def __unicode__(self):
851
return unicode(str(self))
852
834
853
835
854
class DBusPropertyAccessException(DBusPropertyException):
836
855
"""A property's access permissions disallows an operation.
859
878
If called like _is_dbus_thing("method") it returns a function
860
879
suitable for use as predicate to inspect.getmembers().
861
880
"""
862
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
881
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
863
882
False)
864
883
865
884
def _get_all_dbus_things(self, thing):
914
933
# The byte_arrays option is not supported yet on
915
934
# signatures other than "ay".
916
935
if prop._dbus_signature != "ay":
917
raise ValueError("Byte arrays not supported for non-"
918
"'ay' signature {!r}"
919
.format(prop._dbus_signature))
936
raise ValueError
920
937
value = dbus.ByteArray(b''.join(chr(byte)
921
938
for byte in value))
922
939
prop(value)
946
963
value.variant_level+1)
947
964
return dbus.Dictionary(properties, signature="sv")
948
965
949
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
950
def PropertiesChanged(self, interface_name, changed_properties,
951
invalidated_properties):
952
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
953
standard.
954
"""
955
pass
956
957
966
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
958
967
out_signature="s",
959
968
path_keyword='object_path',
994
1003
(prop,
995
1004
"_dbus_annotations",
996
1005
{}))
997
for name, value in annots.items():
1006
for name, value in annots.iteritems():
998
1007
ann_tag = document.createElement(
999
1008
"annotation")
1000
1009
ann_tag.setAttribute("name", name)
1003
1012
# Add interface annotation tags
1004
1013
for annotation, value in dict(
1005
1014
itertools.chain.from_iterable(
1006
annotations().items()
1015
annotations().iteritems()
1007
1016
for name, annotations in
1008
1017
self._get_all_dbus_things("interface")
1009
1018
if name == if_tag.getAttribute("name")
1010
)).items():
1019
)).iteritems():
1011
1020
ann_tag = document.createElement("annotation")
1012
1021
ann_tag.setAttribute("name", annotation)
1013
1022
ann_tag.setAttribute("value", value)
1069
1078
"""
1070
1079
def wrapper(cls):
1071
1080
for orig_interface_name, alt_interface_name in (
1072
alt_interface_names.items()):
1081
alt_interface_names.iteritems()):
1073
1082
attr = {}
1074
1083
interface_names = set()
1075
1084
# Go though all attributes of the class
1192
1201
attribute.func_closure)))
1193
1202
if deprecate:
1194
1203
# Deprecate all alternate interfaces
1195
iname="_AlternateDBusNames_interface_annotation{}"
1204
iname="_AlternateDBusNames_interface_annotation{0}"
1196
1205
for interface_name in interface_names:
1197
1206
@dbus_interface_annotations(interface_name)
1198
1207
def func(self):
1207
1216
if interface_names:
1208
1217
# Replace the class with a new subclass of it with
1209
1218
# methods, signals, etc. as created above.
1210
cls = type(b"{}Alternate".format(cls.__name__),
1219
cls = type(b"{0}Alternate".format(cls.__name__),
1211
1220
(cls,), attr)
1212
1221
return cls
1213
1222
return wrapper
1226
1235
runtime_expansions = (Client.runtime_expansions
1227
1236
+ ("dbus_object_path",))
1228
1237
1229
_interface = "se.recompile.Mandos.Client"
1230
1231
1238
# dbus.service.Object doesn't use super(), so we can't either.
1232
1239
1233
1240
def __init__(self, bus = None, *args, **kwargs):
1235
1242
Client.__init__(self, *args, **kwargs)
1236
1243
# Only now, when this client is initialized, can it show up on
1237
1244
# the D-Bus
1238
client_object_name = str(self.name).translate(
1245
client_object_name = unicode(self.name).translate(
1239
1246
{ord("."): ord("_"),
1240
1247
ord("-"): ord("_")})
1241
1248
self.dbus_object_path = (dbus.ObjectPath
1245
1252
1246
1253
def notifychangeproperty(transform_func,
1247
1254
dbus_name, type_func=lambda x: x,
1248
variant_level=1, invalidate_only=False,
1249
_interface=_interface):
1255
variant_level=1):
1250
1256
""" Modify a variable so that it's a property which announces
1251
1257
its changes to DBus.
1252
1258
1257
1263
to the D-Bus. Default: no transform
1258
1264
variant_level: D-Bus variant level. Default: 1
1259
1265
"""
1260
attrname = "_{}".format(dbus_name)
1266
attrname = "_{0}".format(dbus_name)
1261
1267
def setter(self, value):
1262
1268
if hasattr(self, "dbus_object_path"):
1263
1269
if (not hasattr(self, attrname) or
1264
1270
type_func(getattr(self, attrname, None))
1265
1271
!= type_func(value)):
1266
if invalidate_only:
1267
self.PropertiesChanged(_interface,
1268
dbus.Dictionary(),
1269
dbus.Array
1270
((dbus_name,)))
1271
else:
1272
dbus_value = transform_func(type_func(value),
1273
variant_level
1274
=variant_level)
1275
self.PropertyChanged(dbus.String(dbus_name),
1276
dbus_value)
1277
self.PropertiesChanged(_interface,
1278
dbus.Dictionary({
1279
dbus.String(dbus_name):
1280
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)
1281
1277
setattr(self, attrname, value)
1282
1278
1283
1279
return property(lambda self: getattr(self, attrname), setter)
1303
1299
approval_delay = notifychangeproperty(dbus.UInt64,
1304
1300
"ApprovalDelay",
1305
1301
type_func =
1306
lambda td: td.total_seconds()
1307
* 1000)
1302
timedelta_to_milliseconds)
1308
1303
approval_duration = notifychangeproperty(
1309
1304
dbus.UInt64, "ApprovalDuration",
1310
type_func = lambda td: td.total_seconds() * 1000)
1305
type_func = timedelta_to_milliseconds)
1311
1306
host = notifychangeproperty(dbus.String, "Host")
1312
1307
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1313
type_func = lambda td:
1314
td.total_seconds() * 1000)
1308
type_func =
1309
timedelta_to_milliseconds)
1315
1310
extended_timeout = notifychangeproperty(
1316
1311
dbus.UInt64, "ExtendedTimeout",
1317
type_func = lambda td: td.total_seconds() * 1000)
1312
type_func = timedelta_to_milliseconds)
1318
1313
interval = notifychangeproperty(dbus.UInt64,
1319
1314
"Interval",
1320
1315
type_func =
1321
lambda td: td.total_seconds()
1322
* 1000)
1316
timedelta_to_milliseconds)
1323
1317
checker_command = notifychangeproperty(dbus.String, "Checker")
1324
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1325
invalidate_only=True)
1326
1318
1327
1319
del notifychangeproperty
1328
1320
1355
1347
*args, **kwargs)
1356
1348
1357
1349
def start_checker(self, *args, **kwargs):
1358
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
1359
1355
r = Client.start_checker(self, *args, **kwargs)
1360
1356
# Only if new checker process was started
1361
1357
if (self.checker is not None
1370
1366
1371
1367
def approve(self, value=True):
1372
1368
self.approved = value
1373
gobject.timeout_add(int(self.approval_duration.total_seconds()
1374
* 1000), self._reset_approved)
1369
gobject.timeout_add(timedelta_to_milliseconds
1370
(self.approval_duration),
1371
self._reset_approved)
1375
1372
self.send_changedstate()
1376
1373
1377
1374
## D-Bus methods, signals & properties
1375
_interface = "se.recompile.Mandos.Client"
1378
1376
1379
1377
## Interfaces
1380
1378
1379
@dbus_interface_annotations(_interface)
1380
def _foo(self):
1381
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1382
"false"}
1383
1381
1384
## Signals
1382
1385
1383
1386
# CheckerCompleted - signal
1393
1396
pass
1394
1397
1395
1398
# PropertyChanged - signal
1396
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1397
1399
@dbus.service.signal(_interface, signature="sv")
1398
1400
def PropertyChanged(self, property, value):
1399
1401
"D-Bus signal"
1475
1477
access="readwrite")
1476
1478
def ApprovalDelay_dbus_property(self, value=None):
1477
1479
if value is None: # get
1478
return dbus.UInt64(self.approval_delay.total_seconds()
1479
* 1000)
1480
return dbus.UInt64(self.approval_delay_milliseconds())
1480
1481
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1481
1482
1482
1483
# ApprovalDuration - property
1484
1485
access="readwrite")
1485
1486
def ApprovalDuration_dbus_property(self, value=None):
1486
1487
if value is None: # get
1487
return dbus.UInt64(self.approval_duration.total_seconds()
1488
* 1000)
1488
return dbus.UInt64(timedelta_to_milliseconds(
1489
self.approval_duration))
1489
1490
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1490
1491
1491
1492
# Name - property
1504
1505
def Host_dbus_property(self, value=None):
1505
1506
if value is None: # get
1506
1507
return dbus.String(self.host)
1507
self.host = str(value)
1508
self.host = unicode(value)
1508
1509
1509
1510
# Created - property
1510
1511
@dbus_service_property(_interface, signature="s", access="read")
1557
1558
access="readwrite")
1558
1559
def Timeout_dbus_property(self, value=None):
1559
1560
if value is None: # get
1560
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1561
return dbus.UInt64(self.timeout_milliseconds())
1561
1562
old_timeout = self.timeout
1562
1563
self.timeout = datetime.timedelta(0, 0, 0, value)
1563
1564
# Reschedule disabling
1574
1575
gobject.source_remove(self.disable_initiator_tag)
1575
1576
self.disable_initiator_tag = (
1576
1577
gobject.timeout_add(
1577
int((self.expires - now).total_seconds()
1578
* 1000), self.disable))
1578
timedelta_to_milliseconds(self.expires - now),
1579
self.disable))
1579
1580
1580
1581
# ExtendedTimeout - property
1581
1582
@dbus_service_property(_interface, signature="t",
1582
1583
access="readwrite")
1583
1584
def ExtendedTimeout_dbus_property(self, value=None):
1584
1585
if value is None: # get
1585
return dbus.UInt64(self.extended_timeout.total_seconds()
1586
* 1000)
1586
return dbus.UInt64(self.extended_timeout_milliseconds())
1587
1587
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1588
1588
1589
1589
# Interval - property
1591
1591
access="readwrite")
1592
1592
def Interval_dbus_property(self, value=None):
1593
1593
if value is None: # get
1594
return dbus.UInt64(self.interval.total_seconds() * 1000)
1594
return dbus.UInt64(self.interval_milliseconds())
1595
1595
self.interval = datetime.timedelta(0, 0, 0, value)
1596
1596
if getattr(self, "checker_initiator_tag", None) is None:
1597
1597
return
1608
1608
def Checker_dbus_property(self, value=None):
1609
1609
if value is None: # get
1610
1610
return dbus.String(self.checker_command)
1611
self.checker_command = str(value)
1611
self.checker_command = unicode(value)
1612
1612
1613
1613
# CheckerRunning - property
1614
1614
@dbus_service_property(_interface, signature="b",
1630
1630
@dbus_service_property(_interface, signature="ay",
1631
1631
access="write", byte_arrays=True)
1632
1632
def Secret_dbus_property(self, value):
1633
self.secret = bytes(value)
1633
self.secret = str(value)
1634
1634
1635
1635
del _interface
1636
1636
1670
1670
def handle(self):
1671
1671
with contextlib.closing(self.server.child_pipe) as child_pipe:
1672
1672
logger.info("TCP connection from: %s",
1673
str(self.client_address))
1673
unicode(self.client_address))
1674
1674
logger.debug("Pipe FD: %d",
1675
1675
self.server.child_pipe.fileno())
1676
1676
1702
1702
logger.debug("Protocol version: %r", line)
1703
1703
try:
1704
1704
if int(line.strip().split()[0]) > 1:
1705
raise RuntimeError(line)
1705
raise RuntimeError
1706
1706
except (ValueError, IndexError, RuntimeError) as error:
1707
1707
logger.error("Unknown protocol version: %s", error)
1708
1708
return
1757
1757
if self.server.use_dbus:
1758
1758
# Emit D-Bus signal
1759
1759
client.NeedApproval(
1760
client.approval_delay.total_seconds()
1761
* 1000, client.approved_by_default)
1760
client.approval_delay_milliseconds(),
1761
client.approved_by_default)
1762
1762
else:
1763
1763
logger.warning("Client %s was not approved",
1764
1764
client.name)
1770
1770
#wait until timeout or approved
1771
1771
time = datetime.datetime.now()
1772
1772
client.changedstate.acquire()
1773
client.changedstate.wait(delay.total_seconds())
1773
client.changedstate.wait(
1774
float(timedelta_to_milliseconds(delay)
1775
/ 1000))
1774
1776
client.changedstate.release()
1775
1777
time2 = datetime.datetime.now()
1776
1778
if (time2 - time) >= delay:
1913
1915
1914
1916
def add_pipe(self, parent_pipe, proc):
1915
1917
"""Dummy function; override as necessary"""
1916
raise NotImplementedError()
1918
raise NotImplementedError
1917
1919
1918
1920
1919
1921
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1975
1977
try:
1976
1978
self.socket.setsockopt(socket.SOL_SOCKET,
1977
1979
SO_BINDTODEVICE,
1978
(self.interface + "\0")
1979
.encode("utf-8"))
1980
str(self.interface + '\0'))
1980
1981
except socket.error as error:
1981
1982
if error.errno == errno.EPERM:
1982
1983
logger.error("No permission to bind to"
2185
2186
token_duration = Token(re.compile(r"P"), None,
2186
2187
frozenset((token_year, token_month,
2187
2188
token_day, token_time,
2188
token_week)))
2189
token_week))),
2189
2190
# Define starting values
2190
2191
value = datetime.timedelta() # Value so far
2191
2192
found_token = None
2192
followers = frozenset((token_duration,)) # Following valid tokens
2193
followers = frozenset(token_duration,) # Following valid tokens
2193
2194
s = duration # String left to parse
2194
2195
# Loop until end token is found
2195
2196
while found_token is not token_end:
2242
2243
timevalue = datetime.timedelta(0)
2243
2244
for s in interval.split():
2244
2245
try:
2245
suffix = s[-1]
2246
suffix = unicode(s[-1])
2246
2247
value = int(s[:-1])
2247
2248
if suffix == "d":
2248
2249
delta = datetime.timedelta(value)
2255
2256
elif suffix == "w":
2256
2257
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2257
2258
else:
2258
raise ValueError("Unknown suffix {!r}"
2259
raise ValueError("Unknown suffix {0!r}"
2259
2260
.format(suffix))
2260
except IndexError as e:
2261
except (ValueError, IndexError) as e:
2261
2262
raise ValueError(*(e.args))
2262
2263
timevalue += delta
2263
2264
return timevalue
2278
2279
# Close all standard open file descriptors
2279
2280
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2280
2281
if not stat.S_ISCHR(os.fstat(null).st_mode):
2281
raise OSError(errno.ENODEV, "{} not a character device"
2282
raise OSError(errno.ENODEV,
2283
"{0} not a character device"
2282
2284
.format(os.devnull))
2283
2285
os.dup2(null, sys.stdin.fileno())
2284
2286
os.dup2(null, sys.stdout.fileno())
2294
2296
2295
2297
parser = argparse.ArgumentParser()
2296
2298
parser.add_argument("-v", "--version", action="version",
2297
version = "%(prog)s {}".format(version),
2299
version = "%(prog)s {0}".format(version),
2298
2300
help="show version number and exit")
2299
2301
parser.add_argument("-i", "--interface", metavar="IF",
2300
2302
help="Bind to interface IF")
2333
2335
help="Directory to save/restore state in")
2334
2336
parser.add_argument("--foreground", action="store_true",
2335
2337
help="Run in foreground", default=None)
2336
parser.add_argument("--no-zeroconf", action="store_false",
2337
dest="zeroconf", help="Do not use Zeroconf",
2338
default=None)
2339
2338
2340
2339
options = parser.parse_args()
2341
2340
2342
2341
if options.check:
2343
2342
import doctest
2344
fail_count, test_count = doctest.testmod()
2345
sys.exit(os.EX_OK if fail_count == 0 else 1)
2343
doctest.testmod()
2344
sys.exit()
2346
2345
2347
2346
# Default values for config file for server-global settings
2348
2347
server_defaults = { "interface": "",
2359
2358
"socket": "",
2360
2359
"statedir": "/var/lib/mandos",
2361
2360
"foreground": "False",
2362
"zeroconf": "True",
2363
2361
}
2364
2362
2365
2363
# Parse config file for server-global settings
2392
2390
for option in ("interface", "address", "port", "debug",
2393
2391
"priority", "servicename", "configdir",
2394
2392
"use_dbus", "use_ipv6", "debuglevel", "restore",
2395
"statedir", "socket", "foreground", "zeroconf"):
2393
"statedir", "socket", "foreground"):
2396
2394
value = getattr(options, option)
2397
2395
if value is not None:
2398
2396
server_settings[option] = value
2399
2397
del options
2400
2398
# Force all strings to be unicode
2401
2399
for option in server_settings.keys():
2402
if isinstance(server_settings[option], bytes):
2403
server_settings[option] = (server_settings[option]
2404
.decode("utf-8"))
2400
if type(server_settings[option]) is str:
2401
server_settings[option] = unicode(server_settings[option])
2405
2402
# Force all boolean options to be boolean
2406
2403
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2407
"foreground", "zeroconf"):
2404
"foreground"):
2408
2405
server_settings[option] = bool(server_settings[option])
2409
2406
# Debug implies foreground
2410
2407
if server_settings["debug"]:
2413
2410
2414
2411
##################################################################
2415
2412
2416
if (not server_settings["zeroconf"] and
2417
not (server_settings["port"]
2418
or server_settings["socket"] != "")):
2419
parser.error("Needs port or socket to work without"
2420
" Zeroconf")
2421
2422
2413
# For convenience
2423
2414
debug = server_settings["debug"]
2424
2415
debuglevel = server_settings["debuglevel"]
2427
2418
stored_state_path = os.path.join(server_settings["statedir"],
2428
2419
stored_state_file)
2429
2420
foreground = server_settings["foreground"]
2430
zeroconf = server_settings["zeroconf"]
2431
2421
2432
2422
if debug:
2433
2423
initlogger(debug, logging.DEBUG)
2440
2430
2441
2431
if server_settings["servicename"] != "Mandos":
2442
2432
syslogger.setFormatter(logging.Formatter
2443
('Mandos ({}) [%(process)d]:'
2433
('Mandos ({0}) [%(process)d]:'
2444
2434
' %(levelname)s: %(message)s'
2445
2435
.format(server_settings
2446
2436
["servicename"])))
2454
2444
global mandos_dbus_service
2455
2445
mandos_dbus_service = None
2456
2446
2457
socketfd = None
2458
if server_settings["socket"] != "":
2459
socketfd = server_settings["socket"]
2460
2447
tcp_server = MandosServer((server_settings["address"],
2461
2448
server_settings["port"]),
2462
2449
ClientHandler,
2466
2453
gnutls_priority=
2467
2454
server_settings["priority"],
2468
2455
use_dbus=use_dbus,
2469
socketfd=socketfd)
2456
socketfd=(server_settings["socket"]
2457
or None))
2470
2458
if not foreground:
2471
2459
pidfilename = "/run/mandos.pid"
2472
2460
if not os.path.isdir("/run/."):
2493
2481
os.setuid(uid)
2494
2482
except OSError as error:
2495
2483
if error.errno != errno.EPERM:
2496
raise
2484
raise error
2497
2485
2498
2486
if debug:
2499
2487
# Enable all possible GnuTLS debugging
2542
2530
use_dbus = False
2543
2531
server_settings["use_dbus"] = False
2544
2532
tcp_server.use_dbus = False
2545
if zeroconf:
2546
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2547
service = AvahiServiceToSyslog(name =
2548
server_settings["servicename"],
2549
servicetype = "_mandos._tcp",
2550
protocol = protocol, bus = bus)
2551
if server_settings["interface"]:
2552
service.interface = (if_nametoindex
2553
(server_settings["interface"]
2554
.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"])))
2555
2541
2556
2542
global multiprocessing_manager
2557
2543
multiprocessing_manager = multiprocessing.Manager()
2581
2567
os.remove(stored_state_path)
2582
2568
except IOError as e:
2583
2569
if e.errno == errno.ENOENT:
2584
logger.warning("Could not load persistent state: {}"
2570
logger.warning("Could not load persistent state: {0}"
2585
2571
.format(os.strerror(e.errno)))
2586
2572
else:
2587
2573
logger.critical("Could not load persistent state:",
2592
2578
"EOFError:", exc_info=e)
2593
2579
2594
2580
with PGPEngine() as pgp:
2595
for client_name, client in clients_data.items():
2581
for client_name, client in clients_data.iteritems():
2596
2582
# Skip removed clients
2597
2583
if client_name not in client_settings:
2598
2584
continue
2623
2609
if datetime.datetime.utcnow() >= client["expires"]:
2624
2610
if not client["last_checked_ok"]:
2625
2611
logger.warning(
2626
"disabling client {} - Client never "
2612
"disabling client {0} - Client never "
2627
2613
"performed a successful checker"
2628
2614
.format(client_name))
2629
2615
client["enabled"] = False
2630
2616
elif client["last_checker_status"] != 0:
2631
2617
logger.warning(
2632
"disabling client {} - Client last"
2633
" checker failed with error code {}"
2618
"disabling client {0} - Client "
2619
"last checker failed with error code {1}"
2634
2620
.format(client_name,
2635
2621
client["last_checker_status"]))
2636
2622
client["enabled"] = False
2639
2625
.utcnow()
2640
2626
+ client["timeout"])
2641
2627
logger.debug("Last checker succeeded,"
2642
" keeping {} enabled"
2628
" keeping {0} enabled"
2643
2629
.format(client_name))
2644
2630
try:
2645
2631
client["secret"] = (
2648
2634
["secret"]))
2649
2635
except PGPError:
2650
2636
# If decryption fails, we use secret from new settings
2651
logger.debug("Failed to decrypt {} old secret"
2637
logger.debug("Failed to decrypt {0} old secret"
2652
2638
.format(client_name))
2653
2639
client["secret"] = (
2654
2640
client_settings[client_name]["secret"])
2662
2648
clients_data[client_name] = client_settings[client_name]
2663
2649
2664
2650
# Create all client objects
2665
for client_name, client in clients_data.items():
2651
for client_name, client in clients_data.iteritems():
2666
2652
tcp_server.clients[client_name] = client_class(
2667
2653
name = client_name, settings = client,
2668
2654
server_settings = server_settings)
2675
2661
try:
2676
2662
with pidfile:
2677
2663
pid = os.getpid()
2678
pidfile.write("{}\n".format(pid).encode("utf-8"))
2664
pidfile.write(str(pid) + "\n".encode("utf-8"))
2679
2665
except IOError:
2680
2666
logger.error("Could not write to file %r with PID %d",
2681
2667
pidfilename, pid)
2727
2713
def GetAllClientsWithProperties(self):
2728
2714
"D-Bus method"
2729
2715
return dbus.Dictionary(
2730
{ c.dbus_object_path: c.GetAll("")
2731
for c in tcp_server.clients.itervalues() },
2716
((c.dbus_object_path, c.GetAll(""))
2717
for c in tcp_server.clients.itervalues()),
2732
2718
signature="oa{sv}")
2733
2719
2734
2720
@dbus.service.method(_interface, in_signature="o")
2751
2737
2752
2738
def cleanup():
2753
2739
"Cleanup function; run on exit"
2754
if zeroconf:
2755
service.cleanup()
2740
service.cleanup()
2756
2741
2757
2742
multiprocessing.active_children()
2758
2743
wnull.close()
2772
2757
2773
2758
# A list of attributes that can not be pickled
2774
2759
# + secret.
2775
exclude = { "bus", "changedstate", "secret",
2776
"checker", "server_settings" }
2760
exclude = set(("bus", "changedstate", "secret",
2761
"checker", "server_settings"))
2777
2762
for name, typ in (inspect.getmembers
2778
2763
(dbus.service.Object)):
2779
2764
exclude.add(name)
2802
2787
except NameError:
2803
2788
pass
2804
2789
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2805
logger.warning("Could not save persistent state: {}"
2790
logger.warning("Could not save persistent state: {0}"
2806
2791
.format(os.strerror(e.errno)))
2807
2792
else:
2808
2793
logger.warning("Could not save persistent state:",
2809
2794
exc_info=e)
2810
raise
2795
raise e
2811
2796
2812
2797
# Delete all clients, and settings from config
2813
2798
while tcp_server.clients:
2837
2822
tcp_server.server_activate()
2838
2823
2839
2824
# Find out what port we got
2840
if zeroconf:
2841
service.port = tcp_server.socket.getsockname()[1]
2825
service.port = tcp_server.socket.getsockname()[1]
2842
2826
if use_ipv6:
2843
2827
logger.info("Now listening on address %r, port %d,"
2844
2828
" flowinfo %d, scope_id %d",
2850
2834
#service.interface = tcp_server.socket.getsockname()[3]
2851
2835
2852
2836
try:
2853
if zeroconf:
2854
# From the Avahi example code
2855
try:
2856
service.activate()
2857
except dbus.exceptions.DBusException as error:
2858
logger.critical("D-Bus Exception", exc_info=error)
2859
cleanup()
2860
sys.exit(1)
2861
# 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
2862
2845
2863
2846
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2864
2847
lambda *args, **kwargs:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0