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