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.6"
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,
118
protocol = avahi.PROTO_UNSPEC):
112
servicetype = None, port = None, TXT = None, domain = "",
113
host = "", max_renames = 32768):
119
114
self.interface = interface
120
115
self.name = name
121
116
self.type = servicetype
122
117
self.port = port
123
self.TXT = TXT if TXT is not None else []
118
if TXT is None:
119
self.TXT = []
120
else:
121
self.TXT = TXT
124
122
self.domain = domain
125
123
self.host = host
126
124
self.rename_count = 0
127
125
self.max_renames = max_renames
128
self.protocol = protocol
129
126
def rename(self):
130
127
"""Derived from the Avahi example code"""
131
128
if self.rename_count >= self.max_renames:
132
129
logger.critical(u"No suitable Zeroconf service name found"
133
130
u" after %i retries, exiting.",
134
131
self.rename_count)
135
raise AvahiServiceError(u"Too many renames")
132
raise AvahiServiceError("Too many renames")
136
133
self.name = server.GetAlternativeServiceName(self.name)
137
134
logger.info(u"Changing Zeroconf service name to %r ...",
138
135
str(self.name))
139
syslogger.setFormatter(logging.Formatter
136
syslogger.setFormatter(logging.Formatter\
140
137
('Mandos (%s): %%(levelname)s:'
141
' %%(message)s' % self.name))
138
' %%(message)s' % self.name))
142
139
self.remove()
143
140
self.add()
144
141
self.rename_count += 1
150
147
"""Derived from the Avahi example code"""
151
148
global group
152
149
if group is None:
153
group = dbus.Interface(bus.get_object
154
(avahi.DBUS_NAME,
150
group = dbus.Interface\
151
(bus.get_object(avahi.DBUS_NAME,
155
152
server.EntryGroupNew()),
156
avahi.DBUS_INTERFACE_ENTRY_GROUP)
153
avahi.DBUS_INTERFACE_ENTRY_GROUP)
157
154
group.connect_to_signal('StateChanged',
158
155
entry_group_state_changed)
159
156
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
160
157
service.name, service.type)
161
158
group.AddService(
162
159
self.interface, # interface
163
self.protocol, # protocol
160
avahi.PROTO_INET6, # protocol
164
161
dbus.UInt32(0), # flags
165
162
self.name, self.type,
166
163
self.domain, self.host,
173
170
# End of Avahi example code
174
171
175
172
176
def _datetime_to_dbus(dt, variant_level=0):
177
"""Convert a UTC datetime.datetime() to a D-Bus type."""
178
return dbus.String(dt.isoformat(), variant_level=variant_level)
179
180
181
class Client(dbus.service.Object):
173
class Client(object):
182
174
"""A representation of a client host served by this server.
183
175
Attributes:
184
name: string; from the config file, used in log messages and
185
D-Bus identifiers
176
name: string; from the config file, used in log messages
186
177
fingerprint: string (40 or 32 hexadecimal digits); used to
187
178
uniquely identify the client
188
secret: bytestring; sent verbatim (over TLS) to client
189
host: string; available for use by the checker command
190
created: datetime.datetime(); (UTC) object creation
191
last_enabled: datetime.datetime(); (UTC)
192
enabled: bool()
193
last_checked_ok: datetime.datetime(); (UTC) or None
194
timeout: datetime.timedelta(); How long from last_checked_ok
195
until this client is invalid
196
interval: datetime.timedelta(); How often to start a new checker
197
disable_hook: If set, called by disable() as disable_hook(self)
198
checker: subprocess.Popen(); a running checker process used
199
to see if the client lives.
200
'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.
201
190
checker_initiator_tag: a gobject event source tag, or None
202
disable_initiator_tag: - '' -
191
stop_initiator_tag: - '' -
203
192
checker_callback_tag: - '' -
204
193
checker_command: string; External command which is run to check if
205
194
client lives. %() expansions are done at
206
195
runtime with vars(self) as dict, so that for
207
196
instance %(name)s can be used in the command.
208
current_checker_command: string; current running checker_command
209
use_dbus: bool(); Whether to provide D-Bus interface and signals
210
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: - '' -
211
202
"""
212
def timeout_milliseconds(self):
213
"Return the 'timeout' attribute in milliseconds"
214
return ((self.timeout.days * 24 * 60 * 60 * 1000)
215
+ (self.timeout.seconds * 1000)
216
+ (self.timeout.microseconds // 1000))
217
218
def interval_milliseconds(self):
219
"Return the 'interval' attribute in milliseconds"
220
return ((self.interval.days * 24 * 60 * 60 * 1000)
221
+ (self.interval.seconds * 1000)
222
+ (self.interval.microseconds // 1000))
223
224
def __init__(self, name = None, disable_hook=None, config=None,
225
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):
226
227
"""Note: the 'checker' key in 'config' sets the
227
228
'checker_command' attribute and *not* the 'checker'
228
229
attribute."""
229
self.name = name
230
230
if config is None:
231
231
config = {}
232
self.name = name
232
233
logger.debug(u"Creating client %r", self.name)
233
self.use_dbus = False # During __init__
234
234
# Uppercase and remove spaces from fingerprint for later
235
235
# comparison purposes with return value from the fingerprint()
236
236
# function
237
self.fingerprint = (config["fingerprint"].upper()
238
.replace(u" ", u""))
237
self.fingerprint = config["fingerprint"].upper()\
238
.replace(u" ", u"")
239
239
logger.debug(u" Fingerprint: %s", self.fingerprint)
240
240
if "secret" in config:
241
241
self.secret = config["secret"].decode(u"base64")
242
242
elif "secfile" in config:
243
with closing(open(os.path.expanduser
244
(os.path.expandvars
245
(config["secfile"])))) as secfile:
246
self.secret = secfile.read()
243
secfile = open(config["secfile"])
244
self.secret = secfile.read()
245
secfile.close()
247
246
else:
248
247
raise TypeError(u"No secret or secfile for client %s"
249
248
% self.name)
250
249
self.host = config.get("host", "")
251
self.created = datetime.datetime.utcnow()
252
self.enabled = False
253
self.last_enabled = None
250
self.created = datetime.datetime.now()
254
251
self.last_checked_ok = None
255
252
self.timeout = string_to_delta(config["timeout"])
256
253
self.interval = string_to_delta(config["interval"])
257
self.disable_hook = disable_hook
254
self.stop_hook = stop_hook
258
255
self.checker = None
259
256
self.checker_initiator_tag = None
260
self.disable_initiator_tag = None
257
self.stop_initiator_tag = None
261
258
self.checker_callback_tag = None
262
self.checker_command = config["checker"]
263
self.current_checker_command = None
264
self.last_connect = None
265
# Only now, when this client is initialized, can it show up on
266
# the D-Bus
267
self.use_dbus = use_dbus
268
if self.use_dbus:
269
self.dbus_object_path = (dbus.ObjectPath
270
("/clients/"
271
+ self.name.replace(".", "_")))
272
dbus.service.Object.__init__(self, bus,
273
self.dbus_object_path)
274
275
def enable(self):
259
self.check_command = config["checker"]
260
def start(self):
276
261
"""Start this client's checker and timeout hooks"""
277
self.last_enabled = datetime.datetime.utcnow()
278
262
# Schedule a new checker to be started an 'interval' from now,
279
263
# and every interval from then on.
280
self.checker_initiator_tag = (gobject.timeout_add
281
(self.interval_milliseconds(),
282
self.start_checker))
264
self.checker_initiator_tag = gobject.timeout_add\
265
(self._interval_milliseconds,
266
self.start_checker)
283
267
# Also start a new checker *right now*.
284
268
self.start_checker()
285
# Schedule a disable() when 'timeout' has passed
286
self.disable_initiator_tag = (gobject.timeout_add
287
(self.timeout_milliseconds(),
288
self.disable))
289
self.enabled = True
290
if self.use_dbus:
291
# Emit D-Bus signals
292
self.PropertyChanged(dbus.String(u"enabled"),
293
dbus.Boolean(True, variant_level=1))
294
self.PropertyChanged(dbus.String(u"last_enabled"),
295
(_datetime_to_dbus(self.last_enabled,
296
variant_level=1)))
297
298
def disable(self):
299
"""Disable this client."""
300
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:
301
282
return False
302
logger.info(u"Disabling client %s", self.name)
303
if getattr(self, "disable_initiator_tag", False):
304
gobject.source_remove(self.disable_initiator_tag)
305
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
306
286
if getattr(self, "checker_initiator_tag", False):
307
287
gobject.source_remove(self.checker_initiator_tag)
308
288
self.checker_initiator_tag = None
309
289
self.stop_checker()
310
if self.disable_hook:
311
self.disable_hook(self)
312
self.enabled = False
313
if self.use_dbus:
314
# Emit D-Bus signal
315
self.PropertyChanged(dbus.String(u"enabled"),
316
dbus.Boolean(False, variant_level=1))
290
if self.stop_hook:
291
self.stop_hook(self)
317
292
# Do not run this again if called by a gobject.timeout_add
318
293
return False
319
320
294
def __del__(self):
321
self.disable_hook = None
322
self.disable()
323
324
def checker_callback(self, pid, condition, command):
295
self.stop_hook = None
296
self.stop()
297
def checker_callback(self, pid, condition):
325
298
"""The checker has completed, so take appropriate actions."""
299
now = datetime.datetime.now()
326
300
self.checker_callback_tag = None
327
301
self.checker = None
328
if self.use_dbus:
329
# Emit D-Bus signal
330
self.PropertyChanged(dbus.String(u"checker_running"),
331
dbus.Boolean(False, variant_level=1))
332
if os.WIFEXITED(condition):
333
exitstatus = os.WEXITSTATUS(condition)
334
if exitstatus == 0:
335
logger.info(u"Checker for %(name)s succeeded",
336
vars(self))
337
self.checked_ok()
338
else:
339
logger.info(u"Checker for %(name)s failed",
340
vars(self))
341
if self.use_dbus:
342
# Emit D-Bus signal
343
self.CheckerCompleted(dbus.Int16(exitstatus),
344
dbus.Int64(condition),
345
dbus.String(command))
346
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):
347
312
logger.warning(u"Checker for %(name)s crashed?",
348
313
vars(self))
349
if self.use_dbus:
350
# Emit D-Bus signal
351
self.CheckerCompleted(dbus.Int16(-1),
352
dbus.Int64(condition),
353
dbus.String(command))
354
355
def checked_ok(self):
356
"""Bump up the timeout for this client.
357
This should only be called when the client has been seen,
358
alive and well.
359
"""
360
self.last_checked_ok = datetime.datetime.utcnow()
361
gobject.source_remove(self.disable_initiator_tag)
362
self.disable_initiator_tag = (gobject.timeout_add
363
(self.timeout_milliseconds(),
364
self.disable))
365
if self.use_dbus:
366
# Emit D-Bus signal
367
self.PropertyChanged(
368
dbus.String(u"last_checked_ok"),
369
(_datetime_to_dbus(self.last_checked_ok,
370
variant_level=1)))
371
314
else:
315
logger.info(u"Checker for %(name)s failed",
316
vars(self))
372
317
def start_checker(self):
373
318
"""Start a new checker subprocess if one is not running.
374
319
If a checker already exists, leave it running and do
381
326
# checkers alone, the checker would have to take more time
382
327
# than 'timeout' for the client to be declared invalid, which
383
328
# is as it should be.
384
385
# If a checker exists, make sure it is not a zombie
386
if self.checker is not None:
387
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
388
if pid:
389
logger.warning("Checker was a zombie")
390
gobject.source_remove(self.checker_callback_tag)
391
self.checker_callback(pid, status,
392
self.current_checker_command)
393
# Start a new checker if needed
394
329
if self.checker is None:
395
330
try:
396
# In case checker_command has exactly one % operator
397
command = self.checker_command % self.host
331
# In case check_command has exactly one % operator
332
command = self.check_command % self.host
398
333
except TypeError:
399
334
# Escape attributes for the shell
400
335
escaped_attrs = dict((key, re.escape(str(val)))
401
336
for key, val in
402
337
vars(self).iteritems())
403
338
try:
404
command = self.checker_command % escaped_attrs
339
command = self.check_command % escaped_attrs
405
340
except TypeError, error:
406
341
logger.error(u'Could not format string "%s":'
407
u' %s', self.checker_command, error)
342
u' %s', self.check_command, error)
408
343
return True # Try again later
409
self.current_checker_command = command
410
344
try:
411
345
logger.info(u"Starting checker %r for %s",
412
346
command, self.name)
417
351
self.checker = subprocess.Popen(command,
418
352
close_fds=True,
419
353
shell=True, cwd="/")
420
if self.use_dbus:
421
# Emit D-Bus signal
422
self.CheckerStarted(command)
423
self.PropertyChanged(
424
dbus.String("checker_running"),
425
dbus.Boolean(True, variant_level=1))
426
self.checker_callback_tag = (gobject.child_watch_add
427
(self.checker.pid,
428
self.checker_callback,
429
data=command))
430
# The checker may have completed before the gobject
431
# watch was added. Check for this.
432
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
433
if pid:
434
gobject.source_remove(self.checker_callback_tag)
435
self.checker_callback(pid, status, command)
354
self.checker_callback_tag = gobject.child_watch_add\
355
(self.checker.pid,
356
self.checker_callback)
436
357
except OSError, error:
437
358
logger.error(u"Failed to start subprocess: %s",
438
359
error)
439
360
# Re-run this periodically if run by gobject.timeout_add
440
361
return True
441
442
362
def stop_checker(self):
443
363
"""Force the checker process, if any, to stop."""
444
364
if self.checker_callback_tag:
456
376
if error.errno != errno.ESRCH: # No such process
457
377
raise
458
378
self.checker = None
459
if self.use_dbus:
460
self.PropertyChanged(dbus.String(u"checker_running"),
461
dbus.Boolean(False, variant_level=1))
462
463
379
def still_valid(self):
464
380
"""Has the timeout not yet passed for this client?"""
465
if not getattr(self, "enabled", False):
466
return False
467
now = datetime.datetime.utcnow()
381
now = datetime.datetime.now()
468
382
if self.last_checked_ok is None:
469
383
return now < (self.created + self.timeout)
470
384
else:
471
385
return now < (self.last_checked_ok + self.timeout)
472
473
## D-Bus methods & signals
474
_interface = u"se.bsnet.fukt.Mandos.Client"
475
476
# CheckedOK - method
477
CheckedOK = dbus.service.method(_interface)(checked_ok)
478
CheckedOK.__name__ = "CheckedOK"
479
480
# CheckerCompleted - signal
481
@dbus.service.signal(_interface, signature="nxs")
482
def CheckerCompleted(self, exitcode, waitstatus, command):
483
"D-Bus signal"
484
pass
485
486
# CheckerStarted - signal
487
@dbus.service.signal(_interface, signature="s")
488
def CheckerStarted(self, command):
489
"D-Bus signal"
490
pass
491
492
# GetAllProperties - method
493
@dbus.service.method(_interface, out_signature="a{sv}")
494
def GetAllProperties(self):
495
"D-Bus method"
496
return dbus.Dictionary({
497
dbus.String("name"):
498
dbus.String(self.name, variant_level=1),
499
dbus.String("fingerprint"):
500
dbus.String(self.fingerprint, variant_level=1),
501
dbus.String("host"):
502
dbus.String(self.host, variant_level=1),
503
dbus.String("created"):
504
_datetime_to_dbus(self.created, variant_level=1),
505
dbus.String("last_enabled"):
506
(_datetime_to_dbus(self.last_enabled,
507
variant_level=1)
508
if self.last_enabled is not None
509
else dbus.Boolean(False, variant_level=1)),
510
dbus.String("enabled"):
511
dbus.Boolean(self.enabled, variant_level=1),
512
dbus.String("last_checked_ok"):
513
(_datetime_to_dbus(self.last_checked_ok,
514
variant_level=1)
515
if self.last_checked_ok is not None
516
else dbus.Boolean (False, variant_level=1)),
517
dbus.String("timeout"):
518
dbus.UInt64(self.timeout_milliseconds(),
519
variant_level=1),
520
dbus.String("interval"):
521
dbus.UInt64(self.interval_milliseconds(),
522
variant_level=1),
523
dbus.String("checker"):
524
dbus.String(self.checker_command,
525
variant_level=1),
526
dbus.String("checker_running"):
527
dbus.Boolean(self.checker is not None,
528
variant_level=1),
529
dbus.String("object_path"):
530
dbus.ObjectPath(self.dbus_object_path,
531
variant_level=1)
532
}, signature="sv")
533
534
# IsStillValid - method
535
IsStillValid = (dbus.service.method(_interface, out_signature="b")
536
(still_valid))
537
IsStillValid.__name__ = "IsStillValid"
538
539
# PropertyChanged - signal
540
@dbus.service.signal(_interface, signature="sv")
541
def PropertyChanged(self, property, value):
542
"D-Bus signal"
543
pass
544
545
# SetChecker - method
546
@dbus.service.method(_interface, in_signature="s")
547
def SetChecker(self, checker):
548
"D-Bus setter method"
549
self.checker_command = checker
550
# Emit D-Bus signal
551
self.PropertyChanged(dbus.String(u"checker"),
552
dbus.String(self.checker_command,
553
variant_level=1))
554
555
# SetHost - method
556
@dbus.service.method(_interface, in_signature="s")
557
def SetHost(self, host):
558
"D-Bus setter method"
559
self.host = host
560
# Emit D-Bus signal
561
self.PropertyChanged(dbus.String(u"host"),
562
dbus.String(self.host, variant_level=1))
563
564
# SetInterval - method
565
@dbus.service.method(_interface, in_signature="t")
566
def SetInterval(self, milliseconds):
567
self.interval = datetime.timedelta(0, 0, 0, milliseconds)
568
# Emit D-Bus signal
569
self.PropertyChanged(dbus.String(u"interval"),
570
(dbus.UInt64(self.interval_milliseconds(),
571
variant_level=1)))
572
573
# SetSecret - method
574
@dbus.service.method(_interface, in_signature="ay",
575
byte_arrays=True)
576
def SetSecret(self, secret):
577
"D-Bus setter method"
578
self.secret = str(secret)
579
580
# SetTimeout - method
581
@dbus.service.method(_interface, in_signature="t")
582
def SetTimeout(self, milliseconds):
583
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
584
# Emit D-Bus signal
585
self.PropertyChanged(dbus.String(u"timeout"),
586
(dbus.UInt64(self.timeout_milliseconds(),
587
variant_level=1)))
588
589
# Enable - method
590
Enable = dbus.service.method(_interface)(enable)
591
Enable.__name__ = "Enable"
592
593
# StartChecker - method
594
@dbus.service.method(_interface)
595
def StartChecker(self):
596
"D-Bus method"
597
self.start_checker()
598
599
# Disable - method
600
@dbus.service.method(_interface)
601
def Disable(self):
602
"D-Bus method"
603
self.disable()
604
605
# StopChecker - method
606
StopChecker = dbus.service.method(_interface)(stop_checker)
607
StopChecker.__name__ = "StopChecker"
608
609
del _interface
610
386
611
387
612
388
def peer_certificate(session):
613
389
"Return the peer's OpenPGP certificate as a bytestring"
614
390
# If not an OpenPGP certificate...
615
if (gnutls.library.functions
616
.gnutls_certificate_type_get(session._c_object)
617
!= 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:
618
394
# ...do the normal thing
619
395
return session.peer_certificate
620
list_size = ctypes.c_uint(1)
621
cert_list = (gnutls.library.functions
622
.gnutls_certificate_get_peers
623
(session._c_object, ctypes.byref(list_size)))
624
if not bool(cert_list) and list_size.value != 0:
625
raise gnutls.errors.GNUTLSError("error getting peer"
626
" 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))
627
399
if list_size.value == 0:
628
400
return None
629
401
cert = cert_list[0]
633
405
def fingerprint(openpgp):
634
406
"Convert an OpenPGP bytestring to a hexdigit fingerprint string"
635
407
# New GnuTLS "datum" with the OpenPGP public key
636
datum = (gnutls.library.types
637
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
638
ctypes.POINTER
639
(ctypes.c_ubyte)),
640
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)))
641
412
# New empty GnuTLS certificate
642
413
crt = gnutls.library.types.gnutls_openpgp_crt_t()
643
(gnutls.library.functions
644
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
414
gnutls.library.functions.gnutls_openpgp_crt_init\
415
(ctypes.byref(crt))
645
416
# Import the OpenPGP public key into the certificate
646
(gnutls.library.functions
647
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
648
gnutls.library.constants
649
.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)
650
420
# Verify the self signature in the key
651
421
crtverify = ctypes.c_uint()
652
(gnutls.library.functions
653
.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))
654
424
if crtverify.value != 0:
655
425
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
656
426
raise gnutls.errors.CertificateSecurityError("Verify failed")
658
428
buf = ctypes.create_string_buffer(20)
659
429
buf_len = ctypes.c_size_t()
660
430
# Get the fingerprint from the certificate into the buffer
661
(gnutls.library.functions
662
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
663
ctypes.byref(buf_len)))
431
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
432
(crt, ctypes.byref(buf), ctypes.byref(buf_len))
664
433
# Deinit the certificate
665
434
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
666
435
# Convert the buffer to a Python bytestring
677
446
678
447
def handle(self):
679
448
logger.info(u"TCP connection from: %s",
680
unicode(self.client_address))
681
session = (gnutls.connection
682
.ClientSession(self.request,
683
gnutls.connection
684
.X509Credentials()))
449
unicode(self.client_address))
450
session = gnutls.connection.ClientSession\
451
(self.request, gnutls.connection.X509Credentials())
685
452
686
453
line = self.request.makefile().readline()
687
454
logger.debug(u"Protocol version: %r", line)
698
465
# using OpenPGP certificates.
699
466
700
467
#priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
701
# "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
702
# "+DHE-DSS"))
703
# Use a fallback default, since this MUST be set.
704
priority = self.server.settings.get("priority", "NORMAL")
705
(gnutls.library.functions
706
.gnutls_priority_set_direct(session._c_object,
707
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)
708
476
709
477
try:
710
478
session.handshake()
713
481
# Do not run session.bye() here: the session is not
714
482
# established. Just abandon the request.
715
483
return
716
logger.debug(u"Handshake succeeded")
717
484
try:
718
485
fpr = fingerprint(peer_certificate(session))
719
486
except (TypeError, gnutls.errors.GNUTLSError), error:
721
488
session.bye()
722
489
return
723
490
logger.debug(u"Fingerprint: %s", fpr)
724
491
client = None
725
492
for c in self.server.clients:
726
493
if c.fingerprint == fpr:
727
494
client = c
728
495
break
729
else:
496
if not client:
730
497
logger.warning(u"Client not found for fingerprint: %s",
731
498
fpr)
732
499
session.bye()
739
506
vars(client))
740
507
session.bye()
741
508
return
742
## This won't work here, since we're in a fork.
743
# client.checked_ok()
744
509
sent_size = 0
745
510
while sent_size < len(client.secret):
746
511
sent = session.send(client.secret[sent_size:])
751
516
session.bye()
752
517
753
518
754
class IPv6_TCPServer(SocketServer.ForkingMixIn,
755
SocketServer.TCPServer, object):
756
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
519
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
520
"""IPv6 TCP server. Accepts 'None' as address and/or port.
757
521
Attributes:
758
522
settings: Server settings
759
523
clients: Set() of Client objects
767
531
if "clients" in kwargs:
768
532
self.clients = kwargs["clients"]
769
533
del kwargs["clients"]
770
if "use_ipv6" in kwargs:
771
if not kwargs["use_ipv6"]:
772
self.address_family = socket.AF_INET
773
del kwargs["use_ipv6"]
774
534
self.enabled = False
775
535
super(IPv6_TCPServer, self).__init__(*args, **kwargs)
776
536
def server_bind(self):
790
550
u" bind to interface %s",
791
551
self.settings["interface"])
792
552
else:
793
raise
553
raise error
794
554
# Only bind(2) the socket if we really need to.
795
555
if self.server_address[0] or self.server_address[1]:
796
556
if not self.server_address[0]:
797
if self.address_family == socket.AF_INET6:
798
any_address = "::" # in6addr_any
799
else:
800
any_address = socket.INADDR_ANY
801
self.server_address = (any_address,
557
in6addr_any = "::"
558
self.server_address = (in6addr_any,
802
559
self.server_address[1])
803
560
elif not self.server_address[1]:
804
561
self.server_address = (self.server_address[0],
820
577
821
578
def string_to_delta(interval):
822
579
"""Parse a string and return a datetime.timedelta
823
580
824
581
>>> string_to_delta('7d')
825
582
datetime.timedelta(7)
826
583
>>> string_to_delta('60s')
878
635
elif state == avahi.ENTRY_GROUP_FAILURE:
879
636
logger.critical(u"Avahi: Error in group state changed %s",
880
637
unicode(error))
881
raise AvahiGroupError(u"State changed: %s" % unicode(error))
638
raise AvahiGroupError("State changed: %s", str(error))
882
639
883
640
def if_nametoindex(interface):
884
641
"""Call the C function if_nametoindex(), or equivalent"""
885
642
global if_nametoindex
886
643
try:
887
if_nametoindex = (ctypes.cdll.LoadLibrary
888
(ctypes.util.find_library("c"))
889
.if_nametoindex)
644
if_nametoindex = ctypes.cdll.LoadLibrary\
645
(ctypes.util.find_library("c")).if_nametoindex
890
646
except (OSError, AttributeError):
891
647
if "struct" not in sys.modules:
892
648
import struct
895
651
def if_nametoindex(interface):
896
652
"Get an interface index the hard way, i.e. using fcntl()"
897
653
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
898
with closing(socket.socket()) as s:
899
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
900
struct.pack("16s16x", interface))
654
s = socket.socket()
655
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
656
struct.pack("16s16x", interface))
657
s.close()
901
658
interface_index = struct.unpack("I", ifreq[16:20])[0]
902
659
return interface_index
903
660
return if_nametoindex(interface)
927
684
928
685
929
686
def main():
930
parser = optparse.OptionParser(version = "%%prog %s" % version)
687
parser = OptionParser(version = "%%prog %s" % version)
931
688
parser.add_option("-i", "--interface", type="string",
932
689
metavar="IF", help="Bind to interface IF")
933
690
parser.add_option("-a", "--address", type="string",
934
691
help="Address to listen for requests on")
935
692
parser.add_option("-p", "--port", type="int",
936
693
help="Port number to receive requests on")
937
parser.add_option("--check", action="store_true",
694
parser.add_option("--check", action="store_true", default=False,
938
695
help="Run self-test")
939
696
parser.add_option("--debug", action="store_true",
940
697
help="Debug mode; run in foreground and log to"
947
704
default="/etc/mandos", metavar="DIR",
948
705
help="Directory to search for configuration"
949
706
" files")
950
parser.add_option("--no-dbus", action="store_false",
951
dest="use_dbus",
952
help="Do not provide D-Bus system bus"
953
" interface")
954
parser.add_option("--no-ipv6", action="store_false",
955
dest="use_ipv6", help="Do not use IPv6")
956
707
options = parser.parse_args()[0]
957
708
958
709
if options.check:
968
719
"priority":
969
720
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
970
721
"servicename": "Mandos",
971
"use_dbus": "True",
972
"use_ipv6": "True",
973
722
}
974
723
975
724
# Parse config file for server-global settings
978
727
server_config.read(os.path.join(options.configdir, "mandos.conf"))
979
728
# Convert the SafeConfigParser object to a dict
980
729
server_settings = server_config.defaults()
981
# Use the appropriate methods on the non-string config options
982
server_settings["debug"] = server_config.getboolean("DEFAULT",
983
"debug")
984
server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
985
"use_dbus")
986
server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
987
"use_ipv6")
988
if server_settings["port"]:
989
server_settings["port"] = server_config.getint("DEFAULT",
990
"port")
730
# Use getboolean on the boolean config option
731
server_settings["debug"] = server_config.getboolean\
732
("DEFAULT", "debug")
991
733
del server_config
992
734
993
735
# Override the settings from the config file with command line
994
736
# options, if set.
995
737
for option in ("interface", "address", "port", "debug",
996
"priority", "servicename", "configdir",
997
"use_dbus", "use_ipv6"):
738
"priority", "servicename", "configdir"):
998
739
value = getattr(options, option)
999
740
if value is not None:
1000
741
server_settings[option] = value
1001
742
del options
1002
743
# Now we have our good server settings in "server_settings"
1003
744
1004
# For convenience
1005
745
debug = server_settings["debug"]
1006
use_dbus = server_settings["use_dbus"]
1007
use_ipv6 = server_settings["use_ipv6"]
1008
746
1009
747
if not debug:
1010
748
syslogger.setLevel(logging.WARNING)
1011
749
console.setLevel(logging.WARNING)
1012
750
1013
751
if server_settings["servicename"] != "Mandos":
1014
syslogger.setFormatter(logging.Formatter
752
syslogger.setFormatter(logging.Formatter\
1015
753
('Mandos (%s): %%(levelname)s:'
1016
754
' %%(message)s'
1017
755
% server_settings["servicename"]))
1019
757
# Parse config file with clients
1020
758
client_defaults = { "timeout": "1h",
1021
759
"interval": "5m",
1022
"checker": "fping -q -- %%(host)s",
760
"checker": "fping -q -- %(host)s",
1023
761
"host": "",
1024
762
}
1025
763
client_config = ConfigParser.SafeConfigParser(client_defaults)
1031
769
server_settings["port"]),
1032
770
TCP_handler,
1033
771
settings=server_settings,
1034
clients=clients, use_ipv6=use_ipv6)
772
clients=clients)
1035
773
pidfilename = "/var/run/mandos.pid"
1036
774
try:
1037
775
pidfile = open(pidfilename, "w")
1038
except IOError:
776
except IOError, error:
1039
777
logger.error("Could not open file %r", pidfilename)
1040
778
1041
try:
1042
uid = pwd.getpwnam("_mandos").pw_uid
1043
gid = pwd.getpwnam("_mandos").pw_gid
1044
except KeyError:
1045
try:
1046
uid = pwd.getpwnam("mandos").pw_uid
1047
gid = pwd.getpwnam("mandos").pw_gid
1048
except KeyError:
1049
try:
1050
uid = pwd.getpwnam("nobody").pw_uid
1051
gid = pwd.getpwnam("nogroup").pw_gid
1052
except KeyError:
1053
uid = 65534
1054
gid = 65534
1055
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)
1056
797
os.setgid(gid)
1057
os.setuid(uid)
1058
798
except OSError, error:
1059
799
if error[0] != errno.EPERM:
1060
800
raise error
1061
801
1062
# Enable all possible GnuTLS debugging
1063
if debug:
1064
# "Use a log level over 10 to enable all debugging options."
1065
# - GnuTLS manual
1066
gnutls.library.functions.gnutls_global_set_log_level(11)
1067
1068
@gnutls.library.types.gnutls_log_func
1069
def debug_gnutls(level, string):
1070
logger.debug("GnuTLS: %s", string[:-1])
1071
1072
(gnutls.library.functions
1073
.gnutls_global_set_log_function(debug_gnutls))
1074
1075
802
global service
1076
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1077
803
service = AvahiService(name = server_settings["servicename"],
1078
servicetype = "_mandos._tcp",
1079
protocol = protocol)
804
servicetype = "_mandos._tcp", )
1080
805
if server_settings["interface"]:
1081
service.interface = (if_nametoindex
1082
(server_settings["interface"]))
806
service.interface = if_nametoindex\
807
(server_settings["interface"])
1083
808
1084
809
global main_loop
1085
810
global bus
1092
817
avahi.DBUS_PATH_SERVER),
1093
818
avahi.DBUS_INTERFACE_SERVER)
1094
819
# End of Avahi example code
1095
if use_dbus:
1096
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()
1097
826
1098
827
clients.update(Set(Client(name = section,
828
stop_hook = remove_from_clients,
1099
829
config
1100
= dict(client_config.items(section)),
1101
use_dbus = use_dbus)
830
= dict(client_config.items(section)))
1102
831
for section in client_config.sections()))
1103
832
if not clients:
1104
logger.warning(u"No clients defined")
833
logger.critical(u"No clients defined")
834
sys.exit(1)
1105
835
1106
836
if debug:
1107
837
# Redirect stdin so all checkers get /dev/null
1139
869
1140
870
while clients:
1141
871
client = clients.pop()
1142
client.disable_hook = None
1143
client.disable()
872
client.stop_hook = None
873
client.stop()
1144
874
1145
875
atexit.register(cleanup)
1146
876
1149
879
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1150
880
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1151
881
1152
if use_dbus:
1153
class MandosServer(dbus.service.Object):
1154
"""A D-Bus proxy object"""
1155
def __init__(self):
1156
dbus.service.Object.__init__(self, bus, "/")
1157
_interface = u"se.bsnet.fukt.Mandos"
1158
1159
@dbus.service.signal(_interface, signature="oa{sv}")
1160
def ClientAdded(self, objpath, properties):
1161
"D-Bus signal"
1162
pass
1163
1164
@dbus.service.signal(_interface, signature="os")
1165
def ClientRemoved(self, objpath, name):
1166
"D-Bus signal"
1167
pass
1168
1169
@dbus.service.method(_interface, out_signature="ao")
1170
def GetAllClients(self):
1171
"D-Bus method"
1172
return dbus.Array(c.dbus_object_path for c in clients)
1173
1174
@dbus.service.method(_interface, out_signature="a{oa{sv}}")
1175
def GetAllClientsWithProperties(self):
1176
"D-Bus method"
1177
return dbus.Dictionary(
1178
((c.dbus_object_path, c.GetAllProperties())
1179
for c in clients),
1180
signature="oa{sv}")
1181
1182
@dbus.service.method(_interface, in_signature="o")
1183
def RemoveClient(self, object_path):
1184
"D-Bus method"
1185
for c in clients:
1186
if c.dbus_object_path == object_path:
1187
clients.remove(c)
1188
# Don't signal anything except ClientRemoved
1189
c.use_dbus = False
1190
c.disable()
1191
# Emit D-Bus signal
1192
self.ClientRemoved(object_path, c.name)
1193
return
1194
raise KeyError
1195
1196
del _interface
1197
1198
mandos_server = MandosServer()
1199
1200
882
for client in clients:
1201
if use_dbus:
1202
# Emit D-Bus signal
1203
mandos_server.ClientAdded(client.dbus_object_path,
1204
client.GetAllProperties())
1205
client.enable()
883
client.start()
1206
884
1207
885
tcp_server.enable()
1208
886
tcp_server.server_activate()
1209
887
1210
888
# Find out what port we got
1211
889
service.port = tcp_server.socket.getsockname()[1]
1212
if use_ipv6:
1213
logger.info(u"Now listening on address %r, port %d,"
1214
" flowinfo %d, scope_id %d"
1215
% tcp_server.socket.getsockname())
1216
else: # IPv4
1217
logger.info(u"Now listening on address %r, port %d"
1218
% tcp_server.socket.getsockname())
890
logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
891
u" scope_id %d" % tcp_server.socket.getsockname())
1219
892
1220
893
#service.interface = tcp_server.socket.getsockname()[3]
1221
894
1231
904
1232
905
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
1233
906
lambda *args, **kwargs:
1234
(tcp_server.handle_request
1235
(*args[2:], **kwargs) or True))
907
tcp_server.handle_request\
908
(*args[2:], **kwargs) or True)
1236
909
1237
910
logger.debug(u"Starting main loop")
1238
911
main_loop.run()
1239
912
except AvahiError, error:
1240
logger.critical(u"AvahiError: %s", error)
913
logger.critical(u"AvahiError: %s" + unicode(error))
1241
914
sys.exit(1)
1242
915
except KeyboardInterrupt:
1243
916
if debug:
1244
print >> sys.stderr
1245
logger.debug("Server received KeyboardInterrupt")
1246
logger.debug("Server exiting")
917
print
1247
918
1248
919
if __name__ == '__main__':
1249
920
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0