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