170
164
# End of Avahi example code
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):
167
class Client(object):
179
168
"""A representation of a client host served by this server.
181
name: string; from the config file, used in log messages and
170
name: string; from the config file, used in log messages
183
171
fingerprint: string (40 or 32 hexadecimal digits); used to
184
172
uniquely identify the client
185
secret: bytestring; sent verbatim (over TLS) to client
186
host: string; available for use by the checker command
187
created: datetime.datetime(); (UTC) object creation
188
last_enabled: datetime.datetime(); (UTC)
190
last_checked_ok: datetime.datetime(); (UTC) or None
191
timeout: datetime.timedelta(); How long from last_checked_ok
192
until this client is invalid
193
interval: datetime.timedelta(); How often to start a new checker
194
disable_hook: If set, called by disable() as disable_hook(self)
195
checker: subprocess.Popen(); a running checker process used
196
to see if the client lives.
197
'None' if no process is running.
173
secret: bytestring; sent verbatim (over TLS) to client
174
host: string; available for use by the checker command
175
created: datetime.datetime(); object creation, not client host
176
last_checked_ok: datetime.datetime() or None if not yet checked OK
177
timeout: datetime.timedelta(); How long from last_checked_ok
178
until this client is invalid
179
interval: datetime.timedelta(); How often to start a new checker
180
stop_hook: If set, called by stop() as stop_hook(self)
181
checker: subprocess.Popen(); a running checker process used
182
to see if the client lives.
183
'None' if no process is running.
198
184
checker_initiator_tag: a gobject event source tag, or None
199
disable_initiator_tag: - '' -
185
stop_initiator_tag: - '' -
200
186
checker_callback_tag: - '' -
201
187
checker_command: string; External command which is run to check if
202
188
client lives. %() expansions are done at
203
189
runtime with vars(self) as dict, so that for
204
190
instance %(name)s can be used in the command.
205
use_dbus: bool(); Whether to provide D-Bus interface and signals
206
dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
192
_timeout: Real variable for 'timeout'
193
_interval: Real variable for 'interval'
194
_timeout_milliseconds: Used when calling gobject.timeout_add()
195
_interval_milliseconds: - '' -
208
def timeout_milliseconds(self):
209
"Return the 'timeout' attribute in milliseconds"
210
return ((self.timeout.days * 24 * 60 * 60 * 1000)
211
+ (self.timeout.seconds * 1000)
212
+ (self.timeout.microseconds // 1000))
214
def interval_milliseconds(self):
215
"Return the 'interval' attribute in milliseconds"
216
return ((self.interval.days * 24 * 60 * 60 * 1000)
217
+ (self.interval.seconds * 1000)
218
+ (self.interval.microseconds // 1000))
220
def __init__(self, name = None, disable_hook=None, config=None,
197
def _set_timeout(self, timeout):
198
"Setter function for 'timeout' attribute"
199
self._timeout = timeout
200
self._timeout_milliseconds = ((self.timeout.days
201
* 24 * 60 * 60 * 1000)
202
+ (self.timeout.seconds * 1000)
203
+ (self.timeout.microseconds
205
timeout = property(lambda self: self._timeout,
208
def _set_interval(self, interval):
209
"Setter function for 'interval' attribute"
210
self._interval = interval
211
self._interval_milliseconds = ((self.interval.days
212
* 24 * 60 * 60 * 1000)
213
+ (self.interval.seconds
215
+ (self.interval.microseconds
217
interval = property(lambda self: self._interval,
220
def __init__(self, name = None, stop_hook=None, config={}):
222
221
"""Note: the 'checker' key in 'config' sets the
223
222
'checker_command' attribute and *not* the 'checker'
228
225
logger.debug(u"Creating client %r", self.name)
229
self.use_dbus = False # During __init__
230
226
# Uppercase and remove spaces from fingerprint for later
231
227
# comparison purposes with return value from the fingerprint()
233
self.fingerprint = (config["fingerprint"].upper()
229
self.fingerprint = config["fingerprint"].upper()\
235
231
logger.debug(u" Fingerprint: %s", self.fingerprint)
236
232
if "secret" in config:
237
233
self.secret = config["secret"].decode(u"base64")
238
234
elif "secfile" in config:
239
with closing(open(os.path.expanduser
241
(config["secfile"])))) as secfile:
242
self.secret = secfile.read()
235
sf = open(config["secfile"])
236
self.secret = sf.read()
244
239
raise TypeError(u"No secret or secfile for client %s"
246
241
self.host = config.get("host", "")
247
self.created = datetime.datetime.utcnow()
249
self.last_enabled = None
242
self.created = datetime.datetime.now()
250
243
self.last_checked_ok = None
251
244
self.timeout = string_to_delta(config["timeout"])
252
245
self.interval = string_to_delta(config["interval"])
253
self.disable_hook = disable_hook
246
self.stop_hook = stop_hook
254
247
self.checker = None
255
248
self.checker_initiator_tag = None
256
self.disable_initiator_tag = None
249
self.stop_initiator_tag = None
257
250
self.checker_callback_tag = None
258
self.checker_command = config["checker"]
259
self.last_connect = None
260
# Only now, when this client is initialized, can it show up on
262
self.use_dbus = use_dbus
264
self.dbus_object_path = (dbus.ObjectPath
266
+ self.name.replace(".", "_")))
267
dbus.service.Object.__init__(self, bus,
268
self.dbus_object_path)
251
self.check_command = config["checker"]
271
253
"""Start this client's checker and timeout hooks"""
272
self.last_enabled = datetime.datetime.utcnow()
273
254
# Schedule a new checker to be started an 'interval' from now,
274
255
# and every interval from then on.
275
self.checker_initiator_tag = (gobject.timeout_add
276
(self.interval_milliseconds(),
256
self.checker_initiator_tag = gobject.timeout_add\
257
(self._interval_milliseconds,
278
259
# Also start a new checker *right now*.
279
260
self.start_checker()
280
# Schedule a disable() when 'timeout' has passed
281
self.disable_initiator_tag = (gobject.timeout_add
282
(self.timeout_milliseconds(),
287
self.PropertyChanged(dbus.String(u"enabled"),
288
dbus.Boolean(True, variant_level=1))
289
self.PropertyChanged(dbus.String(u"last_enabled"),
290
(_datetime_to_dbus(self.last_enabled,
294
"""Disable this client."""
295
if not getattr(self, "enabled", False):
261
# Schedule a stop() when 'timeout' has passed
262
self.stop_initiator_tag = gobject.timeout_add\
263
(self._timeout_milliseconds,
267
The possibility that a client might be restarted is left open,
268
but not currently used."""
269
# If this client doesn't have a secret, it is already stopped.
270
if hasattr(self, "secret") and self.secret:
271
logger.info(u"Stopping client %s", self.name)
297
logger.info(u"Disabling client %s", self.name)
298
if getattr(self, "disable_initiator_tag", False):
299
gobject.source_remove(self.disable_initiator_tag)
300
self.disable_initiator_tag = None
275
if getattr(self, "stop_initiator_tag", False):
276
gobject.source_remove(self.stop_initiator_tag)
277
self.stop_initiator_tag = None
301
278
if getattr(self, "checker_initiator_tag", False):
302
279
gobject.source_remove(self.checker_initiator_tag)
303
280
self.checker_initiator_tag = None
304
281
self.stop_checker()
305
if self.disable_hook:
306
self.disable_hook(self)
310
self.PropertyChanged(dbus.String(u"enabled"),
311
dbus.Boolean(False, variant_level=1))
312
284
# Do not run this again if called by a gobject.timeout_add
315
286
def __del__(self):
316
self.disable_hook = None
319
def checker_callback(self, pid, condition, command):
287
self.stop_hook = None
289
def checker_callback(self, pid, condition):
320
290
"""The checker has completed, so take appropriate actions."""
291
now = datetime.datetime.now()
321
292
self.checker_callback_tag = None
322
293
self.checker = None
325
self.PropertyChanged(dbus.String(u"checker_running"),
326
dbus.Boolean(False, variant_level=1))
327
if os.WIFEXITED(condition):
328
exitstatus = os.WEXITSTATUS(condition)
330
logger.info(u"Checker for %(name)s succeeded",
334
logger.info(u"Checker for %(name)s failed",
338
self.CheckerCompleted(dbus.Int16(exitstatus),
339
dbus.Int64(condition),
340
dbus.String(command))
294
if os.WIFEXITED(condition) \
295
and (os.WEXITSTATUS(condition) == 0):
296
logger.info(u"Checker for %(name)s succeeded",
298
self.last_checked_ok = now
299
gobject.source_remove(self.stop_initiator_tag)
300
self.stop_initiator_tag = gobject.timeout_add\
301
(self._timeout_milliseconds,
303
elif not os.WIFEXITED(condition):
342
304
logger.warning(u"Checker for %(name)s crashed?",
346
self.CheckerCompleted(dbus.Int16(-1),
347
dbus.Int64(condition),
348
dbus.String(command))
350
def checked_ok(self):
351
"""Bump up the timeout for this client.
352
This should only be called when the client has been seen,
355
self.last_checked_ok = datetime.datetime.utcnow()
356
gobject.source_remove(self.disable_initiator_tag)
357
self.disable_initiator_tag = (gobject.timeout_add
358
(self.timeout_milliseconds(),
362
self.PropertyChanged(
363
dbus.String(u"last_checked_ok"),
364
(_datetime_to_dbus(self.last_checked_ok,
307
logger.info(u"Checker for %(name)s failed",
367
309
def start_checker(self):
368
310
"""Start a new checker subprocess if one is not running.
369
311
If a checker already exists, leave it running and do
434
364
if error.errno != errno.ESRCH: # No such process
436
366
self.checker = None
438
self.PropertyChanged(dbus.String(u"checker_running"),
439
dbus.Boolean(False, variant_level=1))
441
367
def still_valid(self):
442
368
"""Has the timeout not yet passed for this client?"""
443
if not getattr(self, "enabled", False):
445
now = datetime.datetime.utcnow()
369
now = datetime.datetime.now()
446
370
if self.last_checked_ok is None:
447
371
return now < (self.created + self.timeout)
449
373
return now < (self.last_checked_ok + self.timeout)
451
## D-Bus methods & signals
452
_interface = u"se.bsnet.fukt.Mandos.Client"
455
CheckedOK = dbus.service.method(_interface)(checked_ok)
456
CheckedOK.__name__ = "CheckedOK"
458
# CheckerCompleted - signal
459
@dbus.service.signal(_interface, signature="nxs")
460
def CheckerCompleted(self, exitcode, waitstatus, command):
464
# CheckerStarted - signal
465
@dbus.service.signal(_interface, signature="s")
466
def CheckerStarted(self, command):
470
# GetAllProperties - method
471
@dbus.service.method(_interface, out_signature="a{sv}")
472
def GetAllProperties(self):
474
return dbus.Dictionary({
476
dbus.String(self.name, variant_level=1),
477
dbus.String("fingerprint"):
478
dbus.String(self.fingerprint, variant_level=1),
480
dbus.String(self.host, variant_level=1),
481
dbus.String("created"):
482
_datetime_to_dbus(self.created, variant_level=1),
483
dbus.String("last_enabled"):
484
(_datetime_to_dbus(self.last_enabled,
486
if self.last_enabled is not None
487
else dbus.Boolean(False, variant_level=1)),
488
dbus.String("enabled"):
489
dbus.Boolean(self.enabled, variant_level=1),
490
dbus.String("last_checked_ok"):
491
(_datetime_to_dbus(self.last_checked_ok,
493
if self.last_checked_ok is not None
494
else dbus.Boolean (False, variant_level=1)),
495
dbus.String("timeout"):
496
dbus.UInt64(self.timeout_milliseconds(),
498
dbus.String("interval"):
499
dbus.UInt64(self.interval_milliseconds(),
501
dbus.String("checker"):
502
dbus.String(self.checker_command,
504
dbus.String("checker_running"):
505
dbus.Boolean(self.checker is not None,
507
dbus.String("object_path"):
508
dbus.ObjectPath(self.dbus_object_path,
512
# IsStillValid - method
513
IsStillValid = (dbus.service.method(_interface, out_signature="b")
515
IsStillValid.__name__ = "IsStillValid"
517
# PropertyChanged - signal
518
@dbus.service.signal(_interface, signature="sv")
519
def PropertyChanged(self, property, value):
523
# SetChecker - method
524
@dbus.service.method(_interface, in_signature="s")
525
def SetChecker(self, checker):
526
"D-Bus setter method"
527
self.checker_command = checker
529
self.PropertyChanged(dbus.String(u"checker"),
530
dbus.String(self.checker_command,
534
@dbus.service.method(_interface, in_signature="s")
535
def SetHost(self, host):
536
"D-Bus setter method"
539
self.PropertyChanged(dbus.String(u"host"),
540
dbus.String(self.host, variant_level=1))
542
# SetInterval - method
543
@dbus.service.method(_interface, in_signature="t")
544
def SetInterval(self, milliseconds):
545
self.interval = datetime.timedelta(0, 0, 0, milliseconds)
547
self.PropertyChanged(dbus.String(u"interval"),
548
(dbus.UInt64(self.interval_milliseconds(),
552
@dbus.service.method(_interface, in_signature="ay",
554
def SetSecret(self, secret):
555
"D-Bus setter method"
556
self.secret = str(secret)
558
# SetTimeout - method
559
@dbus.service.method(_interface, in_signature="t")
560
def SetTimeout(self, milliseconds):
561
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
563
self.PropertyChanged(dbus.String(u"timeout"),
564
(dbus.UInt64(self.timeout_milliseconds(),
568
Enable = dbus.service.method(_interface)(enable)
569
Enable.__name__ = "Enable"
571
# StartChecker - method
572
@dbus.service.method(_interface)
573
def StartChecker(self):
578
@dbus.service.method(_interface)
583
# StopChecker - method
584
StopChecker = dbus.service.method(_interface)(stop_checker)
585
StopChecker.__name__ = "StopChecker"
590
376
def peer_certificate(session):
591
377
"Return the peer's OpenPGP certificate as a bytestring"
592
378
# If not an OpenPGP certificate...
593
if (gnutls.library.functions
594
.gnutls_certificate_type_get(session._c_object)
595
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
379
if gnutls.library.functions.gnutls_certificate_type_get\
380
(session._c_object) \
381
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP:
596
382
# ...do the normal thing
597
383
return session.peer_certificate
598
list_size = ctypes.c_uint(1)
599
cert_list = (gnutls.library.functions
600
.gnutls_certificate_get_peers
601
(session._c_object, ctypes.byref(list_size)))
602
if not bool(cert_list) and list_size.value != 0:
603
raise gnutls.errors.GNUTLSError("error getting peer"
384
list_size = ctypes.c_uint()
385
cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
386
(session._c_object, ctypes.byref(list_size))
605
387
if list_size.value == 0:
607
389
cert = cert_list[0]
611
393
def fingerprint(openpgp):
612
394
"Convert an OpenPGP bytestring to a hexdigit fingerprint string"
613
395
# New GnuTLS "datum" with the OpenPGP public key
614
datum = (gnutls.library.types
615
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
618
ctypes.c_uint(len(openpgp))))
396
datum = gnutls.library.types.gnutls_datum_t\
397
(ctypes.cast(ctypes.c_char_p(openpgp),
398
ctypes.POINTER(ctypes.c_ubyte)),
399
ctypes.c_uint(len(openpgp)))
619
400
# New empty GnuTLS certificate
620
401
crt = gnutls.library.types.gnutls_openpgp_crt_t()
621
(gnutls.library.functions
622
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
402
gnutls.library.functions.gnutls_openpgp_crt_init\
623
404
# Import the OpenPGP public key into the certificate
624
(gnutls.library.functions
625
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
626
gnutls.library.constants
627
.GNUTLS_OPENPGP_FMT_RAW))
628
# Verify the self signature in the key
629
crtverify = ctypes.c_uint()
630
(gnutls.library.functions
631
.gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
632
if crtverify.value != 0:
633
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
634
raise gnutls.errors.CertificateSecurityError("Verify failed")
405
gnutls.library.functions.gnutls_openpgp_crt_import\
406
(crt, ctypes.byref(datum),
407
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
635
408
# New buffer for the fingerprint
636
buf = ctypes.create_string_buffer(20)
637
buf_len = ctypes.c_size_t()
409
buffer = ctypes.create_string_buffer(20)
410
buffer_length = ctypes.c_size_t()
638
411
# Get the fingerprint from the certificate into the buffer
639
(gnutls.library.functions
640
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
641
ctypes.byref(buf_len)))
412
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
413
(crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
642
414
# Deinit the certificate
643
415
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
644
416
# Convert the buffer to a Python bytestring
645
fpr = ctypes.string_at(buf, buf_len.value)
417
fpr = ctypes.string_at(buffer, buffer_length.value)
646
418
# Convert the bytestring to hexadecimal notation
647
419
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
651
class TCP_handler(SocketServer.BaseRequestHandler, object):
423
class tcp_handler(SocketServer.BaseRequestHandler, object):
652
424
"""A TCP request handler class.
653
425
Instantiated by IPv6_TCPServer for each request to handle it.
654
426
Note: This will run in its own forked process."""
656
428
def handle(self):
657
429
logger.info(u"TCP connection from: %s",
658
unicode(self.client_address))
659
session = (gnutls.connection
660
.ClientSession(self.request,
430
unicode(self.client_address))
431
session = gnutls.connection.ClientSession\
432
(self.request, gnutls.connection.X509Credentials())
664
434
line = self.request.makefile().readline()
665
435
logger.debug(u"Protocol version: %r", line)
937
694
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
938
695
"servicename": "Mandos",
942
698
# Parse config file for server-global settings
943
699
server_config = ConfigParser.SafeConfigParser(server_defaults)
944
700
del server_defaults
945
701
server_config.read(os.path.join(options.configdir, "mandos.conf"))
702
server_section = "server"
946
703
# Convert the SafeConfigParser object to a dict
947
server_settings = server_config.defaults()
948
# Use the appropriate methods on the non-string config options
949
server_settings["debug"] = server_config.getboolean("DEFAULT",
951
server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
953
if server_settings["port"]:
954
server_settings["port"] = server_config.getint("DEFAULT",
704
server_settings = dict(server_config.items(server_section))
705
# Use getboolean on the boolean config option
706
server_settings["debug"] = server_config.getboolean\
707
(server_section, "debug")
956
708
del server_config
958
710
# Override the settings from the config file with command line
959
711
# options, if set.
960
712
for option in ("interface", "address", "port", "debug",
961
"priority", "servicename", "configdir",
713
"priority", "servicename", "configdir"):
963
714
value = getattr(options, option)
964
715
if value is not None:
965
716
server_settings[option] = value
967
718
# Now we have our good server settings in "server_settings"
970
720
debug = server_settings["debug"]
971
use_dbus = server_settings["use_dbus"]
974
723
syslogger.setLevel(logging.WARNING)
975
724
console.setLevel(logging.WARNING)
977
726
if server_settings["servicename"] != "Mandos":
978
syslogger.setFormatter(logging.Formatter
727
syslogger.setFormatter(logging.Formatter\
979
728
('Mandos (%s): %%(levelname)s:'
981
730
% server_settings["servicename"]))
1098
808
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1099
809
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1102
class MandosServer(dbus.service.Object):
1103
"""A D-Bus proxy object"""
1105
dbus.service.Object.__init__(self, bus, "/")
1106
_interface = u"se.bsnet.fukt.Mandos"
1108
@dbus.service.signal(_interface, signature="oa{sv}")
1109
def ClientAdded(self, objpath, properties):
1113
@dbus.service.signal(_interface, signature="os")
1114
def ClientRemoved(self, objpath, name):
1118
@dbus.service.method(_interface, out_signature="ao")
1119
def GetAllClients(self):
1121
return dbus.Array(c.dbus_object_path for c in clients)
1123
@dbus.service.method(_interface, out_signature="a{oa{sv}}")
1124
def GetAllClientsWithProperties(self):
1126
return dbus.Dictionary(
1127
((c.dbus_object_path, c.GetAllProperties())
1131
@dbus.service.method(_interface, in_signature="o")
1132
def RemoveClient(self, object_path):
1135
if c.dbus_object_path == object_path:
1137
# Don't signal anything except ClientRemoved
1141
self.ClientRemoved(object_path, c.name)
1147
mandos_server = MandosServer()
1149
811
for client in clients:
1152
mandos_server.ClientAdded(client.dbus_object_path,
1153
client.GetAllProperties())
1157
tcp_server.server_activate()
814
tcp_server = IPv6_TCPServer((server_settings["address"],
815
server_settings["port"]),
817
settings=server_settings,
1159
819
# Find out what port we got
1160
820
service.port = tcp_server.socket.getsockname()[1]
1161
821
logger.info(u"Now listening on address %r, port %d, flowinfo %d,"