156
157
u" after %i retries, exiting.",
157
158
self.rename_count)
158
159
raise AvahiServiceError(u"Too many renames")
159
self.name = self.server.GetAlternativeServiceName(self.name)
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
160
161
logger.info(u"Changing Zeroconf service name to %r ...",
162
163
syslogger.setFormatter(logging.Formatter
163
164
(u'Mandos (%s) [%%(process)d]:'
164
165
u' %%(levelname)s: %%(message)s'
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
168
174
self.rename_count += 1
169
175
def remove(self):
170
176
"""Derived from the Avahi example code"""
315
327
self.checker_command = config[u"checker"]
316
328
self.current_checker_command = None
317
329
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.approved_delay = string_to_delta(
335
config[u"approved_delay"])
336
self.approved_duration = string_to_delta(
337
config[u"approved_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()
319
345
def enable(self):
320
346
"""Start this client's checker and timeout hooks"""
321
347
if getattr(self, u"enabled", False):
322
348
# Already enabled
350
self.send_changedstate()
324
351
self.last_enabled = datetime.datetime.utcnow()
325
352
# Schedule a new checker to be started an 'interval' from now,
326
353
# and every interval from then on.
687
716
+ self.name.replace(u".", u"_")))
688
717
DBusObjectWithProperties.__init__(self, self.bus,
689
718
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"approved_pending"),
732
approvals_pending = property(_get_approvals_pending,
733
_set_approvals_pending)
734
del _get_approvals_pending, _set_approvals_pending
692
737
def _datetime_to_dbus(dt, variant_level=0):
808
864
# GotSecret - signal
809
865
@dbus.service.signal(_interface)
810
866
def GotSecret(self):
868
Is sent after a successful transfer of secret from the Mandos
869
server to mandos-client
814
873
# Rejected - signal
815
@dbus.service.signal(_interface)
874
@dbus.service.signal(_interface, signature=u"s")
875
def Rejected(self, reason):
879
# NeedApproval - signal
880
@dbus.service.signal(_interface, signature=u"db")
881
def NeedApproval(self, timeout, default):
888
@dbus.service.method(_interface, in_signature=u"b")
889
def Approve(self, value):
822
892
# CheckedOK - method
823
893
@dbus.service.method(_interface)
824
894
def CheckedOK(self):
922
# approved_pending - property
923
@dbus_service_property(_interface, signature=u"b", access=u"read")
924
def approved_pending_dbus_property(self):
925
return dbus.Boolean(bool(self.approvals_pending))
927
# approved_by_default - property
928
@dbus_service_property(_interface, signature=u"b",
930
def approved_by_default_dbus_property(self):
931
return dbus.Boolean(self.approved_by_default)
933
# approved_delay - property
934
@dbus_service_property(_interface, signature=u"t",
936
def approved_delay_dbus_property(self):
937
return dbus.UInt64(self.approved_delay_milliseconds())
939
# approved_duration - property
940
@dbus_service_property(_interface, signature=u"t",
942
def approved_duration_dbus_property(self):
943
return dbus.UInt64(self._timedelta_to_milliseconds(
944
self.approved_duration))
852
946
# name - property
853
947
@dbus_service_property(_interface, signature=u"s", access=u"read")
854
948
def name_dbus_property(self):
1085
class ProxyClient(object):
1086
def __init__(self, child_pipe, fpr, address):
1087
self._pipe = child_pipe
1088
self._pipe.send(('init', fpr, address))
1089
if not self._pipe.recv():
1092
def __getattribute__(self, name):
1093
if(name == '_pipe'):
1094
return super(ProxyClient, self).__getattribute__(name)
1095
self._pipe.send(('getattr', name))
1096
data = self._pipe.recv()
1097
if data[0] == 'data':
1099
if data[0] == 'function':
1100
def func(*args, **kwargs):
1101
self._pipe.send(('funcall', name, args, kwargs))
1102
return self._pipe.recv()[1]
1105
def __setattr__(self, name, value):
1106
if(name == '_pipe'):
1107
return super(ProxyClient, self).__setattr__(name, value)
1108
self._pipe.send(('setattr', name, value))
991
1111
class ClientHandler(socketserver.BaseRequestHandler, object):
992
1112
"""A class to handle client connections.
995
1115
Note: This will run in its own forked process."""
997
1117
def handle(self):
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):
1118
with contextlib.closing(self.server.child_pipe) as child_pipe:
1119
logger.info(u"TCP connection from: %s",
1120
unicode(self.client_address))
1121
logger.debug(u"Pipe FD: %d",
1122
self.server.child_pipe.fileno())
1006
1124
session = (gnutls.connection
1007
1125
.ClientSession(self.request,
1008
1126
gnutls.connection
1009
1127
.X509Credentials()))
1011
1129
# Note: gnutls.connection.X509Credentials is really a
1012
1130
# generic GnuTLS certificate credentials object so long as
1013
1131
# no X.509 keys are added to it. Therefore, we can use it
1014
1132
# here despite using OpenPGP certificates.
1016
1134
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1017
1135
# u"+AES-256-CBC", u"+SHA1",
1018
1136
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1055
1175
logger.debug(u"Fingerprint: %s", fpr)
1057
for c in self.server.clients:
1058
if c.fingerprint == fpr:
1178
client = ProxyClient(child_pipe, fpr,
1179
self.client_address)
1183
if client.approved_delay:
1184
delay = client.approved_delay
1185
client.approvals_pending += 1
1186
approval_required = True
1189
if not client.enabled:
1190
logger.warning(u"Client %s is disabled",
1192
if self.server.use_dbus:
1194
client.Rejected("Disabled")
1197
if client._approved or not client.approved_delay:
1198
#We are approved or approval is disabled
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()
1200
elif client._approved is None:
1201
logger.info(u"Client %s need approval",
1203
if self.server.use_dbus:
1205
client.NeedApproval(
1206
client.approved_delay_milliseconds(),
1207
client.approved_by_default)
1209
logger.warning(u"Client %s was not approved",
1211
if self.server.use_dbus:
1213
client.Rejected("Disapproved")
1216
#wait until timeout or approved
1217
#x = float(client._timedelta_to_milliseconds(delay))
1218
time = datetime.datetime.now()
1219
client.changedstate.acquire()
1220
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1221
client.changedstate.release()
1222
time2 = datetime.datetime.now()
1223
if (time2 - time) >= delay:
1224
if not client.approved_by_default:
1225
logger.warning("Client %s timed out while"
1226
" waiting for approval",
1228
if self.server.use_dbus:
1230
client.Rejected("Time out")
1235
delay -= time2 - time
1091
1238
while sent_size < len(client.secret):
1092
sent = session.send(client.secret[sent_size:])
1240
sent = session.send(client.secret[sent_size:])
1241
except (gnutls.errors.GNUTLSError), error:
1242
logger.warning("gnutls send failed")
1093
1244
logger.debug(u"Sent: %d, remaining: %d",
1094
1245
sent, len(client.secret)
1095
1246
- (sent_size + sent))
1096
1247
sent_size += sent
1249
logger.info(u"Sending secret to %s", client.name)
1250
# bump the timeout as if seen
1252
if self.server.use_dbus:
1257
if approval_required:
1258
client.approvals_pending -= 1
1261
except (gnutls.errors.GNUTLSError), error:
1262
logger.warning("gnutls bye failed")
1101
1265
def peer_certificate(session):
1164
class ForkingMixInWithPipes(socketserver.ForkingMixIn, object):
1165
"""Like socketserver.ForkingMixIn, but also pass a pipe pair."""
1328
class MultiprocessingMixIn(object):
1329
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1330
def sub_process_main(self, request, address):
1332
self.finish_request(request, address)
1334
self.handle_error(request, address)
1335
self.close_request(request)
1337
def process_request(self, request, address):
1338
"""Start a new process to process the request."""
1339
multiprocessing.Process(target = self.sub_process_main,
1340
args = (request, address)).start()
1342
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1343
""" adds a pipe to the MixIn """
1166
1344
def process_request(self, request, client_address):
1167
1345
"""Overrides and wraps the original process_request().
1169
1347
This function creates a new pipe in self.pipe
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,
1349
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1351
super(MultiprocessingMixInWithPipe,
1176
1352
self).process_request(request, client_address)
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):
1353
self.child_pipe.close()
1354
self.add_pipe(parent_pipe)
1356
def add_pipe(self, parent_pipe):
1182
1357
"""Dummy function; override as necessary"""
1183
child_pipe_fd.close()
1184
parent_pipe_fd.close()
1187
class IPv6_TCPServer(ForkingMixInWithPipes,
1360
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1188
1361
socketserver.TCPServer, object):
1189
1362
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1275
1448
return socketserver.TCPServer.server_activate(self)
1276
1449
def enable(self):
1277
1450
self.enabled = True
1278
def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
1451
def add_pipe(self, parent_pipe):
1279
1452
# Call "handle_ipc" for both data and EOF events
1280
gobject.io_add_watch(child_pipe_fd.fileno(),
1453
gobject.io_add_watch(parent_pipe.fileno(),
1281
1454
gobject.IO_IN | gobject.IO_HUP,
1282
1455
functools.partial(self.handle_ipc,
1283
reply = parent_pipe_fd,
1284
sender= child_pipe_fd))
1285
def handle_ipc(self, source, condition, reply=None, sender=None):
1456
parent_pipe = parent_pipe))
1458
def handle_ipc(self, source, condition, parent_pipe=None,
1459
client_object=None):
1286
1460
condition_names = {
1287
1461
gobject.IO_IN: u"IN", # There is data to read.
1288
1462
gobject.IO_OUT: u"OUT", # Data can be written (without
1299
1473
if cond & condition)
1300
1474
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1301
1475
conditions_string)
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
1477
# error or the other end of multiprocessing.Pipe has closed
1478
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1481
# Read a request from the child
1482
request = parent_pipe.recv()
1483
logger.debug(u"IPC request: %s", repr(request))
1484
command = request[0]
1486
if command == 'init':
1488
address = request[2]
1490
for c in self.clients:
1491
if c.fingerprint == fpr:
1495
logger.warning(u"Client not found for fingerprint: %s, ad"
1496
u"dress: %s", fpr, address)
1499
mandos_dbus_service.ClientNotFound(fpr, address)
1500
parent_pipe.send(False)
1503
gobject.io_add_watch(parent_pipe.fileno(),
1504
gobject.IO_IN | gobject.IO_HUP,
1505
functools.partial(self.handle_ipc,
1506
parent_pipe = parent_pipe,
1507
client_object = client))
1508
parent_pipe.send(True)
1509
# remove the old hook in favor of the new above hook on same fileno
1511
if command == 'funcall':
1512
funcname = request[1]
1516
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1518
if command == 'getattr':
1519
attrname = request[1]
1520
if callable(client_object.__getattribute__(attrname)):
1521
parent_pipe.send(('function',))
1523
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1525
if command == 'setattr':
1526
attrname = request[1]
1528
setattr(client_object, attrname, value)
1469
1635
parser.add_option("--debug", action=u"store_true",
1470
1636
help=u"Debug mode; run in foreground and log to"
1638
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1639
help=u"Debug level for stdout output")
1472
1640
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1473
1641
u" priority string (see GnuTLS documentation)")
1474
1642
parser.add_option("--servicename", type=u"string",
1521
1690
# options, if set.
1522
1691
for option in (u"interface", u"address", u"port", u"debug",
1523
1692
u"priority", u"servicename", u"configdir",
1524
u"use_dbus", u"use_ipv6"):
1693
u"use_dbus", u"use_ipv6", u"debuglevel"):
1525
1694
value = getattr(options, option)
1526
1695
if value is not None:
1527
1696
server_settings[option] = value
1633
1821
if server_settings["interface"]:
1634
1822
service.interface = (if_nametoindex
1635
1823
(str(server_settings[u"interface"])))
1826
# Close all input and output, do double fork, etc.
1829
global multiprocessing_manager
1830
multiprocessing_manager = multiprocessing.Manager()
1637
1832
client_class = Client
1639
1834
client_class = functools.partial(ClientDBus, bus = bus)
1835
def client_config_items(config, section):
1836
special_settings = {
1837
"approved_by_default":
1838
lambda: config.getboolean(section,
1839
"approved_by_default"),
1841
for name, value in config.items(section):
1843
yield (name, special_settings[name]())
1640
1847
tcp_server.clients.update(set(
1641
1848
client_class(name = section,
1642
config= dict(client_config.items(section)))
1849
config= dict(client_config_items(
1850
client_config, section)))
1643
1851
for section in client_config.sections()))
1644
1852
if not tcp_server.clients:
1645
1853
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.
1661
1857
pid = os.getpid()