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 217
- compare with another revision
- download diff
- download tarball
- view history from revision 217
- Committer: Teddy Hogeborn
- Date: 2008-09-30 07:23:39 UTC
- Revision ID: teddy@fukt.bsnet.se-20080930072339-jn15gyrtfpdk2dhx
* .bzrignore: Added "man" directory (created by "make install-html").
* Makefile: Add "common.ent" dependency to all manual pages.
(htmldir, version, SED): New variables.
(CFLAGS): Add -D option to define VERSION to $(version).
(MANPOST, HTMLPOST): Use $(SED).
(PROGS): Use $(CPROGS)
(CPROGS): New; C-only programs.
(objects): Use $(CPROGS).
(common.ent, mandos, mandos-keygen): New targets; update version
number to $(version).
(clean): Use $(CPROGS).
(check): Depend on "all".
(install-html): Install to $(htmldir).
* common.ent: New file with "version" entity.
* mandos-clients.conf.xml: Use "common.ent".
* mandos-keygen.xml: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
* plugin-runner.xml: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.xml: - '' -
* plugin-runner.c (argp_program_version): Use VERSION.
* plugins.d/mandos-client.c (argp_program_version): - '' -
* plugins.d/password-prompt.c (argp_program_version): - '' -
* Makefile: Add "common.ent" dependency to all manual pages.
(htmldir, version, SED): New variables.
(CFLAGS): Add -D option to define VERSION to $(version).
(MANPOST, HTMLPOST): Use $(SED).
(PROGS): Use $(CPROGS)
(CPROGS): New; C-only programs.
(objects): Use $(CPROGS).
(common.ent, mandos, mandos-keygen): New targets; update version
number to $(version).
(clean): Use $(CPROGS).
(check): Depend on "all".
(install-html): Install to $(htmldir).
* common.ent: New file with "version" entity.
* mandos-clients.conf.xml: Use "common.ent".
* mandos-keygen.xml: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
* plugin-runner.xml: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.xml: - '' -
* plugin-runner.c (argp_program_version): Use VERSION.
* plugins.d/mandos-client.c (argp_program_version): - '' -
* plugins.d/password-prompt.c (argp_program_version): - '' -
- 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 © 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
from optparse import OptionParser
39
38
import datetime
40
39
import errno
41
40
import gnutls.crypto
56
55
import logging
57
56
import logging.handlers
58
57
import pwd
59
from contextlib import closing
60
58
61
59
import dbus
62
import dbus.service
63
60
import gobject
64
61
import avahi
65
62
from dbus.mainloop.glib import DBusGMainLoop
66
63
import ctypes
67
64
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
super(AvahiError, self).__init__()
85
def __str__(self):
86
return repr(self.value)
91
87
92
88
class AvahiServiceError(AvahiError):
93
89
pass
113
109
a sensible number of times
114
110
"""
115
111
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
116
servicetype = None, port = None, TXT = None,
117
domain = "", host = "", max_renames = 32768):
112
servicetype = None, port = None, TXT = None, domain = "",
113
host = "", max_renames = 32768):
118
114
self.interface = interface
119
115
self.name = name
120
116
self.type = servicetype
121
117
self.port = port
122
self.TXT = TXT if TXT is not None else []
118
if TXT is None:
119
self.TXT = []
120
else:
121
self.TXT = TXT
123
122
self.domain = domain
124
123
self.host = host
125
124
self.rename_count = 0
130
129
logger.critical(u"No suitable Zeroconf service name found"
131
130
u" after %i retries, exiting.",
132
131
self.rename_count)
133
raise AvahiServiceError(u"Too many renames")
132
raise AvahiServiceError("Too many renames")
134
133
self.name = server.GetAlternativeServiceName(self.name)
135
134
logger.info(u"Changing Zeroconf service name to %r ...",
136
135
str(self.name))
137
syslogger.setFormatter(logging.Formatter
136
syslogger.setFormatter(logging.Formatter\
138
137
('Mandos (%s): %%(levelname)s:'
139
' %%(message)s' % self.name))
138
' %%(message)s' % self.name))
140
139
self.remove()
141
140
self.add()
142
141
self.rename_count += 1
148
147
"""Derived from the Avahi example code"""
149
148
global group
150
149
if group is None:
151
group = dbus.Interface(bus.get_object
152
(avahi.DBUS_NAME,
150
group = dbus.Interface\
151
(bus.get_object(avahi.DBUS_NAME,
153
152
server.EntryGroupNew()),
154
avahi.DBUS_INTERFACE_ENTRY_GROUP)
153
avahi.DBUS_INTERFACE_ENTRY_GROUP)
155
154
group.connect_to_signal('StateChanged',
156
155
entry_group_state_changed)
157
156
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
171
170
# End of Avahi example code
172
171
173
172
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):
173
class Client(object):
180
174
"""A representation of a client host served by this server.
181
175
Attributes:
182
name: string; from the config file, used in log messages and
183
D-Bus identifiers
176
name: string; from the config file, used in log messages
184
177
fingerprint: string (40 or 32 hexadecimal digits); used to
185
178
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.
179
secret: bytestring; sent verbatim (over TLS) to client
180
host: string; available for use by the checker command
181
created: datetime.datetime(); object creation, not client host
182
last_checked_ok: datetime.datetime() or None if not yet checked OK
183
timeout: datetime.timedelta(); How long from last_checked_ok
184
until this client is invalid
185
interval: datetime.timedelta(); How often to start a new checker
186
stop_hook: If set, called by stop() as stop_hook(self)
187
checker: subprocess.Popen(); a running checker process used
188
to see if the client lives.
189
'None' if no process is running.
199
190
checker_initiator_tag: a gobject event source tag, or None
200
disable_initiator_tag: - '' -
191
stop_initiator_tag: - '' -
201
192
checker_callback_tag: - '' -
202
193
checker_command: string; External command which is run to check if
203
194
client lives. %() expansions are done at
204
195
runtime with vars(self) as dict, so that for
205
196
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
197
Private attibutes:
198
_timeout: Real variable for 'timeout'
199
_interval: Real variable for 'interval'
200
_timeout_milliseconds: Used when calling gobject.timeout_add()
201
_interval_milliseconds: - '' -
208
202
"""
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):
203
def _set_timeout(self, timeout):
204
"Setter function for 'timeout' attribute"
205
self._timeout = timeout
206
self._timeout_milliseconds = ((self.timeout.days
207
* 24 * 60 * 60 * 1000)
208
+ (self.timeout.seconds * 1000)
209
+ (self.timeout.microseconds
210
// 1000))
211
timeout = property(lambda self: self._timeout,
212
_set_timeout)
213
del _set_timeout
214
def _set_interval(self, interval):
215
"Setter function for 'interval' attribute"
216
self._interval = interval
217
self._interval_milliseconds = ((self.interval.days
218
* 24 * 60 * 60 * 1000)
219
+ (self.interval.seconds
220
* 1000)
221
+ (self.interval.microseconds
222
// 1000))
223
interval = property(lambda self: self._interval,
224
_set_interval)
225
del _set_interval
226
def __init__(self, name = None, stop_hook=None, config=None):
223
227
"""Note: the 'checker' key in 'config' sets the
224
228
'checker_command' attribute and *not* the 'checker'
225
229
attribute."""
226
self.name = name
227
230
if config is None:
228
231
config = {}
232
self.name = name
229
233
logger.debug(u"Creating client %r", self.name)
230
self.use_dbus = False # During __init__
231
234
# Uppercase and remove spaces from fingerprint for later
232
235
# comparison purposes with return value from the fingerprint()
233
236
# function
234
self.fingerprint = (config["fingerprint"].upper()
235
.replace(u" ", u""))
237
self.fingerprint = config["fingerprint"].upper()\
238
.replace(u" ", u"")
236
239
logger.debug(u" Fingerprint: %s", self.fingerprint)
237
240
if "secret" in config:
238
241
self.secret = config["secret"].decode(u"base64")
239
242
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()
243
secfile = open(config["secfile"])
244
self.secret = secfile.read()
245
secfile.close()
244
246
else:
245
247
raise TypeError(u"No secret or secfile for client %s"
246
248
% self.name)
247
249
self.host = config.get("host", "")
248
self.created = datetime.datetime.utcnow()
249
self.enabled = False
250
self.last_enabled = None
250
self.created = datetime.datetime.now()
251
251
self.last_checked_ok = None
252
252
self.timeout = string_to_delta(config["timeout"])
253
253
self.interval = string_to_delta(config["interval"])
254
self.disable_hook = disable_hook
254
self.stop_hook = stop_hook
255
255
self.checker = None
256
256
self.checker_initiator_tag = None
257
self.disable_initiator_tag = None
257
self.stop_initiator_tag = None
258
258
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):
259
self.check_command = config["checker"]
260
def start(self):
272
261
"""Start this client's checker and timeout hooks"""
273
self.last_enabled = datetime.datetime.utcnow()
274
262
# Schedule a new checker to be started an 'interval' from now,
275
263
# and every interval from then on.
276
self.checker_initiator_tag = (gobject.timeout_add
277
(self.interval_milliseconds(),
278
self.start_checker))
264
self.checker_initiator_tag = gobject.timeout_add\
265
(self._interval_milliseconds,
266
self.start_checker)
279
267
# Also start a new checker *right now*.
280
268
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):
269
# Schedule a stop() when 'timeout' has passed
270
self.stop_initiator_tag = gobject.timeout_add\
271
(self._timeout_milliseconds,
272
self.stop)
273
def stop(self):
274
"""Stop this client.
275
The possibility that a client might be restarted is left open,
276
but not currently used."""
277
# If this client doesn't have a secret, it is already stopped.
278
if hasattr(self, "secret") and self.secret:
279
logger.info(u"Stopping client %s", self.name)
280
self.secret = None
281
else:
297
282
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
283
if getattr(self, "stop_initiator_tag", False):
284
gobject.source_remove(self.stop_initiator_tag)
285
self.stop_initiator_tag = None
302
286
if getattr(self, "checker_initiator_tag", False):
303
287
gobject.source_remove(self.checker_initiator_tag)
304
288
self.checker_initiator_tag = None
305
289
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))
290
if self.stop_hook:
291
self.stop_hook(self)
313
292
# Do not run this again if called by a gobject.timeout_add
314
293
return False
315
316
294
def __del__(self):
317
self.disable_hook = None
318
self.disable()
319
320
def checker_callback(self, pid, condition, command):
295
self.stop_hook = None
296
self.stop()
297
def checker_callback(self, pid, condition):
321
298
"""The checker has completed, so take appropriate actions."""
299
now = datetime.datetime.now()
322
300
self.checker_callback_tag = None
323
301
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:
302
if os.WIFEXITED(condition) \
303
and (os.WEXITSTATUS(condition) == 0):
304
logger.info(u"Checker for %(name)s succeeded",
305
vars(self))
306
self.last_checked_ok = now
307
gobject.source_remove(self.stop_initiator_tag)
308
self.stop_initiator_tag = gobject.timeout_add\
309
(self._timeout_milliseconds,
310
self.stop)
311
elif not os.WIFEXITED(condition):
343
312
logger.warning(u"Checker for %(name)s crashed?",
344
313
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
314
else:
315
logger.info(u"Checker for %(name)s failed",
316
vars(self))
368
317
def start_checker(self):
369
318
"""Start a new checker subprocess if one is not running.
370
319
If a checker already exists, leave it running and do
379
328
# is as it should be.
380
329
if self.checker is None:
381
330
try:
382
# In case checker_command has exactly one % operator
383
command = self.checker_command % self.host
331
# In case check_command has exactly one % operator
332
command = self.check_command % self.host
384
333
except TypeError:
385
334
# Escape attributes for the shell
386
335
escaped_attrs = dict((key, re.escape(str(val)))
387
336
for key, val in
388
337
vars(self).iteritems())
389
338
try:
390
command = self.checker_command % escaped_attrs
339
command = self.check_command % escaped_attrs
391
340
except TypeError, error:
392
341
logger.error(u'Could not format string "%s":'
393
u' %s', self.checker_command, error)
342
u' %s', self.check_command, error)
394
343
return True # Try again later
395
344
try:
396
345
logger.info(u"Starting checker %r for %s",
402
351
self.checker = subprocess.Popen(command,
403
352
close_fds=True,
404
353
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))
354
self.checker_callback_tag = gobject.child_watch_add\
355
(self.checker.pid,
356
self.checker_callback)
415
357
except OSError, error:
416
358
logger.error(u"Failed to start subprocess: %s",
417
359
error)
418
360
# Re-run this periodically if run by gobject.timeout_add
419
361
return True
420
421
362
def stop_checker(self):
422
363
"""Force the checker process, if any, to stop."""
423
364
if self.checker_callback_tag:
435
376
if error.errno != errno.ESRCH: # No such process
436
377
raise
437
378
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
379
def still_valid(self):
443
380
"""Has the timeout not yet passed for this client?"""
444
if not getattr(self, "enabled", False):
445
return False
446
now = datetime.datetime.utcnow()
381
now = datetime.datetime.now()
447
382
if self.last_checked_ok is None:
448
383
return now < (self.created + self.timeout)
449
384
else:
450
385
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
386
590
387
591
388
def peer_certificate(session):
592
389
"Return the peer's OpenPGP certificate as a bytestring"
593
390
# 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):
391
if gnutls.library.functions.gnutls_certificate_type_get\
392
(session._c_object) \
393
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP:
597
394
# ...do the normal thing
598
395
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")
396
list_size = ctypes.c_uint()
397
cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
398
(session._c_object, ctypes.byref(list_size))
606
399
if list_size.value == 0:
607
400
return None
608
401
cert = cert_list[0]
612
405
def fingerprint(openpgp):
613
406
"Convert an OpenPGP bytestring to a hexdigit fingerprint string"
614
407
# 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))))
408
datum = gnutls.library.types.gnutls_datum_t\
409
(ctypes.cast(ctypes.c_char_p(openpgp),
410
ctypes.POINTER(ctypes.c_ubyte)),
411
ctypes.c_uint(len(openpgp)))
620
412
# New empty GnuTLS certificate
621
413
crt = gnutls.library.types.gnutls_openpgp_crt_t()
622
(gnutls.library.functions
623
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
414
gnutls.library.functions.gnutls_openpgp_crt_init\
415
(ctypes.byref(crt))
624
416
# 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))
417
gnutls.library.functions.gnutls_openpgp_crt_import\
418
(crt, ctypes.byref(datum),
419
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
629
420
# Verify the self signature in the key
630
421
crtverify = ctypes.c_uint()
631
(gnutls.library.functions
632
.gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
422
gnutls.library.functions.gnutls_openpgp_crt_verify_self\
423
(crt, 0, ctypes.byref(crtverify))
633
424
if crtverify.value != 0:
634
425
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
635
426
raise gnutls.errors.CertificateSecurityError("Verify failed")
637
428
buf = ctypes.create_string_buffer(20)
638
429
buf_len = ctypes.c_size_t()
639
430
# 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)))
431
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
432
(crt, ctypes.byref(buf), ctypes.byref(buf_len))
643
433
# Deinit the certificate
644
434
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
645
435
# Convert the buffer to a Python bytestring
656
446
657
447
def handle(self):
658
448
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()))
449
unicode(self.client_address))
450
session = gnutls.connection.ClientSession\
451
(self.request, gnutls.connection.X509Credentials())
664
452
665
453
line = self.request.makefile().readline()
666
454
logger.debug(u"Protocol version: %r", line)
677
465
# using OpenPGP certificates.
678
466
679
467
#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))
468
# "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
469
# "+DHE-DSS"))
470
priority = "NORMAL" # Fallback default, since this
471
# MUST be set.
472
if self.server.settings["priority"]:
473
priority = self.server.settings["priority"]
474
gnutls.library.functions.gnutls_priority_set_direct\
475
(session._c_object, priority, None)
687
476
688
477
try:
689
478
session.handshake()
692
481
# Do not run session.bye() here: the session is not
693
482
# established. Just abandon the request.
694
483
return
695
logger.debug(u"Handshake succeeded")
696
484
try:
697
485
fpr = fingerprint(peer_certificate(session))
698
486
except (TypeError, gnutls.errors.GNUTLSError), error:
700
488
session.bye()
701
489
return
702
490
logger.debug(u"Fingerprint: %s", fpr)
703
491
client = None
704
492
for c in self.server.clients:
705
493
if c.fingerprint == fpr:
706
494
client = c
707
495
break
708
else:
496
if not client:
709
497
logger.warning(u"Client not found for fingerprint: %s",
710
498
fpr)
711
499
session.bye()
718
506
vars(client))
719
507
session.bye()
720
508
return
721
## This won't work here, since we're in a fork.
722
# client.checked_ok()
723
509
sent_size = 0
724
510
while sent_size < len(client.secret):
725
511
sent = session.send(client.secret[sent_size:])
730
516
session.bye()
731
517
732
518
733
class IPv6_TCPServer(SocketServer.ForkingMixIn,
734
SocketServer.TCPServer, object):
519
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
735
520
"""IPv6 TCP server. Accepts 'None' as address and/or port.
736
521
Attributes:
737
522
settings: Server settings
765
550
u" bind to interface %s",
766
551
self.settings["interface"])
767
552
else:
768
raise
553
raise error
769
554
# Only bind(2) the socket if we really need to.
770
555
if self.server_address[0] or self.server_address[1]:
771
556
if not self.server_address[0]:
792
577
793
578
def string_to_delta(interval):
794
579
"""Parse a string and return a datetime.timedelta
795
580
796
581
>>> string_to_delta('7d')
797
582
datetime.timedelta(7)
798
583
>>> string_to_delta('60s')
850
635
elif state == avahi.ENTRY_GROUP_FAILURE:
851
636
logger.critical(u"Avahi: Error in group state changed %s",
852
637
unicode(error))
853
raise AvahiGroupError(u"State changed: %s" % unicode(error))
638
raise AvahiGroupError("State changed: %s", str(error))
854
639
855
640
def if_nametoindex(interface):
856
641
"""Call the C function if_nametoindex(), or equivalent"""
857
642
global if_nametoindex
858
643
try:
859
if_nametoindex = (ctypes.cdll.LoadLibrary
860
(ctypes.util.find_library("c"))
861
.if_nametoindex)
644
if_nametoindex = ctypes.cdll.LoadLibrary\
645
(ctypes.util.find_library("c")).if_nametoindex
862
646
except (OSError, AttributeError):
863
647
if "struct" not in sys.modules:
864
648
import struct
867
651
def if_nametoindex(interface):
868
652
"Get an interface index the hard way, i.e. using fcntl()"
869
653
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))
654
s = socket.socket()
655
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
656
struct.pack("16s16x", interface))
657
s.close()
873
658
interface_index = struct.unpack("I", ifreq[16:20])[0]
874
659
return interface_index
875
660
return if_nametoindex(interface)
899
684
900
685
901
686
def main():
902
parser = optparse.OptionParser(version = "%%prog %s" % version)
687
parser = OptionParser(version = "%%prog %s" % version)
903
688
parser.add_option("-i", "--interface", type="string",
904
689
metavar="IF", help="Bind to interface IF")
905
690
parser.add_option("-a", "--address", type="string",
906
691
help="Address to listen for requests on")
907
692
parser.add_option("-p", "--port", type="int",
908
693
help="Port number to receive requests on")
909
parser.add_option("--check", action="store_true",
694
parser.add_option("--check", action="store_true", default=False,
910
695
help="Run self-test")
911
696
parser.add_option("--debug", action="store_true",
912
697
help="Debug mode; run in foreground and log to"
919
704
default="/etc/mandos", metavar="DIR",
920
705
help="Directory to search for configuration"
921
706
" 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
707
options = parser.parse_args()[0]
927
708
928
709
if options.check:
938
719
"priority":
939
720
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
940
721
"servicename": "Mandos",
941
"use_dbus": "True",
942
722
}
943
723
944
724
# Parse config file for server-global settings
947
727
server_config.read(os.path.join(options.configdir, "mandos.conf"))
948
728
# Convert the SafeConfigParser object to a dict
949
729
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")
730
# Use getboolean on the boolean config option
731
server_settings["debug"] = server_config.getboolean\
732
("DEFAULT", "debug")
958
733
del server_config
959
734
960
735
# Override the settings from the config file with command line
961
736
# options, if set.
962
737
for option in ("interface", "address", "port", "debug",
963
"priority", "servicename", "configdir",
964
"use_dbus"):
738
"priority", "servicename", "configdir"):
965
739
value = getattr(options, option)
966
740
if value is not None:
967
741
server_settings[option] = value
968
742
del options
969
743
# Now we have our good server settings in "server_settings"
970
744
971
# For convenience
972
745
debug = server_settings["debug"]
973
use_dbus = server_settings["use_dbus"]
974
746
975
747
if not debug:
976
748
syslogger.setLevel(logging.WARNING)
977
749
console.setLevel(logging.WARNING)
978
750
979
751
if server_settings["servicename"] != "Mandos":
980
syslogger.setFormatter(logging.Formatter
752
syslogger.setFormatter(logging.Formatter\
981
753
('Mandos (%s): %%(levelname)s:'
982
754
' %%(message)s'
983
755
% server_settings["servicename"]))
985
757
# Parse config file with clients
986
758
client_defaults = { "timeout": "1h",
987
759
"interval": "5m",
988
"checker": "fping -q -- %%(host)s",
760
"checker": "fping -q -- %(host)s",
989
761
"host": "",
990
762
}
991
763
client_config = ConfigParser.SafeConfigParser(client_defaults)
1001
773
pidfilename = "/var/run/mandos.pid"
1002
774
try:
1003
775
pidfile = open(pidfilename, "w")
1004
except IOError:
776
except IOError, error:
1005
777
logger.error("Could not open file %r", pidfilename)
1006
778
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:
779
uid = 65534
780
gid = 65534
781
try:
782
uid = pwd.getpwnam("mandos").pw_uid
783
except KeyError:
784
try:
785
uid = pwd.getpwnam("nobody").pw_uid
786
except KeyError:
787
pass
788
try:
789
gid = pwd.getpwnam("mandos").pw_gid
790
except KeyError:
791
try:
792
gid = pwd.getpwnam("nogroup").pw_gid
793
except KeyError:
794
pass
795
try:
796
os.setuid(uid)
1022
797
os.setgid(gid)
1023
os.setuid(uid)
1024
798
except OSError, error:
1025
799
if error[0] != errno.EPERM:
1026
800
raise error
1027
801
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
802
global service
1042
803
service = AvahiService(name = server_settings["servicename"],
1043
804
servicetype = "_mandos._tcp", )
1044
805
if server_settings["interface"]:
1045
service.interface = (if_nametoindex
1046
(server_settings["interface"]))
806
service.interface = if_nametoindex\
807
(server_settings["interface"])
1047
808
1048
809
global main_loop
1049
810
global bus
1056
817
avahi.DBUS_PATH_SERVER),
1057
818
avahi.DBUS_INTERFACE_SERVER)
1058
819
# End of Avahi example code
1059
if use_dbus:
1060
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
820
821
def remove_from_clients(client):
822
clients.remove(client)
823
if not clients:
824
logger.critical(u"No clients left, exiting")
825
sys.exit()
1061
826
1062
827
clients.update(Set(Client(name = section,
828
stop_hook = remove_from_clients,
1063
829
config
1064
= dict(client_config.items(section)),
1065
use_dbus = use_dbus)
830
= dict(client_config.items(section)))
1066
831
for section in client_config.sections()))
1067
832
if not clients:
1068
logger.warning(u"No clients defined")
833
logger.critical(u"No clients defined")
834
sys.exit(1)
1069
835
1070
836
if debug:
1071
837
# Redirect stdin so all checkers get /dev/null
1103
869
1104
870
while clients:
1105
871
client = clients.pop()
1106
client.disable_hook = None
1107
client.disable()
872
client.stop_hook = None
873
client.stop()
1108
874
1109
875
atexit.register(cleanup)
1110
876
1113
879
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1114
880
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1115
881
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
882
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()
883
client.start()
1170
884
1171
885
tcp_server.enable()
1172
886
tcp_server.server_activate()
1190
904
1191
905
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1192
906
lambda *args, **kwargs:
1193
(tcp_server.handle_request
1194
(*args[2:], **kwargs) or True))
907
tcp_server.handle_request\
908
(*args[2:], **kwargs) or True)
1195
909
1196
910
logger.debug(u"Starting main loop")
1197
911
main_loop.run()
1198
912
except AvahiError, error:
1199
logger.critical(u"AvahiError: %s", error)
913
logger.critical(u"AvahiError: %s" + unicode(error))
1200
914
sys.exit(1)
1201
915
except KeyboardInterrupt:
1202
916
if debug:
1203
print >> sys.stderr
1204
logger.debug("Server received KeyboardInterrupt")
1205
logger.debug("Server exiting")
917
print
1206
918
1207
919
if __name__ == '__main__':
1208
920
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0