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