157
154
u" after %i retries, exiting.",
158
155
self.rename_count)
159
156
raise AvahiServiceError(u"Too many renames")
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
157
self.name = self.server.GetAlternativeServiceName(self.name)
161
158
logger.info(u"Changing Zeroconf service name to %r ...",
163
160
syslogger.setFormatter(logging.Formatter
164
161
(u'Mandos (%s) [%%(process)d]:'
165
162
u' %%(levelname)s: %%(message)s'
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
174
166
self.rename_count += 1
175
167
def remove(self):
176
168
"""Derived from the Avahi example code"""
199
191
self.group.Commit()
200
192
def entry_group_state_changed(self, state, error):
201
193
"""Derived from the Avahi example code"""
202
logger.debug(u"Avahi entry group state change: %i", state)
194
logger.debug(u"Avahi state change: %i", state)
204
196
if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
197
logger.debug(u"Zeroconf service established.")
206
198
elif state == avahi.ENTRY_GROUP_COLLISION:
207
logger.info(u"Zeroconf service name collision.")
199
logger.warning(u"Zeroconf service name collision.")
209
201
elif state == avahi.ENTRY_GROUP_FAILURE:
210
202
logger.critical(u"Avahi: Error in group state changed %s",
240
231
"""A representation of a client host served by this server.
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
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)
246
248
checker: subprocess.Popen(); a running checker process used
247
249
to see if the client lives.
248
250
'None' if no process is running.
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
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
252
256
runtime with vars(self) as dict, so that for
253
257
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
256
258
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")
281
262
def _timedelta_to_milliseconds(td):
282
263
"Convert a datetime.timedelta() to milliseconds"
335
313
self.checker_command = config[u"checker"]
336
314
self.current_checker_command = None
337
315
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()
353
317
def enable(self):
354
318
"""Start this client's checker and timeout hooks"""
355
319
if getattr(self, u"enabled", False):
356
320
# Already enabled
358
self.send_changedstate()
359
322
self.last_enabled = datetime.datetime.utcnow()
360
323
# Schedule a new checker to be started an 'interval' from now,
361
324
# and every interval from then on.
362
325
self.checker_initiator_tag = (gobject.timeout_add
363
326
(self.interval_milliseconds(),
364
327
self.start_checker))
328
# Also start a new checker *right now*.
365
330
# Schedule a disable() when 'timeout' has passed
366
331
self.disable_initiator_tag = (gobject.timeout_add
367
332
(self.timeout_milliseconds(),
369
334
self.enabled = True
370
# Also start a new checker *right now*.
373
def disable(self, quiet=True):
374
337
"""Disable this client."""
375
338
if not getattr(self, "enabled", False):
378
self.send_changedstate()
380
logger.info(u"Disabling client %s", self.name)
340
logger.info(u"Disabling client %s", self.name)
381
341
if getattr(self, u"disable_initiator_tag", False):
382
342
gobject.source_remove(self.disable_initiator_tag)
383
343
self.disable_initiator_tag = None
512
467
logger.debug(u"Stopping checker for %(name)s", vars(self))
514
469
os.kill(self.checker.pid, signal.SIGTERM)
516
471
#if self.checker.poll() is None:
517
472
# os.kill(self.checker.pid, signal.SIGKILL)
518
473
except OSError, error:
519
474
if error.errno != errno.ESRCH: # No such process
521
476
self.checker = None
478
def still_valid(self):
479
"""Has the timeout not yet passed for this client?"""
480
if not getattr(self, u"enabled", False):
482
now = datetime.datetime.utcnow()
483
if self.last_checked_ok is None:
484
return now < (self.created + self.timeout)
486
return now < (self.last_checked_ok + self.timeout)
523
489
def dbus_service_property(dbus_interface, signature=u"v",
524
490
access=u"readwrite", byte_arrays=False):
716
673
dbus_object_path: dbus.ObjectPath
717
674
bus: dbus.SystemBus()
720
runtime_expansions = (Client.runtime_expansions
721
+ (u"dbus_object_path",))
723
676
# dbus.service.Object doesn't use super(), so we can't either.
725
678
def __init__(self, bus = None, *args, **kwargs):
726
self._approvals_pending = 0
728
680
Client.__init__(self, *args, **kwargs)
729
681
# 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"_")})
734
683
self.dbus_object_path = (dbus.ObjectPath
735
(u"/clients/" + client_object_name))
685
+ self.name.replace(u".", u"_")))
736
686
DBusObjectWithProperties.__init__(self, self.bus,
737
687
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
756
690
def _datetime_to_dbus(dt, variant_level=0):
763
697
r = Client.enable(self)
764
698
if oldstate != self.enabled:
765
699
# Emit D-Bus signals
766
self.PropertyChanged(dbus.String(u"Enabled"),
700
self.PropertyChanged(dbus.String(u"enabled"),
767
701
dbus.Boolean(True, variant_level=1))
768
702
self.PropertyChanged(
769
dbus.String(u"LastEnabled"),
703
dbus.String(u"last_enabled"),
770
704
self._datetime_to_dbus(self.last_enabled,
771
705
variant_level=1))
774
def disable(self, quiet = False):
708
def disable(self, signal = True):
775
709
oldstate = getattr(self, u"enabled", False)
776
r = Client.disable(self, quiet=quiet)
777
if not quiet and oldstate != self.enabled:
710
r = Client.disable(self)
711
if signal and oldstate != self.enabled:
778
712
# Emit D-Bus signal
779
self.PropertyChanged(dbus.String(u"Enabled"),
713
self.PropertyChanged(dbus.String(u"enabled"),
780
714
dbus.Boolean(False, variant_level=1))
815
749
r = Client.checked_ok(self, *args, **kwargs)
816
750
# Emit D-Bus signal
817
751
self.PropertyChanged(
818
dbus.String(u"LastCheckedOK"),
752
dbus.String(u"last_checked_ok"),
819
753
(self._datetime_to_dbus(self.last_checked_ok,
820
754
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,
832
757
def start_checker(self, *args, **kwargs):
833
758
old_checker = self.checker
834
759
if self.checker is not None:
851
776
r = Client.stop_checker(self, *args, **kwargs)
852
777
if (old_checker is not None
853
778
and getattr(self, u"checker", None) is None):
854
self.PropertyChanged(dbus.String(u"CheckerRunning"),
779
self.PropertyChanged(dbus.String(u"checker_running"),
855
780
dbus.Boolean(False, variant_level=1))
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
783
## D-Bus methods & signals
871
784
_interface = u"se.bsnet.fukt.Mandos.Client"
787
@dbus.service.method(_interface)
789
return self.checked_ok()
875
791
# CheckerCompleted - signal
876
792
@dbus.service.signal(_interface, signature=u"nxs")
893
809
# GotSecret - signal
894
810
@dbus.service.signal(_interface)
895
811
def GotSecret(self):
897
Is sent after a successful transfer of secret from the Mandos
898
server to mandos-client
902
815
# Rejected - signal
903
@dbus.service.signal(_interface, signature=u"s")
904
def Rejected(self, reason):
816
@dbus.service.signal(_interface)
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()
926
821
# Enable - method
927
822
@dbus.service.method(_interface)
928
823
def Enable(self):
946
841
def StopChecker(self):
947
842
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))
991
845
@dbus_service_property(_interface, signature=u"s", access=u"read")
992
def Name_dbus_property(self):
846
def name_dbus_property(self):
993
847
return dbus.String(self.name)
995
# Fingerprint - property
849
# fingerprint - property
996
850
@dbus_service_property(_interface, signature=u"s", access=u"read")
997
def Fingerprint_dbus_property(self):
851
def fingerprint_dbus_property(self):
998
852
return dbus.String(self.fingerprint)
1001
855
@dbus_service_property(_interface, signature=u"s",
1002
856
access=u"readwrite")
1003
def Host_dbus_property(self, value=None):
857
def host_dbus_property(self, value=None):
1004
858
if value is None: # get
1005
859
return dbus.String(self.host)
1006
860
self.host = value
1007
861
# Emit D-Bus signal
1008
self.PropertyChanged(dbus.String(u"Host"),
862
self.PropertyChanged(dbus.String(u"host"),
1009
863
dbus.String(value, variant_level=1))
1011
# Created - property
1012
866
@dbus_service_property(_interface, signature=u"s", access=u"read")
1013
def Created_dbus_property(self):
867
def created_dbus_property(self):
1014
868
return dbus.String(self._datetime_to_dbus(self.created))
1016
# LastEnabled - property
870
# last_enabled - property
1017
871
@dbus_service_property(_interface, signature=u"s", access=u"read")
1018
def LastEnabled_dbus_property(self):
872
def last_enabled_dbus_property(self):
1019
873
if self.last_enabled is None:
1020
874
return dbus.String(u"")
1021
875
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1023
# Enabled - property
1024
878
@dbus_service_property(_interface, signature=u"b",
1025
879
access=u"readwrite")
1026
def Enabled_dbus_property(self, value=None):
880
def enabled_dbus_property(self, value=None):
1027
881
if value is None: # get
1028
882
return dbus.Boolean(self.enabled)
1043
897
return dbus.String(self._datetime_to_dbus(self
1044
898
.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
1056
901
@dbus_service_property(_interface, signature=u"t",
1057
902
access=u"readwrite")
1058
def Timeout_dbus_property(self, value=None):
903
def timeout_dbus_property(self, value=None):
1059
904
if value is None: # get
1060
905
return dbus.UInt64(self.timeout_milliseconds())
1061
906
self.timeout = datetime.timedelta(0, 0, 0, value)
1062
907
# Emit D-Bus signal
1063
self.PropertyChanged(dbus.String(u"Timeout"),
908
self.PropertyChanged(dbus.String(u"timeout"),
1064
909
dbus.UInt64(value, variant_level=1))
1065
910
if getattr(self, u"disable_initiator_tag", None) is None:
1080
925
self.disable_initiator_tag = (gobject.timeout_add
1081
926
(time_to_die, self.disable))
1083
# Interval - property
928
# interval - property
1084
929
@dbus_service_property(_interface, signature=u"t",
1085
930
access=u"readwrite")
1086
def Interval_dbus_property(self, value=None):
931
def interval_dbus_property(self, value=None):
1087
932
if value is None: # get
1088
933
return dbus.UInt64(self.interval_milliseconds())
1089
934
self.interval = datetime.timedelta(0, 0, 0, value)
1090
935
# Emit D-Bus signal
1091
self.PropertyChanged(dbus.String(u"Interval"),
936
self.PropertyChanged(dbus.String(u"interval"),
1092
937
dbus.UInt64(value, variant_level=1))
1093
938
if getattr(self, u"checker_initiator_tag", None) is None:
1098
943
(value, self.start_checker))
1099
944
self.start_checker() # Start one now, too
1101
# Checker - property
1102
947
@dbus_service_property(_interface, signature=u"s",
1103
948
access=u"readwrite")
1104
def Checker_dbus_property(self, value=None):
949
def checker_dbus_property(self, value=None):
1105
950
if value is None: # get
1106
951
return dbus.String(self.checker_command)
1107
952
self.checker_command = value
1108
953
# Emit D-Bus signal
1109
self.PropertyChanged(dbus.String(u"Checker"),
954
self.PropertyChanged(dbus.String(u"checker"),
1110
955
dbus.String(self.checker_command,
1111
956
variant_level=1))
1113
# CheckerRunning - property
958
# checker_running - property
1114
959
@dbus_service_property(_interface, signature=u"b",
1115
960
access=u"readwrite")
1116
def CheckerRunning_dbus_property(self, value=None):
961
def checker_running_dbus_property(self, value=None):
1117
962
if value is None: # get
1118
963
return dbus.Boolean(self.checker is not None)
1122
967
self.stop_checker()
1124
# ObjectPath - property
969
# object_path - property
1125
970
@dbus_service_property(_interface, signature=u"o", access=u"read")
1126
def ObjectPath_dbus_property(self):
971
def object_path_dbus_property(self):
1127
972
return self.dbus_object_path # is already a dbus.ObjectPath
1130
975
@dbus_service_property(_interface, signature=u"ay",
1131
976
access=u"write", byte_arrays=True)
1132
def Secret_dbus_property(self, value):
977
def secret_dbus_property(self, value):
1133
978
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))
1164
983
class ClientHandler(socketserver.BaseRequestHandler, object):
1165
984
"""A class to handle client connections.
1168
987
Note: This will run in its own forked process."""
1170
989
def handle(self):
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())
990
logger.info(u"TCP connection from: %s",
991
unicode(self.client_address))
992
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
993
# Open IPC pipe to parent process
994
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1177
995
session = (gnutls.connection
1178
996
.ClientSession(self.request,
1179
997
gnutls.connection
1180
998
.X509Credentials()))
1000
line = self.request.makefile().readline()
1001
logger.debug(u"Protocol version: %r", line)
1003
if int(line.strip().split()[0]) > 1:
1005
except (ValueError, IndexError, RuntimeError), error:
1006
logger.error(u"Unknown protocol version: %s", error)
1182
1009
# Note: gnutls.connection.X509Credentials is really a
1183
1010
# generic GnuTLS certificate credentials object so long as
1184
1011
# no X.509 keys are added to it. Therefore, we can use it
1185
1012
# here despite using OpenPGP certificates.
1187
1014
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1188
1015
# u"+AES-256-CBC", u"+SHA1",
1189
1016
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1195
1022
(gnutls.library.functions
1196
1023
.gnutls_priority_set_direct(session._c_object,
1197
1024
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
1212
1027
session.handshake()
1213
1028
except gnutls.errors.GNUTLSError, error:
1216
1031
# established. Just abandon the request.
1218
1033
logger.debug(u"Handshake succeeded")
1220
approval_required = False
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:
1035
fpr = self.fingerprint(self.peer_certificate(session))
1036
except (TypeError, gnutls.errors.GNUTLSError), error:
1037
logger.warning(u"Bad certificate: %s", error)
1040
logger.debug(u"Fingerprint: %s", fpr)
1310
if approval_required:
1311
client.approvals_pending -= 1
1314
except (gnutls.errors.GNUTLSError), error:
1315
logger.warning("GnuTLS bye failed")
1042
for c in self.server.clients:
1043
if c.fingerprint == fpr:
1047
ipc.write(u"NOTFOUND %s %s\n"
1048
% (fpr, unicode(self.client_address)))
1051
# Have to check if client.still_valid(), since it is
1052
# possible that the client timed out while establishing
1053
# the GnuTLS session.
1054
if not client.still_valid():
1055
ipc.write(u"INVALID %s\n" % client.name)
1058
ipc.write(u"SENDING %s\n" % client.name)
1060
while sent_size < len(client.secret):
1061
sent = session.send(client.secret[sent_size:])
1062
logger.debug(u"Sent: %d, remaining: %d",
1063
sent, len(client.secret)
1064
- (sent_size + sent))
1318
1069
def peer_certificate(session):
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 """
1132
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1133
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1397
1134
def process_request(self, request, client_address):
1398
1135
"""Overrides and wraps the original process_request().
1400
1137
This function creates a new pipe in self.pipe
1402
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1404
super(MultiprocessingMixInWithPipe,
1139
self.pipe = os.pipe()
1140
super(ForkingMixInWithPipe,
1405
1141
self).process_request(request, client_address)
1406
self.child_pipe.close()
1407
self.add_pipe(parent_pipe)
1409
def add_pipe(self, parent_pipe):
1142
os.close(self.pipe[1]) # close write end
1143
self.add_pipe(self.pipe[0])
1144
def add_pipe(self, pipe):
1410
1145
"""Dummy function; override as necessary"""
1413
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1149
class IPv6_TCPServer(ForkingMixInWithPipe,
1414
1150
socketserver.TCPServer, object):
1415
1151
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1501
1237
return socketserver.TCPServer.server_activate(self)
1502
1238
def enable(self):
1503
1239
self.enabled = True
1504
def add_pipe(self, parent_pipe):
1240
def add_pipe(self, pipe):
1505
1241
# Call "handle_ipc" for both data and EOF events
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):
1242
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1244
def handle_ipc(self, source, condition, file_objects={}):
1513
1245
condition_names = {
1514
1246
gobject.IO_IN: u"IN", # There is data to read.
1515
1247
gobject.IO_OUT: u"OUT", # Data can be written (without
1524
1256
for cond, name in
1525
1257
condition_names.iteritems()
1526
1258
if cond & condition)
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)
1259
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1262
# Turn the pipe file descriptor into a Python file object
1263
if source not in file_objects:
1264
file_objects[source] = os.fdopen(source, u"r", 1)
1266
# Read a line from the file object
1267
cmdline = file_objects[source].readline()
1268
if not cmdline: # Empty line means end of file
1269
# close the IPC pipe
1270
file_objects[source].close()
1271
del file_objects[source]
1273
# Stop calling this function
1276
logger.debug(u"IPC command: %r", cmdline)
1278
# Parse and act on command
1279
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1281
if cmd == u"NOTFOUND":
1282
logger.warning(u"Client not found for fingerprint: %s",
1286
mandos_dbus_service.ClientNotFound(args)
1287
elif cmd == u"INVALID":
1288
for client in self.clients:
1289
if client.name == args:
1290
logger.warning(u"Client %s is invalid", args)
1296
logger.error(u"Unknown client %s is invalid", args)
1297
elif cmd == u"SENDING":
1298
for client in self.clients:
1299
if client.name == args:
1300
logger.info(u"Sending secret to %s", client.name)
1307
logger.error(u"Sending secret to unknown client %s",
1310
logger.error(u"Unknown IPC command: %r", cmdline)
1312
# Keep calling this function
1782
1514
tcp_server = MandosServer((server_settings[u"address"],
1783
1515
server_settings[u"port"]),
1785
interface=(server_settings[u"interface"]
1517
interface=server_settings[u"interface"],
1787
1518
use_ipv6=use_ipv6,
1788
1519
gnutls_priority=
1789
1520
server_settings[u"priority"],
1790
1521
use_dbus=use_dbus)
1792
pidfilename = u"/var/run/mandos.pid"
1794
pidfile = open(pidfilename, u"w")
1796
logger.error(u"Could not open file %r", pidfilename)
1522
pidfilename = u"/var/run/mandos.pid"
1524
pidfile = open(pidfilename, u"w")
1526
logger.error(u"Could not open file %r", pidfilename)
1799
1529
uid = pwd.getpwnam(u"_mandos").pw_uid
1859
1566
bus = dbus.SystemBus()
1860
1567
# End of Avahi example code
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
1569
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1870
1570
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1871
1571
service = AvahiService(name = server_settings[u"servicename"],
1872
1572
servicetype = u"_mandos._tcp",
1875
1575
service.interface = (if_nametoindex
1876
1576
(str(server_settings[u"interface"])))
1878
global multiprocessing_manager
1879
multiprocessing_manager = multiprocessing.Manager()
1881
1578
client_class = Client
1883
1580
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]())
1896
1581
tcp_server.clients.update(set(
1897
1582
client_class(name = section,
1898
config= dict(client_config_items(
1899
client_config, section)))
1583
config= dict(client_config.items(section)))
1900
1584
for section in client_config.sections()))
1901
1585
if not tcp_server.clients:
1902
1586
logger.warning(u"No clients defined")
1589
# Redirect stdin so all checkers get /dev/null
1590
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1591
os.dup2(null, sys.stdin.fileno())
1595
# No console logging
1596
logger.removeHandler(console)
1597
# Close all input and output, do double fork, etc.
1601
with closing(pidfile):
1603
pidfile.write(str(pid) + "\n")
1606
logger.error(u"Could not write to file %r with PID %d",
1609
# "pidfile" was never created
1614
"Cleanup function; run on exit"
1617
while tcp_server.clients:
1618
client = tcp_server.clients.pop()
1619
client.disable_hook = None
1622
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
1918
1625
signal.signal(signal.SIGINT, signal.SIG_IGN)
1920
1626
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1921
1627
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1927
1633
dbus.service.Object.__init__(self, bus, u"/")
1928
1634
_interface = u"se.bsnet.fukt.Mandos"
1930
@dbus.service.signal(_interface, signature=u"o")
1931
def ClientAdded(self, objpath):
1636
@dbus.service.signal(_interface, signature=u"oa{sv}")
1637
def ClientAdded(self, objpath, properties):
1935
@dbus.service.signal(_interface, signature=u"ss")
1936
def ClientNotFound(self, fingerprint, address):
1641
@dbus.service.signal(_interface, signature=u"s")
1642
def ClientNotFound(self, fingerprint):
1965
1671
tcp_server.clients.remove(c)
1966
1672
c.remove_from_connection()
1967
1673
# Don't signal anything except ClientRemoved
1968
c.disable(quiet=True)
1674
c.disable(signal=False)
1969
1675
# Emit D-Bus signal
1970
1676
self.ClientRemoved(object_path, c.name)
1972
raise KeyError(object_path)
1976
1682
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)
1996
1684
for client in tcp_server.clients:
1998
1686
# Emit D-Bus signal
1999
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1687
mandos_dbus_service.ClientAdded(client.dbus_object_path,
2000
1689
client.enable()
2002
1691
tcp_server.enable()