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