157
156
u" after %i retries, exiting.",
158
157
self.rename_count)
159
158
raise AvahiServiceError(u"Too many renames")
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
159
self.name = self.server.GetAlternativeServiceName(self.name)
161
160
logger.info(u"Changing Zeroconf service name to %r ...",
163
162
syslogger.setFormatter(logging.Formatter
164
163
(u'Mandos (%s) [%%(process)d]:'
165
164
u' %%(levelname)s: %%(message)s'
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
174
168
self.rename_count += 1
175
169
def remove(self):
176
170
"""Derived from the Avahi example code"""
327
315
self.checker_command = config[u"checker"]
328
316
self.current_checker_command = None
329
317
self.last_connect = None
330
self._approved = None
331
self.approved_by_default = config.get(u"approved_by_default",
333
self.approvals_pending = 0
334
self.approval_delay = string_to_delta(
335
config[u"approval_delay"])
336
self.approval_duration = string_to_delta(
337
config[u"approval_duration"])
338
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
340
def send_changedstate(self):
341
self.changedstate.acquire()
342
self.changedstate.notify_all()
343
self.changedstate.release()
345
319
def enable(self):
346
320
"""Start this client's checker and timeout hooks"""
347
321
if getattr(self, u"enabled", False):
348
322
# Already enabled
350
self.send_changedstate()
351
324
self.last_enabled = datetime.datetime.utcnow()
352
325
# Schedule a new checker to be started an 'interval' from now,
353
326
# and every interval from then on.
716
687
+ self.name.replace(u".", u"_")))
717
688
DBusObjectWithProperties.__init__(self, self.bus,
718
689
self.dbus_object_path)
720
def _get_approvals_pending(self):
721
return self._approvals_pending
722
def _set_approvals_pending(self, value):
723
old_value = self._approvals_pending
724
self._approvals_pending = value
726
if (hasattr(self, "dbus_object_path")
727
and bval is not bool(old_value)):
728
dbus_bool = dbus.Boolean(bval, variant_level=1)
729
self.PropertyChanged(dbus.String(u"ApprovalPending"),
732
approvals_pending = property(_get_approvals_pending,
733
_set_approvals_pending)
734
del _get_approvals_pending, _set_approvals_pending
737
692
def _datetime_to_dbus(dt, variant_level=0):
823
778
r = Client.stop_checker(self, *args, **kwargs)
824
779
if (old_checker is not None
825
780
and getattr(self, u"checker", None) is None):
826
self.PropertyChanged(dbus.String(u"CheckerRunning"),
781
self.PropertyChanged(dbus.String(u"checker_running"),
827
782
dbus.Boolean(False, variant_level=1))
830
def _reset_approved(self):
831
self._approved = None
834
def approve(self, value=True):
835
self.send_changedstate()
836
self._approved = value
837
gobject.timeout_add(self._timedelta_to_milliseconds
838
(self.approval_duration),
839
self._reset_approved)
842
785
## D-Bus methods, signals & properties
843
786
_interface = u"se.bsnet.fukt.Mandos.Client"
865
808
# GotSecret - signal
866
809
@dbus.service.signal(_interface)
867
810
def GotSecret(self):
869
Is sent after a successful transfer of secret from the Mandos
870
server to mandos-client
874
814
# Rejected - signal
875
@dbus.service.signal(_interface, signature=u"s")
876
def Rejected(self, reason):
880
# NeedApproval - signal
881
@dbus.service.signal(_interface, signature=u"tb")
882
def NeedApproval(self, timeout, default):
815
@dbus.service.signal(_interface)
889
@dbus.service.method(_interface, in_signature=u"b")
890
def Approve(self, value):
893
822
# CheckedOK - method
894
823
@dbus.service.method(_interface)
895
824
def CheckedOK(self):
923
# ApprovalPending - property
924
@dbus_service_property(_interface, signature=u"b", access=u"read")
925
def ApprovalPending_dbus_property(self):
926
return dbus.Boolean(bool(self.approvals_pending))
928
# ApprovedByDefault - property
929
@dbus_service_property(_interface, signature=u"b",
931
def ApprovedByDefault_dbus_property(self, value=None):
932
if value is None: # get
933
return dbus.Boolean(self.approved_by_default)
934
self.approved_by_default = bool(value)
936
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
937
dbus.Boolean(value, variant_level=1))
939
# ApprovalDelay - property
940
@dbus_service_property(_interface, signature=u"t",
942
def ApprovalDelay_dbus_property(self, value=None):
943
if value is None: # get
944
return dbus.UInt64(self.approval_delay_milliseconds())
945
self.approval_delay = datetime.timedelta(0, 0, 0, value)
947
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
948
dbus.UInt64(value, variant_level=1))
950
# ApprovalDuration - property
951
@dbus_service_property(_interface, signature=u"t",
953
def ApprovalDuration_dbus_property(self, value=None):
954
if value is None: # get
955
return dbus.UInt64(self._timedelta_to_milliseconds(
956
self.approval_duration))
957
self.approval_duration = datetime.timedelta(0, 0, 0, value)
959
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
960
dbus.UInt64(value, variant_level=1))
963
853
@dbus_service_property(_interface, signature=u"s", access=u"read")
964
def Name_dbus_property(self):
854
def name_dbus_property(self):
965
855
return dbus.String(self.name)
967
# Fingerprint - property
857
# fingerprint - property
968
858
@dbus_service_property(_interface, signature=u"s", access=u"read")
969
def Fingerprint_dbus_property(self):
859
def fingerprint_dbus_property(self):
970
860
return dbus.String(self.fingerprint)
973
863
@dbus_service_property(_interface, signature=u"s",
974
864
access=u"readwrite")
975
def Host_dbus_property(self, value=None):
865
def host_dbus_property(self, value=None):
976
866
if value is None: # get
977
867
return dbus.String(self.host)
978
868
self.host = value
979
869
# Emit D-Bus signal
980
self.PropertyChanged(dbus.String(u"Host"),
870
self.PropertyChanged(dbus.String(u"host"),
981
871
dbus.String(value, variant_level=1))
984
874
@dbus_service_property(_interface, signature=u"s", access=u"read")
985
def Created_dbus_property(self):
875
def created_dbus_property(self):
986
876
return dbus.String(self._datetime_to_dbus(self.created))
988
# LastEnabled - property
878
# last_enabled - property
989
879
@dbus_service_property(_interface, signature=u"s", access=u"read")
990
def LastEnabled_dbus_property(self):
880
def last_enabled_dbus_property(self):
991
881
if self.last_enabled is None:
992
882
return dbus.String(u"")
993
883
return dbus.String(self._datetime_to_dbus(self.last_enabled))
996
886
@dbus_service_property(_interface, signature=u"b",
997
887
access=u"readwrite")
998
def Enabled_dbus_property(self, value=None):
888
def enabled_dbus_property(self, value=None):
999
889
if value is None: # get
1000
890
return dbus.Boolean(self.enabled)
1015
905
return dbus.String(self._datetime_to_dbus(self
1016
906
.last_checked_ok))
1018
# Timeout - property
1019
909
@dbus_service_property(_interface, signature=u"t",
1020
910
access=u"readwrite")
1021
def Timeout_dbus_property(self, value=None):
911
def timeout_dbus_property(self, value=None):
1022
912
if value is None: # get
1023
913
return dbus.UInt64(self.timeout_milliseconds())
1024
914
self.timeout = datetime.timedelta(0, 0, 0, value)
1025
915
# Emit D-Bus signal
1026
self.PropertyChanged(dbus.String(u"Timeout"),
916
self.PropertyChanged(dbus.String(u"timeout"),
1027
917
dbus.UInt64(value, variant_level=1))
1028
918
if getattr(self, u"disable_initiator_tag", None) is None:
1043
933
self.disable_initiator_tag = (gobject.timeout_add
1044
934
(time_to_die, self.disable))
1046
# Interval - property
936
# interval - property
1047
937
@dbus_service_property(_interface, signature=u"t",
1048
938
access=u"readwrite")
1049
def Interval_dbus_property(self, value=None):
939
def interval_dbus_property(self, value=None):
1050
940
if value is None: # get
1051
941
return dbus.UInt64(self.interval_milliseconds())
1052
942
self.interval = datetime.timedelta(0, 0, 0, value)
1053
943
# Emit D-Bus signal
1054
self.PropertyChanged(dbus.String(u"Interval"),
944
self.PropertyChanged(dbus.String(u"interval"),
1055
945
dbus.UInt64(value, variant_level=1))
1056
946
if getattr(self, u"checker_initiator_tag", None) is None:
1061
951
(value, self.start_checker))
1062
952
self.start_checker() # Start one now, too
1064
# Checker - property
1065
955
@dbus_service_property(_interface, signature=u"s",
1066
956
access=u"readwrite")
1067
def Checker_dbus_property(self, value=None):
957
def checker_dbus_property(self, value=None):
1068
958
if value is None: # get
1069
959
return dbus.String(self.checker_command)
1070
960
self.checker_command = value
1071
961
# Emit D-Bus signal
1072
self.PropertyChanged(dbus.String(u"Checker"),
962
self.PropertyChanged(dbus.String(u"checker"),
1073
963
dbus.String(self.checker_command,
1074
964
variant_level=1))
1076
# CheckerRunning - property
966
# checker_running - property
1077
967
@dbus_service_property(_interface, signature=u"b",
1078
968
access=u"readwrite")
1079
def CheckerRunning_dbus_property(self, value=None):
969
def checker_running_dbus_property(self, value=None):
1080
970
if value is None: # get
1081
971
return dbus.Boolean(self.checker is not None)
1085
975
self.stop_checker()
1087
# ObjectPath - property
977
# object_path - property
1088
978
@dbus_service_property(_interface, signature=u"o", access=u"read")
1089
def ObjectPath_dbus_property(self):
979
def object_path_dbus_property(self):
1090
980
return self.dbus_object_path # is already a dbus.ObjectPath
1093
983
@dbus_service_property(_interface, signature=u"ay",
1094
984
access=u"write", byte_arrays=True)
1095
def Secret_dbus_property(self, value):
985
def secret_dbus_property(self, value):
1096
986
self.secret = str(value)
1101
class ProxyClient(object):
1102
def __init__(self, child_pipe, fpr, address):
1103
self._pipe = child_pipe
1104
self._pipe.send(('init', fpr, address))
1105
if not self._pipe.recv():
1108
def __getattribute__(self, name):
1109
if(name == '_pipe'):
1110
return super(ProxyClient, self).__getattribute__(name)
1111
self._pipe.send(('getattr', name))
1112
data = self._pipe.recv()
1113
if data[0] == 'data':
1115
if data[0] == 'function':
1116
def func(*args, **kwargs):
1117
self._pipe.send(('funcall', name, args, kwargs))
1118
return self._pipe.recv()[1]
1121
def __setattr__(self, name, value):
1122
if(name == '_pipe'):
1123
return super(ProxyClient, self).__setattr__(name, value)
1124
self._pipe.send(('setattr', name, value))
1127
991
class ClientHandler(socketserver.BaseRequestHandler, object):
1128
992
"""A class to handle client connections.
1131
995
Note: This will run in its own forked process."""
1133
997
def handle(self):
1134
with contextlib.closing(self.server.child_pipe) as child_pipe:
1135
logger.info(u"TCP connection from: %s",
1136
unicode(self.client_address))
1137
logger.debug(u"Pipe FD: %d",
1138
self.server.child_pipe.fileno())
998
logger.info(u"TCP connection from: %s",
999
unicode(self.client_address))
1000
logger.debug(u"IPC Pipe FD: %d",
1001
self.server.child_pipe[1].fileno())
1002
# Open IPC pipe to parent process
1003
with contextlib.nested(self.server.child_pipe[1],
1004
self.server.parent_pipe[0]
1005
) as (ipc, ipc_return):
1140
1006
session = (gnutls.connection
1141
1007
.ClientSession(self.request,
1142
1008
gnutls.connection
1143
1009
.X509Credentials()))
1145
1011
# Note: gnutls.connection.X509Credentials is really a
1146
1012
# generic GnuTLS certificate credentials object so long as
1147
1013
# no X.509 keys are added to it. Therefore, we can use it
1148
1014
# here despite using OpenPGP certificates.
1150
1016
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1151
1017
# u"+AES-256-CBC", u"+SHA1",
1152
1018
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1191
1055
logger.debug(u"Fingerprint: %s", fpr)
1194
client = ProxyClient(child_pipe, fpr,
1195
self.client_address)
1199
if client.approval_delay:
1200
delay = client.approval_delay
1201
client.approvals_pending += 1
1202
approval_required = True
1205
if not client.enabled:
1206
logger.warning(u"Client %s is disabled",
1208
if self.server.use_dbus:
1210
client.Rejected("Disabled")
1213
if client._approved or not client.approval_delay:
1214
#We are approved or approval is disabled
1057
for c in self.server.clients:
1058
if c.fingerprint == fpr:
1216
elif client._approved is None:
1217
logger.info(u"Client %s needs approval",
1219
if self.server.use_dbus:
1221
client.NeedApproval(
1222
client.approval_delay_milliseconds(),
1223
client.approved_by_default)
1225
logger.warning(u"Client %s was not approved",
1227
if self.server.use_dbus:
1229
client.Rejected("Denied")
1232
#wait until timeout or approved
1233
#x = float(client._timedelta_to_milliseconds(delay))
1234
time = datetime.datetime.now()
1235
client.changedstate.acquire()
1236
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1237
client.changedstate.release()
1238
time2 = datetime.datetime.now()
1239
if (time2 - time) >= delay:
1240
if not client.approved_by_default:
1241
logger.warning("Client %s timed out while"
1242
" waiting for approval",
1244
if self.server.use_dbus:
1246
client.Rejected("Approval timed out")
1251
delay -= time2 - time
1062
ipc.write(u"NOTFOUND %s %s\n"
1063
% (fpr, unicode(self.client_address)))
1066
class ClientProxy(object):
1067
"""Client proxy object. Not for calling methods."""
1068
def __init__(self, client):
1069
self.client = client
1070
def __getattr__(self, name):
1071
if name.startswith("ipc_"):
1073
ipc.write("%s %s\n" % (name[4:].upper(),
1076
if not hasattr(self.client, name):
1077
raise AttributeError
1078
ipc.write(u"GETATTR %s %s\n"
1079
% (name, self.client.fingerprint))
1080
return pickle.load(ipc_return)
1081
clientproxy = ClientProxy(client)
1082
# Have to check if client.enabled, since it is
1083
# possible that the client was disabled since the
1084
# GnuTLS session was established.
1085
if not clientproxy.enabled:
1086
clientproxy.ipc_disabled()
1089
clientproxy.ipc_sending()
1254
1091
while sent_size < len(client.secret):
1256
sent = session.send(client.secret[sent_size:])
1257
except (gnutls.errors.GNUTLSError), error:
1258
logger.warning("gnutls send failed")
1092
sent = session.send(client.secret[sent_size:])
1260
1093
logger.debug(u"Sent: %d, remaining: %d",
1261
1094
sent, len(client.secret)
1262
1095
- (sent_size + sent))
1263
1096
sent_size += sent
1265
logger.info(u"Sending secret to %s", client.name)
1266
# bump the timeout as if seen
1268
if self.server.use_dbus:
1273
if approval_required:
1274
client.approvals_pending -= 1
1277
except (gnutls.errors.GNUTLSError), error:
1278
logger.warning("GnuTLS bye failed")
1281
1101
def peer_certificate(session):
1344
class MultiprocessingMixIn(object):
1345
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1346
def sub_process_main(self, request, address):
1348
self.finish_request(request, address)
1350
self.handle_error(request, address)
1351
self.close_request(request)
1353
def process_request(self, request, address):
1354
"""Start a new process to process the request."""
1355
multiprocessing.Process(target = self.sub_process_main,
1356
args = (request, address)).start()
1358
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1359
""" adds a pipe to the MixIn """
1164
class ForkingMixInWithPipes(socketserver.ForkingMixIn, object):
1165
"""Like socketserver.ForkingMixIn, but also pass a pipe pair."""
1360
1166
def process_request(self, request, client_address):
1361
1167
"""Overrides and wraps the original process_request().
1363
1169
This function creates a new pipe in self.pipe
1365
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1367
super(MultiprocessingMixInWithPipe,
1171
# Child writes to child_pipe
1172
self.child_pipe = map(os.fdopen, os.pipe(), u"rw", (1, 0))
1173
# Parent writes to parent_pipe
1174
self.parent_pipe = map(os.fdopen, os.pipe(), u"rw", (1, 0))
1175
super(ForkingMixInWithPipes,
1368
1176
self).process_request(request, client_address)
1369
self.child_pipe.close()
1370
self.add_pipe(parent_pipe)
1372
def add_pipe(self, parent_pipe):
1177
# Close unused ends for parent
1178
self.parent_pipe[0].close() # close read end
1179
self.child_pipe[1].close() # close write end
1180
self.add_pipe_fds(self.child_pipe[0], self.parent_pipe[1])
1181
def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
1373
1182
"""Dummy function; override as necessary"""
1376
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1183
child_pipe_fd.close()
1184
parent_pipe_fd.close()
1187
class IPv6_TCPServer(ForkingMixInWithPipes,
1377
1188
socketserver.TCPServer, object):
1378
1189
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1464
1275
return socketserver.TCPServer.server_activate(self)
1465
1276
def enable(self):
1466
1277
self.enabled = True
1467
def add_pipe(self, parent_pipe):
1278
def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
1468
1279
# Call "handle_ipc" for both data and EOF events
1469
gobject.io_add_watch(parent_pipe.fileno(),
1280
gobject.io_add_watch(child_pipe_fd.fileno(),
1470
1281
gobject.IO_IN | gobject.IO_HUP,
1471
1282
functools.partial(self.handle_ipc,
1472
parent_pipe = parent_pipe))
1474
def handle_ipc(self, source, condition, parent_pipe=None,
1475
client_object=None):
1283
reply = parent_pipe_fd,
1284
sender= child_pipe_fd))
1285
def handle_ipc(self, source, condition, reply=None, sender=None):
1476
1286
condition_names = {
1477
1287
gobject.IO_IN: u"IN", # There is data to read.
1478
1288
gobject.IO_OUT: u"OUT", # Data can be written (without
1487
1297
for cond, name in
1488
1298
condition_names.iteritems()
1489
1299
if cond & condition)
1490
# error or the other end of multiprocessing.Pipe has closed
1491
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1494
# Read a request from the child
1495
request = parent_pipe.recv()
1496
command = request[0]
1498
if command == 'init':
1500
address = request[2]
1502
for c in self.clients:
1503
if c.fingerprint == fpr:
1507
logger.warning(u"Client not found for fingerprint: %s, ad"
1508
u"dress: %s", fpr, address)
1511
mandos_dbus_service.ClientNotFound(fpr, address)
1512
parent_pipe.send(False)
1515
gobject.io_add_watch(parent_pipe.fileno(),
1516
gobject.IO_IN | gobject.IO_HUP,
1517
functools.partial(self.handle_ipc,
1518
parent_pipe = parent_pipe,
1519
client_object = client))
1520
parent_pipe.send(True)
1521
# remove the old hook in favor of the new above hook on same fileno
1523
if command == 'funcall':
1524
funcname = request[1]
1528
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1530
if command == 'getattr':
1531
attrname = request[1]
1532
if callable(client_object.__getattribute__(attrname)):
1533
parent_pipe.send(('function',))
1535
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1537
if command == 'setattr':
1538
attrname = request[1]
1540
setattr(client_object, attrname, value)
1300
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1303
# Read a line from the file object
1304
cmdline = sender.readline()
1305
if not cmdline: # Empty line means end of file
1306
# close the IPC pipes
1310
# Stop calling this function
1313
logger.debug(u"IPC command: %r", cmdline)
1315
# Parse and act on command
1316
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1318
if cmd == u"NOTFOUND":
1319
fpr, address = args.split(None, 1)
1320
logger.warning(u"Client not found for fingerprint: %s, ad"
1321
u"dress: %s", fpr, address)
1324
mandos_dbus_service.ClientNotFound(fpr, address)
1325
elif cmd == u"DISABLED":
1326
for client in self.clients:
1327
if client.name == args:
1328
logger.warning(u"Client %s is disabled", args)
1334
logger.error(u"Unknown client %s is disabled", args)
1335
elif cmd == u"SENDING":
1336
for client in self.clients:
1337
if client.name == args:
1338
logger.info(u"Sending secret to %s", client.name)
1345
logger.error(u"Sending secret to unknown client %s",
1347
elif cmd == u"GETATTR":
1348
attr_name, fpr = args.split(None, 1)
1349
for client in self.clients:
1350
if client.fingerprint == fpr:
1351
attr_value = getattr(client, attr_name, None)
1352
logger.debug("IPC reply: %r", attr_value)
1353
pickle.dump(attr_value, reply)
1356
logger.error(u"Client %s on address %s requesting "
1357
u"attribute %s not found", fpr, address,
1359
pickle.dump(None, reply)
1361
logger.error(u"Unknown IPC command: %r", cmdline)
1363
# Keep calling this function
1832
1633
if server_settings["interface"]:
1833
1634
service.interface = (if_nametoindex
1834
1635
(str(server_settings[u"interface"])))
1837
# Close all input and output, do double fork, etc.
1840
global multiprocessing_manager
1841
multiprocessing_manager = multiprocessing.Manager()
1843
1637
client_class = Client
1845
1639
client_class = functools.partial(ClientDBus, bus = bus)
1846
def client_config_items(config, section):
1847
special_settings = {
1848
"approved_by_default":
1849
lambda: config.getboolean(section,
1850
"approved_by_default"),
1852
for name, value in config.items(section):
1854
yield (name, special_settings[name]())
1858
1640
tcp_server.clients.update(set(
1859
1641
client_class(name = section,
1860
config= dict(client_config_items(
1861
client_config, section)))
1642
config= dict(client_config.items(section)))
1862
1643
for section in client_config.sections()))
1863
1644
if not tcp_server.clients:
1864
1645
logger.warning(u"No clients defined")
1648
# Redirect stdin so all checkers get /dev/null
1649
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1650
os.dup2(null, sys.stdin.fileno())
1654
# No console logging
1655
logger.removeHandler(console)
1656
# Close all input and output, do double fork, etc.
1868
1661
pid = os.getpid()