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