170
169
# End of Avahi example code
173
def _datetime_to_dbus_struct(dt, variant_level=0):
174
"""Convert a UTC datetime.datetime() to a D-Bus struct.
175
The format is special to this application, since we could not find
176
any other standard way."""
177
return dbus.Struct((dbus.Int16(dt.year),
181
dbus.Byte(dt.minute),
182
dbus.Byte(dt.second),
183
dbus.UInt32(dt.microsecond)),
185
variant_level=variant_level)
188
class Client(dbus.service.Object):
172
class Client(object):
189
173
"""A representation of a client host served by this server.
191
name: string; from the config file, used in log messages
175
name: string; from the config file, used in log messages
192
176
fingerprint: string (40 or 32 hexadecimal digits); used to
193
177
uniquely identify the client
194
secret: bytestring; sent verbatim (over TLS) to client
195
host: string; available for use by the checker command
196
created: datetime.datetime(); (UTC) object creation
197
last_started: datetime.datetime(); (UTC)
199
last_checked_ok: datetime.datetime(); (UTC) or None
200
timeout: datetime.timedelta(); How long from last_checked_ok
201
until this client is invalid
202
interval: datetime.timedelta(); How often to start a new checker
203
stop_hook: If set, called by stop() as stop_hook(self)
204
checker: subprocess.Popen(); a running checker process used
205
to see if the client lives.
206
'None' if no process is running.
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.
207
189
checker_initiator_tag: a gobject event source tag, or None
208
190
stop_initiator_tag: - '' -
209
191
checker_callback_tag: - '' -
219
200
_interval_milliseconds: - '' -
221
202
def _set_timeout(self, timeout):
222
"Setter function for the 'timeout' attribute"
203
"Setter function for 'timeout' attribute"
223
204
self._timeout = timeout
224
205
self._timeout_milliseconds = ((self.timeout.days
225
206
* 24 * 60 * 60 * 1000)
226
207
+ (self.timeout.seconds * 1000)
227
208
+ (self.timeout.microseconds
230
self.PropertyChanged(dbus.String(u"timeout"),
231
(dbus.UInt64(self._timeout_milliseconds,
233
timeout = property(lambda self: self._timeout, _set_timeout)
210
timeout = property(lambda self: self._timeout,
236
213
def _set_interval(self, interval):
237
"Setter function for the 'interval' attribute"
214
"Setter function for 'interval' attribute"
238
215
self._interval = interval
239
216
self._interval_milliseconds = ((self.interval.days
240
217
* 24 * 60 * 60 * 1000)
243
220
+ (self.interval.microseconds
246
self.PropertyChanged(dbus.String(u"interval"),
247
(dbus.UInt64(self._interval_milliseconds,
249
interval = property(lambda self: self._interval, _set_interval)
222
interval = property(lambda self: self._interval,
250
224
del _set_interval
252
def __init__(self, name = None, stop_hook=None, config=None):
225
def __init__(self, name = None, stop_hook=None, config={}):
253
226
"""Note: the 'checker' key in 'config' sets the
254
227
'checker_command' attribute and *not* the 'checker'
256
self.dbus_object_path = (dbus.ObjectPath
258
+ name.replace(".", "_")))
259
dbus.service.Object.__init__(self, bus,
260
self.dbus_object_path)
264
230
logger.debug(u"Creating client %r", self.name)
265
231
# Uppercase and remove spaces from fingerprint for later
266
232
# comparison purposes with return value from the fingerprint()
268
self.fingerprint = (config["fingerprint"].upper()
234
self.fingerprint = config["fingerprint"].upper()\
270
236
logger.debug(u" Fingerprint: %s", self.fingerprint)
271
237
if "secret" in config:
272
238
self.secret = config["secret"].decode(u"base64")
273
239
elif "secfile" in config:
274
with closing(open(os.path.expanduser
276
(config["secfile"])))) as secfile:
277
self.secret = secfile.read()
240
sf = open(config["secfile"])
241
self.secret = sf.read()
279
244
raise TypeError(u"No secret or secfile for client %s"
281
246
self.host = config.get("host", "")
282
self.created = datetime.datetime.utcnow()
284
self.last_started = None
247
self.created = datetime.datetime.now()
285
248
self.last_checked_ok = None
286
249
self.timeout = string_to_delta(config["timeout"])
287
250
self.interval = string_to_delta(config["interval"])
290
253
self.checker_initiator_tag = None
291
254
self.stop_initiator_tag = None
292
255
self.checker_callback_tag = None
293
self.checker_command = config["checker"]
256
self.check_command = config["checker"]
296
258
"""Start this client's checker and timeout hooks"""
297
self.last_started = datetime.datetime.utcnow()
298
259
# Schedule a new checker to be started an 'interval' from now,
299
260
# and every interval from then on.
300
self.checker_initiator_tag = (gobject.timeout_add
301
(self._interval_milliseconds,
261
self.checker_initiator_tag = gobject.timeout_add\
262
(self._interval_milliseconds,
303
264
# Also start a new checker *right now*.
304
265
self.start_checker()
305
266
# Schedule a stop() when 'timeout' has passed
306
self.stop_initiator_tag = (gobject.timeout_add
307
(self._timeout_milliseconds,
311
self.PropertyChanged(dbus.String(u"started"),
312
dbus.Boolean(True, variant_level=1))
313
self.PropertyChanged(dbus.String(u"last_started"),
314
(_datetime_to_dbus_struct
315
(self.last_started, variant_level=1)))
267
self.stop_initiator_tag = gobject.timeout_add\
268
(self._timeout_milliseconds,
318
"""Stop this client."""
319
if not getattr(self, "started", False):
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)
321
logger.info(u"Stopping client %s", self.name)
322
280
if getattr(self, "stop_initiator_tag", False):
323
281
gobject.source_remove(self.stop_initiator_tag)
324
282
self.stop_initiator_tag = None
328
286
self.stop_checker()
329
287
if self.stop_hook:
330
288
self.stop_hook(self)
333
self.PropertyChanged(dbus.String(u"started"),
334
dbus.Boolean(False, variant_level=1))
335
289
# Do not run this again if called by a gobject.timeout_add
338
291
def __del__(self):
339
292
self.stop_hook = None
342
def checker_callback(self, pid, condition, command):
294
def checker_callback(self, pid, condition):
343
295
"""The checker has completed, so take appropriate actions."""
296
now = datetime.datetime.now()
344
297
self.checker_callback_tag = None
345
298
self.checker = None
347
self.PropertyChanged(dbus.String(u"checker_running"),
348
dbus.Boolean(False, variant_level=1))
349
if (os.WIFEXITED(condition)
350
and (os.WEXITSTATUS(condition) == 0)):
299
if os.WIFEXITED(condition) \
300
and (os.WEXITSTATUS(condition) == 0):
351
301
logger.info(u"Checker for %(name)s succeeded",
354
self.CheckerCompleted(dbus.Boolean(True),
355
dbus.UInt16(condition),
356
dbus.String(command))
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,
358
308
elif not os.WIFEXITED(condition):
359
309
logger.warning(u"Checker for %(name)s crashed?",
362
self.CheckerCompleted(dbus.Boolean(False),
363
dbus.UInt16(condition),
364
dbus.String(command))
366
312
logger.info(u"Checker for %(name)s failed",
369
self.CheckerCompleted(dbus.Boolean(False),
370
dbus.UInt16(condition),
371
dbus.String(command))
373
def bump_timeout(self):
374
"""Bump up the timeout for this client.
375
This should only be called when the client has been seen,
378
self.last_checked_ok = datetime.datetime.utcnow()
379
gobject.source_remove(self.stop_initiator_tag)
380
self.stop_initiator_tag = (gobject.timeout_add
381
(self._timeout_milliseconds,
383
self.PropertyChanged(dbus.String(u"last_checked_ok"),
384
(_datetime_to_dbus_struct
385
(self.last_checked_ok,
388
314
def start_checker(self):
389
315
"""Start a new checker subprocess if one is not running.
390
316
If a checker already exists, leave it running and do
453
373
if error.errno != errno.ESRCH: # No such process
455
375
self.checker = None
456
self.PropertyChanged(dbus.String(u"checker_running"),
457
dbus.Boolean(False, variant_level=1))
459
376
def still_valid(self):
460
377
"""Has the timeout not yet passed for this client?"""
461
if not getattr(self, "started", False):
463
now = datetime.datetime.utcnow()
378
now = datetime.datetime.now()
464
379
if self.last_checked_ok is None:
465
380
return now < (self.created + self.timeout)
467
382
return now < (self.last_checked_ok + self.timeout)
469
## D-Bus methods & signals
470
_interface = u"org.mandos_system.Mandos.Client"
472
# BumpTimeout - method
473
BumpTimeout = dbus.service.method(_interface)(bump_timeout)
474
BumpTimeout.__name__ = "BumpTimeout"
476
# CheckerCompleted - signal
477
@dbus.service.signal(_interface, signature="bqs")
478
def CheckerCompleted(self, success, condition, command):
482
# CheckerStarted - signal
483
@dbus.service.signal(_interface, signature="s")
484
def CheckerStarted(self, command):
488
# GetAllProperties - method
489
@dbus.service.method(_interface, out_signature="a{sv}")
490
def GetAllProperties(self):
492
return dbus.Dictionary({
494
dbus.String(self.name, variant_level=1),
495
dbus.String("fingerprint"):
496
dbus.String(self.fingerprint, variant_level=1),
498
dbus.String(self.host, variant_level=1),
499
dbus.String("created"):
500
_datetime_to_dbus_struct(self.created,
502
dbus.String("last_started"):
503
(_datetime_to_dbus_struct(self.last_started,
505
if self.last_started is not None
506
else dbus.Boolean(False, variant_level=1)),
507
dbus.String("started"):
508
dbus.Boolean(self.started, variant_level=1),
509
dbus.String("last_checked_ok"):
510
(_datetime_to_dbus_struct(self.last_checked_ok,
512
if self.last_checked_ok is not None
513
else dbus.Boolean (False, variant_level=1)),
514
dbus.String("timeout"):
515
dbus.UInt64(self._timeout_milliseconds,
517
dbus.String("interval"):
518
dbus.UInt64(self._interval_milliseconds,
520
dbus.String("checker"):
521
dbus.String(self.checker_command,
523
dbus.String("checker_running"):
524
dbus.Boolean(self.checker is not None,
528
# IsStillValid - method
529
IsStillValid = (dbus.service.method(_interface, out_signature="b")
531
IsStillValid.__name__ = "IsStillValid"
533
# PropertyChanged - signal
534
@dbus.service.signal(_interface, signature="sv")
535
def PropertyChanged(self, property, value):
539
# SetChecker - method
540
@dbus.service.method(_interface, in_signature="s")
541
def SetChecker(self, checker):
542
"D-Bus setter method"
543
self.checker_command = checker
546
@dbus.service.method(_interface, in_signature="s")
547
def SetHost(self, host):
548
"D-Bus setter method"
551
# SetInterval - method
552
@dbus.service.method(_interface, in_signature="t")
553
def SetInterval(self, milliseconds):
554
self.interval = datetime.timdeelta(0, 0, 0, milliseconds)
557
@dbus.service.method(_interface, in_signature="ay",
559
def SetSecret(self, secret):
560
"D-Bus setter method"
561
self.secret = str(secret)
563
# SetTimeout - method
564
@dbus.service.method(_interface, in_signature="t")
565
def SetTimeout(self, milliseconds):
566
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
569
Start = dbus.service.method(_interface)(start)
570
Start.__name__ = "Start"
572
# StartChecker - method
573
@dbus.service.method(_interface)
574
def StartChecker(self):
579
@dbus.service.method(_interface)
584
# StopChecker - method
585
StopChecker = dbus.service.method(_interface)(stop_checker)
586
StopChecker.__name__ = "StopChecker"
591
385
def peer_certificate(session):
592
386
"Return the peer's OpenPGP certificate as a bytestring"
593
387
# If not an OpenPGP certificate...
594
if (gnutls.library.functions
595
.gnutls_certificate_type_get(session._c_object)
596
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
388
if gnutls.library.functions.gnutls_certificate_type_get\
389
(session._c_object) \
390
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP:
597
391
# ...do the normal thing
598
392
return session.peer_certificate
599
393
list_size = ctypes.c_uint()
600
cert_list = (gnutls.library.functions
601
.gnutls_certificate_get_peers
602
(session._c_object, ctypes.byref(list_size)))
394
cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
395
(session._c_object, ctypes.byref(list_size))
603
396
if list_size.value == 0:
605
398
cert = cert_list[0]
609
402
def fingerprint(openpgp):
610
403
"Convert an OpenPGP bytestring to a hexdigit fingerprint string"
611
404
# New GnuTLS "datum" with the OpenPGP public key
612
datum = (gnutls.library.types
613
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
616
ctypes.c_uint(len(openpgp))))
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)))
617
409
# New empty GnuTLS certificate
618
410
crt = gnutls.library.types.gnutls_openpgp_crt_t()
619
(gnutls.library.functions
620
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
411
gnutls.library.functions.gnutls_openpgp_crt_init\
621
413
# Import the OpenPGP public key into the certificate
622
(gnutls.library.functions
623
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
624
gnutls.library.constants
625
.GNUTLS_OPENPGP_FMT_RAW))
414
gnutls.library.functions.gnutls_openpgp_crt_import\
415
(crt, ctypes.byref(datum),
416
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
626
417
# Verify the self signature in the key
627
crtverify = ctypes.c_uint()
628
(gnutls.library.functions
629
.gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
418
crtverify = ctypes.c_uint();
419
gnutls.library.functions.gnutls_openpgp_crt_verify_self\
420
(crt, 0, ctypes.byref(crtverify))
630
421
if crtverify.value != 0:
631
422
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
632
423
raise gnutls.errors.CertificateSecurityError("Verify failed")
633
424
# New buffer for the fingerprint
634
buf = ctypes.create_string_buffer(20)
635
buf_len = ctypes.c_size_t()
425
buffer = ctypes.create_string_buffer(20)
426
buffer_length = ctypes.c_size_t()
636
427
# Get the fingerprint from the certificate into the buffer
637
(gnutls.library.functions
638
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
639
ctypes.byref(buf_len)))
428
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
429
(crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
640
430
# Deinit the certificate
641
431
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
642
432
# Convert the buffer to a Python bytestring
643
fpr = ctypes.string_at(buf, buf_len.value)
433
fpr = ctypes.string_at(buffer, buffer_length.value)
644
434
# Convert the bytestring to hexadecimal notation
645
435
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
649
class TCP_handler(SocketServer.BaseRequestHandler, object):
439
class tcp_handler(SocketServer.BaseRequestHandler, object):
650
440
"""A TCP request handler class.
651
441
Instantiated by IPv6_TCPServer for each request to handle it.
652
442
Note: This will run in its own forked process."""
654
444
def handle(self):
655
445
logger.info(u"TCP connection from: %s",
656
unicode(self.client_address))
657
session = (gnutls.connection
658
.ClientSession(self.request,
446
unicode(self.client_address))
447
session = gnutls.connection.ClientSession\
448
(self.request, gnutls.connection.X509Credentials())
662
450
line = self.request.makefile().readline()
663
451
logger.debug(u"Protocol version: %r", line)
1087
881
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1088
882
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1090
class MandosServer(dbus.service.Object):
1091
"""A D-Bus proxy object"""
1093
dbus.service.Object.__init__(self, bus,
1095
_interface = u"org.mandos_system.Mandos"
1097
@dbus.service.signal(_interface, signature="oa{sv}")
1098
def ClientAdded(self, objpath, properties):
1102
@dbus.service.signal(_interface, signature="o")
1103
def ClientRemoved(self, objpath):
1107
@dbus.service.method(_interface, out_signature="ao")
1108
def GetAllClients(self):
1109
return dbus.Array(c.dbus_object_path for c in clients)
1111
@dbus.service.method(_interface, out_signature="a{oa{sv}}")
1112
def GetAllClientsWithProperties(self):
1113
return dbus.Dictionary(
1114
((c.dbus_object_path, c.GetAllProperties())
1118
@dbus.service.method(_interface, in_signature="o")
1119
def RemoveClient(self, object_path):
1121
if c.dbus_object_path == object_path:
1129
mandos_server = MandosServer()
1131
884
for client in clients:
1133
mandos_server.ClientAdded(client.dbus_object_path,
1134
client.GetAllProperties())
1137
887
tcp_server.enable()