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