169
170
# End of Avahi example code
172
class Client(object):
173
def _datetime_to_dbus(dt, variant_level=0):
174
"""Convert a UTC datetime.datetime() to a D-Bus type."""
175
return dbus.String(dt.isoformat(), variant_level=variant_level)
178
class Client(dbus.service.Object):
173
179
"""A representation of a client host served by this server.
175
name: string; from the config file, used in log messages
181
name: string; from the config file, used in log messages
176
182
fingerprint: string (40 or 32 hexadecimal digits); used to
177
183
uniquely identify the client
178
secret: bytestring; sent verbatim (over TLS) to client
179
host: string; available for use by the checker command
180
created: datetime.datetime(); object creation, not client host
181
last_checked_ok: datetime.datetime() or None if not yet checked OK
182
timeout: datetime.timedelta(); How long from last_checked_ok
183
until this client is invalid
184
interval: datetime.timedelta(); How often to start a new checker
185
stop_hook: If set, called by stop() as stop_hook(self)
186
checker: subprocess.Popen(); a running checker process used
187
to see if the client lives.
188
'None' if no process is running.
184
secret: bytestring; sent verbatim (over TLS) to client
185
host: string; available for use by the checker command
186
created: datetime.datetime(); (UTC) object creation
187
last_enabled: datetime.datetime(); (UTC)
189
last_checked_ok: datetime.datetime(); (UTC) or None
190
timeout: datetime.timedelta(); How long from last_checked_ok
191
until this client is invalid
192
interval: datetime.timedelta(); How often to start a new checker
193
disable_hook: If set, called by disable() as disable_hook(self)
194
checker: subprocess.Popen(); a running checker process used
195
to see if the client lives.
196
'None' if no process is running.
189
197
checker_initiator_tag: a gobject event source tag, or None
190
stop_initiator_tag: - '' -
198
disable_initiator_tag: - '' -
191
199
checker_callback_tag: - '' -
192
200
checker_command: string; External command which is run to check if
193
201
client lives. %() expansions are done at
194
202
runtime with vars(self) as dict, so that for
195
203
instance %(name)s can be used in the command.
204
dbus_object_path: dbus.ObjectPath
196
205
Private attibutes:
197
206
_timeout: Real variable for 'timeout'
198
207
_interval: Real variable for 'interval'
220
233
+ (self.interval.microseconds
222
interval = property(lambda self: self._interval,
236
self.PropertyChanged(dbus.String(u"interval"),
237
(dbus.UInt64(self._interval_milliseconds,
239
interval = property(lambda self: self._interval, _set_interval)
224
240
del _set_interval
225
def __init__(self, name = None, stop_hook=None, config={}):
242
def __init__(self, name = None, disable_hook=None, config=None):
226
243
"""Note: the 'checker' key in 'config' sets the
227
244
'checker_command' attribute and *not* the 'checker'
246
self.dbus_object_path = (dbus.ObjectPath
248
+ name.replace(".", "_")))
249
dbus.service.Object.__init__(self, bus,
250
self.dbus_object_path)
230
254
logger.debug(u"Creating client %r", self.name)
231
255
# Uppercase and remove spaces from fingerprint for later
232
256
# comparison purposes with return value from the fingerprint()
234
self.fingerprint = config["fingerprint"].upper()\
258
self.fingerprint = (config["fingerprint"].upper()
236
260
logger.debug(u" Fingerprint: %s", self.fingerprint)
237
261
if "secret" in config:
238
262
self.secret = config["secret"].decode(u"base64")
239
263
elif "secfile" in config:
240
sf = open(config["secfile"])
241
self.secret = sf.read()
264
with closing(open(os.path.expanduser
266
(config["secfile"])))) as secfile:
267
self.secret = secfile.read()
244
269
raise TypeError(u"No secret or secfile for client %s"
246
271
self.host = config.get("host", "")
247
self.created = datetime.datetime.now()
272
self.created = datetime.datetime.utcnow()
274
self.last_enabled = None
248
275
self.last_checked_ok = None
249
276
self.timeout = string_to_delta(config["timeout"])
250
277
self.interval = string_to_delta(config["interval"])
251
self.stop_hook = stop_hook
278
self.disable_hook = disable_hook
252
279
self.checker = None
253
280
self.checker_initiator_tag = None
254
self.stop_initiator_tag = None
281
self.disable_initiator_tag = None
255
282
self.checker_callback_tag = None
256
self.check_command = config["checker"]
283
self.checker_command = config["checker"]
258
286
"""Start this client's checker and timeout hooks"""
287
self.last_enabled = datetime.datetime.utcnow()
259
288
# Schedule a new checker to be started an 'interval' from now,
260
289
# and every interval from then on.
261
self.checker_initiator_tag = gobject.timeout_add\
262
(self._interval_milliseconds,
290
self.checker_initiator_tag = (gobject.timeout_add
291
(self._interval_milliseconds,
264
293
# Also start a new checker *right now*.
265
294
self.start_checker()
266
# Schedule a stop() when 'timeout' has passed
267
self.stop_initiator_tag = gobject.timeout_add\
268
(self._timeout_milliseconds,
272
The possibility that a client might be restarted is left open,
273
but not currently used."""
274
# If this client doesn't have a secret, it is already stopped.
275
if hasattr(self, "secret") and self.secret:
276
logger.info(u"Stopping client %s", self.name)
295
# Schedule a disable() when 'timeout' has passed
296
self.disable_initiator_tag = (gobject.timeout_add
297
(self._timeout_milliseconds,
301
self.PropertyChanged(dbus.String(u"enabled"),
302
dbus.Boolean(True, variant_level=1))
303
self.PropertyChanged(dbus.String(u"last_enabled"),
304
(_datetime_to_dbus(self.last_enabled,
308
"""Disable this client."""
309
if not getattr(self, "enabled", False):
280
if getattr(self, "stop_initiator_tag", False):
281
gobject.source_remove(self.stop_initiator_tag)
282
self.stop_initiator_tag = None
311
logger.info(u"Disabling client %s", self.name)
312
if getattr(self, "disable_initiator_tag", False):
313
gobject.source_remove(self.disable_initiator_tag)
314
self.disable_initiator_tag = None
283
315
if getattr(self, "checker_initiator_tag", False):
284
316
gobject.source_remove(self.checker_initiator_tag)
285
317
self.checker_initiator_tag = None
286
318
self.stop_checker()
319
if self.disable_hook:
320
self.disable_hook(self)
323
self.PropertyChanged(dbus.String(u"enabled"),
324
dbus.Boolean(False, variant_level=1))
289
325
# Do not run this again if called by a gobject.timeout_add
291
328
def __del__(self):
292
self.stop_hook = None
294
def checker_callback(self, pid, condition):
329
self.disable_hook = None
332
def checker_callback(self, pid, condition, command):
295
333
"""The checker has completed, so take appropriate actions."""
296
now = datetime.datetime.now()
297
334
self.checker_callback_tag = None
298
335
self.checker = None
299
if os.WIFEXITED(condition) \
300
and (os.WEXITSTATUS(condition) == 0):
337
self.PropertyChanged(dbus.String(u"checker_running"),
338
dbus.Boolean(False, variant_level=1))
339
if (os.WIFEXITED(condition)
340
and (os.WEXITSTATUS(condition) == 0)):
301
341
logger.info(u"Checker for %(name)s succeeded",
303
self.last_checked_ok = now
304
gobject.source_remove(self.stop_initiator_tag)
305
self.stop_initiator_tag = gobject.timeout_add\
306
(self._timeout_milliseconds,
344
self.CheckerCompleted(dbus.Boolean(True),
345
dbus.UInt16(condition),
346
dbus.String(command))
308
348
elif not os.WIFEXITED(condition):
309
349
logger.warning(u"Checker for %(name)s crashed?",
352
self.CheckerCompleted(dbus.Boolean(False),
353
dbus.UInt16(condition),
354
dbus.String(command))
312
356
logger.info(u"Checker for %(name)s failed",
359
self.CheckerCompleted(dbus.Boolean(False),
360
dbus.UInt16(condition),
361
dbus.String(command))
363
def bump_timeout(self):
364
"""Bump up the timeout for this client.
365
This should only be called when the client has been seen,
368
self.last_checked_ok = datetime.datetime.utcnow()
369
gobject.source_remove(self.disable_initiator_tag)
370
self.disable_initiator_tag = (gobject.timeout_add
371
(self._timeout_milliseconds,
373
self.PropertyChanged(dbus.String(u"last_checked_ok"),
374
(_datetime_to_dbus(self.last_checked_ok,
314
377
def start_checker(self):
315
378
"""Start a new checker subprocess if one is not running.
316
379
If a checker already exists, leave it running and do
373
442
if error.errno != errno.ESRCH: # No such process
375
444
self.checker = None
445
self.PropertyChanged(dbus.String(u"checker_running"),
446
dbus.Boolean(False, variant_level=1))
376
448
def still_valid(self):
377
449
"""Has the timeout not yet passed for this client?"""
378
now = datetime.datetime.now()
450
if not getattr(self, "enabled", False):
452
now = datetime.datetime.utcnow()
379
453
if self.last_checked_ok is None:
380
454
return now < (self.created + self.timeout)
382
456
return now < (self.last_checked_ok + self.timeout)
458
## D-Bus methods & signals
459
_interface = u"org.mandos_system.Mandos.Client"
461
# BumpTimeout - method
462
BumpTimeout = dbus.service.method(_interface)(bump_timeout)
463
BumpTimeout.__name__ = "BumpTimeout"
465
# CheckerCompleted - signal
466
@dbus.service.signal(_interface, signature="bqs")
467
def CheckerCompleted(self, success, condition, command):
471
# CheckerStarted - signal
472
@dbus.service.signal(_interface, signature="s")
473
def CheckerStarted(self, command):
477
# GetAllProperties - method
478
@dbus.service.method(_interface, out_signature="a{sv}")
479
def GetAllProperties(self):
481
return dbus.Dictionary({
483
dbus.String(self.name, variant_level=1),
484
dbus.String("fingerprint"):
485
dbus.String(self.fingerprint, variant_level=1),
487
dbus.String(self.host, variant_level=1),
488
dbus.String("created"):
489
_datetime_to_dbus(self.created, variant_level=1),
490
dbus.String("last_enabled"):
491
(_datetime_to_dbus(self.last_enabled,
493
if self.last_enabled is not None
494
else dbus.Boolean(False, variant_level=1)),
495
dbus.String("enabled"):
496
dbus.Boolean(self.enabled, variant_level=1),
497
dbus.String("last_checked_ok"):
498
(_datetime_to_dbus(self.last_checked_ok,
500
if self.last_checked_ok is not None
501
else dbus.Boolean (False, variant_level=1)),
502
dbus.String("timeout"):
503
dbus.UInt64(self._timeout_milliseconds,
505
dbus.String("interval"):
506
dbus.UInt64(self._interval_milliseconds,
508
dbus.String("checker"):
509
dbus.String(self.checker_command,
511
dbus.String("checker_running"):
512
dbus.Boolean(self.checker is not None,
516
# IsStillValid - method
517
IsStillValid = (dbus.service.method(_interface, out_signature="b")
519
IsStillValid.__name__ = "IsStillValid"
521
# PropertyChanged - signal
522
@dbus.service.signal(_interface, signature="sv")
523
def PropertyChanged(self, property, value):
527
# SetChecker - method
528
@dbus.service.method(_interface, in_signature="s")
529
def SetChecker(self, checker):
530
"D-Bus setter method"
531
self.checker_command = checker
534
@dbus.service.method(_interface, in_signature="s")
535
def SetHost(self, host):
536
"D-Bus setter method"
539
# SetInterval - method
540
@dbus.service.method(_interface, in_signature="t")
541
def SetInterval(self, milliseconds):
542
self.interval = datetime.timdeelta(0, 0, 0, milliseconds)
545
@dbus.service.method(_interface, in_signature="ay",
547
def SetSecret(self, secret):
548
"D-Bus setter method"
549
self.secret = str(secret)
551
# SetTimeout - method
552
@dbus.service.method(_interface, in_signature="t")
553
def SetTimeout(self, milliseconds):
554
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
557
Enable = dbus.service.method(_interface)(enable)
558
Enable.__name__ = "Enable"
560
# StartChecker - method
561
@dbus.service.method(_interface)
562
def StartChecker(self):
567
@dbus.service.method(_interface)
572
# StopChecker - method
573
StopChecker = dbus.service.method(_interface)(stop_checker)
574
StopChecker.__name__ = "StopChecker"
385
579
def peer_certificate(session):
386
580
"Return the peer's OpenPGP certificate as a bytestring"
387
581
# If not an OpenPGP certificate...
388
if gnutls.library.functions.gnutls_certificate_type_get\
389
(session._c_object) \
390
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP:
582
if (gnutls.library.functions
583
.gnutls_certificate_type_get(session._c_object)
584
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
391
585
# ...do the normal thing
392
586
return session.peer_certificate
393
587
list_size = ctypes.c_uint()
394
cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
395
(session._c_object, ctypes.byref(list_size))
588
cert_list = (gnutls.library.functions
589
.gnutls_certificate_get_peers
590
(session._c_object, ctypes.byref(list_size)))
396
591
if list_size.value == 0:
398
593
cert = cert_list[0]
402
597
def fingerprint(openpgp):
403
598
"Convert an OpenPGP bytestring to a hexdigit fingerprint string"
404
599
# New GnuTLS "datum" with the OpenPGP public key
405
datum = gnutls.library.types.gnutls_datum_t\
406
(ctypes.cast(ctypes.c_char_p(openpgp),
407
ctypes.POINTER(ctypes.c_ubyte)),
408
ctypes.c_uint(len(openpgp)))
600
datum = (gnutls.library.types
601
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
604
ctypes.c_uint(len(openpgp))))
409
605
# New empty GnuTLS certificate
410
606
crt = gnutls.library.types.gnutls_openpgp_crt_t()
411
gnutls.library.functions.gnutls_openpgp_crt_init\
607
(gnutls.library.functions
608
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
413
609
# Import the OpenPGP public key into the certificate
414
gnutls.library.functions.gnutls_openpgp_crt_import\
415
(crt, ctypes.byref(datum),
416
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
610
(gnutls.library.functions
611
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
612
gnutls.library.constants
613
.GNUTLS_OPENPGP_FMT_RAW))
417
614
# Verify the self signature in the key
418
crtverify = ctypes.c_uint();
419
gnutls.library.functions.gnutls_openpgp_crt_verify_self\
420
(crt, 0, ctypes.byref(crtverify))
615
crtverify = ctypes.c_uint()
616
(gnutls.library.functions
617
.gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
421
618
if crtverify.value != 0:
422
619
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
423
620
raise gnutls.errors.CertificateSecurityError("Verify failed")
424
621
# New buffer for the fingerprint
425
buffer = ctypes.create_string_buffer(20)
426
buffer_length = ctypes.c_size_t()
622
buf = ctypes.create_string_buffer(20)
623
buf_len = ctypes.c_size_t()
427
624
# Get the fingerprint from the certificate into the buffer
428
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
429
(crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
625
(gnutls.library.functions
626
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
627
ctypes.byref(buf_len)))
430
628
# Deinit the certificate
431
629
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
432
630
# Convert the buffer to a Python bytestring
433
fpr = ctypes.string_at(buffer, buffer_length.value)
631
fpr = ctypes.string_at(buf, buf_len.value)
434
632
# Convert the bytestring to hexadecimal notation
435
633
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
439
class tcp_handler(SocketServer.BaseRequestHandler, object):
637
class TCP_handler(SocketServer.BaseRequestHandler, object):
440
638
"""A TCP request handler class.
441
639
Instantiated by IPv6_TCPServer for each request to handle it.
442
640
Note: This will run in its own forked process."""
444
642
def handle(self):
445
643
logger.info(u"TCP connection from: %s",
446
unicode(self.client_address))
447
session = gnutls.connection.ClientSession\
448
(self.request, gnutls.connection.X509Credentials())
644
unicode(self.client_address))
645
session = (gnutls.connection
646
.ClientSession(self.request,
450
650
line = self.request.makefile().readline()
451
651
logger.debug(u"Protocol version: %r", line)
881
1075
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
882
1076
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1078
class MandosServer(dbus.service.Object):
1079
"""A D-Bus proxy object"""
1081
dbus.service.Object.__init__(self, bus,
1083
_interface = u"org.mandos_system.Mandos"
1085
@dbus.service.signal(_interface, signature="oa{sv}")
1086
def ClientAdded(self, objpath, properties):
1090
@dbus.service.signal(_interface, signature="o")
1091
def ClientRemoved(self, objpath):
1095
@dbus.service.method(_interface, out_signature="ao")
1096
def GetAllClients(self):
1097
return dbus.Array(c.dbus_object_path for c in clients)
1099
@dbus.service.method(_interface, out_signature="a{oa{sv}}")
1100
def GetAllClientsWithProperties(self):
1101
return dbus.Dictionary(
1102
((c.dbus_object_path, c.GetAllProperties())
1106
@dbus.service.method(_interface, in_signature="o")
1107
def RemoveClient(self, object_path):
1109
if c.dbus_object_path == object_path:
1117
mandos_server = MandosServer()
884
1119
for client in clients:
1121
mandos_server.ClientAdded(client.dbus_object_path,
1122
client.GetAllProperties())
887
1125
tcp_server.enable()
888
1126
tcp_server.server_activate()