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 746
- compare with another revision
- download diff
- download tarball
- view history from revision 746
- Committer: Teddy Hogeborn
- Date: 2015-04-03 03:01:02 UTC
- Revision ID: teddy@recompile.se-20150403030102-xdxyaqcwc4wmqeyb
mandos: Do minor formatting and whitespace adjustments.
- files modified:
- mandos
added
removed
mandos
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-2015 Teddy Hogeborn
15
# Copyright © 2008-2015 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
98
98
syslogger = None
99
99
100
100
try:
101
if_nametoindex = (ctypes.cdll.LoadLibrary
102
(ctypes.util.find_library("c"))
103
.if_nametoindex)
101
if_nametoindex = ctypes.cdll.LoadLibrary(
102
ctypes.util.find_library("c")).if_nametoindex
104
103
except (OSError, AttributeError):
104
105
105
def if_nametoindex(interface):
106
106
"Get an interface index the hard way, i.e. using fcntl()"
107
107
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
116
116
"""init logger and add loglevel"""
117
117
118
118
global syslogger
119
syslogger = (logging.handlers.SysLogHandler
120
(facility =
121
logging.handlers.SysLogHandler.LOG_DAEMON,
122
address = "/dev/log"))
119
syslogger = (logging.handlers.SysLogHandler(
120
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
121
address = "/dev/log"))
123
122
syslogger.setFormatter(logging.Formatter
124
123
('Mandos [%(process)d]: %(levelname)s:'
125
124
' %(message)s'))
142
141
143
142
class PGPEngine(object):
144
143
"""A simple class for OpenPGP symmetric encryption & decryption"""
144
145
145
def __init__(self):
146
146
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
147
147
self.gnupgargs = ['--batch',
186
186
187
187
def encrypt(self, data, password):
188
188
passphrase = self.password_encode(password)
189
with tempfile.NamedTemporaryFile(dir=self.tempdir
190
) as passfile:
189
with tempfile.NamedTemporaryFile(
190
dir=self.tempdir) as passfile:
191
191
passfile.write(passphrase)
192
192
passfile.flush()
193
193
proc = subprocess.Popen(['gpg', '--symmetric',
204
204
205
205
def decrypt(self, data, password):
206
206
passphrase = self.password_encode(password)
207
with tempfile.NamedTemporaryFile(dir = self.tempdir
208
) as passfile:
207
with tempfile.NamedTemporaryFile(
208
dir = self.tempdir) as passfile:
209
209
passfile.write(passphrase)
210
210
passfile.flush()
211
211
proc = subprocess.Popen(['gpg', '--decrypt',
215
215
stdin = subprocess.PIPE,
216
216
stdout = subprocess.PIPE,
217
217
stderr = subprocess.PIPE)
218
decrypted_plaintext, err = proc.communicate(input
219
= data)
218
decrypted_plaintext, err = proc.communicate(input = data)
220
219
if proc.returncode != 0:
221
220
raise PGPError(err)
222
221
return decrypted_plaintext
228
227
return super(AvahiError, self).__init__(value, *args,
229
228
**kwargs)
230
229
230
231
231
class AvahiServiceError(AvahiError):
232
232
pass
233
233
234
234
235
class AvahiGroupError(AvahiError):
235
236
pass
236
237
256
257
bus: dbus.SystemBus()
257
258
"""
258
259
259
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
260
servicetype = None, port = None, TXT = None,
261
domain = "", host = "", max_renames = 32768,
262
protocol = avahi.PROTO_UNSPEC, bus = None):
260
def __init__(self,
261
interface = avahi.IF_UNSPEC,
262
name = None,
263
servicetype = None,
264
port = None,
265
TXT = None,
266
domain = "",
267
host = "",
268
max_renames = 32768,
269
protocol = avahi.PROTO_UNSPEC,
270
bus = None):
263
271
self.interface = interface
264
272
self.name = name
265
273
self.type = servicetype
282
290
" after %i retries, exiting.",
283
291
self.rename_count)
284
292
raise AvahiServiceError("Too many renames")
285
self.name = str(self.server
286
.GetAlternativeServiceName(self.name))
293
self.name = str(
294
self.server.GetAlternativeServiceName(self.name))
287
295
self.rename_count += 1
288
296
logger.info("Changing Zeroconf service name to %r ...",
289
297
self.name)
344
352
elif state == avahi.ENTRY_GROUP_FAILURE:
345
353
logger.critical("Avahi: Error in group state changed %s",
346
354
str(error))
347
raise AvahiGroupError("State changed: {!s}"
348
.format(error))
355
raise AvahiGroupError("State changed: {!s}".format(error))
349
356
350
357
def cleanup(self):
351
358
"""Derived from the Avahi example code"""
361
368
def server_state_changed(self, state, error=None):
362
369
"""Derived from the Avahi example code"""
363
370
logger.debug("Avahi server state change: %i", state)
364
bad_states = { avahi.SERVER_INVALID:
365
"Zeroconf server invalid",
366
avahi.SERVER_REGISTERING: None,
367
avahi.SERVER_COLLISION:
368
"Zeroconf server name collision",
369
avahi.SERVER_FAILURE:
370
"Zeroconf server failure" }
371
bad_states = {
372
avahi.SERVER_INVALID: "Zeroconf server invalid",
373
avahi.SERVER_REGISTERING: None,
374
avahi.SERVER_COLLISION: "Zeroconf server name collision",
375
avahi.SERVER_FAILURE: "Zeroconf server failure",
376
}
371
377
if state in bad_states:
372
378
if bad_states[state] is not None:
373
379
if error is None:
392
398
follow_name_owner_changes=True),
393
399
avahi.DBUS_INTERFACE_SERVER)
394
400
self.server.connect_to_signal("StateChanged",
395
self.server_state_changed)
401
self.server_state_changed)
396
402
self.server_state_changed(self.server.GetState())
397
403
398
404
400
406
def rename(self, *args, **kwargs):
401
407
"""Add the new name to the syslog messages"""
402
408
ret = AvahiService.rename(self, *args, **kwargs)
403
syslogger.setFormatter(logging.Formatter
404
('Mandos ({}) [%(process)d]:'
405
' %(levelname)s: %(message)s'
406
.format(self.name)))
409
syslogger.setFormatter(logging.Formatter(
410
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
411
.format(self.name)))
407
412
return ret
408
413
409
414
456
461
"fingerprint", "host", "interval",
457
462
"last_approval_request", "last_checked_ok",
458
463
"last_enabled", "name", "timeout")
459
client_defaults = { "timeout": "PT5M",
460
"extended_timeout": "PT15M",
461
"interval": "PT2M",
462
"checker": "fping -q -- %%(host)s",
463
"host": "",
464
"approval_delay": "PT0S",
465
"approval_duration": "PT1S",
466
"approved_by_default": "True",
467
"enabled": "True",
468
}
464
client_defaults = {
465
"timeout": "PT5M",
466
"extended_timeout": "PT15M",
467
"interval": "PT2M",
468
"checker": "fping -q -- %%(host)s",
469
"host": "",
470
"approval_delay": "PT0S",
471
"approval_duration": "PT1S",
472
"approved_by_default": "True",
473
"enabled": "True",
474
}
469
475
470
476
@staticmethod
471
477
def config_parser(config):
549
555
self.current_checker_command = None
550
556
self.approved = None
551
557
self.approvals_pending = 0
552
self.changedstate = (multiprocessing_manager
553
.Condition(multiprocessing_manager
554
.Lock()))
555
self.client_structure = [attr for attr in
556
self.__dict__.iterkeys()
558
self.changedstate = multiprocessing_manager.Condition(
559
multiprocessing_manager.Lock())
560
self.client_structure = [attr
561
for attr in self.__dict__.iterkeys()
557
562
if not attr.startswith("_")]
558
563
self.client_structure.append("client_structure")
559
564
560
for name, t in inspect.getmembers(type(self),
561
lambda obj:
562
isinstance(obj,
563
property)):
565
for name, t in inspect.getmembers(
566
type(self), lambda obj: isinstance(obj, property)):
564
567
if not name.startswith("_"):
565
568
self.client_structure.append(name)
566
569
608
611
# and every interval from then on.
609
612
if self.checker_initiator_tag is not None:
610
613
gobject.source_remove(self.checker_initiator_tag)
611
self.checker_initiator_tag = (gobject.timeout_add
612
(int(self.interval
613
.total_seconds() * 1000),
614
self.start_checker))
614
self.checker_initiator_tag = gobject.timeout_add(
615
int(self.interval.total_seconds() * 1000),
616
self.start_checker)
615
617
# Schedule a disable() when 'timeout' has passed
616
618
if self.disable_initiator_tag is not None:
617
619
gobject.source_remove(self.disable_initiator_tag)
618
self.disable_initiator_tag = (gobject.timeout_add
619
(int(self.timeout
620
.total_seconds() * 1000),
621
self.disable))
620
self.disable_initiator_tag = gobject.timeout_add(
621
int(self.timeout.total_seconds() * 1000), self.disable)
622
622
# Also start a new checker *right now*.
623
623
self.start_checker()
624
624
633
633
vars(self))
634
634
self.checked_ok()
635
635
else:
636
logger.info("Checker for %(name)s failed",
637
vars(self))
636
logger.info("Checker for %(name)s failed", vars(self))
638
637
else:
639
638
self.last_checker_status = -1
640
639
logger.warning("Checker for %(name)s crashed?",
654
653
gobject.source_remove(self.disable_initiator_tag)
655
654
self.disable_initiator_tag = None
656
655
if getattr(self, "enabled", False):
657
self.disable_initiator_tag = (gobject.timeout_add
658
(int(timeout.total_seconds()
659
* 1000), self.disable))
656
self.disable_initiator_tag = gobject.timeout_add(
657
int(timeout.total_seconds() * 1000), self.disable)
660
658
self.expires = datetime.datetime.utcnow() + timeout
661
659
662
660
def need_approval(self):
693
691
# Start a new checker if needed
694
692
if self.checker is None:
695
693
# Escape attributes for the shell
696
escaped_attrs = { attr:
697
re.escape(str(getattr(self, attr)))
698
for attr in self.runtime_expansions }
694
escaped_attrs = {
695
attr: re.escape(str(getattr(self, attr)))
696
for attr in self.runtime_expansions }
699
697
try:
700
698
command = self.checker_command % escaped_attrs
701
699
except TypeError as error:
702
700
logger.error('Could not format string "%s"',
703
self.checker_command, exc_info=error)
704
return True # Try again later
701
self.checker_command,
702
exc_info=error)
703
return True # Try again later
705
704
self.current_checker_command = command
706
705
try:
707
logger.info("Starting checker %r for %s",
708
command, self.name)
706
logger.info("Starting checker %r for %s", command,
707
self.name)
709
708
# We don't need to redirect stdout and stderr, since
710
709
# in normal mode, that is already done by daemon(),
711
710
# and in debug mode we don't want to. (Stdin is
720
719
"stderr": wnull })
721
720
self.checker = subprocess.Popen(command,
722
721
close_fds=True,
723
shell=True, cwd="/",
722
shell=True,
723
cwd="/",
724
724
**popen_args)
725
725
except OSError as error:
726
726
logger.error("Failed to start subprocess",
727
727
exc_info=error)
728
728
return True
729
self.checker_callback_tag = (gobject.child_watch_add
730
(self.checker.pid,
731
self.checker_callback,
732
data=command))
729
self.checker_callback_tag = gobject.child_watch_add(
730
self.checker.pid, self.checker_callback, data=command)
733
731
# The checker may have completed before the gobject
734
732
# watch was added. Check for this.
735
733
try:
766
764
self.checker = None
767
765
768
766
769
def dbus_service_property(dbus_interface, signature="v",
770
access="readwrite", byte_arrays=False):
767
def dbus_service_property(dbus_interface,
768
signature="v",
769
access="readwrite",
770
byte_arrays=False):
771
771
"""Decorators for marking methods of a DBusObjectWithProperties to
772
772
become properties on the D-Bus.
773
773
783
783
if byte_arrays and signature != "ay":
784
784
raise ValueError("Byte arrays not supported for non-'ay'"
785
785
" signature {!r}".format(signature))
786
786
787
def decorator(func):
787
788
func._dbus_is_property = True
788
789
func._dbus_interface = dbus_interface
793
794
func._dbus_name = func._dbus_name[:-14]
794
795
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
795
796
return func
797
796
798
return decorator
797
799
798
800
807
809
"org.freedesktop.DBus.Property.EmitsChangedSignal":
808
810
"false"}
809
811
"""
812
810
813
def decorator(func):
811
814
func._dbus_is_interface = True
812
815
func._dbus_interface = dbus_interface
813
816
func._dbus_name = dbus_interface
814
817
return func
818
815
819
return decorator
816
820
817
821
827
831
def Property_dbus_property(self):
828
832
return dbus.Boolean(False)
829
833
"""
834
830
835
def decorator(func):
831
836
func._dbus_annotations = annotations
832
837
return func
838
833
839
return decorator
834
840
835
841
838
844
"""
839
845
pass
840
846
847
841
848
class DBusPropertyAccessException(DBusPropertyException):
842
849
"""A property's access permissions disallows an operation.
843
850
"""
871
878
def _get_all_dbus_things(self, thing):
872
879
"""Returns a generator of (name, attribute) pairs
873
880
"""
874
return ((getattr(athing.__get__(self), "_dbus_name",
875
name),
881
return ((getattr(athing.__get__(self), "_dbus_name", name),
876
882
athing.__get__(self))
877
883
for cls in self.__class__.__mro__
878
884
for name, athing in
879
inspect.getmembers(cls,
880
self._is_dbus_thing(thing)))
885
inspect.getmembers(cls, self._is_dbus_thing(thing)))
881
886
882
887
def _get_dbus_property(self, interface_name, property_name):
883
888
"""Returns a bound method if one exists which is a D-Bus
884
889
property with the specified name and interface.
885
890
"""
886
for cls in self.__class__.__mro__:
887
for name, value in (inspect.getmembers
888
(cls,
889
self._is_dbus_thing("property"))):
891
for cls in self.__class__.__mro__:
892
for name, value in inspect.getmembers(
893
cls, self._is_dbus_thing("property")):
890
894
if (value._dbus_name == property_name
891
895
and value._dbus_interface == interface_name):
892
896
return value.__get__(self)
893
897
894
898
# No such property
895
raise DBusPropertyNotFound(self.dbus_object_path + ":"
896
+ interface_name + "."
897
+ property_name)
899
raise DBusPropertyNotFound("{}:{}.{}".format(
900
self.dbus_object_path, interface_name, property_name))
898
901
899
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
902
@dbus.service.method(dbus.PROPERTIES_IFACE,
903
in_signature="ss",
900
904
out_signature="v")
901
905
def Get(self, interface_name, property_name):
902
906
"""Standard D-Bus property Get() method, see D-Bus standard.
927
931
for byte in value))
928
932
prop(value)
929
933
930
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
934
@dbus.service.method(dbus.PROPERTIES_IFACE,
935
in_signature="s",
931
936
out_signature="a{sv}")
932
937
def GetAll(self, interface_name):
933
938
"""Standard D-Bus property GetAll() method, see D-Bus
948
953
if not hasattr(value, "variant_level"):
949
954
properties[name] = value
950
955
continue
951
properties[name] = type(value)(value, variant_level=
952
value.variant_level+1)
956
properties[name] = type(value)(
957
value, variant_level = value.variant_level + 1)
953
958
return dbus.Dictionary(properties, signature="sv")
954
959
955
960
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
973
978
connection)
974
979
try:
975
980
document = xml.dom.minidom.parseString(xmlstring)
981
976
982
def make_tag(document, name, prop):
977
983
e = document.createElement("property")
978
984
e.setAttribute("name", name)
979
985
e.setAttribute("type", prop._dbus_signature)
980
986
e.setAttribute("access", prop._dbus_access)
981
987
return e
988
982
989
for if_tag in document.getElementsByTagName("interface"):
983
990
# Add property tags
984
991
for tag in (make_tag(document, name, prop)
996
1003
if (name == tag.getAttribute("name")
997
1004
and prop._dbus_interface
998
1005
== if_tag.getAttribute("name")):
999
annots.update(getattr
1000
(prop,
1001
"_dbus_annotations",
1002
{}))
1006
annots.update(getattr(
1007
prop, "_dbus_annotations", {}))
1003
1008
for name, value in annots.items():
1004
1009
ann_tag = document.createElement(
1005
1010
"annotation")
1010
1015
for annotation, value in dict(
1011
1016
itertools.chain.from_iterable(
1012
1017
annotations().items()
1013
for name, annotations in
1014
self._get_all_dbus_things("interface")
1018
for name, annotations
1019
in self._get_all_dbus_things("interface")
1015
1020
if name == if_tag.getAttribute("name")
1016
1021
)).items():
1017
1022
ann_tag = document.createElement("annotation")
1046
1051
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1047
1052
if dt is None:
1048
1053
return dbus.String("", variant_level = variant_level)
1049
return dbus.String(dt.isoformat(),
1050
variant_level=variant_level)
1054
return dbus.String(dt.isoformat(), variant_level=variant_level)
1051
1055
1052
1056
1053
1057
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1073
1077
(from DBusObjectWithProperties) and interfaces (from the
1074
1078
dbus_interface_annotations decorator).
1075
1079
"""
1080
1076
1081
def wrapper(cls):
1077
1082
for orig_interface_name, alt_interface_name in (
1078
alt_interface_names.items()):
1083
alt_interface_names.items()):
1079
1084
attr = {}
1080
1085
interface_names = set()
1081
1086
# Go though all attributes of the class
1083
1088
# Ignore non-D-Bus attributes, and D-Bus attributes
1084
1089
# with the wrong interface name
1085
1090
if (not hasattr(attribute, "_dbus_interface")
1086
or not attribute._dbus_interface
1087
.startswith(orig_interface_name)):
1091
or not attribute._dbus_interface.startswith(
1092
orig_interface_name)):
1088
1093
continue
1089
1094
# Create an alternate D-Bus interface name based on
1090
1095
# the current name
1091
alt_interface = (attribute._dbus_interface
1092
.replace(orig_interface_name,
1093
alt_interface_name))
1096
alt_interface = attribute._dbus_interface.replace(
1097
orig_interface_name, alt_interface_name)
1094
1098
interface_names.add(alt_interface)
1095
1099
# Is this a D-Bus signal?
1096
1100
if getattr(attribute, "_dbus_is_signal", False):
1097
1101
# Extract the original non-method undecorated
1098
1102
# function by black magic
1099
1103
nonmethod_func = (dict(
1100
zip(attribute.func_code.co_freevars,
1101
attribute.__closure__))["func"]
1102
.cell_contents)
1104
zip(attribute.func_code.co_freevars,
1105
attribute.__closure__))
1106
["func"].cell_contents)
1103
1107
# Create a new, but exactly alike, function
1104
1108
# object, and decorate it to be a new D-Bus signal
1105
1109
# with the alternate D-Bus interface name
1106
new_function = (dbus.service.signal
1107
(alt_interface,
1108
attribute._dbus_signature)
1110
new_function = (dbus.service.signal(
1111
alt_interface, attribute._dbus_signature)
1109
1112
(types.FunctionType(
1110
nonmethod_func.func_code,
1111
nonmethod_func.func_globals,
1112
nonmethod_func.func_name,
1113
nonmethod_func.func_defaults,
1114
nonmethod_func.func_closure)))
1113
nonmethod_func.func_code,
1114
nonmethod_func.func_globals,
1115
nonmethod_func.func_name,
1116
nonmethod_func.func_defaults,
1117
nonmethod_func.func_closure)))
1115
1118
# Copy annotations, if any
1116
1119
try:
1117
new_function._dbus_annotations = (
1118
dict(attribute._dbus_annotations))
1120
new_function._dbus_annotations = dict(
1121
attribute._dbus_annotations)
1119
1122
except AttributeError:
1120
1123
pass
1121
1124
# Define a creator of a function to call both the
1126
1129
"""This function is a scope container to pass
1127
1130
func1 and func2 to the "call_both" function
1128
1131
outside of its arguments"""
1132
1129
1133
def call_both(*args, **kwargs):
1130
1134
"""This function will emit two D-Bus
1131
1135
signals by calling func1 and func2"""
1132
1136
func1(*args, **kwargs)
1133
1137
func2(*args, **kwargs)
1138
1134
1139
return call_both
1135
1140
# Create the "call_both" function and add it to
1136
1141
# the class
1141
1146
# object. Decorate it to be a new D-Bus method
1142
1147
# with the alternate D-Bus interface name. Add it
1143
1148
# to the class.
1144
attr[attrname] = (dbus.service.method
1145
(alt_interface,
1146
attribute._dbus_in_signature,
1147
attribute._dbus_out_signature)
1148
(types.FunctionType
1149
(attribute.func_code,
1150
attribute.func_globals,
1151
attribute.func_name,
1152
attribute.func_defaults,
1153
attribute.func_closure)))
1149
attr[attrname] = (
1150
dbus.service.method(
1151
alt_interface,
1152
attribute._dbus_in_signature,
1153
attribute._dbus_out_signature)
1154
(types.FunctionType(attribute.func_code,
1155
attribute.func_globals,
1156
attribute.func_name,
1157
attribute.func_defaults,
1158
attribute.func_closure)))
1154
1159
# Copy annotations, if any
1155
1160
try:
1156
attr[attrname]._dbus_annotations = (
1157
dict(attribute._dbus_annotations))
1161
attr[attrname]._dbus_annotations = dict(
1162
attribute._dbus_annotations)
1158
1163
except AttributeError:
1159
1164
pass
1160
1165
# Is this a D-Bus property?
1163
1168
# object, and decorate it to be a new D-Bus
1164
1169
# property with the alternate D-Bus interface
1165
1170
# name. Add it to the class.
1166
attr[attrname] = (dbus_service_property
1167
(alt_interface,
1168
attribute._dbus_signature,
1169
attribute._dbus_access,
1170
attribute
1171
._dbus_get_args_options
1172
["byte_arrays"])
1173
(types.FunctionType
1174
(attribute.func_code,
1175
attribute.func_globals,
1176
attribute.func_name,
1177
attribute.func_defaults,
1178
attribute.func_closure)))
1171
attr[attrname] = (dbus_service_property(
1172
alt_interface, attribute._dbus_signature,
1173
attribute._dbus_access,
1174
attribute._dbus_get_args_options
1175
["byte_arrays"])
1176
(types.FunctionType(
1177
attribute.func_code,
1178
attribute.func_globals,
1179
attribute.func_name,
1180
attribute.func_defaults,
1181
attribute.func_closure)))
1179
1182
# Copy annotations, if any
1180
1183
try:
1181
attr[attrname]._dbus_annotations = (
1182
dict(attribute._dbus_annotations))
1184
attr[attrname]._dbus_annotations = dict(
1185
attribute._dbus_annotations)
1183
1186
except AttributeError:
1184
1187
pass
1185
1188
# Is this a D-Bus interface?
1188
1191
# object. Decorate it to be a new D-Bus interface
1189
1192
# with the alternate D-Bus interface name. Add it
1190
1193
# to the class.
1191
attr[attrname] = (dbus_interface_annotations
1192
(alt_interface)
1193
(types.FunctionType
1194
(attribute.func_code,
1195
attribute.func_globals,
1196
attribute.func_name,
1197
attribute.func_defaults,
1198
attribute.func_closure)))
1194
attr[attrname] = (
1195
dbus_interface_annotations(alt_interface)
1196
(types.FunctionType(attribute.func_code,
1197
attribute.func_globals,
1198
attribute.func_name,
1199
attribute.func_defaults,
1200
attribute.func_closure)))
1199
1201
if deprecate:
1200
1202
# Deprecate all alternate interfaces
1201
1203
iname="_AlternateDBusNames_interface_annotation{}"
1202
1204
for interface_name in interface_names:
1205
1203
1206
@dbus_interface_annotations(interface_name)
1204
1207
def func(self):
1205
1208
return { "org.freedesktop.DBus.Deprecated":
1206
"true" }
1209
"true" }
1207
1210
# Find an unused name
1208
1211
for aname in (iname.format(i)
1209
1212
for i in itertools.count()):
1214
1217
# Replace the class with a new subclass of it with
1215
1218
# methods, signals, etc. as created above.
1216
1219
cls = type(b"{}Alternate".format(cls.__name__),
1217
(cls,), attr)
1220
(cls, ), attr)
1218
1221
return cls
1222
1219
1223
return wrapper
1220
1224
1221
1225
1222
1226
@alternate_dbus_interfaces({"se.recompile.Mandos":
1223
"se.bsnet.fukt.Mandos"})
1227
"se.bsnet.fukt.Mandos"})
1224
1228
class ClientDBus(Client, DBusObjectWithProperties):
1225
1229
"""A Client class using D-Bus
1226
1230
1230
1234
"""
1231
1235
1232
1236
runtime_expansions = (Client.runtime_expansions
1233
+ ("dbus_object_path",))
1237
+ ("dbus_object_path", ))
1234
1238
1235
1239
_interface = "se.recompile.Mandos.Client"
1236
1240
1244
1248
client_object_name = str(self.name).translate(
1245
1249
{ord("."): ord("_"),
1246
1250
ord("-"): ord("_")})
1247
self.dbus_object_path = (dbus.ObjectPath
1248
("/clients/" + client_object_name))
1251
self.dbus_object_path = dbus.ObjectPath(
1252
"/clients/" + client_object_name)
1249
1253
DBusObjectWithProperties.__init__(self, self.bus,
1250
1254
self.dbus_object_path)
1251
1255
1252
def notifychangeproperty(transform_func,
1253
dbus_name, type_func=lambda x: x,
1254
variant_level=1, invalidate_only=False,
1256
def notifychangeproperty(transform_func, dbus_name,
1257
type_func=lambda x: x,
1258
variant_level=1,
1259
invalidate_only=False,
1255
1260
_interface=_interface):
1256
1261
""" Modify a variable so that it's a property which announces
1257
1262
its changes to DBus.
1264
1269
variant_level: D-Bus variant level. Default: 1
1265
1270
"""
1266
1271
attrname = "_{}".format(dbus_name)
1272
1267
1273
def setter(self, value):
1268
1274
if hasattr(self, "dbus_object_path"):
1269
1275
if (not hasattr(self, attrname) or
1270
1276
type_func(getattr(self, attrname, None))
1271
1277
!= type_func(value)):
1272
1278
if invalidate_only:
1273
self.PropertiesChanged(_interface,
1274
dbus.Dictionary(),
1275
dbus.Array
1276
((dbus_name,)))
1279
self.PropertiesChanged(
1280
_interface, dbus.Dictionary(),
1281
dbus.Array((dbus_name, )))
1277
1282
else:
1278
dbus_value = transform_func(type_func(value),
1279
variant_level
1280
=variant_level)
1283
dbus_value = transform_func(
1284
type_func(value),
1285
variant_level = variant_level)
1281
1286
self.PropertyChanged(dbus.String(dbus_name),
1282
1287
dbus_value)
1283
self.PropertiesChanged(_interface,
1284
dbus.Dictionary({
1285
dbus.String(dbus_name):
1286
dbus_value }), dbus.Array())
1288
self.PropertiesChanged(
1289
_interface,
1290
dbus.Dictionary({ dbus.String(dbus_name):
1291
dbus_value }),
1292
dbus.Array())
1287
1293
setattr(self, attrname, value)
1288
1294
1289
1295
return property(lambda self: getattr(self, attrname), setter)
1295
1301
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1296
1302
last_enabled = notifychangeproperty(datetime_to_dbus,
1297
1303
"LastEnabled")
1298
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1299
type_func = lambda checker:
1300
checker is not None)
1304
checker = notifychangeproperty(
1305
dbus.Boolean, "CheckerRunning",
1306
type_func = lambda checker: checker is not None)
1301
1307
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1302
1308
"LastCheckedOK")
1303
1309
last_checker_status = notifychangeproperty(dbus.Int16,
1306
1312
datetime_to_dbus, "LastApprovalRequest")
1307
1313
approved_by_default = notifychangeproperty(dbus.Boolean,
1308
1314
"ApprovedByDefault")
1309
approval_delay = notifychangeproperty(dbus.UInt64,
1310
"ApprovalDelay",
1311
type_func =
1312
lambda td: td.total_seconds()
1313
* 1000)
1315
approval_delay = notifychangeproperty(
1316
dbus.UInt64, "ApprovalDelay",
1317
type_func = lambda td: td.total_seconds() * 1000)
1314
1318
approval_duration = notifychangeproperty(
1315
1319
dbus.UInt64, "ApprovalDuration",
1316
1320
type_func = lambda td: td.total_seconds() * 1000)
1317
1321
host = notifychangeproperty(dbus.String, "Host")
1318
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1319
type_func = lambda td:
1320
td.total_seconds() * 1000)
1322
timeout = notifychangeproperty(
1323
dbus.UInt64, "Timeout",
1324
type_func = lambda td: td.total_seconds() * 1000)
1321
1325
extended_timeout = notifychangeproperty(
1322
1326
dbus.UInt64, "ExtendedTimeout",
1323
1327
type_func = lambda td: td.total_seconds() * 1000)
1324
interval = notifychangeproperty(dbus.UInt64,
1325
"Interval",
1326
type_func =
1327
lambda td: td.total_seconds()
1328
* 1000)
1328
interval = notifychangeproperty(
1329
dbus.UInt64, "Interval",
1330
type_func = lambda td: td.total_seconds() * 1000)
1329
1331
checker_command = notifychangeproperty(dbus.String, "Checker")
1330
1332
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1331
1333
invalidate_only=True)
1469
1471
return dbus.Boolean(bool(self.approvals_pending))
1470
1472
1471
1473
# ApprovedByDefault - property
1472
@dbus_service_property(_interface, signature="b",
1474
@dbus_service_property(_interface,
1475
signature="b",
1473
1476
access="readwrite")
1474
1477
def ApprovedByDefault_dbus_property(self, value=None):
1475
1478
if value is None: # get
1477
1480
self.approved_by_default = bool(value)
1478
1481
1479
1482
# ApprovalDelay - property
1480
@dbus_service_property(_interface, signature="t",
1483
@dbus_service_property(_interface,
1484
signature="t",
1481
1485
access="readwrite")
1482
1486
def ApprovalDelay_dbus_property(self, value=None):
1483
1487
if value is None: # get
1486
1490
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1487
1491
1488
1492
# ApprovalDuration - property
1489
@dbus_service_property(_interface, signature="t",
1493
@dbus_service_property(_interface,
1494
signature="t",
1490
1495
access="readwrite")
1491
1496
def ApprovalDuration_dbus_property(self, value=None):
1492
1497
if value is None: # get
1505
1510
return dbus.String(self.fingerprint)
1506
1511
1507
1512
# Host - property
1508
@dbus_service_property(_interface, signature="s",
1513
@dbus_service_property(_interface,
1514
signature="s",
1509
1515
access="readwrite")
1510
1516
def Host_dbus_property(self, value=None):
1511
1517
if value is None: # get
1523
1529
return datetime_to_dbus(self.last_enabled)
1524
1530
1525
1531
# Enabled - property
1526
@dbus_service_property(_interface, signature="b",
1532
@dbus_service_property(_interface,
1533
signature="b",
1527
1534
access="readwrite")
1528
1535
def Enabled_dbus_property(self, value=None):
1529
1536
if value is None: # get
1534
1541
self.disable()
1535
1542
1536
1543
# LastCheckedOK - property
1537
@dbus_service_property(_interface, signature="s",
1544
@dbus_service_property(_interface,
1545
signature="s",
1538
1546
access="readwrite")
1539
1547
def LastCheckedOK_dbus_property(self, value=None):
1540
1548
if value is not None:
1543
1551
return datetime_to_dbus(self.last_checked_ok)
1544
1552
1545
1553
# LastCheckerStatus - property
1546
@dbus_service_property(_interface, signature="n",
1547
access="read")
1554
@dbus_service_property(_interface, signature="n", access="read")
1548
1555
def LastCheckerStatus_dbus_property(self):
1549
1556
return dbus.Int16(self.last_checker_status)
1550
1557
1559
1566
return datetime_to_dbus(self.last_approval_request)
1560
1567
1561
1568
# Timeout - property
1562
@dbus_service_property(_interface, signature="t",
1569
@dbus_service_property(_interface,
1570
signature="t",
1563
1571
access="readwrite")
1564
1572
def Timeout_dbus_property(self, value=None):
1565
1573
if value is None: # get
1578
1586
is None):
1579
1587
return
1580
1588
gobject.source_remove(self.disable_initiator_tag)
1581
self.disable_initiator_tag = (
1582
gobject.timeout_add(
1583
int((self.expires - now).total_seconds()
1584
* 1000), self.disable))
1589
self.disable_initiator_tag = gobject.timeout_add(
1590
int((self.expires - now).total_seconds() * 1000),
1591
self.disable)
1585
1592
1586
1593
# ExtendedTimeout - property
1587
@dbus_service_property(_interface, signature="t",
1594
@dbus_service_property(_interface,
1595
signature="t",
1588
1596
access="readwrite")
1589
1597
def ExtendedTimeout_dbus_property(self, value=None):
1590
1598
if value is None: # get
1593
1601
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1594
1602
1595
1603
# Interval - property
1596
@dbus_service_property(_interface, signature="t",
1604
@dbus_service_property(_interface,
1605
signature="t",
1597
1606
access="readwrite")
1598
1607
def Interval_dbus_property(self, value=None):
1599
1608
if value is None: # get
1604
1613
if self.enabled:
1605
1614
# Reschedule checker run
1606
1615
gobject.source_remove(self.checker_initiator_tag)
1607
self.checker_initiator_tag = (gobject.timeout_add
1608
(value, self.start_checker))
1609
self.start_checker() # Start one now, too
1616
self.checker_initiator_tag = gobject.timeout_add(
1617
value, self.start_checker)
1618
self.start_checker() # Start one now, too
1610
1619
1611
1620
# Checker - property
1612
@dbus_service_property(_interface, signature="s",
1621
@dbus_service_property(_interface,
1622
signature="s",
1613
1623
access="readwrite")
1614
1624
def Checker_dbus_property(self, value=None):
1615
1625
if value is None: # get
1617
1627
self.checker_command = str(value)
1618
1628
1619
1629
# CheckerRunning - property
1620
@dbus_service_property(_interface, signature="b",
1630
@dbus_service_property(_interface,
1631
signature="b",
1621
1632
access="readwrite")
1622
1633
def CheckerRunning_dbus_property(self, value=None):
1623
1634
if value is None: # get
1633
1644
return self.dbus_object_path # is already a dbus.ObjectPath
1634
1645
1635
1646
# Secret = property
1636
@dbus_service_property(_interface, signature="ay",
1637
access="write", byte_arrays=True)
1647
@dbus_service_property(_interface,
1648
signature="ay",
1649
access="write",
1650
byte_arrays=True)
1638
1651
def Secret_dbus_property(self, value):
1639
1652
self.secret = bytes(value)
1640
1653
1656
1669
if data[0] == 'data':
1657
1670
return data[1]
1658
1671
if data[0] == 'function':
1672
1659
1673
def func(*args, **kwargs):
1660
1674
self._pipe.send(('funcall', name, args, kwargs))
1661
1675
return self._pipe.recv()[1]
1676
1662
1677
return func
1663
1678
1664
1679
def __setattr__(self, name, value):
1680
1695
logger.debug("Pipe FD: %d",
1681
1696
self.server.child_pipe.fileno())
1682
1697
1683
session = (gnutls.connection
1684
.ClientSession(self.request,
1685
gnutls.connection
1686
.X509Credentials()))
1698
session = gnutls.connection.ClientSession(
1699
self.request, gnutls.connection .X509Credentials())
1687
1700
1688
1701
# Note: gnutls.connection.X509Credentials is really a
1689
1702
# generic GnuTLS certificate credentials object so long as
1698
1711
priority = self.server.gnutls_priority
1699
1712
if priority is None:
1700
1713
priority = "NORMAL"
1701
(gnutls.library.functions
1702
.gnutls_priority_set_direct(session._c_object,
1703
priority, None))
1714
gnutls.library.functions.gnutls_priority_set_direct(
1715
session._c_object, priority, None)
1704
1716
1705
1717
# Start communication using the Mandos protocol
1706
1718
# Get protocol number
1726
1738
approval_required = False
1727
1739
try:
1728
1740
try:
1729
fpr = self.fingerprint(self.peer_certificate
1730
(session))
1741
fpr = self.fingerprint(
1742
self.peer_certificate(session))
1731
1743
except (TypeError,
1732
1744
gnutls.errors.GNUTLSError) as error:
1733
1745
logger.warning("Bad certificate: %s", error)
1748
1760
while True:
1749
1761
if not client.enabled:
1750
1762
logger.info("Client %s is disabled",
1751
client.name)
1763
client.name)
1752
1764
if self.server.use_dbus:
1753
1765
# Emit D-Bus signal
1754
1766
client.Rejected("Disabled")
1801
1813
logger.warning("gnutls send failed",
1802
1814
exc_info=error)
1803
1815
return
1804
logger.debug("Sent: %d, remaining: %d",
1805
sent, len(client.secret)
1806
- (sent_size + sent))
1816
logger.debug("Sent: %d, remaining: %d", sent,
1817
len(client.secret) - (sent_size
1818
+ sent))
1807
1819
sent_size += sent
1808
1820
1809
1821
logger.info("Sending secret to %s", client.name)
1826
1838
def peer_certificate(session):
1827
1839
"Return the peer's OpenPGP certificate as a bytestring"
1828
1840
# If not an OpenPGP certificate...
1829
if (gnutls.library.functions
1830
.gnutls_certificate_type_get(session._c_object)
1841
if (gnutls.library.functions.gnutls_certificate_type_get(
1842
session._c_object)
1831
1843
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1832
1844
# ...do the normal thing
1833
1845
return session.peer_certificate
1847
1859
def fingerprint(openpgp):
1848
1860
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1849
1861
# New GnuTLS "datum" with the OpenPGP public key
1850
datum = (gnutls.library.types
1851
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1852
ctypes.POINTER
1853
(ctypes.c_ubyte)),
1854
ctypes.c_uint(len(openpgp))))
1862
datum = gnutls.library.types.gnutls_datum_t(
1863
ctypes.cast(ctypes.c_char_p(openpgp),
1864
ctypes.POINTER(ctypes.c_ubyte)),
1865
ctypes.c_uint(len(openpgp)))
1855
1866
# New empty GnuTLS certificate
1856
1867
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1857
(gnutls.library.functions
1858
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1868
gnutls.library.functions.gnutls_openpgp_crt_init(
1869
ctypes.byref(crt))
1859
1870
# Import the OpenPGP public key into the certificate
1860
(gnutls.library.functions
1861
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1862
gnutls.library.constants
1863
.GNUTLS_OPENPGP_FMT_RAW))
1871
gnutls.library.functions.gnutls_openpgp_crt_import(
1872
crt, ctypes.byref(datum),
1873
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1864
1874
# Verify the self signature in the key
1865
1875
crtverify = ctypes.c_uint()
1866
(gnutls.library.functions
1867
.gnutls_openpgp_crt_verify_self(crt, 0,
1868
ctypes.byref(crtverify)))
1876
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1877
crt, 0, ctypes.byref(crtverify))
1869
1878
if crtverify.value != 0:
1870
1879
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1871
raise (gnutls.errors.CertificateSecurityError
1872
("Verify failed"))
1880
raise gnutls.errors.CertificateSecurityError(
1881
"Verify failed")
1873
1882
# New buffer for the fingerprint
1874
1883
buf = ctypes.create_string_buffer(20)
1875
1884
buf_len = ctypes.c_size_t()
1876
1885
# Get the fingerprint from the certificate into the buffer
1877
(gnutls.library.functions
1878
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1879
ctypes.byref(buf_len)))
1886
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1887
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1880
1888
# Deinit the certificate
1881
1889
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1882
1890
# Convert the buffer to a Python bytestring
1888
1896
1889
1897
class MultiprocessingMixIn(object):
1890
1898
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1899
1891
1900
def sub_process_main(self, request, address):
1892
1901
try:
1893
1902
self.finish_request(request, address)
1905
1914
1906
1915
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1907
1916
""" adds a pipe to the MixIn """
1917
1908
1918
def process_request(self, request, client_address):
1909
1919
"""Overrides and wraps the original process_request().
1910
1920
1931
1941
interface: None or a network interface name (string)
1932
1942
use_ipv6: Boolean; to use IPv6 or not
1933
1943
"""
1944
1934
1945
def __init__(self, server_address, RequestHandlerClass,
1935
interface=None, use_ipv6=True, socketfd=None):
1946
interface=None,
1947
use_ipv6=True,
1948
socketfd=None):
1936
1949
"""If socketfd is set, use that file descriptor instead of
1937
1950
creating a new one with socket.socket().
1938
1951
"""
1979
1992
self.interface)
1980
1993
else:
1981
1994
try:
1982
self.socket.setsockopt(socket.SOL_SOCKET,
1983
SO_BINDTODEVICE,
1984
(self.interface + "\0")
1985
.encode("utf-8"))
1995
self.socket.setsockopt(
1996
socket.SOL_SOCKET, SO_BINDTODEVICE,
1997
(self.interface + "\0").encode("utf-8"))
1986
1998
except socket.error as error:
1987
1999
if error.errno == errno.EPERM:
1988
2000
logger.error("No permission to bind to"
2006
2018
self.server_address = (any_address,
2007
2019
self.server_address[1])
2008
2020
elif not self.server_address[1]:
2009
self.server_address = (self.server_address[0],
2010
0)
2021
self.server_address = (self.server_address[0], 0)
2011
2022
# if self.interface:
2012
2023
# self.server_address = (self.server_address[0],
2013
2024
# 0, # port
2027
2038
2028
2039
Assumes a gobject.MainLoop event loop.
2029
2040
"""
2041
2030
2042
def __init__(self, server_address, RequestHandlerClass,
2031
interface=None, use_ipv6=True, clients=None,
2032
gnutls_priority=None, use_dbus=True, socketfd=None):
2043
interface=None,
2044
use_ipv6=True,
2045
clients=None,
2046
gnutls_priority=None,
2047
use_dbus=True,
2048
socketfd=None):
2033
2049
self.enabled = False
2034
2050
self.clients = clients
2035
2051
if self.clients is None:
2041
2057
interface = interface,
2042
2058
use_ipv6 = use_ipv6,
2043
2059
socketfd = socketfd)
2060
2044
2061
def server_activate(self):
2045
2062
if self.enabled:
2046
2063
return socketserver.TCPServer.server_activate(self)
2050
2067
2051
2068
def add_pipe(self, parent_pipe, proc):
2052
2069
# Call "handle_ipc" for both data and EOF events
2053
gobject.io_add_watch(parent_pipe.fileno(),
2054
gobject.IO_IN | gobject.IO_HUP,
2055
functools.partial(self.handle_ipc,
2056
parent_pipe =
2057
parent_pipe,
2058
proc = proc))
2070
gobject.io_add_watch(
2071
parent_pipe.fileno(),
2072
gobject.IO_IN | gobject.IO_HUP,
2073
functools.partial(self.handle_ipc,
2074
parent_pipe = parent_pipe,
2075
proc = proc))
2059
2076
2060
def handle_ipc(self, source, condition, parent_pipe=None,
2061
proc = None, client_object=None):
2077
def handle_ipc(self, source, condition,
2078
parent_pipe=None,
2079
proc = None,
2080
client_object=None):
2062
2081
# error, or the other end of multiprocessing.Pipe has closed
2063
2082
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2064
2083
# Wait for other process to exit
2087
2106
parent_pipe.send(False)
2088
2107
return False
2089
2108
2090
gobject.io_add_watch(parent_pipe.fileno(),
2091
gobject.IO_IN | gobject.IO_HUP,
2092
functools.partial(self.handle_ipc,
2093
parent_pipe =
2094
parent_pipe,
2095
proc = proc,
2096
client_object =
2097
client))
2109
gobject.io_add_watch(
2110
parent_pipe.fileno(),
2111
gobject.IO_IN | gobject.IO_HUP,
2112
functools.partial(self.handle_ipc,
2113
parent_pipe = parent_pipe,
2114
proc = proc,
2115
client_object = client))
2098
2116
parent_pipe.send(True)
2099
2117
# remove the old hook in favor of the new above hook on
2100
2118
# same fileno
2106
2124
2107
2125
parent_pipe.send(('data', getattr(client_object,
2108
2126
funcname)(*args,
2109
**kwargs)))
2127
**kwargs)))
2110
2128
2111
2129
if command == 'getattr':
2112
2130
attrname = request[1]
2113
2131
if callable(client_object.__getattribute__(attrname)):
2114
parent_pipe.send(('function',))
2132
parent_pipe.send(('function', ))
2115
2133
else:
2116
parent_pipe.send(('data', client_object
2117
.__getattribute__(attrname)))
2134
parent_pipe.send((
2135
'data', client_object.__getattribute__(attrname)))
2118
2136
2119
2137
if command == 'setattr':
2120
2138
attrname = request[1]
2160
2178
# None
2161
2179
"followers")) # Tokens valid after
2162
2180
# this token
2181
Token = collections.namedtuple("Token", (
2182
"regexp", # To match token; if "value" is not None, must have
2183
# a "group" containing digits
2184
"value", # datetime.timedelta or None
2185
"followers")) # Tokens valid after this token
2163
2186
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2164
2187
# the "duration" ABNF definition in RFC 3339, Appendix A.
2165
2188
token_end = Token(re.compile(r"$"), None, frozenset())
2166
2189
token_second = Token(re.compile(r"(\d+)S"),
2167
2190
datetime.timedelta(seconds=1),
2168
frozenset((token_end,)))
2191
frozenset((token_end, )))
2169
2192
token_minute = Token(re.compile(r"(\d+)M"),
2170
2193
datetime.timedelta(minutes=1),
2171
2194
frozenset((token_second, token_end)))
2187
2210
frozenset((token_month, token_end)))
2188
2211
token_week = Token(re.compile(r"(\d+)W"),
2189
2212
datetime.timedelta(weeks=1),
2190
frozenset((token_end,)))
2213
frozenset((token_end, )))
2191
2214
token_duration = Token(re.compile(r"P"), None,
2192
2215
frozenset((token_year, token_month,
2193
2216
token_day, token_time,
2261
2284
elif suffix == "w":
2262
2285
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2263
2286
else:
2264
raise ValueError("Unknown suffix {!r}"
2265
.format(suffix))
2287
raise ValueError("Unknown suffix {!r}".format(suffix))
2266
2288
except IndexError as e:
2267
2289
raise ValueError(*(e.args))
2268
2290
timevalue += delta
2284
2306
# Close all standard open file descriptors
2285
2307
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2286
2308
if not stat.S_ISCHR(os.fstat(null).st_mode):
2287
raise OSError(errno.ENODEV, "{} not a character device"
2309
raise OSError(errno.ENODEV,
2310
"{} not a character device"
2288
2311
.format(os.devnull))
2289
2312
os.dup2(null, sys.stdin.fileno())
2290
2313
os.dup2(null, sys.stdout.fileno())
2367
2390
"statedir": "/var/lib/mandos",
2368
2391
"foreground": "False",
2369
2392
"zeroconf": "True",
2370
}
2393
}
2371
2394
2372
2395
# Parse config file for server-global settings
2373
2396
server_config = configparser.SafeConfigParser(server_defaults)
2374
2397
del server_defaults
2375
server_config.read(os.path.join(options.configdir,
2376
"mandos.conf"))
2398
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2377
2399
# Convert the SafeConfigParser object to a dict
2378
2400
server_settings = server_config.defaults()
2379
2401
# Use the appropriate methods on the non-string config options
2397
2419
# Override the settings from the config file with command line
2398
2420
# options, if set.
2399
2421
for option in ("interface", "address", "port", "debug",
2400
"priority", "servicename", "configdir",
2401
"use_dbus", "use_ipv6", "debuglevel", "restore",
2402
"statedir", "socket", "foreground", "zeroconf"):
2422
"priority", "servicename", "configdir", "use_dbus",
2423
"use_ipv6", "debuglevel", "restore", "statedir",
2424
"socket", "foreground", "zeroconf"):
2403
2425
value = getattr(options, option)
2404
2426
if value is not None:
2405
2427
server_settings[option] = value
2420
2442
2421
2443
##################################################################
2422
2444
2423
if (not server_settings["zeroconf"] and
2424
not (server_settings["port"]
2425
or server_settings["socket"] != "")):
2426
parser.error("Needs port or socket to work without"
2427
" Zeroconf")
2445
if (not server_settings["zeroconf"]
2446
and not (server_settings["port"]
2447
or server_settings["socket"] != "")):
2448
parser.error("Needs port or socket to work without Zeroconf")
2428
2449
2429
2450
# For convenience
2430
2451
debug = server_settings["debug"]
2446
2467
initlogger(debug, level)
2447
2468
2448
2469
if server_settings["servicename"] != "Mandos":
2449
syslogger.setFormatter(logging.Formatter
2450
('Mandos ({}) [%(process)d]:'
2451
' %(levelname)s: %(message)s'
2452
.format(server_settings
2453
["servicename"])))
2470
syslogger.setFormatter(
2471
logging.Formatter('Mandos ({}) [%(process)d]:'
2472
' %(levelname)s: %(message)s'.format(
2473
server_settings["servicename"])))
2454
2474
2455
2475
# Parse config file with clients
2456
2476
client_config = configparser.SafeConfigParser(Client
2464
2484
socketfd = None
2465
2485
if server_settings["socket"] != "":
2466
2486
socketfd = server_settings["socket"]
2467
tcp_server = MandosServer((server_settings["address"],
2468
server_settings["port"]),
2469
ClientHandler,
2470
interface=(server_settings["interface"]
2471
or None),
2472
use_ipv6=use_ipv6,
2473
gnutls_priority=
2474
server_settings["priority"],
2475
use_dbus=use_dbus,
2476
socketfd=socketfd)
2487
tcp_server = MandosServer(
2488
(server_settings["address"], server_settings["port"]),
2489
ClientHandler,
2490
interface=(server_settings["interface"] or None),
2491
use_ipv6=use_ipv6,
2492
gnutls_priority=server_settings["priority"],
2493
use_dbus=use_dbus,
2494
socketfd=socketfd)
2477
2495
if not foreground:
2478
2496
pidfilename = "/run/mandos.pid"
2479
2497
if not os.path.isdir("/run/."):
2513
2531
def debug_gnutls(level, string):
2514
2532
logger.debug("GnuTLS: %s", string[:-1])
2515
2533
2516
(gnutls.library.functions
2517
.gnutls_global_set_log_function(debug_gnutls))
2534
gnutls.library.functions.gnutls_global_set_log_function(
2535
debug_gnutls)
2518
2536
2519
2537
# Redirect stdin so all checkers get /dev/null
2520
2538
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2540
2558
if use_dbus:
2541
2559
try:
2542
2560
bus_name = dbus.service.BusName("se.recompile.Mandos",
2543
bus, do_not_queue=True)
2544
old_bus_name = (dbus.service.BusName
2545
("se.bsnet.fukt.Mandos", bus,
2546
do_not_queue=True))
2561
bus,
2562
do_not_queue=True)
2563
old_bus_name = dbus.service.BusName(
2564
"se.bsnet.fukt.Mandos", bus,
2565
do_not_queue=True)
2547
2566
except dbus.exceptions.NameExistsException as e:
2548
2567
logger.error("Disabling D-Bus:", exc_info=e)
2549
2568
use_dbus = False
2551
2570
tcp_server.use_dbus = False
2552
2571
if zeroconf:
2553
2572
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2554
service = AvahiServiceToSyslog(name =
2555
server_settings["servicename"],
2556
servicetype = "_mandos._tcp",
2557
protocol = protocol, bus = bus)
2573
service = AvahiServiceToSyslog(
2574
name = server_settings["servicename"],
2575
servicetype = "_mandos._tcp",
2576
protocol = protocol,
2577
bus = bus)
2558
2578
if server_settings["interface"]:
2559
service.interface = (if_nametoindex
2560
(server_settings["interface"]
2561
.encode("utf-8")))
2579
service.interface = if_nametoindex(
2580
server_settings["interface"].encode("utf-8"))
2562
2581
2563
2582
global multiprocessing_manager
2564
2583
multiprocessing_manager = multiprocessing.Manager()
2583
2602
if server_settings["restore"]:
2584
2603
try:
2585
2604
with open(stored_state_path, "rb") as stored_state:
2586
clients_data, old_client_settings = (pickle.load
2587
(stored_state))
2605
clients_data, old_client_settings = pickle.load(
2606
stored_state)
2588
2607
os.remove(stored_state_path)
2589
2608
except IOError as e:
2590
2609
if e.errno == errno.ENOENT:
2591
logger.warning("Could not load persistent state: {}"
2592
.format(os.strerror(e.errno)))
2610
logger.warning("Could not load persistent state:"
2611
" {}".format(os.strerror(e.errno)))
2593
2612
else:
2594
2613
logger.critical("Could not load persistent state:",
2595
2614
exc_info=e)
2596
2615
raise
2597
2616
except EOFError as e:
2598
2617
logger.warning("Could not load persistent state: "
2599
"EOFError:", exc_info=e)
2618
"EOFError:",
2619
exc_info=e)
2600
2620
2601
2621
with PGPEngine() as pgp:
2602
2622
for client_name, client in clients_data.items():
2614
2634
# For each value in new config, check if it
2615
2635
# differs from the old config value (Except for
2616
2636
# the "secret" attribute)
2617
if (name != "secret" and
2618
value != old_client_settings[client_name]
2619
[name]):
2637
if (name != "secret"
2638
and (value !=
2639
old_client_settings[client_name][name])):
2620
2640
client[name] = value
2621
2641
except KeyError:
2622
2642
pass
2631
2651
if not client["last_checked_ok"]:
2632
2652
logger.warning(
2633
2653
"disabling client {} - Client never "
2634
"performed a successful checker"
2635
.format(client_name))
2654
"performed a successful checker".format(
2655
client_name))
2636
2656
client["enabled"] = False
2637
2657
elif client["last_checker_status"] != 0:
2638
2658
logger.warning(
2639
2659
"disabling client {} - Client last"
2640
" checker failed with error code {}"
2641
.format(client_name,
2642
client["last_checker_status"]))
2660
" checker failed with error code"
2661
" {}".format(
2662
client_name,
2663
client["last_checker_status"]))
2643
2664
client["enabled"] = False
2644
2665
else:
2645
client["expires"] = (datetime.datetime
2646
.utcnow()
2647
+ client["timeout"])
2666
client["expires"] = (
2667
datetime.datetime.utcnow()
2668
+ client["timeout"])
2648
2669
logger.debug("Last checker succeeded,"
2649
" keeping {} enabled"
2650
.format(client_name))
2670
" keeping {} enabled".format(
2671
client_name))
2651
2672
try:
2652
client["secret"] = (
2653
pgp.decrypt(client["encrypted_secret"],
2654
client_settings[client_name]
2655
["secret"]))
2673
client["secret"] = pgp.decrypt(
2674
client["encrypted_secret"],
2675
client_settings[client_name]["secret"])
2656
2676
except PGPError:
2657
2677
# If decryption fails, we use secret from new settings
2658
logger.debug("Failed to decrypt {} old secret"
2659
.format(client_name))
2660
client["secret"] = (
2661
client_settings[client_name]["secret"])
2678
logger.debug("Failed to decrypt {} old secret".format(
2679
client_name))
2680
client["secret"] = (client_settings[client_name]
2681
["secret"])
2662
2682
2663
2683
# Add/remove clients based on new changes made to config
2664
2684
for client_name in (set(old_client_settings)
2671
2691
# Create all client objects
2672
2692
for client_name, client in clients_data.items():
2673
2693
tcp_server.clients[client_name] = client_class(
2674
name = client_name, settings = client,
2694
name = client_name,
2695
settings = client,
2675
2696
server_settings = server_settings)
2676
2697
2677
2698
if not tcp_server.clients:
2693
2714
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2694
2715
2695
2716
if use_dbus:
2696
@alternate_dbus_interfaces({"se.recompile.Mandos":
2697
"se.bsnet.fukt.Mandos"})
2717
2718
@alternate_dbus_interfaces(
2719
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2698
2720
class MandosDBusService(DBusObjectWithProperties):
2699
2721
"""A D-Bus proxy object"""
2722
2700
2723
def __init__(self):
2701
2724
dbus.service.Object.__init__(self, bus, "/")
2725
2702
2726
_interface = "se.recompile.Mandos"
2703
2727
2704
2728
@dbus_interface_annotations(_interface)
2705
2729
def _foo(self):
2706
return { "org.freedesktop.DBus.Property"
2707
".EmitsChangedSignal":
2708
"false"}
2730
return {
2731
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2732
"false" }
2709
2733
2710
2734
@dbus.service.signal(_interface, signature="o")
2711
2735
def ClientAdded(self, objpath):
2725
2749
@dbus.service.method(_interface, out_signature="ao")
2726
2750
def GetAllClients(self):
2727
2751
"D-Bus method"
2728
return dbus.Array(c.dbus_object_path
2729
for c in
2752
return dbus.Array(c.dbus_object_path for c in
2730
2753
tcp_server.clients.itervalues())
2731
2754
2732
2755
@dbus.service.method(_interface,
2781
2804
# + secret.
2782
2805
exclude = { "bus", "changedstate", "secret",
2783
2806
"checker", "server_settings" }
2784
for name, typ in (inspect.getmembers
2785
(dbus.service.Object)):
2807
for name, typ in inspect.getmembers(dbus.service
2808
.Object):
2786
2809
exclude.add(name)
2787
2810
2788
2811
client_dict["encrypted_secret"] = (client
2795
2818
del client_settings[client.name]["secret"]
2796
2819
2797
2820
try:
2798
with (tempfile.NamedTemporaryFile
2799
(mode='wb', suffix=".pickle", prefix='clients-',
2800
dir=os.path.dirname(stored_state_path),
2801
delete=False)) as stored_state:
2821
with tempfile.NamedTemporaryFile(
2822
mode='wb',
2823
suffix=".pickle",
2824
prefix='clients-',
2825
dir=os.path.dirname(stored_state_path),
2826
delete=False) as stored_state:
2802
2827
pickle.dump((clients, client_settings), stored_state)
2803
tempname=stored_state.name
2828
tempname = stored_state.name
2804
2829
os.rename(tempname, stored_state_path)
2805
2830
except (IOError, OSError) as e:
2806
2831
if not debug:
2825
2850
client.disable(quiet=True)
2826
2851
if use_dbus:
2827
2852
# Emit D-Bus signal
2828
mandos_dbus_service.ClientRemoved(client
2829
.dbus_object_path,
2830
client.name)
2853
mandos_dbus_service.ClientRemoved(
2854
client.dbus_object_path, client.name)
2831
2855
client_settings.clear()
2832
2856
2833
2857
atexit.register(cleanup)
2886
2910
# Must run before the D-Bus bus name gets deregistered
2887
2911
cleanup()
2888
2912
2913
2889
2914
if __name__ == '__main__':
2890
2915
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0