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