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