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"""
313
327
self.checker_command = config[u"checker"]
314
328
self.current_checker_command = None
315
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()
317
345
def enable(self):
318
346
"""Start this client's checker and timeout hooks"""
319
347
if getattr(self, u"enabled", False):
320
348
# Already enabled
350
self.send_changedstate()
322
351
self.last_enabled = datetime.datetime.utcnow()
323
352
# Schedule a new checker to be started an 'interval' from now,
324
353
# and every interval from then on.
333
362
# Also start a new checker *right now*.
334
363
self.start_checker()
336
def disable(self, log=True):
365
def disable(self, quiet=True):
337
366
"""Disable this client."""
338
367
if not getattr(self, "enabled", False):
370
self.send_changedstate()
341
372
logger.info(u"Disabling client %s", self.name)
342
373
if getattr(self, u"disable_initiator_tag", False):
343
374
gobject.source_remove(self.disable_initiator_tag)
475
506
if error.errno != errno.ESRCH: # No such process
477
508
self.checker = None
479
def still_valid(self):
480
"""Has the timeout not yet passed for this client?"""
481
if not getattr(self, u"enabled", False):
483
now = datetime.datetime.utcnow()
484
if self.last_checked_ok is None:
485
return now < (self.created + self.timeout)
487
return now < (self.last_checked_ok + self.timeout)
490
510
def dbus_service_property(dbus_interface, signature=u"v",
491
511
access=u"readwrite", byte_arrays=False):
499
519
dbus.service.method, except there is only "signature", since the
500
520
type from Get() and the type sent to Set() is the same.
522
# Encoding deeply encoded byte arrays is not supported yet by the
523
# "Set" method, so we fail early here:
524
if byte_arrays and signature != u"ay":
525
raise ValueError(u"Byte arrays not supported for non-'ay'"
526
u" signature %r" % signature)
502
527
def decorator(func):
503
528
func._dbus_is_property = True
504
529
func._dbus_interface = dbus_interface
686
716
+ self.name.replace(u".", u"_")))
687
717
DBusObjectWithProperties.__init__(self, self.bus,
688
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
691
737
def _datetime_to_dbus(dt, variant_level=0):
706
752
variant_level=1))
709
def disable(self, signal = True):
755
def disable(self, quiet = False):
710
756
oldstate = getattr(self, u"enabled", False)
711
r = Client.disable(self, log=signal)
712
if signal and oldstate != self.enabled:
757
r = Client.disable(self, quiet=quiet)
758
if not quiet and oldstate != self.enabled:
713
759
# Emit D-Bus signal
714
760
self.PropertyChanged(dbus.String(u"enabled"),
715
761
dbus.Boolean(False, variant_level=1))
780
826
self.PropertyChanged(dbus.String(u"checker_running"),
781
827
dbus.Boolean(False, variant_level=1))
784
## D-Bus methods & signals
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(self.approved_duration),
838
self._reset_approved)
841
## D-Bus methods, signals & properties
785
842
_interface = u"se.bsnet.fukt.Mandos.Client"
788
@dbus.service.method(_interface)
790
return self.checked_ok()
792
846
# CheckerCompleted - signal
793
847
@dbus.service.signal(_interface, signature=u"nxs")
810
864
# GotSecret - signal
811
865
@dbus.service.signal(_interface)
812
866
def GotSecret(self):
868
Is sent after a successful transfer of secret from the Mandos
869
server to mandos-client
816
873
# Rejected - signal
817
@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):
893
@dbus.service.method(_interface)
895
return self.checked_ok()
822
897
# Enable - method
823
898
@dbus.service.method(_interface)
842
917
def StopChecker(self):
843
918
self.stop_checker()
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))
845
946
# name - property
846
947
@dbus_service_property(_interface, signature=u"s", access=u"read")
847
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))
984
1111
class ClientHandler(socketserver.BaseRequestHandler, object):
985
1112
"""A class to handle client connections.
988
1115
Note: This will run in its own forked process."""
990
1117
def handle(self):
991
logger.info(u"TCP connection from: %s",
992
unicode(self.client_address))
993
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
994
# Open IPC pipe to parent process
995
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
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())
996
1124
session = (gnutls.connection
997
1125
.ClientSession(self.request,
998
1126
gnutls.connection
999
1127
.X509Credentials()))
1001
line = self.request.makefile().readline()
1002
logger.debug(u"Protocol version: %r", line)
1004
if int(line.strip().split()[0]) > 1:
1006
except (ValueError, IndexError, RuntimeError), error:
1007
logger.error(u"Unknown protocol version: %s", error)
1010
1129
# Note: gnutls.connection.X509Credentials is really a
1011
1130
# generic GnuTLS certificate credentials object so long as
1012
1131
# no X.509 keys are added to it. Therefore, we can use it
1013
1132
# here despite using OpenPGP certificates.
1015
1134
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1016
1135
# u"+AES-256-CBC", u"+SHA1",
1017
1136
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1023
1142
(gnutls.library.functions
1024
1143
.gnutls_priority_set_direct(session._c_object,
1025
1144
priority, None))
1146
# Start communication using the Mandos protocol
1147
# Get protocol number
1148
line = self.request.makefile().readline()
1149
logger.debug(u"Protocol version: %r", line)
1151
if int(line.strip().split()[0]) > 1:
1153
except (ValueError, IndexError, RuntimeError), error:
1154
logger.error(u"Unknown protocol version: %s", error)
1157
# Start GnuTLS connection
1028
1159
session.handshake()
1029
1160
except gnutls.errors.GNUTLSError, error:
1032
1163
# established. Just abandon the request.
1034
1165
logger.debug(u"Handshake succeeded")
1167
approval_required = False
1036
fpr = self.fingerprint(self.peer_certificate(session))
1037
except (TypeError, gnutls.errors.GNUTLSError), error:
1038
logger.warning(u"Bad certificate: %s", error)
1041
logger.debug(u"Fingerprint: %s", fpr)
1170
fpr = self.fingerprint(self.peer_certificate
1172
except (TypeError, gnutls.errors.GNUTLSError), error:
1173
logger.warning(u"Bad certificate: %s", error)
1175
logger.debug(u"Fingerprint: %s", 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
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("Approval timed out")
1235
delay -= time2 - time
1238
while sent_size < len(client.secret):
1240
sent = session.send(client.secret[sent_size:])
1241
except (gnutls.errors.GNUTLSError), error:
1242
logger.warning("gnutls send failed")
1244
logger.debug(u"Sent: %d, remaining: %d",
1245
sent, len(client.secret)
1246
- (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:
1043
for c in self.server.clients:
1044
if c.fingerprint == fpr:
1048
ipc.write(u"NOTFOUND %s %s\n"
1049
% (fpr, unicode(self.client_address)))
1052
# Have to check if client.still_valid(), since it is
1053
# possible that the client timed out while establishing
1054
# the GnuTLS session.
1055
if not client.still_valid():
1056
ipc.write(u"INVALID %s\n" % client.name)
1059
ipc.write(u"SENDING %s\n" % client.name)
1061
while sent_size < len(client.secret):
1062
sent = session.send(client.secret[sent_size:])
1063
logger.debug(u"Sent: %d, remaining: %d",
1064
sent, len(client.secret)
1065
- (sent_size + sent))
1257
if approval_required:
1258
client.approvals_pending -= 1
1261
except (gnutls.errors.GNUTLSError), error:
1262
logger.warning("gnutls bye failed")
1070
1265
def peer_certificate(session):
1133
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1134
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
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 """
1135
1344
def process_request(self, request, client_address):
1136
1345
"""Overrides and wraps the original process_request().
1138
1347
This function creates a new pipe in self.pipe
1140
self.pipe = os.pipe()
1141
super(ForkingMixInWithPipe,
1349
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1351
super(MultiprocessingMixInWithPipe,
1142
1352
self).process_request(request, client_address)
1143
os.close(self.pipe[1]) # close write end
1144
self.add_pipe(self.pipe[0])
1145
def add_pipe(self, pipe):
1353
self.child_pipe.close()
1354
self.add_pipe(parent_pipe)
1356
def add_pipe(self, parent_pipe):
1146
1357
"""Dummy function; override as necessary"""
1150
class IPv6_TCPServer(ForkingMixInWithPipe,
1360
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1151
1361
socketserver.TCPServer, object):
1152
1362
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1238
1448
return socketserver.TCPServer.server_activate(self)
1239
1449
def enable(self):
1240
1450
self.enabled = True
1241
def add_pipe(self, pipe):
1451
def add_pipe(self, parent_pipe):
1242
1452
# Call "handle_ipc" for both data and EOF events
1243
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1245
def handle_ipc(self, source, condition, file_objects={}):
1453
gobject.io_add_watch(parent_pipe.fileno(),
1454
gobject.IO_IN | gobject.IO_HUP,
1455
functools.partial(self.handle_ipc,
1456
parent_pipe = parent_pipe))
1458
def handle_ipc(self, source, condition, parent_pipe=None,
1459
client_object=None):
1246
1460
condition_names = {
1247
1461
gobject.IO_IN: u"IN", # There is data to read.
1248
1462
gobject.IO_OUT: u"OUT", # Data can be written (without
1257
1471
for cond, name in
1258
1472
condition_names.iteritems()
1259
1473
if cond & condition)
1260
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1263
# Turn the pipe file descriptor into a Python file object
1264
if source not in file_objects:
1265
file_objects[source] = os.fdopen(source, u"r", 1)
1267
# Read a line from the file object
1268
cmdline = file_objects[source].readline()
1269
if not cmdline: # Empty line means end of file
1270
# close the IPC pipe
1271
file_objects[source].close()
1272
del file_objects[source]
1274
# Stop calling this function
1277
logger.debug(u"IPC command: %r", cmdline)
1279
# Parse and act on command
1280
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1282
if cmd == u"NOTFOUND":
1283
logger.warning(u"Client not found for fingerprint: %s",
1287
mandos_dbus_service.ClientNotFound(args)
1288
elif cmd == u"INVALID":
1289
for client in self.clients:
1290
if client.name == args:
1291
logger.warning(u"Client %s is invalid", args)
1297
logger.error(u"Unknown client %s is invalid", args)
1298
elif cmd == u"SENDING":
1299
for client in self.clients:
1300
if client.name == args:
1301
logger.info(u"Sending secret to %s", client.name)
1308
logger.error(u"Sending secret to unknown client %s",
1311
logger.error(u"Unknown IPC command: %r", cmdline)
1313
# Keep calling this function
1474
# error or the other end of multiprocessing.Pipe has closed
1475
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1478
# Read a request from the child
1479
request = parent_pipe.recv()
1480
command = request[0]
1482
if command == 'init':
1484
address = request[2]
1486
for c in self.clients:
1487
if c.fingerprint == fpr:
1491
logger.warning(u"Client not found for fingerprint: %s, ad"
1492
u"dress: %s", fpr, address)
1495
mandos_dbus_service.ClientNotFound(fpr, address)
1496
parent_pipe.send(False)
1499
gobject.io_add_watch(parent_pipe.fileno(),
1500
gobject.IO_IN | gobject.IO_HUP,
1501
functools.partial(self.handle_ipc,
1502
parent_pipe = parent_pipe,
1503
client_object = client))
1504
parent_pipe.send(True)
1505
# remove the old hook in favor of the new above hook on same fileno
1507
if command == 'funcall':
1508
funcname = request[1]
1512
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1514
if command == 'getattr':
1515
attrname = request[1]
1516
if callable(client_object.__getattribute__(attrname)):
1517
parent_pipe.send(('function',))
1519
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1521
if command == 'setattr':
1522
attrname = request[1]
1524
setattr(client_object, attrname, value)
1419
1631
parser.add_option("--debug", action=u"store_true",
1420
1632
help=u"Debug mode; run in foreground and log to"
1634
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1635
help=u"Debug level for stdout output")
1422
1636
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1423
1637
u" priority string (see GnuTLS documentation)")
1424
1638
parser.add_option("--servicename", type=u"string",
1471
1686
# options, if set.
1472
1687
for option in (u"interface", u"address", u"port", u"debug",
1473
1688
u"priority", u"servicename", u"configdir",
1474
u"use_dbus", u"use_ipv6"):
1689
u"use_dbus", u"use_ipv6", u"debuglevel"):
1475
1690
value = getattr(options, option)
1476
1691
if value is not None:
1477
1692
server_settings[option] = value
1567
1802
bus = dbus.SystemBus()
1568
1803
# End of Avahi example code
1570
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1806
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1807
bus, do_not_queue=True)
1808
except dbus.exceptions.NameExistsException, e:
1809
logger.error(unicode(e) + u", disabling D-Bus")
1811
server_settings[u"use_dbus"] = False
1812
tcp_server.use_dbus = False
1571
1813
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1572
1814
service = AvahiService(name = server_settings[u"servicename"],
1573
1815
servicetype = u"_mandos._tcp",
1575
1817
if server_settings["interface"]:
1576
1818
service.interface = (if_nametoindex
1577
1819
(str(server_settings[u"interface"])))
1822
# Close all input and output, do double fork, etc.
1825
global multiprocessing_manager
1826
multiprocessing_manager = multiprocessing.Manager()
1579
1828
client_class = Client
1581
1830
client_class = functools.partial(ClientDBus, bus = bus)
1831
def client_config_items(config, section):
1832
special_settings = {
1833
"approved_by_default":
1834
lambda: config.getboolean(section,
1835
"approved_by_default"),
1837
for name, value in config.items(section):
1839
yield (name, special_settings[name]())
1582
1843
tcp_server.clients.update(set(
1583
1844
client_class(name = section,
1584
config= dict(client_config.items(section)))
1845
config= dict(client_config_items(
1846
client_config, section)))
1585
1847
for section in client_config.sections()))
1586
1848
if not tcp_server.clients:
1587
1849
logger.warning(u"No clients defined")
1590
# Redirect stdin so all checkers get /dev/null
1591
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1592
os.dup2(null, sys.stdin.fileno())
1596
# No console logging
1597
logger.removeHandler(console)
1598
# Close all input and output, do double fork, etc.
1602
with closing(pidfile):
1603
1853
pid = os.getpid()
1604
1854
pidfile.write(str(pid) + "\n")
1623
1873
dbus.service.Object.__init__(self, bus, u"/")
1624
1874
_interface = u"se.bsnet.fukt.Mandos"
1626
@dbus.service.signal(_interface, signature=u"oa{sv}")
1627
def ClientAdded(self, objpath, properties):
1876
@dbus.service.signal(_interface, signature=u"o")
1877
def ClientAdded(self, objpath):
1631
@dbus.service.signal(_interface, signature=u"s")
1632
def ClientNotFound(self, fingerprint):
1881
@dbus.service.signal(_interface, signature=u"ss")
1882
def ClientNotFound(self, fingerprint, address):