To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 202
- compare with another revision
- download diff
- download tarball
- view history from revision 202
- Committer: Teddy Hogeborn
- Date: 2008-09-21 13:42:34 UTC
- Revision ID: teddy@fukt.bsnet.se-20080921134234-jo8p4rwtm50yb4xj
* clients.conf ([bar]/secfile): Do not imply armored format.
* debian/control: Build-Depend on pkg-config.
* debian/mandos.prerm (remove): Bug fix; check for
"/etc/init.d/mandos", not
"/etc/init.d/ssh".
* debian/control: Build-Depend on pkg-config.
* debian/mandos.prerm (remove): Bug fix; check for
"/etc/init.d/mandos", not
"/etc/init.d/ssh".
- files added:
- debian/mandos-client.config
- files removed:
- NEWS
- files modified:
- .bzrignore
added
removed
mandos
11
11
# and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008,2009 Teddy Hogeborn
15
# Copyright © 2008,2009 Björn Påhlsson
14
# Copyright © 2007-2008 Teddy Hogeborn & Björn Påhlsson
16
15
#
17
16
# This program is free software: you can redistribute it and/or modify
18
17
# it under the terms of the GNU General Public License as published by
31
30
# Contact the authors at <mandos@fukt.bsnet.se>.
32
31
#
33
32
34
from __future__ import division, with_statement, absolute_import
33
from __future__ import division
35
34
36
35
import SocketServer
37
36
import socket
38
import optparse
37
import select
38
from optparse import OptionParser
39
39
import datetime
40
40
import errno
41
41
import gnutls.crypto
56
56
import logging
57
57
import logging.handlers
58
58
import pwd
59
from contextlib import closing
60
59
61
60
import dbus
62
import dbus.service
63
61
import gobject
64
62
import avahi
65
63
from dbus.mainloop.glib import DBusGMainLoop
66
64
import ctypes
67
import ctypes.util
68
65
69
version = "1.0.5"
66
version = "1.0"
70
67
71
68
logger = logging.Logger('mandos')
72
syslogger = (logging.handlers.SysLogHandler
73
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
74
address = "/dev/log"))
75
syslogger.setFormatter(logging.Formatter
76
('Mandos [%(process)d]: %(levelname)s:'
77
' %(message)s'))
69
syslogger = logging.handlers.SysLogHandler\
70
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
71
address = "/dev/log")
72
syslogger.setFormatter(logging.Formatter\
73
('Mandos: %(levelname)s: %(message)s'))
78
74
logger.addHandler(syslogger)
79
75
80
76
console = logging.StreamHandler()
81
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
82
' %(levelname)s: %(message)s'))
77
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
78
' %(message)s'))
83
79
logger.addHandler(console)
84
80
85
81
class AvahiError(Exception):
86
def __init__(self, value, *args, **kwargs):
82
def __init__(self, value):
87
83
self.value = value
88
super(AvahiError, self).__init__(value, *args, **kwargs)
89
def __unicode__(self):
90
return unicode(repr(self.value))
84
def __str__(self):
85
return repr(self.value)
91
86
92
87
class AvahiServiceError(AvahiError):
93
88
pass
113
108
a sensible number of times
114
109
"""
115
110
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
116
servicetype = None, port = None, TXT = None,
117
domain = "", host = "", max_renames = 32768):
111
type = None, port = None, TXT = None, domain = "",
112
host = "", max_renames = 32768):
118
113
self.interface = interface
119
114
self.name = name
120
self.type = servicetype
115
self.type = type
121
116
self.port = port
122
self.TXT = TXT if TXT is not None else []
117
if TXT is None:
118
self.TXT = []
119
else:
120
self.TXT = TXT
123
121
self.domain = domain
124
122
self.host = host
125
123
self.rename_count = 0
129
127
if self.rename_count >= self.max_renames:
130
128
logger.critical(u"No suitable Zeroconf service name found"
131
129
u" after %i retries, exiting.",
132
self.rename_count)
133
raise AvahiServiceError(u"Too many renames")
130
rename_count)
131
raise AvahiServiceError("Too many renames")
134
132
self.name = server.GetAlternativeServiceName(self.name)
135
133
logger.info(u"Changing Zeroconf service name to %r ...",
136
134
str(self.name))
137
syslogger.setFormatter(logging.Formatter
135
syslogger.setFormatter(logging.Formatter\
138
136
('Mandos (%s): %%(levelname)s:'
139
' %%(message)s' % self.name))
137
' %%(message)s' % self.name))
140
138
self.remove()
141
139
self.add()
142
140
self.rename_count += 1
148
146
"""Derived from the Avahi example code"""
149
147
global group
150
148
if group is None:
151
group = dbus.Interface(bus.get_object
152
(avahi.DBUS_NAME,
149
group = dbus.Interface\
150
(bus.get_object(avahi.DBUS_NAME,
153
151
server.EntryGroupNew()),
154
avahi.DBUS_INTERFACE_ENTRY_GROUP)
152
avahi.DBUS_INTERFACE_ENTRY_GROUP)
155
153
group.connect_to_signal('StateChanged',
156
154
entry_group_state_changed)
157
155
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
171
169
# End of Avahi example code
172
170
173
171
174
def _datetime_to_dbus(dt, variant_level=0):
175
"""Convert a UTC datetime.datetime() to a D-Bus type."""
176
return dbus.String(dt.isoformat(), variant_level=variant_level)
177
178
179
class Client(dbus.service.Object):
172
class Client(object):
180
173
"""A representation of a client host served by this server.
181
174
Attributes:
182
name: string; from the config file, used in log messages and
183
D-Bus identifiers
175
name: string; from the config file, used in log messages
184
176
fingerprint: string (40 or 32 hexadecimal digits); used to
185
177
uniquely identify the client
186
secret: bytestring; sent verbatim (over TLS) to client
187
host: string; available for use by the checker command
188
created: datetime.datetime(); (UTC) object creation
189
last_enabled: datetime.datetime(); (UTC)
190
enabled: bool()
191
last_checked_ok: datetime.datetime(); (UTC) or None
192
timeout: datetime.timedelta(); How long from last_checked_ok
193
until this client is invalid
194
interval: datetime.timedelta(); How often to start a new checker
195
disable_hook: If set, called by disable() as disable_hook(self)
196
checker: subprocess.Popen(); a running checker process used
197
to see if the client lives.
198
'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.
199
189
checker_initiator_tag: a gobject event source tag, or None
200
disable_initiator_tag: - '' -
190
stop_initiator_tag: - '' -
201
191
checker_callback_tag: - '' -
202
192
checker_command: string; External command which is run to check if
203
193
client lives. %() expansions are done at
204
194
runtime with vars(self) as dict, so that for
205
195
instance %(name)s can be used in the command.
206
use_dbus: bool(); Whether to provide D-Bus interface and signals
207
dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
196
Private attibutes:
197
_timeout: Real variable for 'timeout'
198
_interval: Real variable for 'interval'
199
_timeout_milliseconds: Used when calling gobject.timeout_add()
200
_interval_milliseconds: - '' -
208
201
"""
209
def timeout_milliseconds(self):
210
"Return the 'timeout' attribute in milliseconds"
211
return ((self.timeout.days * 24 * 60 * 60 * 1000)
212
+ (self.timeout.seconds * 1000)
213
+ (self.timeout.microseconds // 1000))
214
215
def interval_milliseconds(self):
216
"Return the 'interval' attribute in milliseconds"
217
return ((self.interval.days * 24 * 60 * 60 * 1000)
218
+ (self.interval.seconds * 1000)
219
+ (self.interval.microseconds // 1000))
220
221
def __init__(self, name = None, disable_hook=None, config=None,
222
use_dbus=True):
202
def _set_timeout(self, timeout):
203
"Setter function for 'timeout' attribute"
204
self._timeout = timeout
205
self._timeout_milliseconds = ((self.timeout.days
206
* 24 * 60 * 60 * 1000)
207
+ (self.timeout.seconds * 1000)
208
+ (self.timeout.microseconds
209
// 1000))
210
timeout = property(lambda self: self._timeout,
211
_set_timeout)
212
del _set_timeout
213
def _set_interval(self, interval):
214
"Setter function for 'interval' attribute"
215
self._interval = interval
216
self._interval_milliseconds = ((self.interval.days
217
* 24 * 60 * 60 * 1000)
218
+ (self.interval.seconds
219
* 1000)
220
+ (self.interval.microseconds
221
// 1000))
222
interval = property(lambda self: self._interval,
223
_set_interval)
224
del _set_interval
225
def __init__(self, name = None, stop_hook=None, config={}):
223
226
"""Note: the 'checker' key in 'config' sets the
224
227
'checker_command' attribute and *not* the 'checker'
225
228
attribute."""
226
229
self.name = name
227
if config is None:
228
config = {}
229
230
logger.debug(u"Creating client %r", self.name)
230
self.use_dbus = False # During __init__
231
231
# Uppercase and remove spaces from fingerprint for later
232
232
# comparison purposes with return value from the fingerprint()
233
233
# function
234
self.fingerprint = (config["fingerprint"].upper()
235
.replace(u" ", u""))
234
self.fingerprint = config["fingerprint"].upper()\
235
.replace(u" ", u"")
236
236
logger.debug(u" Fingerprint: %s", self.fingerprint)
237
237
if "secret" in config:
238
238
self.secret = config["secret"].decode(u"base64")
239
239
elif "secfile" in config:
240
with closing(open(os.path.expanduser
241
(os.path.expandvars
242
(config["secfile"])))) as secfile:
243
self.secret = secfile.read()
240
sf = open(config["secfile"])
241
self.secret = sf.read()
242
sf.close()
244
243
else:
245
244
raise TypeError(u"No secret or secfile for client %s"
246
245
% self.name)
247
246
self.host = config.get("host", "")
248
self.created = datetime.datetime.utcnow()
249
self.enabled = False
250
self.last_enabled = None
247
self.created = datetime.datetime.now()
251
248
self.last_checked_ok = None
252
249
self.timeout = string_to_delta(config["timeout"])
253
250
self.interval = string_to_delta(config["interval"])
254
self.disable_hook = disable_hook
251
self.stop_hook = stop_hook
255
252
self.checker = None
256
253
self.checker_initiator_tag = None
257
self.disable_initiator_tag = None
254
self.stop_initiator_tag = None
258
255
self.checker_callback_tag = None
259
self.checker_command = config["checker"]
260
self.last_connect = None
261
# Only now, when this client is initialized, can it show up on
262
# the D-Bus
263
self.use_dbus = use_dbus
264
if self.use_dbus:
265
self.dbus_object_path = (dbus.ObjectPath
266
("/clients/"
267
+ self.name.replace(".", "_")))
268
dbus.service.Object.__init__(self, bus,
269
self.dbus_object_path)
270
271
def enable(self):
256
self.check_command = config["checker"]
257
def start(self):
272
258
"""Start this client's checker and timeout hooks"""
273
self.last_enabled = datetime.datetime.utcnow()
274
259
# Schedule a new checker to be started an 'interval' from now,
275
260
# and every interval from then on.
276
self.checker_initiator_tag = (gobject.timeout_add
277
(self.interval_milliseconds(),
278
self.start_checker))
261
self.checker_initiator_tag = gobject.timeout_add\
262
(self._interval_milliseconds,
263
self.start_checker)
279
264
# Also start a new checker *right now*.
280
265
self.start_checker()
281
# Schedule a disable() when 'timeout' has passed
282
self.disable_initiator_tag = (gobject.timeout_add
283
(self.timeout_milliseconds(),
284
self.disable))
285
self.enabled = True
286
if self.use_dbus:
287
# Emit D-Bus signals
288
self.PropertyChanged(dbus.String(u"enabled"),
289
dbus.Boolean(True, variant_level=1))
290
self.PropertyChanged(dbus.String(u"last_enabled"),
291
(_datetime_to_dbus(self.last_enabled,
292
variant_level=1)))
293
294
def disable(self):
295
"""Disable this client."""
296
if not getattr(self, "enabled", False):
266
# Schedule a stop() when 'timeout' has passed
267
self.stop_initiator_tag = gobject.timeout_add\
268
(self._timeout_milliseconds,
269
self.stop)
270
def stop(self):
271
"""Stop this client.
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)
277
self.secret = None
278
else:
297
279
return False
298
logger.info(u"Disabling client %s", self.name)
299
if getattr(self, "disable_initiator_tag", False):
300
gobject.source_remove(self.disable_initiator_tag)
301
self.disable_initiator_tag = None
280
if getattr(self, "stop_initiator_tag", False):
281
gobject.source_remove(self.stop_initiator_tag)
282
self.stop_initiator_tag = None
302
283
if getattr(self, "checker_initiator_tag", False):
303
284
gobject.source_remove(self.checker_initiator_tag)
304
285
self.checker_initiator_tag = None
305
286
self.stop_checker()
306
if self.disable_hook:
307
self.disable_hook(self)
308
self.enabled = False
309
if self.use_dbus:
310
# Emit D-Bus signal
311
self.PropertyChanged(dbus.String(u"enabled"),
312
dbus.Boolean(False, variant_level=1))
287
if self.stop_hook:
288
self.stop_hook(self)
313
289
# Do not run this again if called by a gobject.timeout_add
314
290
return False
315
316
291
def __del__(self):
317
self.disable_hook = None
318
self.disable()
319
320
def checker_callback(self, pid, condition, command):
292
self.stop_hook = None
293
self.stop()
294
def checker_callback(self, pid, condition):
321
295
"""The checker has completed, so take appropriate actions."""
296
now = datetime.datetime.now()
322
297
self.checker_callback_tag = None
323
298
self.checker = None
324
if self.use_dbus:
325
# Emit D-Bus signal
326
self.PropertyChanged(dbus.String(u"checker_running"),
327
dbus.Boolean(False, variant_level=1))
328
if os.WIFEXITED(condition):
329
exitstatus = os.WEXITSTATUS(condition)
330
if exitstatus == 0:
331
logger.info(u"Checker for %(name)s succeeded",
332
vars(self))
333
self.checked_ok()
334
else:
335
logger.info(u"Checker for %(name)s failed",
336
vars(self))
337
if self.use_dbus:
338
# Emit D-Bus signal
339
self.CheckerCompleted(dbus.Int16(exitstatus),
340
dbus.Int64(condition),
341
dbus.String(command))
342
else:
299
if os.WIFEXITED(condition) \
300
and (os.WEXITSTATUS(condition) == 0):
301
logger.info(u"Checker for %(name)s succeeded",
302
vars(self))
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,
307
self.stop)
308
elif not os.WIFEXITED(condition):
343
309
logger.warning(u"Checker for %(name)s crashed?",
344
310
vars(self))
345
if self.use_dbus:
346
# Emit D-Bus signal
347
self.CheckerCompleted(dbus.Int16(-1),
348
dbus.Int64(condition),
349
dbus.String(command))
350
351
def checked_ok(self):
352
"""Bump up the timeout for this client.
353
This should only be called when the client has been seen,
354
alive and well.
355
"""
356
self.last_checked_ok = datetime.datetime.utcnow()
357
gobject.source_remove(self.disable_initiator_tag)
358
self.disable_initiator_tag = (gobject.timeout_add
359
(self.timeout_milliseconds(),
360
self.disable))
361
if self.use_dbus:
362
# Emit D-Bus signal
363
self.PropertyChanged(
364
dbus.String(u"last_checked_ok"),
365
(_datetime_to_dbus(self.last_checked_ok,
366
variant_level=1)))
367
311
else:
312
logger.info(u"Checker for %(name)s failed",
313
vars(self))
368
314
def start_checker(self):
369
315
"""Start a new checker subprocess if one is not running.
370
316
If a checker already exists, leave it running and do
379
325
# is as it should be.
380
326
if self.checker is None:
381
327
try:
382
# In case checker_command has exactly one % operator
383
command = self.checker_command % self.host
328
# In case check_command has exactly one % operator
329
command = self.check_command % self.host
384
330
except TypeError:
385
331
# Escape attributes for the shell
386
332
escaped_attrs = dict((key, re.escape(str(val)))
387
333
for key, val in
388
334
vars(self).iteritems())
389
335
try:
390
command = self.checker_command % escaped_attrs
336
command = self.check_command % escaped_attrs
391
337
except TypeError, error:
392
338
logger.error(u'Could not format string "%s":'
393
u' %s', self.checker_command, error)
339
u' %s', self.check_command, error)
394
340
return True # Try again later
395
341
try:
396
342
logger.info(u"Starting checker %r for %s",
402
348
self.checker = subprocess.Popen(command,
403
349
close_fds=True,
404
350
shell=True, cwd="/")
405
if self.use_dbus:
406
# Emit D-Bus signal
407
self.CheckerStarted(command)
408
self.PropertyChanged(
409
dbus.String("checker_running"),
410
dbus.Boolean(True, variant_level=1))
411
self.checker_callback_tag = (gobject.child_watch_add
412
(self.checker.pid,
413
self.checker_callback,
414
data=command))
351
self.checker_callback_tag = gobject.child_watch_add\
352
(self.checker.pid,
353
self.checker_callback)
415
354
except OSError, error:
416
355
logger.error(u"Failed to start subprocess: %s",
417
356
error)
418
357
# Re-run this periodically if run by gobject.timeout_add
419
358
return True
420
421
359
def stop_checker(self):
422
360
"""Force the checker process, if any, to stop."""
423
361
if self.checker_callback_tag:
435
373
if error.errno != errno.ESRCH: # No such process
436
374
raise
437
375
self.checker = None
438
if self.use_dbus:
439
self.PropertyChanged(dbus.String(u"checker_running"),
440
dbus.Boolean(False, variant_level=1))
441
442
376
def still_valid(self):
443
377
"""Has the timeout not yet passed for this client?"""
444
if not getattr(self, "enabled", False):
445
return False
446
now = datetime.datetime.utcnow()
378
now = datetime.datetime.now()
447
379
if self.last_checked_ok is None:
448
380
return now < (self.created + self.timeout)
449
381
else:
450
382
return now < (self.last_checked_ok + self.timeout)
451
452
## D-Bus methods & signals
453
_interface = u"se.bsnet.fukt.Mandos.Client"
454
455
# CheckedOK - method
456
CheckedOK = dbus.service.method(_interface)(checked_ok)
457
CheckedOK.__name__ = "CheckedOK"
458
459
# CheckerCompleted - signal
460
@dbus.service.signal(_interface, signature="nxs")
461
def CheckerCompleted(self, exitcode, waitstatus, command):
462
"D-Bus signal"
463
pass
464
465
# CheckerStarted - signal
466
@dbus.service.signal(_interface, signature="s")
467
def CheckerStarted(self, command):
468
"D-Bus signal"
469
pass
470
471
# GetAllProperties - method
472
@dbus.service.method(_interface, out_signature="a{sv}")
473
def GetAllProperties(self):
474
"D-Bus method"
475
return dbus.Dictionary({
476
dbus.String("name"):
477
dbus.String(self.name, variant_level=1),
478
dbus.String("fingerprint"):
479
dbus.String(self.fingerprint, variant_level=1),
480
dbus.String("host"):
481
dbus.String(self.host, variant_level=1),
482
dbus.String("created"):
483
_datetime_to_dbus(self.created, variant_level=1),
484
dbus.String("last_enabled"):
485
(_datetime_to_dbus(self.last_enabled,
486
variant_level=1)
487
if self.last_enabled is not None
488
else dbus.Boolean(False, variant_level=1)),
489
dbus.String("enabled"):
490
dbus.Boolean(self.enabled, variant_level=1),
491
dbus.String("last_checked_ok"):
492
(_datetime_to_dbus(self.last_checked_ok,
493
variant_level=1)
494
if self.last_checked_ok is not None
495
else dbus.Boolean (False, variant_level=1)),
496
dbus.String("timeout"):
497
dbus.UInt64(self.timeout_milliseconds(),
498
variant_level=1),
499
dbus.String("interval"):
500
dbus.UInt64(self.interval_milliseconds(),
501
variant_level=1),
502
dbus.String("checker"):
503
dbus.String(self.checker_command,
504
variant_level=1),
505
dbus.String("checker_running"):
506
dbus.Boolean(self.checker is not None,
507
variant_level=1),
508
dbus.String("object_path"):
509
dbus.ObjectPath(self.dbus_object_path,
510
variant_level=1)
511
}, signature="sv")
512
513
# IsStillValid - method
514
IsStillValid = (dbus.service.method(_interface, out_signature="b")
515
(still_valid))
516
IsStillValid.__name__ = "IsStillValid"
517
518
# PropertyChanged - signal
519
@dbus.service.signal(_interface, signature="sv")
520
def PropertyChanged(self, property, value):
521
"D-Bus signal"
522
pass
523
524
# SetChecker - method
525
@dbus.service.method(_interface, in_signature="s")
526
def SetChecker(self, checker):
527
"D-Bus setter method"
528
self.checker_command = checker
529
# Emit D-Bus signal
530
self.PropertyChanged(dbus.String(u"checker"),
531
dbus.String(self.checker_command,
532
variant_level=1))
533
534
# SetHost - method
535
@dbus.service.method(_interface, in_signature="s")
536
def SetHost(self, host):
537
"D-Bus setter method"
538
self.host = host
539
# Emit D-Bus signal
540
self.PropertyChanged(dbus.String(u"host"),
541
dbus.String(self.host, variant_level=1))
542
543
# SetInterval - method
544
@dbus.service.method(_interface, in_signature="t")
545
def SetInterval(self, milliseconds):
546
self.interval = datetime.timedelta(0, 0, 0, milliseconds)
547
# Emit D-Bus signal
548
self.PropertyChanged(dbus.String(u"interval"),
549
(dbus.UInt64(self.interval_milliseconds(),
550
variant_level=1)))
551
552
# SetSecret - method
553
@dbus.service.method(_interface, in_signature="ay",
554
byte_arrays=True)
555
def SetSecret(self, secret):
556
"D-Bus setter method"
557
self.secret = str(secret)
558
559
# SetTimeout - method
560
@dbus.service.method(_interface, in_signature="t")
561
def SetTimeout(self, milliseconds):
562
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
563
# Emit D-Bus signal
564
self.PropertyChanged(dbus.String(u"timeout"),
565
(dbus.UInt64(self.timeout_milliseconds(),
566
variant_level=1)))
567
568
# Enable - method
569
Enable = dbus.service.method(_interface)(enable)
570
Enable.__name__ = "Enable"
571
572
# StartChecker - method
573
@dbus.service.method(_interface)
574
def StartChecker(self):
575
"D-Bus method"
576
self.start_checker()
577
578
# Disable - method
579
@dbus.service.method(_interface)
580
def Disable(self):
581
"D-Bus method"
582
self.disable()
583
584
# StopChecker - method
585
StopChecker = dbus.service.method(_interface)(stop_checker)
586
StopChecker.__name__ = "StopChecker"
587
588
del _interface
589
383
590
384
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
list_size = ctypes.c_uint(1)
600
cert_list = (gnutls.library.functions
601
.gnutls_certificate_get_peers
602
(session._c_object, ctypes.byref(list_size)))
603
if not bool(cert_list) and list_size.value != 0:
604
raise gnutls.errors.GNUTLSError("error getting peer"
605
" certificate")
393
list_size = ctypes.c_uint()
394
cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
395
(session._c_object, ctypes.byref(list_size))
606
396
if list_size.value == 0:
607
397
return None
608
398
cert = cert_list[0]
612
402
def fingerprint(openpgp):
613
403
"Convert an OpenPGP bytestring to a hexdigit fingerprint string"
614
404
# New GnuTLS "datum" with the OpenPGP public key
615
datum = (gnutls.library.types
616
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
617
ctypes.POINTER
618
(ctypes.c_ubyte)),
619
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)))
620
409
# New empty GnuTLS certificate
621
410
crt = gnutls.library.types.gnutls_openpgp_crt_t()
622
(gnutls.library.functions
623
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
411
gnutls.library.functions.gnutls_openpgp_crt_init\
412
(ctypes.byref(crt))
624
413
# Import the OpenPGP public key into the certificate
625
(gnutls.library.functions
626
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
627
gnutls.library.constants
628
.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)
629
417
# Verify the self signature in the key
630
crtverify = ctypes.c_uint()
631
(gnutls.library.functions
632
.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))
633
421
if crtverify.value != 0:
634
422
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
635
423
raise gnutls.errors.CertificateSecurityError("Verify failed")
636
424
# New buffer for the fingerprint
637
buf = ctypes.create_string_buffer(20)
638
buf_len = ctypes.c_size_t()
425
buffer = ctypes.create_string_buffer(20)
426
buffer_length = ctypes.c_size_t()
639
427
# Get the fingerprint from the certificate into the buffer
640
(gnutls.library.functions
641
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
642
ctypes.byref(buf_len)))
428
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
429
(crt, ctypes.byref(buffer), ctypes.byref(buffer_length))
643
430
# Deinit the certificate
644
431
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
645
432
# Convert the buffer to a Python bytestring
646
fpr = ctypes.string_at(buf, buf_len.value)
433
fpr = ctypes.string_at(buffer, buffer_length.value)
647
434
# Convert the bytestring to hexadecimal notation
648
435
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
649
436
return hex_fpr
650
437
651
438
652
class TCP_handler(SocketServer.BaseRequestHandler, object):
439
class tcp_handler(SocketServer.BaseRequestHandler, object):
653
440
"""A TCP request handler class.
654
441
Instantiated by IPv6_TCPServer for each request to handle it.
655
442
Note: This will run in its own forked process."""
656
443
657
444
def handle(self):
658
445
logger.info(u"TCP connection from: %s",
659
unicode(self.client_address))
660
session = (gnutls.connection
661
.ClientSession(self.request,
662
gnutls.connection
663
.X509Credentials()))
446
unicode(self.client_address))
447
session = gnutls.connection.ClientSession\
448
(self.request, gnutls.connection.X509Credentials())
664
449
665
450
line = self.request.makefile().readline()
666
451
logger.debug(u"Protocol version: %r", line)
677
462
# using OpenPGP certificates.
678
463
679
464
#priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
680
# "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
681
# "+DHE-DSS"))
682
# Use a fallback default, since this MUST be set.
683
priority = self.server.settings.get("priority", "NORMAL")
684
(gnutls.library.functions
685
.gnutls_priority_set_direct(session._c_object,
686
priority, None))
465
# "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
466
# "+DHE-DSS"))
467
priority = "NORMAL" # Fallback default, since this
468
# MUST be set.
469
if self.server.settings["priority"]:
470
priority = self.server.settings["priority"]
471
gnutls.library.functions.gnutls_priority_set_direct\
472
(session._c_object, priority, None);
687
473
688
474
try:
689
475
session.handshake()
692
478
# Do not run session.bye() here: the session is not
693
479
# established. Just abandon the request.
694
480
return
695
logger.debug(u"Handshake succeeded")
696
481
try:
697
482
fpr = fingerprint(peer_certificate(session))
698
483
except (TypeError, gnutls.errors.GNUTLSError), error:
700
485
session.bye()
701
486
return
702
487
logger.debug(u"Fingerprint: %s", fpr)
703
488
client = None
704
489
for c in self.server.clients:
705
490
if c.fingerprint == fpr:
706
491
client = c
707
492
break
708
else:
493
if not client:
709
494
logger.warning(u"Client not found for fingerprint: %s",
710
495
fpr)
711
496
session.bye()
718
503
vars(client))
719
504
session.bye()
720
505
return
721
## This won't work here, since we're in a fork.
722
# client.checked_ok()
723
506
sent_size = 0
724
507
while sent_size < len(client.secret):
725
508
sent = session.send(client.secret[sent_size:])
730
513
session.bye()
731
514
732
515
733
class IPv6_TCPServer(SocketServer.ForkingMixIn,
734
SocketServer.TCPServer, object):
516
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
735
517
"""IPv6 TCP server. Accepts 'None' as address and/or port.
736
518
Attributes:
737
519
settings: Server settings
747
529
self.clients = kwargs["clients"]
748
530
del kwargs["clients"]
749
531
self.enabled = False
750
super(IPv6_TCPServer, self).__init__(*args, **kwargs)
532
return super(type(self), self).__init__(*args, **kwargs)
751
533
def server_bind(self):
752
534
"""This overrides the normal server_bind() function
753
535
to bind to an interface if one was specified, and also NOT to
765
547
u" bind to interface %s",
766
548
self.settings["interface"])
767
549
else:
768
raise
550
raise error
769
551
# Only bind(2) the socket if we really need to.
770
552
if self.server_address[0] or self.server_address[1]:
771
553
if not self.server_address[0]:
782
564
# if_nametoindex
783
565
# (self.settings
784
566
# ["interface"]))
785
return super(IPv6_TCPServer, self).server_bind()
567
return super(type(self), self).server_bind()
786
568
def server_activate(self):
787
569
if self.enabled:
788
return super(IPv6_TCPServer, self).server_activate()
570
return super(type(self), self).server_activate()
789
571
def enable(self):
790
572
self.enabled = True
791
573
792
574
793
575
def string_to_delta(interval):
794
576
"""Parse a string and return a datetime.timedelta
795
577
796
578
>>> string_to_delta('7d')
797
579
datetime.timedelta(7)
798
580
>>> string_to_delta('60s')
809
591
timevalue = datetime.timedelta(0)
810
592
for s in interval.split():
811
593
try:
812
suffix = unicode(s[-1])
813
value = int(s[:-1])
594
suffix=unicode(s[-1])
595
value=int(s[:-1])
814
596
if suffix == u"d":
815
597
delta = datetime.timedelta(value)
816
598
elif suffix == u"s":
850
632
elif state == avahi.ENTRY_GROUP_FAILURE:
851
633
logger.critical(u"Avahi: Error in group state changed %s",
852
634
unicode(error))
853
raise AvahiGroupError(u"State changed: %s" % unicode(error))
635
raise AvahiGroupError("State changed: %s", str(error))
854
636
855
637
def if_nametoindex(interface):
856
638
"""Call the C function if_nametoindex(), or equivalent"""
857
639
global if_nametoindex
858
640
try:
859
if_nametoindex = (ctypes.cdll.LoadLibrary
860
(ctypes.util.find_library("c"))
861
.if_nametoindex)
641
if "ctypes.util" not in sys.modules:
642
import ctypes.util
643
if_nametoindex = ctypes.cdll.LoadLibrary\
644
(ctypes.util.find_library("c")).if_nametoindex
862
645
except (OSError, AttributeError):
863
646
if "struct" not in sys.modules:
864
647
import struct
867
650
def if_nametoindex(interface):
868
651
"Get an interface index the hard way, i.e. using fcntl()"
869
652
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
870
with closing(socket.socket()) as s:
871
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
872
struct.pack("16s16x", interface))
653
s = socket.socket()
654
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
655
struct.pack("16s16x", interface))
656
s.close()
873
657
interface_index = struct.unpack("I", ifreq[16:20])[0]
874
658
return interface_index
875
659
return if_nametoindex(interface)
899
683
900
684
901
685
def main():
902
parser = optparse.OptionParser(version = "%%prog %s" % version)
686
global main_loop_started
687
main_loop_started = False
688
689
parser = OptionParser(version = "%%prog %s" % version)
903
690
parser.add_option("-i", "--interface", type="string",
904
691
metavar="IF", help="Bind to interface IF")
905
692
parser.add_option("-a", "--address", type="string",
906
693
help="Address to listen for requests on")
907
694
parser.add_option("-p", "--port", type="int",
908
695
help="Port number to receive requests on")
909
parser.add_option("--check", action="store_true",
696
parser.add_option("--check", action="store_true", default=False,
910
697
help="Run self-test")
911
698
parser.add_option("--debug", action="store_true",
912
699
help="Debug mode; run in foreground and log to"
919
706
default="/etc/mandos", metavar="DIR",
920
707
help="Directory to search for configuration"
921
708
" files")
922
parser.add_option("--no-dbus", action="store_false",
923
dest="use_dbus",
924
help="Do not provide D-Bus system bus"
925
" interface")
926
options = parser.parse_args()[0]
709
(options, args) = parser.parse_args()
927
710
928
711
if options.check:
929
712
import doctest
938
721
"priority":
939
722
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
940
723
"servicename": "Mandos",
941
"use_dbus": "True",
942
724
}
943
725
944
726
# Parse config file for server-global settings
947
729
server_config.read(os.path.join(options.configdir, "mandos.conf"))
948
730
# Convert the SafeConfigParser object to a dict
949
731
server_settings = server_config.defaults()
950
# Use the appropriate methods on the non-string config options
951
server_settings["debug"] = server_config.getboolean("DEFAULT",
952
"debug")
953
server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
954
"use_dbus")
955
if server_settings["port"]:
956
server_settings["port"] = server_config.getint("DEFAULT",
957
"port")
732
# Use getboolean on the boolean config option
733
server_settings["debug"] = server_config.getboolean\
734
("DEFAULT", "debug")
958
735
del server_config
959
736
960
737
# Override the settings from the config file with command line
961
738
# options, if set.
962
739
for option in ("interface", "address", "port", "debug",
963
"priority", "servicename", "configdir",
964
"use_dbus"):
740
"priority", "servicename", "configdir"):
965
741
value = getattr(options, option)
966
742
if value is not None:
967
743
server_settings[option] = value
968
744
del options
969
745
# Now we have our good server settings in "server_settings"
970
746
971
# For convenience
972
747
debug = server_settings["debug"]
973
use_dbus = server_settings["use_dbus"]
974
748
975
749
if not debug:
976
750
syslogger.setLevel(logging.WARNING)
977
751
console.setLevel(logging.WARNING)
978
752
979
753
if server_settings["servicename"] != "Mandos":
980
syslogger.setFormatter(logging.Formatter
754
syslogger.setFormatter(logging.Formatter\
981
755
('Mandos (%s): %%(levelname)s:'
982
756
' %%(message)s'
983
757
% server_settings["servicename"]))
985
759
# Parse config file with clients
986
760
client_defaults = { "timeout": "1h",
987
761
"interval": "5m",
988
"checker": "fping -q -- %%(host)s",
762
"checker": "fping -q -- %(host)s",
989
763
"host": "",
990
764
}
991
765
client_config = ConfigParser.SafeConfigParser(client_defaults)
995
769
clients = Set()
996
770
tcp_server = IPv6_TCPServer((server_settings["address"],
997
771
server_settings["port"]),
998
TCP_handler,
772
tcp_handler,
999
773
settings=server_settings,
1000
774
clients=clients)
1001
775
pidfilename = "/var/run/mandos.pid"
1002
776
try:
1003
777
pidfile = open(pidfilename, "w")
1004
except IOError:
778
except IOError, error:
1005
779
logger.error("Could not open file %r", pidfilename)
1006
780
1007
try:
1008
uid = pwd.getpwnam("_mandos").pw_uid
1009
gid = pwd.getpwnam("_mandos").pw_gid
1010
except KeyError:
1011
try:
1012
uid = pwd.getpwnam("mandos").pw_uid
1013
gid = pwd.getpwnam("mandos").pw_gid
1014
except KeyError:
1015
try:
1016
uid = pwd.getpwnam("nobody").pw_uid
1017
gid = pwd.getpwnam("nogroup").pw_gid
1018
except KeyError:
1019
uid = 65534
1020
gid = 65534
1021
try:
781
uid = 65534
782
gid = 65534
783
try:
784
uid = pwd.getpwnam("mandos").pw_uid
785
except KeyError:
786
try:
787
uid = pwd.getpwnam("nobody").pw_uid
788
except KeyError:
789
pass
790
try:
791
gid = pwd.getpwnam("mandos").pw_gid
792
except KeyError:
793
try:
794
gid = pwd.getpwnam("nogroup").pw_gid
795
except KeyError:
796
pass
797
try:
798
os.setuid(uid)
1022
799
os.setgid(gid)
1023
os.setuid(uid)
1024
800
except OSError, error:
1025
801
if error[0] != errno.EPERM:
1026
802
raise error
1027
803
1028
# Enable all possible GnuTLS debugging
1029
if debug:
1030
# "Use a log level over 10 to enable all debugging options."
1031
# - GnuTLS manual
1032
gnutls.library.functions.gnutls_global_set_log_level(11)
1033
1034
@gnutls.library.types.gnutls_log_func
1035
def debug_gnutls(level, string):
1036
logger.debug("GnuTLS: %s", string[:-1])
1037
1038
(gnutls.library.functions
1039
.gnutls_global_set_log_function(debug_gnutls))
1040
1041
804
global service
1042
805
service = AvahiService(name = server_settings["servicename"],
1043
servicetype = "_mandos._tcp", )
806
type = "_mandos._tcp", );
1044
807
if server_settings["interface"]:
1045
service.interface = (if_nametoindex
1046
(server_settings["interface"]))
808
service.interface = if_nametoindex\
809
(server_settings["interface"])
1047
810
1048
811
global main_loop
1049
812
global bus
1056
819
avahi.DBUS_PATH_SERVER),
1057
820
avahi.DBUS_INTERFACE_SERVER)
1058
821
# End of Avahi example code
1059
if use_dbus:
1060
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
822
823
def remove_from_clients(client):
824
clients.remove(client)
825
if not clients:
826
logger.critical(u"No clients left, exiting")
827
sys.exit()
1061
828
1062
829
clients.update(Set(Client(name = section,
830
stop_hook = remove_from_clients,
1063
831
config
1064
= dict(client_config.items(section)),
1065
use_dbus = use_dbus)
832
= dict(client_config.items(section)))
1066
833
for section in client_config.sections()))
1067
834
if not clients:
1068
logger.warning(u"No clients defined")
835
logger.critical(u"No clients defined")
836
sys.exit(1)
1069
837
1070
838
if debug:
1071
839
# Redirect stdin so all checkers get /dev/null
1084
852
pidfile.write(str(pid) + "\n")
1085
853
pidfile.close()
1086
854
del pidfile
1087
except IOError:
855
except IOError, err:
1088
856
logger.error(u"Could not write to file %r with PID %d",
1089
857
pidfilename, pid)
1090
858
except NameError:
1103
871
1104
872
while clients:
1105
873
client = clients.pop()
1106
client.disable_hook = None
1107
client.disable()
874
client.stop_hook = None
875
client.stop()
1108
876
1109
877
atexit.register(cleanup)
1110
878
1113
881
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1114
882
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1115
883
1116
if use_dbus:
1117
class MandosServer(dbus.service.Object):
1118
"""A D-Bus proxy object"""
1119
def __init__(self):
1120
dbus.service.Object.__init__(self, bus, "/")
1121
_interface = u"se.bsnet.fukt.Mandos"
1122
1123
@dbus.service.signal(_interface, signature="oa{sv}")
1124
def ClientAdded(self, objpath, properties):
1125
"D-Bus signal"
1126
pass
1127
1128
@dbus.service.signal(_interface, signature="os")
1129
def ClientRemoved(self, objpath, name):
1130
"D-Bus signal"
1131
pass
1132
1133
@dbus.service.method(_interface, out_signature="ao")
1134
def GetAllClients(self):
1135
"D-Bus method"
1136
return dbus.Array(c.dbus_object_path for c in clients)
1137
1138
@dbus.service.method(_interface, out_signature="a{oa{sv}}")
1139
def GetAllClientsWithProperties(self):
1140
"D-Bus method"
1141
return dbus.Dictionary(
1142
((c.dbus_object_path, c.GetAllProperties())
1143
for c in clients),
1144
signature="oa{sv}")
1145
1146
@dbus.service.method(_interface, in_signature="o")
1147
def RemoveClient(self, object_path):
1148
"D-Bus method"
1149
for c in clients:
1150
if c.dbus_object_path == object_path:
1151
clients.remove(c)
1152
# Don't signal anything except ClientRemoved
1153
c.use_dbus = False
1154
c.disable()
1155
# Emit D-Bus signal
1156
self.ClientRemoved(object_path, c.name)
1157
return
1158
raise KeyError
1159
1160
del _interface
1161
1162
mandos_server = MandosServer()
1163
1164
884
for client in clients:
1165
if use_dbus:
1166
# Emit D-Bus signal
1167
mandos_server.ClientAdded(client.dbus_object_path,
1168
client.GetAllProperties())
1169
client.enable()
885
client.start()
1170
886
1171
887
tcp_server.enable()
1172
888
tcp_server.server_activate()
1190
906
1191
907
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1192
908
lambda *args, **kwargs:
1193
(tcp_server.handle_request
1194
(*args[2:], **kwargs) or True))
909
tcp_server.handle_request\
910
(*args[2:], **kwargs) or True)
1195
911
1196
912
logger.debug(u"Starting main loop")
913
main_loop_started = True
1197
914
main_loop.run()
1198
915
except AvahiError, error:
1199
logger.critical(u"AvahiError: %s", error)
916
logger.critical(u"AvahiError: %s" + unicode(error))
1200
917
sys.exit(1)
1201
918
except KeyboardInterrupt:
1202
919
if debug:
1203
print >> sys.stderr
1204
logger.debug("Server received KeyboardInterrupt")
1205
logger.debug("Server exiting")
920
print
1206
921
1207
922
if __name__ == '__main__':
1208
923
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0