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:
- network-protocol.txt
- files renamed:
- mandos-client.c => plugin-runner.c
- plugins.d/password-request.c => plugins.d/mandos-client.c
- 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
69
version = "1.0.5"
64
70
65
71
logger = logging.Logger('mandos')
66
syslogger = logging.handlers.SysLogHandler\
67
(facility = logging.handlers.SysLogHandler.LOG_DAEMON)
68
syslogger.setFormatter(logging.Formatter\
69
('%(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'))
70
77
logger.addHandler(syslogger)
71
del syslogger
72
78
79
console = logging.StreamHandler()
80
console.setFormatter(logging.Formatter('%(name)s: %(levelname)s:'
81
' %(message)s'))
82
logger.addHandler(console)
73
83
74
84
class AvahiError(Exception):
75
def __init__(self, value):
85
def __init__(self, value, *args, **kwargs):
76
86
self.value = value
77
def __str__(self):
78
return repr(self.value)
87
super(AvahiError, self).__init__(value, *args, **kwargs)
88
def __unicode__(self):
89
return unicode(repr(self.value))
79
90
80
91
class AvahiServiceError(AvahiError):
81
92
pass
101
112
a sensible number of times
102
113
"""
103
114
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
104
type = None, port = None, TXT = None, domain = "",
105
host = "", max_renames = 12):
115
servicetype = None, port = None, TXT = None,
116
domain = "", host = "", max_renames = 32768):
106
117
self.interface = interface
107
118
self.name = name
108
self.type = type
119
self.type = servicetype
109
120
self.port = port
110
if TXT is None:
111
self.TXT = []
112
else:
113
self.TXT = TXT
121
self.TXT = TXT if TXT is not None else []
114
122
self.domain = domain
115
123
self.host = host
116
124
self.rename_count = 0
125
self.max_renames = max_renames
117
126
def rename(self):
118
127
"""Derived from the Avahi example code"""
119
128
if self.rename_count >= self.max_renames:
120
logger.critical(u"No suitable service name found after %i"
121
u" retries, exiting.", rename_count)
122
raise AvahiServiceError("Too many renames")
123
name = server.GetAlternativeServiceName(name)
124
logger.error(u"Changing name to %r ...", name)
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
137
('Mandos (%s): %%(levelname)s:'
138
' %%(message)s' % self.name))
125
139
self.remove()
126
140
self.add()
127
141
self.rename_count += 1
133
147
"""Derived from the Avahi example code"""
134
148
global group
135
149
if group is None:
136
group = dbus.Interface\
137
(bus.get_object(avahi.DBUS_NAME,
150
group = dbus.Interface(bus.get_object
151
(avahi.DBUS_NAME,
138
152
server.EntryGroupNew()),
139
avahi.DBUS_INTERFACE_ENTRY_GROUP)
153
avahi.DBUS_INTERFACE_ENTRY_GROUP)
140
154
group.connect_to_signal('StateChanged',
141
155
entry_group_state_changed)
142
logger.debug(u"Adding service '%s' of type '%s' ...",
156
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
143
157
service.name, service.type)
144
158
group.AddService(
145
159
self.interface, # interface
156
170
# End of Avahi example code
157
171
158
172
159
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):
160
179
"""A representation of a client host served by this server.
161
180
Attributes:
162
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
163
183
fingerprint: string (40 or 32 hexadecimal digits); used to
164
184
uniquely identify the client
165
secret: bytestring; sent verbatim (over TLS) to client
166
fqdn: string (FQDN); available for use by the checker command
167
created: datetime.datetime(); object creation, not client host
168
last_checked_ok: datetime.datetime() or None if not yet checked OK
169
timeout: datetime.timedelta(); How long from last_checked_ok
170
until this client is invalid
171
interval: datetime.timedelta(); How often to start a new checker
172
stop_hook: If set, called by stop() as stop_hook(self)
173
checker: subprocess.Popen(); a running checker process used
174
to see if the client lives.
175
'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.
176
198
checker_initiator_tag: a gobject event source tag, or None
177
stop_initiator_tag: - '' -
199
disable_initiator_tag: - '' -
178
200
checker_callback_tag: - '' -
179
201
checker_command: string; External command which is run to check if
180
202
client lives. %() expansions are done at
181
203
runtime with vars(self) as dict, so that for
182
204
instance %(name)s can be used in the command.
183
Private attibutes:
184
_timeout: Real variable for 'timeout'
185
_interval: Real variable for 'interval'
186
_timeout_milliseconds: Used when calling gobject.timeout_add()
187
_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
188
207
"""
189
def _set_timeout(self, timeout):
190
"Setter function for 'timeout' attribute"
191
self._timeout = timeout
192
self._timeout_milliseconds = ((self.timeout.days
193
* 24 * 60 * 60 * 1000)
194
+ (self.timeout.seconds * 1000)
195
+ (self.timeout.microseconds
196
// 1000))
197
timeout = property(lambda self: self._timeout,
198
_set_timeout)
199
del _set_timeout
200
def _set_interval(self, interval):
201
"Setter function for 'interval' attribute"
202
self._interval = interval
203
self._interval_milliseconds = ((self.interval.days
204
* 24 * 60 * 60 * 1000)
205
+ (self.interval.seconds
206
* 1000)
207
+ (self.interval.microseconds
208
// 1000))
209
interval = property(lambda self: self._interval,
210
_set_interval)
211
del _set_interval
212
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):
213
222
"""Note: the 'checker' key in 'config' sets the
214
223
'checker_command' attribute and *not* the 'checker'
215
224
attribute."""
216
225
self.name = name
226
if config is None:
227
config = {}
217
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)
218
236
# Uppercase and remove spaces from fingerprint for later
219
237
# comparison purposes with return value from the fingerprint()
220
238
# function
221
self.fingerprint = config["fingerprint"].upper()\
222
.replace(u" ", u"")
239
self.fingerprint = (config["fingerprint"].upper()
240
.replace(u" ", u""))
223
241
logger.debug(u" Fingerprint: %s", self.fingerprint)
224
242
if "secret" in config:
225
243
self.secret = config["secret"].decode(u"base64")
226
244
elif "secfile" in config:
227
sf = open(config["secfile"])
228
self.secret = sf.read()
229
sf.close()
245
with closing(open(os.path.expanduser
246
(os.path.expandvars
247
(config["secfile"])))) as secfile:
248
self.secret = secfile.read()
230
249
else:
231
250
raise TypeError(u"No secret or secfile for client %s"
232
251
% self.name)
233
self.fqdn = config.get("fqdn", "")
234
self.created = datetime.datetime.now()
252
self.host = config.get("host", "")
253
self.created = datetime.datetime.utcnow()
254
self.enabled = False
255
self.last_enabled = None
235
256
self.last_checked_ok = None
236
257
self.timeout = string_to_delta(config["timeout"])
237
258
self.interval = string_to_delta(config["interval"])
238
self.stop_hook = stop_hook
259
self.disable_hook = disable_hook
239
260
self.checker = None
240
261
self.checker_initiator_tag = None
241
self.stop_initiator_tag = None
262
self.disable_initiator_tag = None
242
263
self.checker_callback_tag = None
243
self.check_command = config["checker"]
244
def start(self):
264
self.checker_command = config["checker"]
265
266
def enable(self):
245
267
"""Start this client's checker and timeout hooks"""
268
self.last_enabled = datetime.datetime.utcnow()
246
269
# Schedule a new checker to be started an 'interval' from now,
247
270
# and every interval from then on.
248
self.checker_initiator_tag = gobject.timeout_add\
249
(self._interval_milliseconds,
250
self.start_checker)
271
self.checker_initiator_tag = (gobject.timeout_add
272
(self.interval_milliseconds(),
273
self.start_checker))
251
274
# Also start a new checker *right now*.
252
275
self.start_checker()
253
# Schedule a stop() when 'timeout' has passed
254
self.stop_initiator_tag = gobject.timeout_add\
255
(self._timeout_milliseconds,
256
self.stop)
257
def stop(self):
258
"""Stop this client.
259
The possibility that a client might be restarted is left open,
260
but not currently used."""
261
# If this client doesn't have a secret, it is already stopped.
262
if self.secret:
263
logger.info(u"Stopping client %s", self.name)
264
self.secret = None
265
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):
266
292
return False
267
if getattr(self, "stop_initiator_tag", False):
268
gobject.source_remove(self.stop_initiator_tag)
269
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
270
297
if getattr(self, "checker_initiator_tag", False):
271
298
gobject.source_remove(self.checker_initiator_tag)
272
299
self.checker_initiator_tag = None
273
300
self.stop_checker()
274
if self.stop_hook:
275
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))
276
308
# Do not run this again if called by a gobject.timeout_add
277
309
return False
310
278
311
def __del__(self):
279
self.stop_hook = None
280
self.stop()
281
def checker_callback(self, pid, condition):
312
self.disable_hook = None
313
self.disable()
314
315
def checker_callback(self, pid, condition, command):
282
316
"""The checker has completed, so take appropriate actions."""
283
now = datetime.datetime.now()
284
317
self.checker_callback_tag = None
285
318
self.checker = None
286
if os.WIFEXITED(condition) \
287
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)):
288
325
logger.info(u"Checker for %(name)s succeeded",
289
326
vars(self))
290
self.last_checked_ok = now
291
gobject.source_remove(self.stop_initiator_tag)
292
self.stop_initiator_tag = gobject.timeout_add\
293
(self._timeout_milliseconds,
294
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()
295
333
elif not os.WIFEXITED(condition):
296
334
logger.warning(u"Checker for %(name)s crashed?",
297
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))
298
341
else:
299
342
logger.info(u"Checker for %(name)s failed",
300
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
301
367
def start_checker(self):
302
368
"""Start a new checker subprocess if one is not running.
303
369
If a checker already exists, leave it running and do
312
378
# is as it should be.
313
379
if self.checker is None:
314
380
try:
315
# In case check_command has exactly one % operator
316
command = self.check_command % self.fqdn
381
# In case checker_command has exactly one % operator
382
command = self.checker_command % self.host
317
383
except TypeError:
318
384
# Escape attributes for the shell
319
385
escaped_attrs = dict((key, re.escape(str(val)))
320
386
for key, val in
321
387
vars(self).iteritems())
322
388
try:
323
command = self.check_command % escaped_attrs
389
command = self.checker_command % escaped_attrs
324
390
except TypeError, error:
325
391
logger.error(u'Could not format string "%s":'
326
u' %s', self.check_command, error)
392
u' %s', self.checker_command, error)
327
393
return True # Try again later
328
394
try:
329
395
logger.info(u"Starting checker %r for %s",
330
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.)
331
401
self.checker = subprocess.Popen(command,
332
402
close_fds=True,
333
403
shell=True, cwd="/")
334
self.checker_callback_tag = gobject.child_watch_add\
335
(self.checker.pid,
336
self.checker_callback)
337
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:
338
415
logger.error(u"Failed to start subprocess: %s",
339
416
error)
340
417
# Re-run this periodically if run by gobject.timeout_add
341
418
return True
419
342
420
def stop_checker(self):
343
421
"""Force the checker process, if any, to stop."""
344
422
if self.checker_callback_tag:
346
424
self.checker_callback_tag = None
347
425
if getattr(self, "checker", None) is None:
348
426
return
349
logger.debug("Stopping checker for %(name)s", vars(self))
427
logger.debug(u"Stopping checker for %(name)s", vars(self))
350
428
try:
351
429
os.kill(self.checker.pid, signal.SIGTERM)
352
430
#os.sleep(0.5)
356
434
if error.errno != errno.ESRCH: # No such process
357
435
raise
358
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
359
441
def still_valid(self):
360
442
"""Has the timeout not yet passed for this client?"""
361
now = datetime.datetime.now()
443
if not getattr(self, "enabled", False):
444
return False
445
now = datetime.datetime.utcnow()
362
446
if self.last_checked_ok is None:
363
447
return now < (self.created + self.timeout)
364
448
else:
365
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
366
588
367
589
368
590
def peer_certificate(session):
369
591
"Return the peer's OpenPGP certificate as a bytestring"
370
592
# If not an OpenPGP certificate...
371
if gnutls.library.functions.gnutls_certificate_type_get\
372
(session._c_object) \
373
!= 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):
374
596
# ...do the normal thing
375
597
return session.peer_certificate
376
598
list_size = ctypes.c_uint()
377
cert_list = gnutls.library.functions.gnutls_certificate_get_peers\
378
(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)))
379
602
if list_size.value == 0:
380
603
return None
381
604
cert = cert_list[0]
385
608
def fingerprint(openpgp):
386
609
"Convert an OpenPGP bytestring to a hexdigit fingerprint string"
387
610
# New GnuTLS "datum" with the OpenPGP public key
388
datum = gnutls.library.types.gnutls_datum_t\
389
(ctypes.cast(ctypes.c_char_p(openpgp),
390
ctypes.POINTER(ctypes.c_ubyte)),
391
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))))
392
616
# New empty GnuTLS certificate
393
617
crt = gnutls.library.types.gnutls_openpgp_crt_t()
394
gnutls.library.functions.gnutls_openpgp_crt_init\
395
(ctypes.byref(crt))
618
(gnutls.library.functions
619
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
396
620
# Import the OpenPGP public key into the certificate
397
gnutls.library.functions.gnutls_openpgp_crt_import\
398
(crt, ctypes.byref(datum),
399
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")
400
632
# New buffer for the fingerprint
401
buffer = ctypes.create_string_buffer(20)
402
buffer_length = ctypes.c_size_t()
633
buf = ctypes.create_string_buffer(20)
634
buf_len = ctypes.c_size_t()
403
635
# Get the fingerprint from the certificate into the buffer
404
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint\
405
(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)))
406
639
# Deinit the certificate
407
640
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
408
641
# Convert the buffer to a Python bytestring
409
fpr = ctypes.string_at(buffer, buffer_length.value)
642
fpr = ctypes.string_at(buf, buf_len.value)
410
643
# Convert the bytestring to hexadecimal notation
411
644
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
412
645
return hex_fpr
413
646
414
647
415
class tcp_handler(SocketServer.BaseRequestHandler, object):
648
class TCP_handler(SocketServer.BaseRequestHandler, object):
416
649
"""A TCP request handler class.
417
650
Instantiated by IPv6_TCPServer for each request to handle it.
418
651
Note: This will run in its own forked process."""
419
652
420
653
def handle(self):
421
654
logger.info(u"TCP connection from: %s",
422
unicode(self.client_address))
423
session = gnutls.connection.ClientSession\
424
(self.request, gnutls.connection.X509Credentials())
655
unicode(self.client_address))
656
session = (gnutls.connection
657
.ClientSession(self.request,
658
gnutls.connection
659
.X509Credentials()))
425
660
426
661
line = self.request.makefile().readline()
427
662
logger.debug(u"Protocol version: %r", line)
440
675
#priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
441
676
# "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
442
677
# "+DHE-DSS"))
443
priority = "NORMAL" # Fallback default, since this
444
# MUST be set.
445
if self.server.settings["priority"]:
446
priority = self.server.settings["priority"]
447
gnutls.library.functions.gnutls_priority_set_direct\
448
(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))
449
683
450
684
try:
451
685
session.handshake()
461
695
session.bye()
462
696
return
463
697
logger.debug(u"Fingerprint: %s", fpr)
464
client = None
465
698
for c in self.server.clients:
466
699
if c.fingerprint == fpr:
467
700
client = c
468
701
break
469
if not client:
702
else:
470
703
logger.warning(u"Client not found for fingerprint: %s",
471
704
fpr)
472
705
session.bye()
479
712
vars(client))
480
713
session.bye()
481
714
return
715
## This won't work here, since we're in a fork.
716
# client.bump_timeout()
482
717
sent_size = 0
483
718
while sent_size < len(client.secret):
484
719
sent = session.send(client.secret[sent_size:])
489
724
session.bye()
490
725
491
726
492
class IPv6_TCPServer(SocketServer.ForkingTCPServer, object):
727
class IPv6_TCPServer(SocketServer.ForkingMixIn,
728
SocketServer.TCPServer, object):
493
729
"""IPv6 TCP server. Accepts 'None' as address and/or port.
494
730
Attributes:
495
731
settings: Server settings
496
732
clients: Set() of Client objects
733
enabled: Boolean; whether this server is activated yet
497
734
"""
498
735
address_family = socket.AF_INET6
499
736
def __init__(self, *args, **kwargs):
503
740
if "clients" in kwargs:
504
741
self.clients = kwargs["clients"]
505
742
del kwargs["clients"]
506
return super(type(self), self).__init__(*args, **kwargs)
743
self.enabled = False
744
super(IPv6_TCPServer, self).__init__(*args, **kwargs)
507
745
def server_bind(self):
508
746
"""This overrides the normal server_bind() function
509
747
to bind to an interface if one was specified, and also NOT to
538
776
# if_nametoindex
539
777
# (self.settings
540
778
# ["interface"]))
541
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
542
785
543
786
544
787
def string_to_delta(interval):
554
797
datetime.timedelta(1)
555
798
>>> string_to_delta(u'1w')
556
799
datetime.timedelta(7)
800
>>> string_to_delta('5m 30s')
801
datetime.timedelta(0, 330)
557
802
"""
558
try:
559
suffix=unicode(interval[-1])
560
value=int(interval[:-1])
561
if suffix == u"d":
562
delta = datetime.timedelta(value)
563
elif suffix == u"s":
564
delta = datetime.timedelta(0, value)
565
elif suffix == u"m":
566
delta = datetime.timedelta(0, 0, 0, 0, value)
567
elif suffix == u"h":
568
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
569
elif suffix == u"w":
570
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
571
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):
572
821
raise ValueError
573
except (ValueError, IndexError):
574
raise ValueError
575
return delta
822
timevalue += delta
823
return timevalue
576
824
577
825
578
826
def server_state_changed(state):
579
827
"""Derived from the Avahi example code"""
580
828
if state == avahi.SERVER_COLLISION:
581
logger.error(u"Server name collision")
829
logger.error(u"Zeroconf server name collision")
582
830
service.remove()
583
831
elif state == avahi.SERVER_RUNNING:
584
832
service.add()
586
834
587
835
def entry_group_state_changed(state, error):
588
836
"""Derived from the Avahi example code"""
589
logger.debug(u"state change: %i", state)
837
logger.debug(u"Avahi state change: %i", state)
590
838
591
839
if state == avahi.ENTRY_GROUP_ESTABLISHED:
592
logger.debug(u"Service established.")
840
logger.debug(u"Zeroconf service established.")
593
841
elif state == avahi.ENTRY_GROUP_COLLISION:
594
logger.warning(u"Service name collision.")
842
logger.warning(u"Zeroconf service name collision.")
595
843
service.rename()
596
844
elif state == avahi.ENTRY_GROUP_FAILURE:
597
logger.critical(u"Error in group state changed %s",
845
logger.critical(u"Avahi: Error in group state changed %s",
598
846
unicode(error))
599
raise AvahiGroupError("State changed: %s", str(error))
847
raise AvahiGroupError(u"State changed: %s" % unicode(error))
600
848
601
849
def if_nametoindex(interface):
602
850
"""Call the C function if_nametoindex(), or equivalent"""
603
851
global if_nametoindex
604
852
try:
605
if "ctypes.util" not in sys.modules:
606
import ctypes.util
607
if_nametoindex = ctypes.cdll.LoadLibrary\
608
(ctypes.util.find_library("c")).if_nametoindex
853
if_nametoindex = (ctypes.cdll.LoadLibrary
854
(ctypes.util.find_library("c"))
855
.if_nametoindex)
609
856
except (OSError, AttributeError):
610
857
if "struct" not in sys.modules:
611
858
import struct
614
861
def if_nametoindex(interface):
615
862
"Get an interface index the hard way, i.e. using fcntl()"
616
863
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
617
s = socket.socket()
618
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
619
struct.pack("16s16x", interface))
620
s.close()
864
with closing(socket.socket()) as s:
865
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
866
struct.pack("16s16x", interface))
621
867
interface_index = struct.unpack("I", ifreq[16:20])[0]
622
868
return interface_index
623
869
return if_nametoindex(interface)
647
893
648
894
649
895
def main():
650
global main_loop_started
651
main_loop_started = False
652
653
parser = OptionParser()
896
parser = optparse.OptionParser(version = "%%prog %s" % version)
654
897
parser.add_option("-i", "--interface", type="string",
655
898
metavar="IF", help="Bind to interface IF")
656
899
parser.add_option("-a", "--address", type="string",
657
900
help="Address to listen for requests on")
658
901
parser.add_option("-p", "--port", type="int",
659
902
help="Port number to receive requests on")
660
parser.add_option("--check", action="store_true", default=False,
903
parser.add_option("--check", action="store_true",
661
904
help="Run self-test")
662
905
parser.add_option("--debug", action="store_true",
663
906
help="Debug mode; run in foreground and log to"
670
913
default="/etc/mandos", metavar="DIR",
671
914
help="Directory to search for configuration"
672
915
" files")
673
(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]
674
921
675
922
if options.check:
676
923
import doctest
685
932
"priority":
686
933
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
687
934
"servicename": "Mandos",
935
"use_dbus": "True",
688
936
}
689
937
690
938
# Parse config file for server-global settings
691
939
server_config = ConfigParser.SafeConfigParser(server_defaults)
692
940
del server_defaults
693
941
server_config.read(os.path.join(options.configdir, "mandos.conf"))
694
server_section = "server"
695
942
# Convert the SafeConfigParser object to a dict
696
server_settings = dict(server_config.items(server_section))
697
# Use getboolean on the boolean config option
698
server_settings["debug"] = server_config.getboolean\
699
(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"))
700
949
del server_config
701
950
702
951
# Override the settings from the config file with command line
703
952
# options, if set.
704
953
for option in ("interface", "address", "port", "debug",
705
"priority", "servicename", "configdir"):
954
"priority", "servicename", "configdir",
955
"use_dbus"):
706
956
value = getattr(options, option)
707
957
if value is not None:
708
958
server_settings[option] = value
709
959
del options
710
960
# Now we have our good server settings in "server_settings"
711
961
962
# For convenience
963
debug = server_settings["debug"]
964
use_dbus = server_settings["use_dbus"]
965
966
if not debug:
967
syslogger.setLevel(logging.WARNING)
968
console.setLevel(logging.WARNING)
969
970
if server_settings["servicename"] != "Mandos":
971
syslogger.setFormatter(logging.Formatter
972
('Mandos (%s): %%(levelname)s:'
973
' %%(message)s'
974
% server_settings["servicename"]))
975
712
976
# Parse config file with clients
713
977
client_defaults = { "timeout": "1h",
714
978
"interval": "5m",
715
"checker": "fping -q -- %%(fqdn)s",
979
"checker": "fping -q -- %%(host)s",
980
"host": "",
716
981
}
717
982
client_config = ConfigParser.SafeConfigParser(client_defaults)
718
983
client_config.read(os.path.join(server_settings["configdir"],
719
984
"clients.conf"))
720
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
721
1019
global service
722
1020
service = AvahiService(name = server_settings["servicename"],
723
type = "_mandos._tcp", );
1021
servicetype = "_mandos._tcp", )
724
1022
if server_settings["interface"]:
725
service.interface = if_nametoindex(server_settings["interface"])
1023
service.interface = (if_nametoindex
1024
(server_settings["interface"]))
726
1025
727
1026
global main_loop
728
1027
global bus
731
1030
DBusGMainLoop(set_as_default=True )
732
1031
main_loop = gobject.MainLoop()
733
1032
bus = dbus.SystemBus()
734
server = dbus.Interface(
735
bus.get_object( avahi.DBUS_NAME, avahi.DBUS_PATH_SERVER ),
736
avahi.DBUS_INTERFACE_SERVER )
1033
server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
1034
avahi.DBUS_PATH_SERVER),
1035
avahi.DBUS_INTERFACE_SERVER)
737
1036
# End of Avahi example code
738
739
debug = server_settings["debug"]
740
741
if debug:
742
console = logging.StreamHandler()
743
# console.setLevel(logging.DEBUG)
744
console.setFormatter(logging.Formatter\
745
('%(levelname)s: %(message)s'))
746
logger.addHandler(console)
747
del console
748
749
clients = Set()
750
def remove_from_clients(client):
751
clients.remove(client)
752
if not clients:
753
logger.critical(u"No clients left, exiting")
754
sys.exit()
1037
if use_dbus:
1038
bus_name = dbus.service.BusName(u"org.mandos-system.Mandos",
1039
bus)
755
1040
756
1041
clients.update(Set(Client(name = section,
757
stop_hook = remove_from_clients,
758
1042
config
759
= dict(client_config.items(section)))
1043
= dict(client_config.items(section)),
1044
use_dbus = use_dbus)
760
1045
for section in client_config.sections()))
1046
if not clients:
1047
logger.warning(u"No clients defined")
761
1048
762
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
1057
logger.removeHandler(console)
1058
# Close all input and output, do double fork, etc.
763
1059
daemon()
764
1060
1061
try:
1062
pid = os.getpid()
1063
pidfile.write(str(pid) + "\n")
1064
pidfile.close()
1065
del pidfile
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
1073
765
1074
def cleanup():
766
1075
"Cleanup function; run on exit"
767
1076
global group
773
1082
774
1083
while clients:
775
1084
client = clients.pop()
776
client.stop_hook = None
777
client.stop()
1085
client.disable_hook = None
1086
client.disable()
778
1087
779
1088
atexit.register(cleanup)
780
1089
783
1092
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
784
1093
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
785
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
786
1158
for client in clients:
787
client.start()
788
789
tcp_server = IPv6_TCPServer((server_settings["address"],
790
server_settings["port"]),
791
tcp_handler,
792
settings=server_settings,
793
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
794
1168
# Find out what port we got
795
1169
service.port = tcp_server.socket.getsockname()[1]
796
1170
logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
810
1184
811
1185
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
812
1186
lambda *args, **kwargs:
813
tcp_server.handle_request\
814
(*args[2:], **kwargs) or True)
1187
(tcp_server.handle_request
1188
(*args[2:], **kwargs) or True))
815
1189
816
logger.debug("Starting main loop")
817
main_loop_started = True
1190
logger.debug(u"Starting main loop")
818
1191
main_loop.run()
819
1192
except AvahiError, error:
820
logger.critical(u"AvahiError: %s" + unicode(error))
1193
logger.critical(u"AvahiError: %s", error)
821
1194
sys.exit(1)
822
1195
except KeyboardInterrupt:
823
1196
if debug:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0