154
157
u" after %i retries, exiting.",
155
158
self.rename_count)
156
159
raise AvahiServiceError(u"Too many renames")
157
self.name = self.server.GetAlternativeServiceName(self.name)
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
158
161
logger.info(u"Changing Zeroconf service name to %r ...",
160
163
syslogger.setFormatter(logging.Formatter
161
164
(u'Mandos (%s) [%%(process)d]:'
162
165
u' %%(levelname)s: %%(message)s'
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
166
174
self.rename_count += 1
167
175
def remove(self):
168
176
"""Derived from the Avahi example code"""
231
240
"""A representation of a client host served by this server.
234
name: string; from the config file, used in log messages and
236
fingerprint: string (40 or 32 hexadecimal digits); used to
237
uniquely identify the client
238
secret: bytestring; sent verbatim (over TLS) to client
239
host: string; available for use by the checker command
240
created: datetime.datetime(); (UTC) object creation
241
last_enabled: datetime.datetime(); (UTC)
243
last_checked_ok: datetime.datetime(); (UTC) or None
244
timeout: datetime.timedelta(); How long from last_checked_ok
245
until this client is invalid
246
interval: datetime.timedelta(); How often to start a new checker
247
disable_hook: If set, called by disable() as disable_hook(self)
243
_approved: bool(); 'None' if not yet approved/disapproved
244
approval_delay: datetime.timedelta(); Time to wait for approval
245
approval_duration: datetime.timedelta(); Duration of one approval
248
246
checker: subprocess.Popen(); a running checker process used
249
247
to see if the client lives.
250
248
'None' if no process is running.
251
checker_initiator_tag: a gobject event source tag, or None
252
disable_initiator_tag: - '' -
253
checker_callback_tag: - '' -
254
checker_command: string; External command which is run to check if
255
client lives. %() expansions are done at
249
checker_callback_tag: a gobject event source tag, or None
250
checker_command: string; External command which is run to check
251
if client lives. %() expansions are done at
256
252
runtime with vars(self) as dict, so that for
257
253
instance %(name)s can be used in the command.
254
checker_initiator_tag: a gobject event source tag, or None
255
created: datetime.datetime(); (UTC) object creation
258
256
current_checker_command: string; current running checker_command
257
disable_hook: If set, called by disable() as disable_hook(self)
258
disable_initiator_tag: a gobject event source tag, or None
260
fingerprint: string (40 or 32 hexadecimal digits); used to
261
uniquely identify the client
262
host: string; available for use by the checker command
263
interval: datetime.timedelta(); How often to start a new checker
264
last_approval_request: datetime.datetime(); (UTC) or None
265
last_checked_ok: datetime.datetime(); (UTC) or None
266
last_enabled: datetime.datetime(); (UTC)
267
name: string; from the config file, used in log messages and
269
secret: bytestring; sent verbatim (over TLS) to client
270
timeout: datetime.timedelta(); How long from last_checked_ok
271
until this client is disabled
272
runtime_expansions: Allowed attributes for runtime expansion.
275
runtime_expansions = (u"approval_delay", u"approval_duration",
276
u"created", u"enabled", u"fingerprint",
277
u"host", u"interval", u"last_checked_ok",
278
u"last_enabled", u"name", u"timeout")
262
281
def _timedelta_to_milliseconds(td):
263
282
"Convert a datetime.timedelta() to milliseconds"
312
335
self.checker_command = config[u"checker"]
313
336
self.current_checker_command = None
314
337
self.last_connect = None
338
self._approved = None
339
self.approved_by_default = config.get(u"approved_by_default",
341
self.approvals_pending = 0
342
self.approval_delay = string_to_delta(
343
config[u"approval_delay"])
344
self.approval_duration = string_to_delta(
345
config[u"approval_duration"])
346
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
348
def send_changedstate(self):
349
self.changedstate.acquire()
350
self.changedstate.notify_all()
351
self.changedstate.release()
316
353
def enable(self):
317
354
"""Start this client's checker and timeout hooks"""
318
355
if getattr(self, u"enabled", False):
319
356
# Already enabled
358
self.send_changedstate()
321
359
self.last_enabled = datetime.datetime.utcnow()
322
360
# Schedule a new checker to be started an 'interval' from now,
323
361
# and every interval from then on.
324
362
self.checker_initiator_tag = (gobject.timeout_add
325
363
(self.interval_milliseconds(),
326
364
self.start_checker))
327
# Also start a new checker *right now*.
329
365
# Schedule a disable() when 'timeout' has passed
330
366
self.disable_initiator_tag = (gobject.timeout_add
331
367
(self.timeout_milliseconds(),
333
369
self.enabled = True
370
# Also start a new checker *right now*.
373
def disable(self, quiet=True):
336
374
"""Disable this client."""
337
375
if not getattr(self, "enabled", False):
339
logger.info(u"Disabling client %s", self.name)
378
self.send_changedstate()
380
logger.info(u"Disabling client %s", self.name)
340
381
if getattr(self, u"disable_initiator_tag", False):
341
382
gobject.source_remove(self.disable_initiator_tag)
342
383
self.disable_initiator_tag = None
466
512
logger.debug(u"Stopping checker for %(name)s", vars(self))
468
514
os.kill(self.checker.pid, signal.SIGTERM)
470
516
#if self.checker.poll() is None:
471
517
# os.kill(self.checker.pid, signal.SIGKILL)
472
518
except OSError, error:
473
519
if error.errno != errno.ESRCH: # No such process
475
521
self.checker = None
477
def still_valid(self):
478
"""Has the timeout not yet passed for this client?"""
479
if not getattr(self, u"enabled", False):
481
now = datetime.datetime.utcnow()
482
if self.last_checked_ok is None:
483
return now < (self.created + self.timeout)
485
return now < (self.last_checked_ok + self.timeout)
488
523
def dbus_service_property(dbus_interface, signature=u"v",
489
524
access=u"readwrite", byte_arrays=False):
625
669
"""Standard D-Bus method, overloaded to insert property tags.
627
671
xmlstring = dbus.service.Object.Introspect(self, object_path,
629
document = xml.dom.minidom.parseString(xmlstring)
631
def make_tag(document, name, prop):
632
e = document.createElement(u"property")
633
e.setAttribute(u"name", name)
634
e.setAttribute(u"type", prop._dbus_signature)
635
e.setAttribute(u"access", prop._dbus_access)
637
for if_tag in document.getElementsByTagName(u"interface"):
638
for tag in (make_tag(document, name, prop)
640
in self._get_all_dbus_properties()
641
if prop._dbus_interface
642
== if_tag.getAttribute(u"name")):
643
if_tag.appendChild(tag)
644
xmlstring = document.toxml(u"utf-8")
674
document = xml.dom.minidom.parseString(xmlstring)
675
def make_tag(document, name, prop):
676
e = document.createElement(u"property")
677
e.setAttribute(u"name", name)
678
e.setAttribute(u"type", prop._dbus_signature)
679
e.setAttribute(u"access", prop._dbus_access)
681
for if_tag in document.getElementsByTagName(u"interface"):
682
for tag in (make_tag(document, name, prop)
684
in self._get_all_dbus_properties()
685
if prop._dbus_interface
686
== if_tag.getAttribute(u"name")):
687
if_tag.appendChild(tag)
688
# Add the names to the return values for the
689
# "org.freedesktop.DBus.Properties" methods
690
if (if_tag.getAttribute(u"name")
691
== u"org.freedesktop.DBus.Properties"):
692
for cn in if_tag.getElementsByTagName(u"method"):
693
if cn.getAttribute(u"name") == u"Get":
694
for arg in cn.getElementsByTagName(u"arg"):
695
if (arg.getAttribute(u"direction")
697
arg.setAttribute(u"name", u"value")
698
elif cn.getAttribute(u"name") == u"GetAll":
699
for arg in cn.getElementsByTagName(u"arg"):
700
if (arg.getAttribute(u"direction")
702
arg.setAttribute(u"name", u"props")
703
xmlstring = document.toxml(u"utf-8")
705
except (AttributeError, xml.dom.DOMException,
706
xml.parsers.expat.ExpatError), error:
707
logger.error(u"Failed to override Introspection method",
653
716
dbus_object_path: dbus.ObjectPath
654
717
bus: dbus.SystemBus()
720
runtime_expansions = (Client.runtime_expansions
721
+ (u"dbus_object_path",))
656
723
# dbus.service.Object doesn't use super(), so we can't either.
658
725
def __init__(self, bus = None, *args, **kwargs):
726
self._approvals_pending = 0
660
728
Client.__init__(self, *args, **kwargs)
661
729
# Only now, when this client is initialized, can it show up on
731
client_object_name = unicode(self.name).translate(
732
{ord(u"."): ord(u"_"),
733
ord(u"-"): ord(u"_")})
663
734
self.dbus_object_path = (dbus.ObjectPath
665
+ self.name.replace(u".", u"_")))
735
(u"/clients/" + client_object_name))
666
736
DBusObjectWithProperties.__init__(self, self.bus,
667
737
self.dbus_object_path)
739
def _get_approvals_pending(self):
740
return self._approvals_pending
741
def _set_approvals_pending(self, value):
742
old_value = self._approvals_pending
743
self._approvals_pending = value
745
if (hasattr(self, "dbus_object_path")
746
and bval is not bool(old_value)):
747
dbus_bool = dbus.Boolean(bval, variant_level=1)
748
self.PropertyChanged(dbus.String(u"ApprovalPending"),
751
approvals_pending = property(_get_approvals_pending,
752
_set_approvals_pending)
753
del _get_approvals_pending, _set_approvals_pending
670
756
def _datetime_to_dbus(dt, variant_level=0):
677
763
r = Client.enable(self)
678
764
if oldstate != self.enabled:
679
765
# Emit D-Bus signals
680
self.PropertyChanged(dbus.String(u"enabled"),
766
self.PropertyChanged(dbus.String(u"Enabled"),
681
767
dbus.Boolean(True, variant_level=1))
682
768
self.PropertyChanged(
683
dbus.String(u"last_enabled"),
769
dbus.String(u"LastEnabled"),
684
770
self._datetime_to_dbus(self.last_enabled,
685
771
variant_level=1))
688
def disable(self, signal = True):
774
def disable(self, quiet = False):
689
775
oldstate = getattr(self, u"enabled", False)
690
r = Client.disable(self)
691
if signal and oldstate != self.enabled:
776
r = Client.disable(self, quiet=quiet)
777
if not quiet and oldstate != self.enabled:
692
778
# Emit D-Bus signal
693
self.PropertyChanged(dbus.String(u"enabled"),
779
self.PropertyChanged(dbus.String(u"Enabled"),
694
780
dbus.Boolean(False, variant_level=1))
729
815
r = Client.checked_ok(self, *args, **kwargs)
730
816
# Emit D-Bus signal
731
817
self.PropertyChanged(
732
dbus.String(u"last_checked_ok"),
818
dbus.String(u"LastCheckedOK"),
733
819
(self._datetime_to_dbus(self.last_checked_ok,
734
820
variant_level=1)))
823
def need_approval(self, *args, **kwargs):
824
r = Client.need_approval(self, *args, **kwargs)
826
self.PropertyChanged(
827
dbus.String(u"LastApprovalRequest"),
828
(self._datetime_to_dbus(self.last_approval_request,
737
832
def start_checker(self, *args, **kwargs):
738
833
old_checker = self.checker
739
834
if self.checker is not None:
756
851
r = Client.stop_checker(self, *args, **kwargs)
757
852
if (old_checker is not None
758
853
and getattr(self, u"checker", None) is None):
759
self.PropertyChanged(dbus.String(u"checker_running"),
854
self.PropertyChanged(dbus.String(u"CheckerRunning"),
760
855
dbus.Boolean(False, variant_level=1))
763
## D-Bus methods & signals
858
def _reset_approved(self):
859
self._approved = None
862
def approve(self, value=True):
863
self.send_changedstate()
864
self._approved = value
865
gobject.timeout_add(self._timedelta_to_milliseconds
866
(self.approval_duration),
867
self._reset_approved)
870
## D-Bus methods, signals & properties
764
871
_interface = u"se.bsnet.fukt.Mandos.Client"
767
@dbus.service.method(_interface)
769
return self.checked_ok()
771
875
# CheckerCompleted - signal
772
876
@dbus.service.signal(_interface, signature=u"nxs")
789
# ReceivedSecret - signal
790
894
@dbus.service.signal(_interface)
791
def ReceivedSecret(self):
897
Is sent after a successful transfer of secret from the Mandos
898
server to mandos-client
795
902
# Rejected - signal
796
@dbus.service.signal(_interface)
903
@dbus.service.signal(_interface, signature=u"s")
904
def Rejected(self, reason):
908
# NeedApproval - signal
909
@dbus.service.signal(_interface, signature=u"tb")
910
def NeedApproval(self, timeout, default):
912
return self.need_approval()
917
@dbus.service.method(_interface, in_signature=u"b")
918
def Approve(self, value):
922
@dbus.service.method(_interface)
924
return self.checked_ok()
801
926
# Enable - method
802
927
@dbus.service.method(_interface)
803
928
def Enable(self):
821
946
def StopChecker(self):
822
947
self.stop_checker()
951
# ApprovalPending - property
952
@dbus_service_property(_interface, signature=u"b", access=u"read")
953
def ApprovalPending_dbus_property(self):
954
return dbus.Boolean(bool(self.approvals_pending))
956
# ApprovedByDefault - property
957
@dbus_service_property(_interface, signature=u"b",
959
def ApprovedByDefault_dbus_property(self, value=None):
960
if value is None: # get
961
return dbus.Boolean(self.approved_by_default)
962
self.approved_by_default = bool(value)
964
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
965
dbus.Boolean(value, variant_level=1))
967
# ApprovalDelay - property
968
@dbus_service_property(_interface, signature=u"t",
970
def ApprovalDelay_dbus_property(self, value=None):
971
if value is None: # get
972
return dbus.UInt64(self.approval_delay_milliseconds())
973
self.approval_delay = datetime.timedelta(0, 0, 0, value)
975
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
976
dbus.UInt64(value, variant_level=1))
978
# ApprovalDuration - property
979
@dbus_service_property(_interface, signature=u"t",
981
def ApprovalDuration_dbus_property(self, value=None):
982
if value is None: # get
983
return dbus.UInt64(self._timedelta_to_milliseconds(
984
self.approval_duration))
985
self.approval_duration = datetime.timedelta(0, 0, 0, value)
987
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
988
dbus.UInt64(value, variant_level=1))
825
991
@dbus_service_property(_interface, signature=u"s", access=u"read")
826
def name_dbus_property(self):
992
def Name_dbus_property(self):
827
993
return dbus.String(self.name)
829
# fingerprint - property
995
# Fingerprint - property
830
996
@dbus_service_property(_interface, signature=u"s", access=u"read")
831
def fingerprint_dbus_property(self):
997
def Fingerprint_dbus_property(self):
832
998
return dbus.String(self.fingerprint)
835
1001
@dbus_service_property(_interface, signature=u"s",
836
1002
access=u"readwrite")
837
def host_dbus_property(self, value=None):
1003
def Host_dbus_property(self, value=None):
838
1004
if value is None: # get
839
1005
return dbus.String(self.host)
840
1006
self.host = value
841
1007
# Emit D-Bus signal
842
self.PropertyChanged(dbus.String(u"host"),
1008
self.PropertyChanged(dbus.String(u"Host"),
843
1009
dbus.String(value, variant_level=1))
1011
# Created - property
846
1012
@dbus_service_property(_interface, signature=u"s", access=u"read")
847
def created_dbus_property(self):
1013
def Created_dbus_property(self):
848
1014
return dbus.String(self._datetime_to_dbus(self.created))
850
# last_enabled - property
1016
# LastEnabled - property
851
1017
@dbus_service_property(_interface, signature=u"s", access=u"read")
852
def last_enabled_dbus_property(self):
1018
def LastEnabled_dbus_property(self):
853
1019
if self.last_enabled is None:
854
1020
return dbus.String(u"")
855
1021
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1023
# Enabled - property
858
1024
@dbus_service_property(_interface, signature=u"b",
859
1025
access=u"readwrite")
860
def enabled_dbus_property(self, value=None):
1026
def Enabled_dbus_property(self, value=None):
861
1027
if value is None: # get
862
1028
return dbus.Boolean(self.enabled)
877
1043
return dbus.String(self._datetime_to_dbus(self
878
1044
.last_checked_ok))
1046
# LastApprovalRequest - property
1047
@dbus_service_property(_interface, signature=u"s", access=u"read")
1048
def LastApprovalRequest_dbus_property(self):
1049
if self.last_approval_request is None:
1050
return dbus.String(u"")
1051
return dbus.String(self.
1052
_datetime_to_dbus(self
1053
.last_approval_request))
1055
# Timeout - property
881
1056
@dbus_service_property(_interface, signature=u"t",
882
1057
access=u"readwrite")
883
def timeout_dbus_property(self, value=None):
1058
def Timeout_dbus_property(self, value=None):
884
1059
if value is None: # get
885
1060
return dbus.UInt64(self.timeout_milliseconds())
886
1061
self.timeout = datetime.timedelta(0, 0, 0, value)
887
1062
# Emit D-Bus signal
888
self.PropertyChanged(dbus.String(u"timeout"),
1063
self.PropertyChanged(dbus.String(u"Timeout"),
889
1064
dbus.UInt64(value, variant_level=1))
890
1065
if getattr(self, u"disable_initiator_tag", None) is None:
905
1080
self.disable_initiator_tag = (gobject.timeout_add
906
1081
(time_to_die, self.disable))
908
# interval - property
1083
# Interval - property
909
1084
@dbus_service_property(_interface, signature=u"t",
910
1085
access=u"readwrite")
911
def interval_dbus_property(self, value=None):
1086
def Interval_dbus_property(self, value=None):
912
1087
if value is None: # get
913
1088
return dbus.UInt64(self.interval_milliseconds())
914
1089
self.interval = datetime.timedelta(0, 0, 0, value)
915
1090
# Emit D-Bus signal
916
self.PropertyChanged(dbus.String(u"interval"),
1091
self.PropertyChanged(dbus.String(u"Interval"),
917
1092
dbus.UInt64(value, variant_level=1))
918
1093
if getattr(self, u"checker_initiator_tag", None) is None:
923
1098
(value, self.start_checker))
924
1099
self.start_checker() # Start one now, too
1101
# Checker - property
927
1102
@dbus_service_property(_interface, signature=u"s",
928
1103
access=u"readwrite")
929
def checker_dbus_property(self, value=None):
1104
def Checker_dbus_property(self, value=None):
930
1105
if value is None: # get
931
1106
return dbus.String(self.checker_command)
932
1107
self.checker_command = value
933
1108
# Emit D-Bus signal
934
self.PropertyChanged(dbus.String(u"checker"),
1109
self.PropertyChanged(dbus.String(u"Checker"),
935
1110
dbus.String(self.checker_command,
936
1111
variant_level=1))
938
# checker_running - property
1113
# CheckerRunning - property
939
1114
@dbus_service_property(_interface, signature=u"b",
940
1115
access=u"readwrite")
941
def checker_running_dbus_property(self, value=None):
1116
def CheckerRunning_dbus_property(self, value=None):
942
1117
if value is None: # get
943
1118
return dbus.Boolean(self.checker is not None)
947
1122
self.stop_checker()
949
# object_path - property
1124
# ObjectPath - property
950
1125
@dbus_service_property(_interface, signature=u"o", access=u"read")
951
def object_path_dbus_property(self):
1126
def ObjectPath_dbus_property(self):
952
1127
return self.dbus_object_path # is already a dbus.ObjectPath
955
1130
@dbus_service_property(_interface, signature=u"ay",
956
1131
access=u"write", byte_arrays=True)
957
def secret_dbus_property(self, value):
1132
def Secret_dbus_property(self, value):
958
1133
self.secret = str(value)
1138
class ProxyClient(object):
1139
def __init__(self, child_pipe, fpr, address):
1140
self._pipe = child_pipe
1141
self._pipe.send(('init', fpr, address))
1142
if not self._pipe.recv():
1145
def __getattribute__(self, name):
1146
if(name == '_pipe'):
1147
return super(ProxyClient, self).__getattribute__(name)
1148
self._pipe.send(('getattr', name))
1149
data = self._pipe.recv()
1150
if data[0] == 'data':
1152
if data[0] == 'function':
1153
def func(*args, **kwargs):
1154
self._pipe.send(('funcall', name, args, kwargs))
1155
return self._pipe.recv()[1]
1158
def __setattr__(self, name, value):
1159
if(name == '_pipe'):
1160
return super(ProxyClient, self).__setattr__(name, value)
1161
self._pipe.send(('setattr', name, value))
963
1164
class ClientHandler(socketserver.BaseRequestHandler, object):
964
1165
"""A class to handle client connections.
967
1168
Note: This will run in its own forked process."""
969
1170
def handle(self):
970
logger.info(u"TCP connection from: %s",
971
unicode(self.client_address))
972
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
973
# Open IPC pipe to parent process
974
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1171
with contextlib.closing(self.server.child_pipe) as child_pipe:
1172
logger.info(u"TCP connection from: %s",
1173
unicode(self.client_address))
1174
logger.debug(u"Pipe FD: %d",
1175
self.server.child_pipe.fileno())
975
1177
session = (gnutls.connection
976
1178
.ClientSession(self.request,
977
1179
gnutls.connection
978
1180
.X509Credentials()))
980
line = self.request.makefile().readline()
981
logger.debug(u"Protocol version: %r", line)
983
if int(line.strip().split()[0]) > 1:
985
except (ValueError, IndexError, RuntimeError), error:
986
logger.error(u"Unknown protocol version: %s", error)
989
1182
# Note: gnutls.connection.X509Credentials is really a
990
1183
# generic GnuTLS certificate credentials object so long as
991
1184
# no X.509 keys are added to it. Therefore, we can use it
992
1185
# here despite using OpenPGP certificates.
994
1187
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
995
1188
# u"+AES-256-CBC", u"+SHA1",
996
1189
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1002
1195
(gnutls.library.functions
1003
1196
.gnutls_priority_set_direct(session._c_object,
1004
1197
priority, None))
1199
# Start communication using the Mandos protocol
1200
# Get protocol number
1201
line = self.request.makefile().readline()
1202
logger.debug(u"Protocol version: %r", line)
1204
if int(line.strip().split()[0]) > 1:
1206
except (ValueError, IndexError, RuntimeError), error:
1207
logger.error(u"Unknown protocol version: %s", error)
1210
# Start GnuTLS connection
1007
1212
session.handshake()
1008
1213
except gnutls.errors.GNUTLSError, error:
1011
1216
# established. Just abandon the request.
1013
1218
logger.debug(u"Handshake succeeded")
1220
approval_required = False
1015
fpr = self.fingerprint(self.peer_certificate(session))
1016
except (TypeError, gnutls.errors.GNUTLSError), error:
1017
logger.warning(u"Bad certificate: %s", error)
1020
logger.debug(u"Fingerprint: %s", fpr)
1223
fpr = self.fingerprint(self.peer_certificate
1225
except (TypeError, gnutls.errors.GNUTLSError), error:
1226
logger.warning(u"Bad certificate: %s", error)
1228
logger.debug(u"Fingerprint: %s", fpr)
1231
client = ProxyClient(child_pipe, fpr,
1232
self.client_address)
1236
if client.approval_delay:
1237
delay = client.approval_delay
1238
client.approvals_pending += 1
1239
approval_required = True
1242
if not client.enabled:
1243
logger.warning(u"Client %s is disabled",
1245
if self.server.use_dbus:
1247
client.Rejected("Disabled")
1250
if client._approved or not client.approval_delay:
1251
#We are approved or approval is disabled
1253
elif client._approved is None:
1254
logger.info(u"Client %s needs approval",
1256
if self.server.use_dbus:
1258
client.NeedApproval(
1259
client.approval_delay_milliseconds(),
1260
client.approved_by_default)
1262
logger.warning(u"Client %s was not approved",
1264
if self.server.use_dbus:
1266
client.Rejected("Denied")
1269
#wait until timeout or approved
1270
#x = float(client._timedelta_to_milliseconds(delay))
1271
time = datetime.datetime.now()
1272
client.changedstate.acquire()
1273
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1274
client.changedstate.release()
1275
time2 = datetime.datetime.now()
1276
if (time2 - time) >= delay:
1277
if not client.approved_by_default:
1278
logger.warning("Client %s timed out while"
1279
" waiting for approval",
1281
if self.server.use_dbus:
1283
client.Rejected("Approval timed out")
1288
delay -= time2 - time
1291
while sent_size < len(client.secret):
1293
sent = session.send(client.secret[sent_size:])
1294
except (gnutls.errors.GNUTLSError), error:
1295
logger.warning("gnutls send failed")
1297
logger.debug(u"Sent: %d, remaining: %d",
1298
sent, len(client.secret)
1299
- (sent_size + sent))
1302
logger.info(u"Sending secret to %s", client.name)
1303
# bump the timeout as if seen
1305
if self.server.use_dbus:
1022
for c in self.server.clients:
1023
if c.fingerprint == fpr:
1027
ipc.write(u"NOTFOUND %s %s\n"
1028
% (fpr, unicode(self.client_address)))
1031
# Have to check if client.still_valid(), since it is
1032
# possible that the client timed out while establishing
1033
# the GnuTLS session.
1034
if not client.still_valid():
1035
ipc.write(u"INVALID %s\n" % client.name)
1038
ipc.write(u"SENDING %s\n" % client.name)
1040
while sent_size < len(client.secret):
1041
sent = session.send(client.secret[sent_size:])
1042
logger.debug(u"Sent: %d, remaining: %d",
1043
sent, len(client.secret)
1044
- (sent_size + sent))
1310
if approval_required:
1311
client.approvals_pending -= 1
1314
except (gnutls.errors.GNUTLSError), error:
1315
logger.warning("GnuTLS bye failed")
1049
1318
def peer_certificate(session):
1112
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1113
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1381
class MultiprocessingMixIn(object):
1382
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1383
def sub_process_main(self, request, address):
1385
self.finish_request(request, address)
1387
self.handle_error(request, address)
1388
self.close_request(request)
1390
def process_request(self, request, address):
1391
"""Start a new process to process the request."""
1392
multiprocessing.Process(target = self.sub_process_main,
1393
args = (request, address)).start()
1395
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1396
""" adds a pipe to the MixIn """
1114
1397
def process_request(self, request, client_address):
1115
1398
"""Overrides and wraps the original process_request().
1117
1400
This function creates a new pipe in self.pipe
1119
self.pipe = os.pipe()
1120
super(ForkingMixInWithPipe,
1402
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1404
super(MultiprocessingMixInWithPipe,
1121
1405
self).process_request(request, client_address)
1122
os.close(self.pipe[1]) # close write end
1123
self.add_pipe(self.pipe[0])
1124
def add_pipe(self, pipe):
1406
self.child_pipe.close()
1407
self.add_pipe(parent_pipe)
1409
def add_pipe(self, parent_pipe):
1125
1410
"""Dummy function; override as necessary"""
1129
class IPv6_TCPServer(ForkingMixInWithPipe,
1413
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1130
1414
socketserver.TCPServer, object):
1131
1415
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1217
1501
return socketserver.TCPServer.server_activate(self)
1218
1502
def enable(self):
1219
1503
self.enabled = True
1220
def add_pipe(self, pipe):
1504
def add_pipe(self, parent_pipe):
1221
1505
# Call "handle_ipc" for both data and EOF events
1222
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1224
def handle_ipc(self, source, condition, file_objects={}):
1506
gobject.io_add_watch(parent_pipe.fileno(),
1507
gobject.IO_IN | gobject.IO_HUP,
1508
functools.partial(self.handle_ipc,
1509
parent_pipe = parent_pipe))
1511
def handle_ipc(self, source, condition, parent_pipe=None,
1512
client_object=None):
1225
1513
condition_names = {
1226
1514
gobject.IO_IN: u"IN", # There is data to read.
1227
1515
gobject.IO_OUT: u"OUT", # Data can be written (without
1236
1524
for cond, name in
1237
1525
condition_names.iteritems()
1238
1526
if cond & condition)
1239
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1242
# Turn the pipe file descriptor into a Python file object
1243
if source not in file_objects:
1244
file_objects[source] = os.fdopen(source, u"r", 1)
1246
# Read a line from the file object
1247
cmdline = file_objects[source].readline()
1248
if not cmdline: # Empty line means end of file
1249
# close the IPC pipe
1250
file_objects[source].close()
1251
del file_objects[source]
1253
# Stop calling this function
1256
logger.debug(u"IPC command: %r", cmdline)
1258
# Parse and act on command
1259
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1261
if cmd == u"NOTFOUND":
1262
logger.warning(u"Client not found for fingerprint: %s",
1266
mandos_dbus_service.ClientNotFound(args)
1267
elif cmd == u"INVALID":
1268
for client in self.clients:
1269
if client.name == args:
1270
logger.warning(u"Client %s is invalid", args)
1276
logger.error(u"Unknown client %s is invalid", args)
1277
elif cmd == u"SENDING":
1278
for client in self.clients:
1279
if client.name == args:
1280
logger.info(u"Sending secret to %s", client.name)
1284
client.ReceivedSecret()
1287
logger.error(u"Sending secret to unknown client %s",
1290
logger.error(u"Unknown IPC command: %r", cmdline)
1292
# Keep calling this function
1527
# error or the other end of multiprocessing.Pipe has closed
1528
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1531
# Read a request from the child
1532
request = parent_pipe.recv()
1533
command = request[0]
1535
if command == 'init':
1537
address = request[2]
1539
for c in self.clients:
1540
if c.fingerprint == fpr:
1544
logger.warning(u"Client not found for fingerprint: %s, ad"
1545
u"dress: %s", fpr, address)
1548
mandos_dbus_service.ClientNotFound(fpr, address[0])
1549
parent_pipe.send(False)
1552
gobject.io_add_watch(parent_pipe.fileno(),
1553
gobject.IO_IN | gobject.IO_HUP,
1554
functools.partial(self.handle_ipc,
1555
parent_pipe = parent_pipe,
1556
client_object = client))
1557
parent_pipe.send(True)
1558
# remove the old hook in favor of the new above hook on same fileno
1560
if command == 'funcall':
1561
funcname = request[1]
1565
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1567
if command == 'getattr':
1568
attrname = request[1]
1569
if callable(client_object.__getattribute__(attrname)):
1570
parent_pipe.send(('function',))
1572
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1574
if command == 'setattr':
1575
attrname = request[1]
1577
setattr(client_object, attrname, value)
1493
1782
tcp_server = MandosServer((server_settings[u"address"],
1494
1783
server_settings[u"port"]),
1496
interface=server_settings[u"interface"],
1785
interface=(server_settings[u"interface"]
1497
1787
use_ipv6=use_ipv6,
1498
1788
gnutls_priority=
1499
1789
server_settings[u"priority"],
1500
1790
use_dbus=use_dbus)
1501
pidfilename = u"/var/run/mandos.pid"
1503
pidfile = open(pidfilename, u"w")
1505
logger.error(u"Could not open file %r", pidfilename)
1792
pidfilename = u"/var/run/mandos.pid"
1794
pidfile = open(pidfilename, u"w")
1796
logger.error(u"Could not open file %r", pidfilename)
1508
1799
uid = pwd.getpwnam(u"_mandos").pw_uid
1545
1859
bus = dbus.SystemBus()
1546
1860
# End of Avahi example code
1548
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1863
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1864
bus, do_not_queue=True)
1865
except dbus.exceptions.NameExistsException, e:
1866
logger.error(unicode(e) + u", disabling D-Bus")
1868
server_settings[u"use_dbus"] = False
1869
tcp_server.use_dbus = False
1549
1870
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1550
1871
service = AvahiService(name = server_settings[u"servicename"],
1551
1872
servicetype = u"_mandos._tcp",
1554
1875
service.interface = (if_nametoindex
1555
1876
(str(server_settings[u"interface"])))
1878
global multiprocessing_manager
1879
multiprocessing_manager = multiprocessing.Manager()
1557
1881
client_class = Client
1559
1883
client_class = functools.partial(ClientDBus, bus = bus)
1884
def client_config_items(config, section):
1885
special_settings = {
1886
"approved_by_default":
1887
lambda: config.getboolean(section,
1888
"approved_by_default"),
1890
for name, value in config.items(section):
1892
yield (name, special_settings[name]())
1560
1896
tcp_server.clients.update(set(
1561
1897
client_class(name = section,
1562
config= dict(client_config.items(section)))
1898
config= dict(client_config_items(
1899
client_config, section)))
1563
1900
for section in client_config.sections()))
1564
1901
if not tcp_server.clients:
1565
1902
logger.warning(u"No clients defined")
1568
# Redirect stdin so all checkers get /dev/null
1569
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1570
os.dup2(null, sys.stdin.fileno())
1574
# No console logging
1575
logger.removeHandler(console)
1576
# Close all input and output, do double fork, etc.
1580
with closing(pidfile):
1582
pidfile.write(str(pid) + "\n")
1585
logger.error(u"Could not write to file %r with PID %d",
1588
# "pidfile" was never created
1593
"Cleanup function; run on exit"
1596
while tcp_server.clients:
1597
client = tcp_server.clients.pop()
1598
client.disable_hook = None
1601
atexit.register(cleanup)
1908
pidfile.write(str(pid) + "\n")
1911
logger.error(u"Could not write to file %r with PID %d",
1914
# "pidfile" was never created
1604
1918
signal.signal(signal.SIGINT, signal.SIG_IGN)
1605
1920
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1606
1921
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1612
1927
dbus.service.Object.__init__(self, bus, u"/")
1613
1928
_interface = u"se.bsnet.fukt.Mandos"
1615
@dbus.service.signal(_interface, signature=u"oa{sv}")
1616
def ClientAdded(self, objpath, properties):
1930
@dbus.service.signal(_interface, signature=u"o")
1931
def ClientAdded(self, objpath):
1620
@dbus.service.signal(_interface, signature=u"s")
1621
def ClientNotFound(self, fingerprint):
1935
@dbus.service.signal(_interface, signature=u"ss")
1936
def ClientNotFound(self, fingerprint, address):
1650
1965
tcp_server.clients.remove(c)
1651
1966
c.remove_from_connection()
1652
1967
# Don't signal anything except ClientRemoved
1653
c.disable(signal=False)
1968
c.disable(quiet=True)
1654
1969
# Emit D-Bus signal
1655
1970
self.ClientRemoved(object_path, c.name)
1972
raise KeyError(object_path)
1661
1976
mandos_dbus_service = MandosDBusService()
1979
"Cleanup function; run on exit"
1982
while tcp_server.clients:
1983
client = tcp_server.clients.pop()
1985
client.remove_from_connection()
1986
client.disable_hook = None
1987
# Don't signal anything except ClientRemoved
1988
client.disable(quiet=True)
1991
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
1994
atexit.register(cleanup)
1663
1996
for client in tcp_server.clients:
1665
1998
# Emit D-Bus signal
1666
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1999
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1668
2000
client.enable()
1670
2002
tcp_server.enable()