242
234
# Uppercase and remove spaces from fingerprint for later
243
235
# comparison purposes with return value from the fingerprint()
245
self.fingerprint = (config["fingerprint"].upper()
237
self.fingerprint = config["fingerprint"].upper()\
247
239
logger.debug(u" Fingerprint: %s", self.fingerprint)
248
240
if "secret" in config:
249
241
self.secret = config["secret"].decode(u"base64")
250
242
elif "secfile" in config:
251
with closing(open(os.path.expanduser
253
(config["secfile"])))) as secfile:
254
self.secret = secfile.read()
243
secfile = open(os.path.expanduser(os.path.expandvars
244
(config["secfile"])))
245
self.secret = secfile.read()
256
248
raise TypeError(u"No secret or secfile for client %s"
258
250
self.host = config.get("host", "")
259
self.created = datetime.datetime.utcnow()
251
self.created = datetime.datetime.now()
261
252
self.last_checked_ok = None
262
253
self.timeout = string_to_delta(config["timeout"])
263
254
self.interval = string_to_delta(config["interval"])
267
258
self.stop_initiator_tag = None
268
259
self.checker_callback_tag = None
269
260
self.check_command = config["checker"]
272
262
"""Start this client's checker and timeout hooks"""
273
self.started = datetime.datetime.utcnow()
274
263
# Schedule a new checker to be started an 'interval' from now,
275
264
# and every interval from then on.
276
self.checker_initiator_tag = (gobject.timeout_add
277
(self._interval_milliseconds,
265
self.checker_initiator_tag = gobject.timeout_add\
266
(self._interval_milliseconds,
279
268
# Also start a new checker *right now*.
280
269
self.start_checker()
281
270
# Schedule a stop() when 'timeout' has passed
282
self.stop_initiator_tag = (gobject.timeout_add
283
(self._timeout_milliseconds,
286
self.StateChanged(True)
271
self.stop_initiator_tag = gobject.timeout_add\
272
(self._timeout_milliseconds,
289
"""Stop this client."""
290
if getattr(self, "started", None) is not None:
276
The possibility that a client might be restarted is left open,
277
but not currently used."""
278
# If this client doesn't have a secret, it is already stopped.
279
if hasattr(self, "secret") and self.secret:
291
280
logger.info(u"Stopping client %s", self.name)
294
284
if getattr(self, "stop_initiator_tag", False):
300
290
self.stop_checker()
301
291
if self.stop_hook:
302
292
self.stop_hook(self)
305
self.StateChanged(False)
306
293
# Do not run this again if called by a gobject.timeout_add
309
295
def __del__(self):
310
296
self.stop_hook = None
313
298
def checker_callback(self, pid, condition):
314
299
"""The checker has completed, so take appropriate actions."""
300
now = datetime.datetime.now()
315
301
self.checker_callback_tag = None
316
302
self.checker = None
317
if (os.WIFEXITED(condition)
318
and (os.WEXITSTATUS(condition) == 0)):
303
if os.WIFEXITED(condition) \
304
and (os.WEXITSTATUS(condition) == 0):
319
305
logger.info(u"Checker for %(name)s succeeded",
322
self.CheckerCompleted(True)
307
self.last_checked_ok = now
308
gobject.source_remove(self.stop_initiator_tag)
309
self.stop_initiator_tag = gobject.timeout_add\
310
(self._timeout_milliseconds,
324
312
elif not os.WIFEXITED(condition):
325
313
logger.warning(u"Checker for %(name)s crashed?",
328
self.CheckerCompleted(False)
330
316
logger.info(u"Checker for %(name)s failed",
333
self.CheckerCompleted(False)
335
def bump_timeout(self):
336
"""Bump up the timeout for this client.
337
This should only be called when the client has been seen,
340
self.last_checked_ok = datetime.datetime.utcnow()
341
gobject.source_remove(self.stop_initiator_tag)
342
self.stop_initiator_tag = (gobject.timeout_add
343
(self._timeout_milliseconds,
346
318
def start_checker(self):
347
319
"""Start a new checker subprocess if one is not running.
348
320
If a checker already exists, leave it running and do
408
377
if error.errno != errno.ESRCH: # No such process
410
379
self.checker = None
412
380
def still_valid(self):
413
381
"""Has the timeout not yet passed for this client?"""
416
now = datetime.datetime.utcnow()
382
now = datetime.datetime.now()
417
383
if self.last_checked_ok is None:
418
384
return now < (self.created + self.timeout)
420
386
return now < (self.last_checked_ok + self.timeout)
422
## D-Bus methods & signals
423
_interface = u"org.mandos_system.Mandos.Client"
425
def _datetime_to_dbus_struct(dt):
426
return dbus.Struct(dt.year, dt.month, dt.day, dt.hour,
427
dt.minute, dt.second, dt.microsecond,
430
# BumpTimeout - method
431
BumpTimeout = dbus.service.method(_interface)(bump_timeout)
432
BumpTimeout.__name__ = "BumpTimeout"
434
# IntervalChanged - signal
435
@dbus.service.signal(_interface, signature="t")
436
def IntervalChanged(self, t):
440
# CheckerCompleted - signal
441
@dbus.service.signal(_interface, signature="b")
442
def CheckerCompleted(self, success):
446
# CheckerIsRunning - method
447
@dbus.service.method(_interface, out_signature="b")
448
def CheckerIsRunning(self):
449
"D-Bus getter method"
450
return self.checker is not None
452
# CheckerStarted - signal
453
@dbus.service.signal(_interface, signature="s")
454
def CheckerStarted(self, command):
458
# GetChecker - method
459
@dbus.service.method(_interface, out_signature="s")
460
def GetChecker(self):
461
"D-Bus getter method"
462
return self.checker_command
464
# GetCreated - method
465
@dbus.service.method(_interface, out_signature="(nyyyyyu)")
466
def GetCreated(self):
467
"D-Bus getter method"
468
return datetime_to_dbus_struct(self.created)
470
# GetFingerprint - method
471
@dbus.service.method(_interface, out_signature="s")
472
def GetFingerprint(self):
473
"D-Bus getter method"
474
return self.fingerprint
477
@dbus.service.method(_interface, out_signature="s")
479
"D-Bus getter method"
482
# GetInterval - method
483
@dbus.service.method(_interface, out_signature="t")
484
def GetInterval(self):
485
"D-Bus getter method"
486
return self._interval_milliseconds
489
@dbus.service.method(_interface, out_signature="s")
491
"D-Bus getter method"
494
# GetStarted - method
495
@dbus.service.method(_interface, out_signature="(nyyyyyu)")
496
def GetStarted(self):
497
"D-Bus getter method"
498
if self.started is not None:
499
return datetime_to_dbus_struct(self.started)
501
return dbus.Struct(0, 0, 0, 0, 0, 0, 0,
504
# GetTimeout - method
505
@dbus.service.method(_interface, out_signature="t")
506
def GetTimeout(self):
507
"D-Bus getter method"
508
return self._timeout_milliseconds
510
# SetChecker - method
511
@dbus.service.method(_interface, in_signature="s")
512
def SetChecker(self, checker):
513
"D-Bus setter method"
514
self.checker_command = checker
517
@dbus.service.method(_interface, in_signature="s")
518
def SetHost(self, host):
519
"D-Bus setter method"
522
# SetInterval - method
523
@dbus.service.method(_interface, in_signature="t")
524
def SetInterval(self, milliseconds):
525
self.interval = datetime.timdeelta(0, 0, 0, milliseconds)
527
# SetTimeout - method
528
@dbus.service.method(_interface, in_signature="t")
529
def SetTimeout(self, milliseconds):
530
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
533
@dbus.service.method(_interface, in_signature="ay",
535
def SetSecret(self, secret):
536
"D-Bus setter method"
537
self.secret = str(secret)
540
Start = dbus.service.method(_interface)(start)
541
Start.__name__ = "Start"
543
# StartChecker - method
544
StartChecker = dbus.service.method(_interface)(start_checker)
545
StartChecker.__name__ = "StartChecker"
547
# StateChanged - signal
548
@dbus.service.signal(_interface, signature="b")
549
def StateChanged(self, started):
553
# StillValid - method
554
StillValid = (dbus.service.method(_interface, out_signature="b")
556
StillValid.__name__ = "StillValid"
559
Stop = dbus.service.method(_interface)(stop)
560
Stop.__name__ = "Stop"
562
# StopChecker - method
563
StopChecker = dbus.service.method(_interface)(stop_checker)
564
StopChecker.__name__ = "StopChecker"
566
# TimeoutChanged - signal
567
@dbus.service.signal(_interface, signature="t")
568
def TimeoutChanged(self, t):
572
del _datetime_to_dbus_struct
576
389
def peer_certificate(session):
577
390
"Return the peer's OpenPGP certificate as a bytestring"
578
391
# If not an OpenPGP certificate...
579
if (gnutls.library.functions
580
.gnutls_certificate_type_get(session._c_object)
581
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
392
if gnutls.library.functions.gnutls_certificate_type_get\
393
(session._c_object) \
394
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP:
582
395
# ...do the normal thing
583
396
return session.peer_certificate
584
397
list_size = ctypes.c_uint()
585
cert_list = (gnutls.library.functions
586
.gnutls_certificate_get_peers
587
(session._c_object, ctypes.byref(list_size)))
398
cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
399
(session._c_object, ctypes.byref(list_size))
588
400
if list_size.value == 0:
590
402
cert = cert_list[0]
594
406
def fingerprint(openpgp):
595
407
"Convert an OpenPGP bytestring to a hexdigit fingerprint string"
596
408
# New GnuTLS "datum" with the OpenPGP public key
597
datum = (gnutls.library.types
598
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
601
ctypes.c_uint(len(openpgp))))
409
datum = gnutls.library.types.gnutls_datum_t\
410
(ctypes.cast(ctypes.c_char_p(openpgp),
411
ctypes.POINTER(ctypes.c_ubyte)),
412
ctypes.c_uint(len(openpgp)))
602
413
# New empty GnuTLS certificate
603
414
crt = gnutls.library.types.gnutls_openpgp_crt_t()
604
(gnutls.library.functions
605
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
415
gnutls.library.functions.gnutls_openpgp_crt_init\
606
417
# Import the OpenPGP public key into the certificate
607
(gnutls.library.functions
608
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
609
gnutls.library.constants
610
.GNUTLS_OPENPGP_FMT_RAW))
418
gnutls.library.functions.gnutls_openpgp_crt_import\
419
(crt, ctypes.byref(datum),
420
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
611
421
# Verify the self signature in the key
612
422
crtverify = ctypes.c_uint()
613
(gnutls.library.functions
614
.gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
423
gnutls.library.functions.gnutls_openpgp_crt_verify_self\
424
(crt, 0, ctypes.byref(crtverify))
615
425
if crtverify.value != 0:
616
426
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
617
427
raise gnutls.errors.CertificateSecurityError("Verify failed")