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 237.2.19
- compare with another revision
- download diff
- download tarball
- view history from revision 237.2.19
- Committer: Teddy Hogeborn
- Date: 2009-05-17 00:50:09 UTC
- mto: (24.1.170 mandos) (237.4.29 release)
- mto: This revision was merged to the branch mainline in revision 343.
- Revision ID: teddy@fukt.bsnet.se-20090517005009-c0iptxampo6nf177
* initramfs-tools-hook-conf: Security bug fix: Add code to handle
being called by "mkinitramfs-kpkg"
instead of "update-initramfs".
being called by "mkinitramfs-kpkg"
instead of "update-initramfs".
- files removed:
- dbus-mandos.conf
- files modified:
- Makefile
added
removed
mandos
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
# methods "add", "remove", "server_state_changed",
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
# "AvahiService" class, and some lines in "main".
9
# methods "add" and "remove" in the "AvahiService" class, the
10
# "server_state_changed" and "entry_group_state_changed" functions,
11
# and some lines in "main".
12
12
#
13
13
# Everything else is
14
14
# Copyright © 2008,2009 Teddy Hogeborn
33
33
34
34
from __future__ import division, with_statement, absolute_import
35
35
36
import SocketServer as socketserver
36
import SocketServer
37
37
import socket
38
38
import optparse
39
39
import datetime
44
44
import gnutls.library.functions
45
45
import gnutls.library.constants
46
46
import gnutls.library.types
47
import ConfigParser as configparser
47
import ConfigParser
48
48
import sys
49
49
import re
50
50
import os
51
51
import signal
52
from sets import Set
52
53
import subprocess
53
54
import atexit
54
55
import stat
55
56
import logging
56
57
import logging.handlers
57
58
import pwd
58
import contextlib
59
import struct
60
import fcntl
61
import functools
62
import cPickle as pickle
63
import multiprocessing
59
from contextlib import closing
64
60
65
61
import dbus
66
62
import dbus.service
69
65
from dbus.mainloop.glib import DBusGMainLoop
70
66
import ctypes
71
67
import ctypes.util
72
import xml.dom.minidom
73
import inspect
74
75
try:
76
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
77
except AttributeError:
78
try:
79
from IN import SO_BINDTODEVICE
80
except ImportError:
81
SO_BINDTODEVICE = None
82
83
84
version = "1.0.14"
85
86
logger = logging.Logger(u'mandos')
68
69
version = "1.0.8"
70
71
logger = logging.Logger('mandos')
87
72
syslogger = (logging.handlers.SysLogHandler
88
73
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
89
74
address = "/dev/log"))
90
75
syslogger.setFormatter(logging.Formatter
91
(u'Mandos [%(process)d]: %(levelname)s:'
92
u' %(message)s'))
76
('Mandos [%(process)d]: %(levelname)s:'
77
' %(message)s'))
93
78
logger.addHandler(syslogger)
94
79
95
80
console = logging.StreamHandler()
96
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
97
u' %(levelname)s:'
98
u' %(message)s'))
81
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
82
' %(levelname)s: %(message)s'))
99
83
logger.addHandler(console)
100
84
101
multiprocessing_manager = multiprocessing.Manager()
102
103
85
class AvahiError(Exception):
104
86
def __init__(self, value, *args, **kwargs):
105
87
self.value = value
116
98
117
99
class AvahiService(object):
118
100
"""An Avahi (Zeroconf) service.
119
120
101
Attributes:
121
102
interface: integer; avahi.IF_UNSPEC or an interface index.
122
103
Used to optionally bind to the specified interface.
123
name: string; Example: u'Mandos'
124
type: string; Example: u'_mandos._tcp'.
104
name: string; Example: 'Mandos'
105
type: string; Example: '_mandos._tcp'.
125
106
See <http://www.dns-sd.org/ServiceTypes.html>
126
107
port: integer; what port to announce
127
108
TXT: list of strings; TXT record for the service
130
111
max_renames: integer; maximum number of renames
131
112
rename_count: integer; counter so we only rename after collisions
132
113
a sensible number of times
133
group: D-Bus Entry Group
134
server: D-Bus Server
135
bus: dbus.SystemBus()
136
114
"""
137
115
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
138
116
servicetype = None, port = None, TXT = None,
139
domain = u"", host = u"", max_renames = 32768,
140
protocol = avahi.PROTO_UNSPEC, bus = None):
117
domain = "", host = "", max_renames = 32768,
118
protocol = avahi.PROTO_UNSPEC):
141
119
self.interface = interface
142
120
self.name = name
143
121
self.type = servicetype
148
126
self.rename_count = 0
149
127
self.max_renames = max_renames
150
128
self.protocol = protocol
151
self.group = None # our entry group
152
self.server = None
153
self.bus = bus
154
129
def rename(self):
155
130
"""Derived from the Avahi example code"""
156
131
if self.rename_count >= self.max_renames:
158
133
u" after %i retries, exiting.",
159
134
self.rename_count)
160
135
raise AvahiServiceError(u"Too many renames")
161
self.name = self.server.GetAlternativeServiceName(self.name)
136
self.name = server.GetAlternativeServiceName(self.name)
162
137
logger.info(u"Changing Zeroconf service name to %r ...",
163
unicode(self.name))
138
str(self.name))
164
139
syslogger.setFormatter(logging.Formatter
165
(u'Mandos (%s) [%%(process)d]:'
166
u' %%(levelname)s: %%(message)s'
167
% self.name))
140
('Mandos (%s): %%(levelname)s:'
141
' %%(message)s' % self.name))
168
142
self.remove()
169
143
self.add()
170
144
self.rename_count += 1
171
145
def remove(self):
172
146
"""Derived from the Avahi example code"""
173
if self.group is not None:
174
self.group.Reset()
147
if group is not None:
148
group.Reset()
175
149
def add(self):
176
150
"""Derived from the Avahi example code"""
177
if self.group is None:
178
self.group = dbus.Interface(
179
self.bus.get_object(avahi.DBUS_NAME,
180
self.server.EntryGroupNew()),
181
avahi.DBUS_INTERFACE_ENTRY_GROUP)
182
self.group.connect_to_signal('StateChanged',
183
self
184
.entry_group_state_changed)
151
global group
152
if group is None:
153
group = dbus.Interface(bus.get_object
154
(avahi.DBUS_NAME,
155
server.EntryGroupNew()),
156
avahi.DBUS_INTERFACE_ENTRY_GROUP)
157
group.connect_to_signal('StateChanged',
158
entry_group_state_changed)
185
159
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
186
self.name, self.type)
187
self.group.AddService(
188
self.interface,
189
self.protocol,
190
dbus.UInt32(0), # flags
191
self.name, self.type,
192
self.domain, self.host,
193
dbus.UInt16(self.port),
194
avahi.string_array_to_txt_array(self.TXT))
195
self.group.Commit()
196
def entry_group_state_changed(self, state, error):
197
"""Derived from the Avahi example code"""
198
logger.debug(u"Avahi state change: %i", state)
199
200
if state == avahi.ENTRY_GROUP_ESTABLISHED:
201
logger.debug(u"Zeroconf service established.")
202
elif state == avahi.ENTRY_GROUP_COLLISION:
203
logger.warning(u"Zeroconf service name collision.")
204
self.rename()
205
elif state == avahi.ENTRY_GROUP_FAILURE:
206
logger.critical(u"Avahi: Error in group state changed %s",
207
unicode(error))
208
raise AvahiGroupError(u"State changed: %s"
209
% unicode(error))
210
def cleanup(self):
211
"""Derived from the Avahi example code"""
212
if self.group is not None:
213
self.group.Free()
214
self.group = None
215
def server_state_changed(self, state):
216
"""Derived from the Avahi example code"""
217
if state == avahi.SERVER_COLLISION:
218
logger.error(u"Zeroconf server name collision")
219
self.remove()
220
elif state == avahi.SERVER_RUNNING:
221
self.add()
222
def activate(self):
223
"""Derived from the Avahi example code"""
224
if self.server is None:
225
self.server = dbus.Interface(
226
self.bus.get_object(avahi.DBUS_NAME,
227
avahi.DBUS_PATH_SERVER),
228
avahi.DBUS_INTERFACE_SERVER)
229
self.server.connect_to_signal(u"StateChanged",
230
self.server_state_changed)
231
self.server_state_changed(self.server.GetState())
232
233
234
class Client(object):
160
service.name, service.type)
161
group.AddService(
162
self.interface, # interface
163
self.protocol, # protocol
164
dbus.UInt32(0), # flags
165
self.name, self.type,
166
self.domain, self.host,
167
dbus.UInt16(self.port),
168
avahi.string_array_to_txt_array(self.TXT))
169
group.Commit()
170
171
# From the Avahi example code:
172
group = None # our entry group
173
# End of Avahi example code
174
175
176
def _datetime_to_dbus(dt, variant_level=0):
177
"""Convert a UTC datetime.datetime() to a D-Bus type."""
178
return dbus.String(dt.isoformat(), variant_level=variant_level)
179
180
181
class Client(dbus.service.Object):
235
182
"""A representation of a client host served by this server.
236
237
183
Attributes:
238
184
name: string; from the config file, used in log messages and
239
185
D-Bus identifiers
246
192
enabled: bool()
247
193
last_checked_ok: datetime.datetime(); (UTC) or None
248
194
timeout: datetime.timedelta(); How long from last_checked_ok
249
until this client is disabled
195
until this client is invalid
250
196
interval: datetime.timedelta(); How often to start a new checker
251
197
disable_hook: If set, called by disable() as disable_hook(self)
252
198
checker: subprocess.Popen(); a running checker process used
253
199
to see if the client lives.
254
200
'None' if no process is running.
255
201
checker_initiator_tag: a gobject event source tag, or None
256
disable_initiator_tag: - '' -
202
disable_initiator_tag: - '' -
257
203
checker_callback_tag: - '' -
258
204
checker_command: string; External command which is run to check if
259
205
client lives. %() expansions are done at
260
206
runtime with vars(self) as dict, so that for
261
207
instance %(name)s can be used in the command.
262
208
current_checker_command: string; current running checker_command
263
approved_delay: datetime.timedelta(); Time to wait for approval
264
_approved: bool(); 'None' if not yet approved/disapproved
265
approved_duration: datetime.timedelta(); Duration of one approval
209
use_dbus: bool(); Whether to provide D-Bus interface and signals
210
dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
266
211
"""
267
268
@staticmethod
269
def _timedelta_to_milliseconds(td):
270
"Convert a datetime.timedelta() to milliseconds"
271
return ((td.days * 24 * 60 * 60 * 1000)
272
+ (td.seconds * 1000)
273
+ (td.microseconds // 1000))
274
275
212
def timeout_milliseconds(self):
276
213
"Return the 'timeout' attribute in milliseconds"
277
return self._timedelta_to_milliseconds(self.timeout)
214
return ((self.timeout.days * 24 * 60 * 60 * 1000)
215
+ (self.timeout.seconds * 1000)
216
+ (self.timeout.microseconds // 1000))
278
217
279
218
def interval_milliseconds(self):
280
219
"Return the 'interval' attribute in milliseconds"
281
return self._timedelta_to_milliseconds(self.interval)
282
283
def approved_delay_milliseconds(self):
284
return self._timedelta_to_milliseconds(self.approved_delay)
220
return ((self.interval.days * 24 * 60 * 60 * 1000)
221
+ (self.interval.seconds * 1000)
222
+ (self.interval.microseconds // 1000))
285
223
286
def __init__(self, name = None, disable_hook=None, config=None):
224
def __init__(self, name = None, disable_hook=None, config=None,
225
use_dbus=True):
287
226
"""Note: the 'checker' key in 'config' sets the
288
227
'checker_command' attribute and *not* the 'checker'
289
228
attribute."""
291
230
if config is None:
292
231
config = {}
293
232
logger.debug(u"Creating client %r", self.name)
233
self.use_dbus = False # During __init__
294
234
# Uppercase and remove spaces from fingerprint for later
295
235
# comparison purposes with return value from the fingerprint()
296
236
# function
297
self.fingerprint = (config[u"fingerprint"].upper()
237
self.fingerprint = (config["fingerprint"].upper()
298
238
.replace(u" ", u""))
299
239
logger.debug(u" Fingerprint: %s", self.fingerprint)
300
if u"secret" in config:
301
self.secret = config[u"secret"].decode(u"base64")
302
elif u"secfile" in config:
303
with open(os.path.expanduser(os.path.expandvars
304
(config[u"secfile"])),
305
"rb") as secfile:
240
if "secret" in config:
241
self.secret = config["secret"].decode(u"base64")
242
elif "secfile" in config:
243
with closing(open(os.path.expanduser
244
(os.path.expandvars
245
(config["secfile"])))) as secfile:
306
246
self.secret = secfile.read()
307
247
else:
308
#XXX Need to allow secret on demand!
309
248
raise TypeError(u"No secret or secfile for client %s"
310
249
% self.name)
311
self.host = config.get(u"host", u"")
250
self.host = config.get("host", "")
312
251
self.created = datetime.datetime.utcnow()
313
252
self.enabled = False
314
253
self.last_enabled = None
315
254
self.last_checked_ok = None
316
self.timeout = string_to_delta(config[u"timeout"])
317
self.interval = string_to_delta(config[u"interval"])
255
self.timeout = string_to_delta(config["timeout"])
256
self.interval = string_to_delta(config["interval"])
318
257
self.disable_hook = disable_hook
319
258
self.checker = None
320
259
self.checker_initiator_tag = None
321
260
self.disable_initiator_tag = None
322
261
self.checker_callback_tag = None
323
self.checker_command = config[u"checker"]
262
self.checker_command = config["checker"]
324
263
self.current_checker_command = None
325
264
self.last_connect = None
326
self.approvals_pending = 0
327
self._approved = None
328
self.approved_by_default = config.get(u"approved_by_default",
329
False)
330
self.approved_delay = string_to_delta(
331
config[u"approved_delay"])
332
self.approved_duration = string_to_delta(
333
config[u"approved_duration"])
334
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
335
336
def send_changedstate(self):
337
self.changedstate.acquire()
338
self.changedstate.notify_all()
339
self.changedstate.release()
340
265
# Only now, when this client is initialized, can it show up on
266
# the D-Bus
267
self.use_dbus = use_dbus
268
if self.use_dbus:
269
self.dbus_object_path = (dbus.ObjectPath
270
("/clients/"
271
+ self.name.replace(".", "_")))
272
dbus.service.Object.__init__(self, bus,
273
self.dbus_object_path)
274
341
275
def enable(self):
342
276
"""Start this client's checker and timeout hooks"""
343
if getattr(self, u"enabled", False):
344
# Already enabled
345
return
346
self.send_changedstate()
347
277
self.last_enabled = datetime.datetime.utcnow()
348
278
# Schedule a new checker to be started an 'interval' from now,
349
279
# and every interval from then on.
350
280
self.checker_initiator_tag = (gobject.timeout_add
351
281
(self.interval_milliseconds(),
352
282
self.start_checker))
283
# Also start a new checker *right now*.
284
self.start_checker()
353
285
# Schedule a disable() when 'timeout' has passed
354
286
self.disable_initiator_tag = (gobject.timeout_add
355
287
(self.timeout_milliseconds(),
356
288
self.disable))
357
289
self.enabled = True
358
# Also start a new checker *right now*.
359
self.start_checker()
290
if self.use_dbus:
291
# Emit D-Bus signals
292
self.PropertyChanged(dbus.String(u"enabled"),
293
dbus.Boolean(True, variant_level=1))
294
self.PropertyChanged(dbus.String(u"last_enabled"),
295
(_datetime_to_dbus(self.last_enabled,
296
variant_level=1)))
360
297
361
def disable(self, quiet=True):
298
def disable(self):
362
299
"""Disable this client."""
363
300
if not getattr(self, "enabled", False):
364
301
return False
365
if not quiet:
366
self.send_changedstate()
367
if not quiet:
368
logger.info(u"Disabling client %s", self.name)
369
if getattr(self, u"disable_initiator_tag", False):
302
logger.info(u"Disabling client %s", self.name)
303
if getattr(self, "disable_initiator_tag", False):
370
304
gobject.source_remove(self.disable_initiator_tag)
371
305
self.disable_initiator_tag = None
372
if getattr(self, u"checker_initiator_tag", False):
306
if getattr(self, "checker_initiator_tag", False):
373
307
gobject.source_remove(self.checker_initiator_tag)
374
308
self.checker_initiator_tag = None
375
309
self.stop_checker()
376
310
if self.disable_hook:
377
311
self.disable_hook(self)
378
312
self.enabled = False
313
if self.use_dbus:
314
# Emit D-Bus signal
315
self.PropertyChanged(dbus.String(u"enabled"),
316
dbus.Boolean(False, variant_level=1))
379
317
# Do not run this again if called by a gobject.timeout_add
380
318
return False
381
319
387
325
"""The checker has completed, so take appropriate actions."""
388
326
self.checker_callback_tag = None
389
327
self.checker = None
328
if self.use_dbus:
329
# Emit D-Bus signal
330
self.PropertyChanged(dbus.String(u"checker_running"),
331
dbus.Boolean(False, variant_level=1))
390
332
if os.WIFEXITED(condition):
391
333
exitstatus = os.WEXITSTATUS(condition)
392
334
if exitstatus == 0:
396
338
else:
397
339
logger.info(u"Checker for %(name)s failed",
398
340
vars(self))
341
if self.use_dbus:
342
# Emit D-Bus signal
343
self.CheckerCompleted(dbus.Int16(exitstatus),
344
dbus.Int64(condition),
345
dbus.String(command))
399
346
else:
400
347
logger.warning(u"Checker for %(name)s crashed?",
401
348
vars(self))
349
if self.use_dbus:
350
# Emit D-Bus signal
351
self.CheckerCompleted(dbus.Int16(-1),
352
dbus.Int64(condition),
353
dbus.String(command))
402
354
403
355
def checked_ok(self):
404
356
"""Bump up the timeout for this client.
405
406
357
This should only be called when the client has been seen,
407
358
alive and well.
408
359
"""
411
362
self.disable_initiator_tag = (gobject.timeout_add
412
363
(self.timeout_milliseconds(),
413
364
self.disable))
365
if self.use_dbus:
366
# Emit D-Bus signal
367
self.PropertyChanged(
368
dbus.String(u"last_checked_ok"),
369
(_datetime_to_dbus(self.last_checked_ok,
370
variant_level=1)))
414
371
415
372
def start_checker(self):
416
373
"""Start a new checker subprocess if one is not running.
417
418
374
If a checker already exists, leave it running and do
419
375
nothing."""
420
376
# The reason for not killing a running checker is that if we
423
379
# client would inevitably timeout, since no checker would get
424
380
# a chance to run to completion. If we instead leave running
425
381
# checkers alone, the checker would have to take more time
426
# than 'timeout' for the client to be disabled, which is as it
427
# should be.
382
# than 'timeout' for the client to be declared invalid, which
383
# is as it should be.
428
384
429
385
# If a checker exists, make sure it is not a zombie
430
try:
386
if self.checker is not None:
431
387
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
432
except (AttributeError, OSError), error:
433
if (isinstance(error, OSError)
434
and error.errno != errno.ECHILD):
435
raise error
436
else:
437
388
if pid:
438
logger.warning(u"Checker was a zombie")
389
logger.warning("Checker was a zombie")
439
390
gobject.source_remove(self.checker_callback_tag)
440
391
self.checker_callback(pid, status,
441
392
self.current_checker_command)
446
397
command = self.checker_command % self.host
447
398
except TypeError:
448
399
# Escape attributes for the shell
449
escaped_attrs = dict((key,
450
re.escape(unicode(str(val),
451
errors=
452
u'replace')))
400
escaped_attrs = dict((key, re.escape(str(val)))
453
401
for key, val in
454
402
vars(self).iteritems())
455
403
try:
458
406
logger.error(u'Could not format string "%s":'
459
407
u' %s', self.checker_command, error)
460
408
return True # Try again later
461
self.current_checker_command = command
409
self.current_checker_command = command
462
410
try:
463
411
logger.info(u"Starting checker %r for %s",
464
412
command, self.name)
468
416
# always replaced by /dev/null.)
469
417
self.checker = subprocess.Popen(command,
470
418
close_fds=True,
471
shell=True, cwd=u"/")
419
shell=True, cwd="/")
420
if self.use_dbus:
421
# Emit D-Bus signal
422
self.CheckerStarted(command)
423
self.PropertyChanged(
424
dbus.String("checker_running"),
425
dbus.Boolean(True, variant_level=1))
472
426
self.checker_callback_tag = (gobject.child_watch_add
473
427
(self.checker.pid,
474
428
self.checker_callback,
490
444
if self.checker_callback_tag:
491
445
gobject.source_remove(self.checker_callback_tag)
492
446
self.checker_callback_tag = None
493
if getattr(self, u"checker", None) is None:
447
if getattr(self, "checker", None) is None:
494
448
return
495
449
logger.debug(u"Stopping checker for %(name)s", vars(self))
496
450
try:
497
451
os.kill(self.checker.pid, signal.SIGTERM)
498
#time.sleep(0.5)
452
#os.sleep(0.5)
499
453
#if self.checker.poll() is None:
500
454
# os.kill(self.checker.pid, signal.SIGKILL)
501
455
except OSError, error:
502
456
if error.errno != errno.ESRCH: # No such process
503
457
raise
504
458
self.checker = None
505
506
def dbus_service_property(dbus_interface, signature=u"v",
507
access=u"readwrite", byte_arrays=False):
508
"""Decorators for marking methods of a DBusObjectWithProperties to
509
become properties on the D-Bus.
510
511
The decorated method will be called with no arguments by "Get"
512
and with one argument by "Set".
513
514
The parameters, where they are supported, are the same as
515
dbus.service.method, except there is only "signature", since the
516
type from Get() and the type sent to Set() is the same.
517
"""
518
# Encoding deeply encoded byte arrays is not supported yet by the
519
# "Set" method, so we fail early here:
520
if byte_arrays and signature != u"ay":
521
raise ValueError(u"Byte arrays not supported for non-'ay'"
522
u" signature %r" % signature)
523
def decorator(func):
524
func._dbus_is_property = True
525
func._dbus_interface = dbus_interface
526
func._dbus_signature = signature
527
func._dbus_access = access
528
func._dbus_name = func.__name__
529
if func._dbus_name.endswith(u"_dbus_property"):
530
func._dbus_name = func._dbus_name[:-14]
531
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
532
return func
533
return decorator
534
535
536
class DBusPropertyException(dbus.exceptions.DBusException):
537
"""A base class for D-Bus property-related exceptions
538
"""
539
def __unicode__(self):
540
return unicode(str(self))
541
542
543
class DBusPropertyAccessException(DBusPropertyException):
544
"""A property's access permissions disallows an operation.
545
"""
546
pass
547
548
549
class DBusPropertyNotFound(DBusPropertyException):
550
"""An attempt was made to access a non-existing property.
551
"""
552
pass
553
554
555
class DBusObjectWithProperties(dbus.service.Object):
556
"""A D-Bus object with properties.
557
558
Classes inheriting from this can use the dbus_service_property
559
decorator to expose methods as D-Bus properties. It exposes the
560
standard Get(), Set(), and GetAll() methods on the D-Bus.
561
"""
562
563
@staticmethod
564
def _is_dbus_property(obj):
565
return getattr(obj, u"_dbus_is_property", False)
566
567
def _get_all_dbus_properties(self):
568
"""Returns a generator of (name, attribute) pairs
569
"""
570
return ((prop._dbus_name, prop)
571
for name, prop in
572
inspect.getmembers(self, self._is_dbus_property))
573
574
def _get_dbus_property(self, interface_name, property_name):
575
"""Returns a bound method if one exists which is a D-Bus
576
property with the specified name and interface.
577
"""
578
for name in (property_name,
579
property_name + u"_dbus_property"):
580
prop = getattr(self, name, None)
581
if (prop is None
582
or not self._is_dbus_property(prop)
583
or prop._dbus_name != property_name
584
or (interface_name and prop._dbus_interface
585
and interface_name != prop._dbus_interface)):
586
continue
587
return prop
588
# No such property
589
raise DBusPropertyNotFound(self.dbus_object_path + u":"
590
+ interface_name + u"."
591
+ property_name)
592
593
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
594
out_signature=u"v")
595
def Get(self, interface_name, property_name):
596
"""Standard D-Bus property Get() method, see D-Bus standard.
597
"""
598
prop = self._get_dbus_property(interface_name, property_name)
599
if prop._dbus_access == u"write":
600
raise DBusPropertyAccessException(property_name)
601
value = prop()
602
if not hasattr(value, u"variant_level"):
603
return value
604
return type(value)(value, variant_level=value.variant_level+1)
605
606
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
607
def Set(self, interface_name, property_name, value):
608
"""Standard D-Bus property Set() method, see D-Bus standard.
609
"""
610
prop = self._get_dbus_property(interface_name, property_name)
611
if prop._dbus_access == u"read":
612
raise DBusPropertyAccessException(property_name)
613
if prop._dbus_get_args_options[u"byte_arrays"]:
614
# The byte_arrays option is not supported yet on
615
# signatures other than "ay".
616
if prop._dbus_signature != u"ay":
617
raise ValueError
618
value = dbus.ByteArray(''.join(unichr(byte)
619
for byte in value))
620
prop(value)
621
622
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
623
out_signature=u"a{sv}")
624
def GetAll(self, interface_name):
625
"""Standard D-Bus property GetAll() method, see D-Bus
626
standard.
627
628
Note: Will not include properties with access="write".
629
"""
630
all = {}
631
for name, prop in self._get_all_dbus_properties():
632
if (interface_name
633
and interface_name != prop._dbus_interface):
634
# Interface non-empty but did not match
635
continue
636
# Ignore write-only properties
637
if prop._dbus_access == u"write":
638
continue
639
value = prop()
640
if not hasattr(value, u"variant_level"):
641
all[name] = value
642
continue
643
all[name] = type(value)(value, variant_level=
644
value.variant_level+1)
645
return dbus.Dictionary(all, signature=u"sv")
646
647
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
648
out_signature=u"s",
649
path_keyword='object_path',
650
connection_keyword='connection')
651
def Introspect(self, object_path, connection):
652
"""Standard D-Bus method, overloaded to insert property tags.
653
"""
654
xmlstring = dbus.service.Object.Introspect(self, object_path,
655
connection)
656
try:
657
document = xml.dom.minidom.parseString(xmlstring)
658
def make_tag(document, name, prop):
659
e = document.createElement(u"property")
660
e.setAttribute(u"name", name)
661
e.setAttribute(u"type", prop._dbus_signature)
662
e.setAttribute(u"access", prop._dbus_access)
663
return e
664
for if_tag in document.getElementsByTagName(u"interface"):
665
for tag in (make_tag(document, name, prop)
666
for name, prop
667
in self._get_all_dbus_properties()
668
if prop._dbus_interface
669
== if_tag.getAttribute(u"name")):
670
if_tag.appendChild(tag)
671
# Add the names to the return values for the
672
# "org.freedesktop.DBus.Properties" methods
673
if (if_tag.getAttribute(u"name")
674
== u"org.freedesktop.DBus.Properties"):
675
for cn in if_tag.getElementsByTagName(u"method"):
676
if cn.getAttribute(u"name") == u"Get":
677
for arg in cn.getElementsByTagName(u"arg"):
678
if (arg.getAttribute(u"direction")
679
== u"out"):
680
arg.setAttribute(u"name", u"value")
681
elif cn.getAttribute(u"name") == u"GetAll":
682
for arg in cn.getElementsByTagName(u"arg"):
683
if (arg.getAttribute(u"direction")
684
== u"out"):
685
arg.setAttribute(u"name", u"props")
686
xmlstring = document.toxml(u"utf-8")
687
document.unlink()
688
except (AttributeError, xml.dom.DOMException,
689
xml.parsers.expat.ExpatError), error:
690
logger.error(u"Failed to override Introspection method",
691
error)
692
return xmlstring
693
694
695
class ClientDBus(Client, DBusObjectWithProperties):
696
"""A Client class using D-Bus
697
698
Attributes:
699
dbus_object_path: dbus.ObjectPath
700
bus: dbus.SystemBus()
701
"""
702
# dbus.service.Object doesn't use super(), so we can't either.
703
704
def __init__(self, bus = None, *args, **kwargs):
705
self.bus = bus
706
Client.__init__(self, *args, **kwargs)
707
# Only now, when this client is initialized, can it show up on
708
# the D-Bus
709
self.dbus_object_path = (dbus.ObjectPath
710
(u"/clients/"
711
+ self.name.replace(u".", u"_")))
712
DBusObjectWithProperties.__init__(self, self.bus,
713
self.dbus_object_path)
714
715
@staticmethod
716
def _datetime_to_dbus(dt, variant_level=0):
717
"""Convert a UTC datetime.datetime() to a D-Bus type."""
718
return dbus.String(dt.isoformat(),
719
variant_level=variant_level)
720
721
def enable(self):
722
oldstate = getattr(self, u"enabled", False)
723
r = Client.enable(self)
724
if oldstate != self.enabled:
725
# Emit D-Bus signals
726
self.PropertyChanged(dbus.String(u"enabled"),
727
dbus.Boolean(True, variant_level=1))
728
self.PropertyChanged(
729
dbus.String(u"last_enabled"),
730
self._datetime_to_dbus(self.last_enabled,
731
variant_level=1))
732
return r
733
734
def disable(self, quiet = False):
735
oldstate = getattr(self, u"enabled", False)
736
r = Client.disable(self, quiet=quiet)
737
if not quiet and oldstate != self.enabled:
738
# Emit D-Bus signal
739
self.PropertyChanged(dbus.String(u"enabled"),
740
dbus.Boolean(False, variant_level=1))
741
return r
742
743
def __del__(self, *args, **kwargs):
744
try:
745
self.remove_from_connection()
746
except LookupError:
747
pass
748
if hasattr(DBusObjectWithProperties, u"__del__"):
749
DBusObjectWithProperties.__del__(self, *args, **kwargs)
750
Client.__del__(self, *args, **kwargs)
751
752
def checker_callback(self, pid, condition, command,
753
*args, **kwargs):
754
self.checker_callback_tag = None
755
self.checker = None
756
# Emit D-Bus signal
757
self.PropertyChanged(dbus.String(u"checker_running"),
758
dbus.Boolean(False, variant_level=1))
759
if os.WIFEXITED(condition):
760
exitstatus = os.WEXITSTATUS(condition)
761
# Emit D-Bus signal
762
self.CheckerCompleted(dbus.Int16(exitstatus),
763
dbus.Int64(condition),
764
dbus.String(command))
765
else:
766
# Emit D-Bus signal
767
self.CheckerCompleted(dbus.Int16(-1),
768
dbus.Int64(condition),
769
dbus.String(command))
770
771
return Client.checker_callback(self, pid, condition, command,
772
*args, **kwargs)
773
774
def checked_ok(self, *args, **kwargs):
775
r = Client.checked_ok(self, *args, **kwargs)
776
# Emit D-Bus signal
777
self.PropertyChanged(
778
dbus.String(u"last_checked_ok"),
779
(self._datetime_to_dbus(self.last_checked_ok,
780
variant_level=1)))
781
return r
782
783
def start_checker(self, *args, **kwargs):
784
old_checker = self.checker
785
if self.checker is not None:
786
old_checker_pid = self.checker.pid
787
else:
788
old_checker_pid = None
789
r = Client.start_checker(self, *args, **kwargs)
790
# Only if new checker process was started
791
if (self.checker is not None
792
and old_checker_pid != self.checker.pid):
793
# Emit D-Bus signal
794
self.CheckerStarted(self.current_checker_command)
795
self.PropertyChanged(
796
dbus.String(u"checker_running"),
797
dbus.Boolean(True, variant_level=1))
798
return r
799
800
def stop_checker(self, *args, **kwargs):
801
old_checker = getattr(self, u"checker", None)
802
r = Client.stop_checker(self, *args, **kwargs)
803
if (old_checker is not None
804
and getattr(self, u"checker", None) is None):
459
if self.use_dbus:
805
460
self.PropertyChanged(dbus.String(u"checker_running"),
806
461
dbus.Boolean(False, variant_level=1))
807
return r
808
809
def _reset_approved(self):
810
self._approved = None
811
return False
812
813
def approve(self, value=True):
814
self._approved = value
815
gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration, self._reset_approved))
816
817
def approved_pending(self):
818
return self.approvals_pending > 0
819
820
821
## D-Bus methods, signals & properties
462
463
def still_valid(self):
464
"""Has the timeout not yet passed for this client?"""
465
if not getattr(self, "enabled", False):
466
return False
467
now = datetime.datetime.utcnow()
468
if self.last_checked_ok is None:
469
return now < (self.created + self.timeout)
470
else:
471
return now < (self.last_checked_ok + self.timeout)
472
473
## D-Bus methods & signals
822
474
_interface = u"se.bsnet.fukt.Mandos.Client"
823
475
824
## Signals
476
# CheckedOK - method
477
CheckedOK = dbus.service.method(_interface)(checked_ok)
478
CheckedOK.__name__ = "CheckedOK"
825
479
826
480
# CheckerCompleted - signal
827
@dbus.service.signal(_interface, signature=u"nxs")
481
@dbus.service.signal(_interface, signature="nxs")
828
482
def CheckerCompleted(self, exitcode, waitstatus, command):
829
483
"D-Bus signal"
830
484
pass
831
485
832
486
# CheckerStarted - signal
833
@dbus.service.signal(_interface, signature=u"s")
487
@dbus.service.signal(_interface, signature="s")
834
488
def CheckerStarted(self, command):
835
489
"D-Bus signal"
836
490
pass
837
491
492
# GetAllProperties - method
493
@dbus.service.method(_interface, out_signature="a{sv}")
494
def GetAllProperties(self):
495
"D-Bus method"
496
return dbus.Dictionary({
497
dbus.String("name"):
498
dbus.String(self.name, variant_level=1),
499
dbus.String("fingerprint"):
500
dbus.String(self.fingerprint, variant_level=1),
501
dbus.String("host"):
502
dbus.String(self.host, variant_level=1),
503
dbus.String("created"):
504
_datetime_to_dbus(self.created, variant_level=1),
505
dbus.String("last_enabled"):
506
(_datetime_to_dbus(self.last_enabled,
507
variant_level=1)
508
if self.last_enabled is not None
509
else dbus.Boolean(False, variant_level=1)),
510
dbus.String("enabled"):
511
dbus.Boolean(self.enabled, variant_level=1),
512
dbus.String("last_checked_ok"):
513
(_datetime_to_dbus(self.last_checked_ok,
514
variant_level=1)
515
if self.last_checked_ok is not None
516
else dbus.Boolean (False, variant_level=1)),
517
dbus.String("timeout"):
518
dbus.UInt64(self.timeout_milliseconds(),
519
variant_level=1),
520
dbus.String("interval"):
521
dbus.UInt64(self.interval_milliseconds(),
522
variant_level=1),
523
dbus.String("checker"):
524
dbus.String(self.checker_command,
525
variant_level=1),
526
dbus.String("checker_running"):
527
dbus.Boolean(self.checker is not None,
528
variant_level=1),
529
dbus.String("object_path"):
530
dbus.ObjectPath(self.dbus_object_path,
531
variant_level=1)
532
}, signature="sv")
533
534
# IsStillValid - method
535
IsStillValid = (dbus.service.method(_interface, out_signature="b")
536
(still_valid))
537
IsStillValid.__name__ = "IsStillValid"
538
838
539
# PropertyChanged - signal
839
@dbus.service.signal(_interface, signature=u"sv")
540
@dbus.service.signal(_interface, signature="sv")
840
541
def PropertyChanged(self, property, value):
841
542
"D-Bus signal"
842
543
pass
843
544
844
# GotSecret - signal
845
@dbus.service.signal(_interface)
846
def GotSecret(self):
847
"D-Bus signal"
848
pass
849
850
# Rejected - signal
851
@dbus.service.signal(_interface, signature=u"s")
852
def Rejected(self, reason):
853
"D-Bus signal"
854
pass
855
856
# NeedApproval - signal
857
@dbus.service.signal(_interface, signature=u"db")
858
def NeedApproval(self, timeout, default):
859
"D-Bus signal"
860
pass
861
862
## Methods
863
864
# Approve - method
865
@dbus.service.method(_interface, in_signature=u"b")
866
def Approve(self, value):
867
self.approve(value)
868
869
# CheckedOK - method
870
@dbus.service.method(_interface)
871
def CheckedOK(self):
872
return self.checked_ok()
545
# SetChecker - method
546
@dbus.service.method(_interface, in_signature="s")
547
def SetChecker(self, checker):
548
"D-Bus setter method"
549
self.checker_command = checker
550
# Emit D-Bus signal
551
self.PropertyChanged(dbus.String(u"checker"),
552
dbus.String(self.checker_command,
553
variant_level=1))
554
555
# SetHost - method
556
@dbus.service.method(_interface, in_signature="s")
557
def SetHost(self, host):
558
"D-Bus setter method"
559
self.host = host
560
# Emit D-Bus signal
561
self.PropertyChanged(dbus.String(u"host"),
562
dbus.String(self.host, variant_level=1))
563
564
# SetInterval - method
565
@dbus.service.method(_interface, in_signature="t")
566
def SetInterval(self, milliseconds):
567
self.interval = datetime.timedelta(0, 0, 0, milliseconds)
568
# Emit D-Bus signal
569
self.PropertyChanged(dbus.String(u"interval"),
570
(dbus.UInt64(self.interval_milliseconds(),
571
variant_level=1)))
572
573
# SetSecret - method
574
@dbus.service.method(_interface, in_signature="ay",
575
byte_arrays=True)
576
def SetSecret(self, secret):
577
"D-Bus setter method"
578
self.secret = str(secret)
579
580
# SetTimeout - method
581
@dbus.service.method(_interface, in_signature="t")
582
def SetTimeout(self, milliseconds):
583
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
584
# Emit D-Bus signal
585
self.PropertyChanged(dbus.String(u"timeout"),
586
(dbus.UInt64(self.timeout_milliseconds(),
587
variant_level=1)))
873
588
874
589
# Enable - method
875
@dbus.service.method(_interface)
876
def Enable(self):
877
"D-Bus method"
878
self.enable()
590
Enable = dbus.service.method(_interface)(enable)
591
Enable.__name__ = "Enable"
879
592
880
593
# StartChecker - method
881
594
@dbus.service.method(_interface)
890
603
self.disable()
891
604
892
605
# StopChecker - method
893
@dbus.service.method(_interface)
894
def StopChecker(self):
895
self.stop_checker()
896
897
## Properties
898
899
# approved_pending - property
900
@dbus_service_property(_interface, signature=u"b", access=u"read")
901
def approved_pending_dbus_property(self):
902
return dbus.Boolean(self.approved_pending())
903
904
# approved_by_default - property
905
@dbus_service_property(_interface, signature=u"b",
906
access=u"readwrite")
907
def approved_by_default_dbus_property(self):
908
return dbus.Boolean(self.approved_by_default)
909
910
# approved_delay - property
911
@dbus_service_property(_interface, signature=u"t",
912
access=u"readwrite")
913
def approved_delay_dbus_property(self):
914
return dbus.UInt64(self.approved_delay_milliseconds())
915
916
# approved_duration - property
917
@dbus_service_property(_interface, signature=u"t",
918
access=u"readwrite")
919
def approved_duration_dbus_property(self):
920
return dbus.UInt64(self._timedelta_to_milliseconds(
921
self.approved_duration))
922
923
# name - property
924
@dbus_service_property(_interface, signature=u"s", access=u"read")
925
def name_dbus_property(self):
926
return dbus.String(self.name)
927
928
# fingerprint - property
929
@dbus_service_property(_interface, signature=u"s", access=u"read")
930
def fingerprint_dbus_property(self):
931
return dbus.String(self.fingerprint)
932
933
# host - property
934
@dbus_service_property(_interface, signature=u"s",
935
access=u"readwrite")
936
def host_dbus_property(self, value=None):
937
if value is None: # get
938
return dbus.String(self.host)
939
self.host = value
940
# Emit D-Bus signal
941
self.PropertyChanged(dbus.String(u"host"),
942
dbus.String(value, variant_level=1))
943
944
# created - property
945
@dbus_service_property(_interface, signature=u"s", access=u"read")
946
def created_dbus_property(self):
947
return dbus.String(self._datetime_to_dbus(self.created))
948
949
# last_enabled - property
950
@dbus_service_property(_interface, signature=u"s", access=u"read")
951
def last_enabled_dbus_property(self):
952
if self.last_enabled is None:
953
return dbus.String(u"")
954
return dbus.String(self._datetime_to_dbus(self.last_enabled))
955
956
# enabled - property
957
@dbus_service_property(_interface, signature=u"b",
958
access=u"readwrite")
959
def enabled_dbus_property(self, value=None):
960
if value is None: # get
961
return dbus.Boolean(self.enabled)
962
if value:
963
self.enable()
964
else:
965
self.disable()
966
967
# last_checked_ok - property
968
@dbus_service_property(_interface, signature=u"s",
969
access=u"readwrite")
970
def last_checked_ok_dbus_property(self, value=None):
971
if value is not None:
972
self.checked_ok()
973
return
974
if self.last_checked_ok is None:
975
return dbus.String(u"")
976
return dbus.String(self._datetime_to_dbus(self
977
.last_checked_ok))
978
979
# timeout - property
980
@dbus_service_property(_interface, signature=u"t",
981
access=u"readwrite")
982
def timeout_dbus_property(self, value=None):
983
if value is None: # get
984
return dbus.UInt64(self.timeout_milliseconds())
985
self.timeout = datetime.timedelta(0, 0, 0, value)
986
# Emit D-Bus signal
987
self.PropertyChanged(dbus.String(u"timeout"),
988
dbus.UInt64(value, variant_level=1))
989
if getattr(self, u"disable_initiator_tag", None) is None:
990
return
991
# Reschedule timeout
992
gobject.source_remove(self.disable_initiator_tag)
993
self.disable_initiator_tag = None
994
time_to_die = (self.
995
_timedelta_to_milliseconds((self
996
.last_checked_ok
997
+ self.timeout)
998
- datetime.datetime
999
.utcnow()))
1000
if time_to_die <= 0:
1001
# The timeout has passed
1002
self.disable()
1003
else:
1004
self.disable_initiator_tag = (gobject.timeout_add
1005
(time_to_die, self.disable))
1006
1007
# interval - property
1008
@dbus_service_property(_interface, signature=u"t",
1009
access=u"readwrite")
1010
def interval_dbus_property(self, value=None):
1011
if value is None: # get
1012
return dbus.UInt64(self.interval_milliseconds())
1013
self.interval = datetime.timedelta(0, 0, 0, value)
1014
# Emit D-Bus signal
1015
self.PropertyChanged(dbus.String(u"interval"),
1016
dbus.UInt64(value, variant_level=1))
1017
if getattr(self, u"checker_initiator_tag", None) is None:
1018
return
1019
# Reschedule checker run
1020
gobject.source_remove(self.checker_initiator_tag)
1021
self.checker_initiator_tag = (gobject.timeout_add
1022
(value, self.start_checker))
1023
self.start_checker() # Start one now, too
1024
1025
# checker - property
1026
@dbus_service_property(_interface, signature=u"s",
1027
access=u"readwrite")
1028
def checker_dbus_property(self, value=None):
1029
if value is None: # get
1030
return dbus.String(self.checker_command)
1031
self.checker_command = value
1032
# Emit D-Bus signal
1033
self.PropertyChanged(dbus.String(u"checker"),
1034
dbus.String(self.checker_command,
1035
variant_level=1))
1036
1037
# checker_running - property
1038
@dbus_service_property(_interface, signature=u"b",
1039
access=u"readwrite")
1040
def checker_running_dbus_property(self, value=None):
1041
if value is None: # get
1042
return dbus.Boolean(self.checker is not None)
1043
if value:
1044
self.start_checker()
1045
else:
1046
self.stop_checker()
1047
1048
# object_path - property
1049
@dbus_service_property(_interface, signature=u"o", access=u"read")
1050
def object_path_dbus_property(self):
1051
return self.dbus_object_path # is already a dbus.ObjectPath
1052
1053
# secret = property
1054
@dbus_service_property(_interface, signature=u"ay",
1055
access=u"write", byte_arrays=True)
1056
def secret_dbus_property(self, value):
1057
self.secret = str(value)
606
StopChecker = dbus.service.method(_interface)(stop_checker)
607
StopChecker.__name__ = "StopChecker"
1058
608
1059
609
del _interface
1060
610
1061
611
1062
class ProxyClient(object):
1063
def __init__(self, child_pipe, fpr, address):
1064
self._pipe = child_pipe
1065
self._pipe.send(('init', fpr, address))
1066
if not self._pipe.recv():
1067
raise KeyError()
1068
1069
def __getattribute__(self, name):
1070
if(name == '_pipe'):
1071
return super(ProxyClient, self).__getattribute__(name)
1072
self._pipe.send(('getattr', name))
1073
data = self._pipe.recv()
1074
if data[0] == 'data':
1075
return data[1]
1076
if data[0] == 'function':
1077
def func(*args, **kwargs):
1078
self._pipe.send(('funcall', name, args, kwargs))
1079
return self._pipe.recv()[1]
1080
return func
1081
1082
def __setattr__(self, name, value):
1083
if(name == '_pipe'):
1084
return super(ProxyClient, self).__setattr__(name, value)
1085
self._pipe.send(('setattr', name, value))
1086
1087
1088
class ClientHandler(socketserver.BaseRequestHandler, object):
1089
"""A class to handle client connections.
1090
1091
Instantiated once for each connection to handle it.
612
def peer_certificate(session):
613
"Return the peer's OpenPGP certificate as a bytestring"
614
# If not an OpenPGP certificate...
615
if (gnutls.library.functions
616
.gnutls_certificate_type_get(session._c_object)
617
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
618
# ...do the normal thing
619
return session.peer_certificate
620
list_size = ctypes.c_uint(1)
621
cert_list = (gnutls.library.functions
622
.gnutls_certificate_get_peers
623
(session._c_object, ctypes.byref(list_size)))
624
if not bool(cert_list) and list_size.value != 0:
625
raise gnutls.errors.GNUTLSError("error getting peer"
626
" certificate")
627
if list_size.value == 0:
628
return None
629
cert = cert_list[0]
630
return ctypes.string_at(cert.data, cert.size)
631
632
633
def fingerprint(openpgp):
634
"Convert an OpenPGP bytestring to a hexdigit fingerprint string"
635
# New GnuTLS "datum" with the OpenPGP public key
636
datum = (gnutls.library.types
637
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
638
ctypes.POINTER
639
(ctypes.c_ubyte)),
640
ctypes.c_uint(len(openpgp))))
641
# New empty GnuTLS certificate
642
crt = gnutls.library.types.gnutls_openpgp_crt_t()
643
(gnutls.library.functions
644
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
645
# Import the OpenPGP public key into the certificate
646
(gnutls.library.functions
647
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
648
gnutls.library.constants
649
.GNUTLS_OPENPGP_FMT_RAW))
650
# Verify the self signature in the key
651
crtverify = ctypes.c_uint()
652
(gnutls.library.functions
653
.gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
654
if crtverify.value != 0:
655
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
656
raise gnutls.errors.CertificateSecurityError("Verify failed")
657
# New buffer for the fingerprint
658
buf = ctypes.create_string_buffer(20)
659
buf_len = ctypes.c_size_t()
660
# Get the fingerprint from the certificate into the buffer
661
(gnutls.library.functions
662
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
663
ctypes.byref(buf_len)))
664
# Deinit the certificate
665
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
666
# Convert the buffer to a Python bytestring
667
fpr = ctypes.string_at(buf, buf_len.value)
668
# Convert the bytestring to hexadecimal notation
669
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
670
return hex_fpr
671
672
673
class TCP_handler(SocketServer.BaseRequestHandler, object):
674
"""A TCP request handler class.
675
Instantiated by IPv6_TCPServer for each request to handle it.
1092
676
Note: This will run in its own forked process."""
1093
677
1094
678
def handle(self):
1095
with contextlib.closing(self.server.child_pipe) as child_pipe:
1096
logger.info(u"TCP connection from: %s",
1097
unicode(self.client_address))
1098
logger.debug(u"Pipe FD: %d",
1099
self.server.child_pipe.fileno())
1100
1101
session = (gnutls.connection
1102
.ClientSession(self.request,
1103
gnutls.connection
1104
.X509Credentials()))
1105
1106
# Note: gnutls.connection.X509Credentials is really a
1107
# generic GnuTLS certificate credentials object so long as
1108
# no X.509 keys are added to it. Therefore, we can use it
1109
# here despite using OpenPGP certificates.
1110
1111
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1112
# u"+AES-256-CBC", u"+SHA1",
1113
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1114
# u"+DHE-DSS"))
1115
# Use a fallback default, since this MUST be set.
1116
priority = self.server.gnutls_priority
1117
if priority is None:
1118
priority = u"NORMAL"
1119
(gnutls.library.functions
1120
.gnutls_priority_set_direct(session._c_object,
1121
priority, None))
1122
1123
# Start communication using the Mandos protocol
1124
# Get protocol number
1125
line = self.request.makefile().readline()
1126
logger.debug(u"Protocol version: %r", line)
1127
try:
1128
if int(line.strip().split()[0]) > 1:
1129
raise RuntimeError
1130
except (ValueError, IndexError, RuntimeError), error:
1131
logger.error(u"Unknown protocol version: %s", error)
1132
return
1133
1134
# Start GnuTLS connection
1135
try:
1136
session.handshake()
1137
except gnutls.errors.GNUTLSError, error:
1138
logger.warning(u"Handshake failed: %s", error)
1139
# Do not run session.bye() here: the session is not
1140
# established. Just abandon the request.
1141
return
1142
logger.debug(u"Handshake succeeded")
1143
1144
approval_required = False
1145
try:
1146
try:
1147
fpr = self.fingerprint(self.peer_certificate
1148
(session))
1149
except (TypeError, gnutls.errors.GNUTLSError), error:
1150
logger.warning(u"Bad certificate: %s", error)
1151
return
1152
logger.debug(u"Fingerprint: %s", fpr)
1153
1154
try:
1155
client = ProxyClient(child_pipe, fpr,
1156
self.client_address)
1157
except KeyError:
1158
return
1159
1160
if client.approved_delay:
1161
delay = client.approved_delay
1162
client.approvals_pending += 1
1163
approval_required = True
1164
1165
while True:
1166
if not client.enabled:
1167
logger.warning(u"Client %s is disabled",
1168
client.name)
1169
if self.server.use_dbus:
1170
# Emit D-Bus signal
1171
client.Rejected("Disabled")
1172
return
1173
1174
if client._approved or not client.approved_delay:
1175
#We are approved or approval is disabled
1176
break
1177
elif client._approved is None:
1178
logger.info(u"Client %s need approval",
1179
client.name)
1180
if self.server.use_dbus:
1181
# Emit D-Bus signal
1182
client.NeedApproval(
1183
client.approved_delay_milliseconds(),
1184
client.approved_by_default)
1185
else:
1186
logger.warning(u"Client %s was not approved",
1187
client.name)
1188
if self.server.use_dbus:
1189
# Emit D-Bus signal
1190
client.Rejected("Disapproved")
1191
return
1192
1193
#wait until timeout or approved
1194
#x = float(client._timedelta_to_milliseconds(delay))
1195
time = datetime.datetime.now()
1196
client.changedstate.acquire()
1197
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1198
client.changedstate.release()
1199
time2 = datetime.datetime.now()
1200
if (time2 - time) >= delay:
1201
if not client.approved_by_default:
1202
logger.warning("Client %s timed out while"
1203
" waiting for approval",
1204
client.name)
1205
if self.server.use_dbus:
1206
# Emit D-Bus signal
1207
client.Rejected("Time out")
1208
return
1209
else:
1210
break
1211
else:
1212
delay -= time2 - time
1213
1214
sent_size = 0
1215
while sent_size < len(client.secret):
1216
# XXX handle session exception
1217
sent = session.send(client.secret[sent_size:])
1218
logger.debug(u"Sent: %d, remaining: %d",
1219
sent, len(client.secret)
1220
- (sent_size + sent))
1221
sent_size += sent
1222
1223
logger.info(u"Sending secret to %s", client.name)
1224
# bump the timeout as if seen
1225
client.checked_ok()
1226
if self.server.use_dbus:
1227
# Emit D-Bus signal
1228
client.GotSecret()
1229
1230
finally:
1231
if approval_required:
1232
client.approvals_pending -= 1
1233
session.bye()
1234
1235
@staticmethod
1236
def peer_certificate(session):
1237
"Return the peer's OpenPGP certificate as a bytestring"
1238
# If not an OpenPGP certificate...
1239
if (gnutls.library.functions
1240
.gnutls_certificate_type_get(session._c_object)
1241
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1242
# ...do the normal thing
1243
return session.peer_certificate
1244
list_size = ctypes.c_uint(1)
1245
cert_list = (gnutls.library.functions
1246
.gnutls_certificate_get_peers
1247
(session._c_object, ctypes.byref(list_size)))
1248
if not bool(cert_list) and list_size.value != 0:
1249
raise gnutls.errors.GNUTLSError(u"error getting peer"
1250
u" certificate")
1251
if list_size.value == 0:
1252
return None
1253
cert = cert_list[0]
1254
return ctypes.string_at(cert.data, cert.size)
1255
1256
@staticmethod
1257
def fingerprint(openpgp):
1258
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1259
# New GnuTLS "datum" with the OpenPGP public key
1260
datum = (gnutls.library.types
1261
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1262
ctypes.POINTER
1263
(ctypes.c_ubyte)),
1264
ctypes.c_uint(len(openpgp))))
1265
# New empty GnuTLS certificate
1266
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1267
(gnutls.library.functions
1268
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1269
# Import the OpenPGP public key into the certificate
1270
(gnutls.library.functions
1271
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1272
gnutls.library.constants
1273
.GNUTLS_OPENPGP_FMT_RAW))
1274
# Verify the self signature in the key
1275
crtverify = ctypes.c_uint()
1276
(gnutls.library.functions
1277
.gnutls_openpgp_crt_verify_self(crt, 0,
1278
ctypes.byref(crtverify)))
1279
if crtverify.value != 0:
1280
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1281
raise (gnutls.errors.CertificateSecurityError
1282
(u"Verify failed"))
1283
# New buffer for the fingerprint
1284
buf = ctypes.create_string_buffer(20)
1285
buf_len = ctypes.c_size_t()
1286
# Get the fingerprint from the certificate into the buffer
1287
(gnutls.library.functions
1288
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1289
ctypes.byref(buf_len)))
1290
# Deinit the certificate
1291
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1292
# Convert the buffer to a Python bytestring
1293
fpr = ctypes.string_at(buf, buf_len.value)
1294
# Convert the bytestring to hexadecimal notation
1295
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1296
return hex_fpr
1297
1298
1299
class MultiprocessingMixIn(object):
1300
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1301
def sub_process_main(self, request, address):
1302
try:
1303
self.finish_request(request, address)
1304
except:
1305
self.handle_error(request, address)
1306
self.close_request(request)
1307
1308
def process_request(self, request, address):
1309
"""Start a new process to process the request."""
1310
multiprocessing.Process(target = self.sub_process_main,
1311
args = (request, address)).start()
1312
1313
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1314
""" adds a pipe to the MixIn """
1315
def process_request(self, request, client_address):
1316
"""Overrides and wraps the original process_request().
1317
1318
This function creates a new pipe in self.pipe
1319
"""
1320
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1321
1322
super(MultiprocessingMixInWithPipe,
1323
self).process_request(request, client_address)
1324
self.add_pipe(parent_pipe)
1325
def add_pipe(self, parent_pipe):
1326
"""Dummy function; override as necessary"""
1327
pass
1328
1329
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1330
socketserver.TCPServer, object):
679
logger.info(u"TCP connection from: %s",
680
unicode(self.client_address))
681
session = (gnutls.connection
682
.ClientSession(self.request,
683
gnutls.connection
684
.X509Credentials()))
685
686
line = self.request.makefile().readline()
687
logger.debug(u"Protocol version: %r", line)
688
try:
689
if int(line.strip().split()[0]) > 1:
690
raise RuntimeError
691
except (ValueError, IndexError, RuntimeError), error:
692
logger.error(u"Unknown protocol version: %s", error)
693
return
694
695
# Note: gnutls.connection.X509Credentials is really a generic
696
# GnuTLS certificate credentials object so long as no X.509
697
# keys are added to it. Therefore, we can use it here despite
698
# using OpenPGP certificates.
699
700
#priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
701
# "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
702
# "+DHE-DSS"))
703
# Use a fallback default, since this MUST be set.
704
priority = self.server.settings.get("priority", "NORMAL")
705
(gnutls.library.functions
706
.gnutls_priority_set_direct(session._c_object,
707
priority, None))
708
709
try:
710
session.handshake()
711
except gnutls.errors.GNUTLSError, error:
712
logger.warning(u"Handshake failed: %s", error)
713
# Do not run session.bye() here: the session is not
714
# established. Just abandon the request.
715
return
716
logger.debug(u"Handshake succeeded")
717
try:
718
fpr = fingerprint(peer_certificate(session))
719
except (TypeError, gnutls.errors.GNUTLSError), error:
720
logger.warning(u"Bad certificate: %s", error)
721
session.bye()
722
return
723
logger.debug(u"Fingerprint: %s", fpr)
724
725
for c in self.server.clients:
726
if c.fingerprint == fpr:
727
client = c
728
break
729
else:
730
logger.warning(u"Client not found for fingerprint: %s",
731
fpr)
732
session.bye()
733
return
734
# Have to check if client.still_valid(), since it is possible
735
# that the client timed out while establishing the GnuTLS
736
# session.
737
if not client.still_valid():
738
logger.warning(u"Client %(name)s is invalid",
739
vars(client))
740
session.bye()
741
return
742
## This won't work here, since we're in a fork.
743
# client.checked_ok()
744
sent_size = 0
745
while sent_size < len(client.secret):
746
sent = session.send(client.secret[sent_size:])
747
logger.debug(u"Sent: %d, remaining: %d",
748
sent, len(client.secret)
749
- (sent_size + sent))
750
sent_size += sent
751
session.bye()
752
753
754
class IPv6_TCPServer(SocketServer.ForkingMixIn,
755
SocketServer.TCPServer, object):
1331
756
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1332
1333
757
Attributes:
758
settings: Server settings
759
clients: Set() of Client objects
1334
760
enabled: Boolean; whether this server is activated yet
1335
interface: None or a network interface name (string)
1336
use_ipv6: Boolean; to use IPv6 or not
1337
761
"""
1338
def __init__(self, server_address, RequestHandlerClass,
1339
interface=None, use_ipv6=True):
1340
self.interface = interface
1341
if use_ipv6:
1342
self.address_family = socket.AF_INET6
1343
socketserver.TCPServer.__init__(self, server_address,
1344
RequestHandlerClass)
762
address_family = socket.AF_INET6
763
def __init__(self, *args, **kwargs):
764
if "settings" in kwargs:
765
self.settings = kwargs["settings"]
766
del kwargs["settings"]
767
if "clients" in kwargs:
768
self.clients = kwargs["clients"]
769
del kwargs["clients"]
770
if "use_ipv6" in kwargs:
771
if not kwargs["use_ipv6"]:
772
self.address_family = socket.AF_INET
773
del kwargs["use_ipv6"]
774
self.enabled = False
775
super(IPv6_TCPServer, self).__init__(*args, **kwargs)
1345
776
def server_bind(self):
1346
777
"""This overrides the normal server_bind() function
1347
778
to bind to an interface if one was specified, and also NOT to
1348
779
bind to an address or port if they were not specified."""
1349
if self.interface is not None:
1350
if SO_BINDTODEVICE is None:
1351
logger.error(u"SO_BINDTODEVICE does not exist;"
1352
u" cannot bind to interface %s",
1353
self.interface)
1354
else:
1355
try:
1356
self.socket.setsockopt(socket.SOL_SOCKET,
1357
SO_BINDTODEVICE,
1358
str(self.interface
1359
+ u'\0'))
1360
except socket.error, error:
1361
if error[0] == errno.EPERM:
1362
logger.error(u"No permission to"
1363
u" bind to interface %s",
1364
self.interface)
1365
elif error[0] == errno.ENOPROTOOPT:
1366
logger.error(u"SO_BINDTODEVICE not available;"
1367
u" cannot bind to interface %s",
1368
self.interface)
1369
else:
1370
raise
780
if self.settings["interface"]:
781
# 25 is from /usr/include/asm-i486/socket.h
782
SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
783
try:
784
self.socket.setsockopt(socket.SOL_SOCKET,
785
SO_BINDTODEVICE,
786
self.settings["interface"])
787
except socket.error, error:
788
if error[0] == errno.EPERM:
789
logger.error(u"No permission to"
790
u" bind to interface %s",
791
self.settings["interface"])
792
else:
793
raise
1371
794
# Only bind(2) the socket if we really need to.
1372
795
if self.server_address[0] or self.server_address[1]:
1373
796
if not self.server_address[0]:
1374
797
if self.address_family == socket.AF_INET6:
1375
any_address = u"::" # in6addr_any
798
any_address = "::" # in6addr_any
1376
799
else:
1377
800
any_address = socket.INADDR_ANY
1378
801
self.server_address = (any_address,
1380
803
elif not self.server_address[1]:
1381
804
self.server_address = (self.server_address[0],
1382
805
0)
1383
# if self.interface:
806
# if self.settings["interface"]:
1384
807
# self.server_address = (self.server_address[0],
1385
808
# 0, # port
1386
809
# 0, # flowinfo
1387
810
# if_nametoindex
1388
# (self.interface))
1389
return socketserver.TCPServer.server_bind(self)
1390
1391
1392
class MandosServer(IPv6_TCPServer):
1393
"""Mandos server.
1394
1395
Attributes:
1396
clients: set of Client objects
1397
gnutls_priority GnuTLS priority string
1398
use_dbus: Boolean; to emit D-Bus signals or not
1399
1400
Assumes a gobject.MainLoop event loop.
1401
"""
1402
def __init__(self, server_address, RequestHandlerClass,
1403
interface=None, use_ipv6=True, clients=None,
1404
gnutls_priority=None, use_dbus=True):
1405
self.enabled = False
1406
self.clients = clients
1407
if self.clients is None:
1408
self.clients = set()
1409
self.use_dbus = use_dbus
1410
self.gnutls_priority = gnutls_priority
1411
IPv6_TCPServer.__init__(self, server_address,
1412
RequestHandlerClass,
1413
interface = interface,
1414
use_ipv6 = use_ipv6)
811
# (self.settings
812
# ["interface"]))
813
return super(IPv6_TCPServer, self).server_bind()
1415
814
def server_activate(self):
1416
815
if self.enabled:
1417
return socketserver.TCPServer.server_activate(self)
816
return super(IPv6_TCPServer, self).server_activate()
1418
817
def enable(self):
1419
818
self.enabled = True
1420
def add_pipe(self, parent_pipe):
1421
# Call "handle_ipc" for both data and EOF events
1422
gobject.io_add_watch(parent_pipe.fileno(),
1423
gobject.IO_IN | gobject.IO_HUP,
1424
functools.partial(self.handle_ipc,
1425
parent_pipe = parent_pipe))
1426
1427
def handle_ipc(self, source, condition, parent_pipe=None,
1428
client_object=None):
1429
condition_names = {
1430
gobject.IO_IN: u"IN", # There is data to read.
1431
gobject.IO_OUT: u"OUT", # Data can be written (without
1432
# blocking).
1433
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1434
gobject.IO_ERR: u"ERR", # Error condition.
1435
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1436
# broken, usually for pipes and
1437
# sockets).
1438
}
1439
conditions_string = ' | '.join(name
1440
for cond, name in
1441
condition_names.iteritems()
1442
if cond & condition)
1443
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1444
conditions_string)
1445
1446
# Read a request from the child
1447
request = parent_pipe.recv()
1448
command = request[0]
1449
1450
if command == 'init':
1451
fpr = request[1]
1452
address = request[2]
1453
1454
for c in self.clients:
1455
if c.fingerprint == fpr:
1456
client = c
1457
break
1458
else:
1459
logger.warning(u"Client not found for fingerprint: %s, ad"
1460
u"dress: %s", fpr, address)
1461
if self.use_dbus:
1462
# Emit D-Bus signal
1463
mandos_dbus_service.ClientNotFound(fpr, address)
1464
parent_pipe.send(False)
1465
return False
1466
1467
gobject.io_add_watch(parent_pipe.fileno(),
1468
gobject.IO_IN | gobject.IO_HUP,
1469
functools.partial(self.handle_ipc,
1470
parent_pipe = parent_pipe,
1471
client_object = client))
1472
parent_pipe.send(True)
1473
# remove the old hook in favor of the new above hook on same fileno
1474
return False
1475
if command == 'funcall':
1476
funcname = request[1]
1477
args = request[2]
1478
kwargs = request[3]
1479
1480
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1481
1482
if command == 'getattr':
1483
attrname = request[1]
1484
if callable(client_object.__getattribute__(attrname)):
1485
parent_pipe.send(('function',))
1486
else:
1487
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1488
1489
if command == 'setattr':
1490
attrname = request[1]
1491
value = request[2]
1492
setattr(client_object, attrname, value)
1493
1494
return True
1495
819
1496
820
1497
821
def string_to_delta(interval):
1498
822
"""Parse a string and return a datetime.timedelta
1499
823
1500
>>> string_to_delta(u'7d')
824
>>> string_to_delta('7d')
1501
825
datetime.timedelta(7)
1502
>>> string_to_delta(u'60s')
826
>>> string_to_delta('60s')
1503
827
datetime.timedelta(0, 60)
1504
>>> string_to_delta(u'60m')
828
>>> string_to_delta('60m')
1505
829
datetime.timedelta(0, 3600)
1506
>>> string_to_delta(u'24h')
830
>>> string_to_delta('24h')
1507
831
datetime.timedelta(1)
1508
832
>>> string_to_delta(u'1w')
1509
833
datetime.timedelta(7)
1510
>>> string_to_delta(u'5m 30s')
834
>>> string_to_delta('5m 30s')
1511
835
datetime.timedelta(0, 330)
1512
836
"""
1513
837
timevalue = datetime.timedelta(0)
1526
850
elif suffix == u"w":
1527
851
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1528
852
else:
1529
raise ValueError(u"Unknown suffix %r" % suffix)
1530
except (ValueError, IndexError), e:
1531
raise ValueError(e.message)
853
raise ValueError
854
except (ValueError, IndexError):
855
raise ValueError
1532
856
timevalue += delta
1533
857
return timevalue
1534
858
1535
859
860
def server_state_changed(state):
861
"""Derived from the Avahi example code"""
862
if state == avahi.SERVER_COLLISION:
863
logger.error(u"Zeroconf server name collision")
864
service.remove()
865
elif state == avahi.SERVER_RUNNING:
866
service.add()
867
868
869
def entry_group_state_changed(state, error):
870
"""Derived from the Avahi example code"""
871
logger.debug(u"Avahi state change: %i", state)
872
873
if state == avahi.ENTRY_GROUP_ESTABLISHED:
874
logger.debug(u"Zeroconf service established.")
875
elif state == avahi.ENTRY_GROUP_COLLISION:
876
logger.warning(u"Zeroconf service name collision.")
877
service.rename()
878
elif state == avahi.ENTRY_GROUP_FAILURE:
879
logger.critical(u"Avahi: Error in group state changed %s",
880
unicode(error))
881
raise AvahiGroupError(u"State changed: %s" % unicode(error))
882
1536
883
def if_nametoindex(interface):
1537
"""Call the C function if_nametoindex(), or equivalent
1538
1539
Note: This function cannot accept a unicode string."""
884
"""Call the C function if_nametoindex(), or equivalent"""
1540
885
global if_nametoindex
1541
886
try:
1542
887
if_nametoindex = (ctypes.cdll.LoadLibrary
1543
(ctypes.util.find_library(u"c"))
888
(ctypes.util.find_library("c"))
1544
889
.if_nametoindex)
1545
890
except (OSError, AttributeError):
1546
logger.warning(u"Doing if_nametoindex the hard way")
891
if "struct" not in sys.modules:
892
import struct
893
if "fcntl" not in sys.modules:
894
import fcntl
1547
895
def if_nametoindex(interface):
1548
896
"Get an interface index the hard way, i.e. using fcntl()"
1549
897
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1550
with contextlib.closing(socket.socket()) as s:
898
with closing(socket.socket()) as s:
1551
899
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1552
struct.pack(str(u"16s16x"),
1553
interface))
1554
interface_index = struct.unpack(str(u"I"),
1555
ifreq[16:20])[0]
900
struct.pack("16s16x", interface))
901
interface_index = struct.unpack("I", ifreq[16:20])[0]
1556
902
return interface_index
1557
903
return if_nametoindex(interface)
1558
904
1559
905
1560
906
def daemon(nochdir = False, noclose = False):
1561
907
"""See daemon(3). Standard BSD Unix function.
1562
1563
908
This should really exist as os.daemon, but it doesn't (yet)."""
1564
909
if os.fork():
1565
910
sys.exit()
1566
911
os.setsid()
1567
912
if not nochdir:
1568
os.chdir(u"/")
913
os.chdir("/")
1569
914
if os.fork():
1570
915
sys.exit()
1571
916
if not noclose:
1573
918
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1574
919
if not stat.S_ISCHR(os.fstat(null).st_mode):
1575
920
raise OSError(errno.ENODEV,
1576
u"%s not a character device"
1577
% os.path.devnull)
921
"/dev/null not a character device")
1578
922
os.dup2(null, sys.stdin.fileno())
1579
923
os.dup2(null, sys.stdout.fileno())
1580
924
os.dup2(null, sys.stderr.fileno())
1583
927
1584
928
1585
929
def main():
1586
1587
##################################################################
1588
# Parsing of options, both command line and config file
1589
1590
930
parser = optparse.OptionParser(version = "%%prog %s" % version)
1591
parser.add_option("-i", u"--interface", type=u"string",
1592
metavar="IF", help=u"Bind to interface IF")
1593
parser.add_option("-a", u"--address", type=u"string",
1594
help=u"Address to listen for requests on")
1595
parser.add_option("-p", u"--port", type=u"int",
1596
help=u"Port number to receive requests on")
1597
parser.add_option("--check", action=u"store_true",
1598
help=u"Run self-test")
1599
parser.add_option("--debug", action=u"store_true",
1600
help=u"Debug mode; run in foreground and log to"
1601
u" terminal")
1602
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1603
u" priority string (see GnuTLS documentation)")
1604
parser.add_option("--servicename", type=u"string",
1605
metavar=u"NAME", help=u"Zeroconf service name")
1606
parser.add_option("--configdir", type=u"string",
1607
default=u"/etc/mandos", metavar=u"DIR",
1608
help=u"Directory to search for configuration"
1609
u" files")
1610
parser.add_option("--no-dbus", action=u"store_false",
1611
dest=u"use_dbus", help=u"Do not provide D-Bus"
1612
u" system bus interface")
1613
parser.add_option("--no-ipv6", action=u"store_false",
1614
dest=u"use_ipv6", help=u"Do not use IPv6")
931
parser.add_option("-i", "--interface", type="string",
932
metavar="IF", help="Bind to interface IF")
933
parser.add_option("-a", "--address", type="string",
934
help="Address to listen for requests on")
935
parser.add_option("-p", "--port", type="int",
936
help="Port number to receive requests on")
937
parser.add_option("--check", action="store_true",
938
help="Run self-test")
939
parser.add_option("--debug", action="store_true",
940
help="Debug mode; run in foreground and log to"
941
" terminal")
942
parser.add_option("--priority", type="string", help="GnuTLS"
943
" priority string (see GnuTLS documentation)")
944
parser.add_option("--servicename", type="string", metavar="NAME",
945
help="Zeroconf service name")
946
parser.add_option("--configdir", type="string",
947
default="/etc/mandos", metavar="DIR",
948
help="Directory to search for configuration"
949
" files")
950
parser.add_option("--no-dbus", action="store_false",
951
dest="use_dbus",
952
help=optparse.SUPPRESS_HELP) # XXX: Not done yet
953
parser.add_option("--no-ipv6", action="store_false",
954
dest="use_ipv6", help="Do not use IPv6")
1615
955
options = parser.parse_args()[0]
1616
956
1617
957
if options.check:
1620
960
sys.exit()
1621
961
1622
962
# Default values for config file for server-global settings
1623
server_defaults = { u"interface": u"",
1624
u"address": u"",
1625
u"port": u"",
1626
u"debug": u"False",
1627
u"priority":
1628
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1629
u"servicename": u"Mandos",
1630
u"use_dbus": u"True",
1631
u"use_ipv6": u"True",
963
server_defaults = { "interface": "",
964
"address": "",
965
"port": "",
966
"debug": "False",
967
"priority":
968
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
969
"servicename": "Mandos",
970
"use_dbus": "True",
971
"use_ipv6": "True",
1632
972
}
1633
973
1634
974
# Parse config file for server-global settings
1635
server_config = configparser.SafeConfigParser(server_defaults)
975
server_config = ConfigParser.SafeConfigParser(server_defaults)
1636
976
del server_defaults
1637
server_config.read(os.path.join(options.configdir,
1638
u"mandos.conf"))
977
server_config.read(os.path.join(options.configdir, "mandos.conf"))
1639
978
# Convert the SafeConfigParser object to a dict
1640
979
server_settings = server_config.defaults()
1641
980
# Use the appropriate methods on the non-string config options
1642
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1643
server_settings[option] = server_config.getboolean(u"DEFAULT",
1644
option)
981
server_settings["debug"] = server_config.getboolean("DEFAULT",
982
"debug")
983
server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
984
"use_dbus")
985
server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
986
"use_ipv6")
1645
987
if server_settings["port"]:
1646
server_settings["port"] = server_config.getint(u"DEFAULT",
1647
u"port")
988
server_settings["port"] = server_config.getint("DEFAULT",
989
"port")
1648
990
del server_config
1649
991
1650
992
# Override the settings from the config file with command line
1651
993
# options, if set.
1652
for option in (u"interface", u"address", u"port", u"debug",
1653
u"priority", u"servicename", u"configdir",
1654
u"use_dbus", u"use_ipv6"):
994
for option in ("interface", "address", "port", "debug",
995
"priority", "servicename", "configdir",
996
"use_dbus", "use_ipv6"):
1655
997
value = getattr(options, option)
1656
998
if value is not None:
1657
999
server_settings[option] = value
1658
1000
del options
1659
# Force all strings to be unicode
1660
for option in server_settings.keys():
1661
if type(server_settings[option]) is str:
1662
server_settings[option] = unicode(server_settings[option])
1663
1001
# Now we have our good server settings in "server_settings"
1664
1002
1665
##################################################################
1666
1667
1003
# For convenience
1668
debug = server_settings[u"debug"]
1669
use_dbus = server_settings[u"use_dbus"]
1670
use_ipv6 = server_settings[u"use_ipv6"]
1004
debug = server_settings["debug"]
1005
use_dbus = server_settings["use_dbus"]
1006
use_dbus = False # XXX: Not done yet
1007
use_ipv6 = server_settings["use_ipv6"]
1671
1008
1672
1009
if not debug:
1673
1010
syslogger.setLevel(logging.WARNING)
1674
1011
console.setLevel(logging.WARNING)
1675
1012
1676
if server_settings[u"servicename"] != u"Mandos":
1013
if server_settings["servicename"] != "Mandos":
1677
1014
syslogger.setFormatter(logging.Formatter
1678
(u'Mandos (%s) [%%(process)d]:'
1679
u' %%(levelname)s: %%(message)s'
1680
% server_settings[u"servicename"]))
1015
('Mandos (%s): %%(levelname)s:'
1016
' %%(message)s'
1017
% server_settings["servicename"]))
1681
1018
1682
1019
# Parse config file with clients
1683
client_defaults = { u"timeout": u"1h",
1684
u"interval": u"5m",
1685
u"checker": u"fping -q -- %%(host)s",
1686
u"host": u"",
1687
u"approved_delay": u"5m",
1688
u"approved_duration": u"1s",
1020
client_defaults = { "timeout": "1h",
1021
"interval": "5m",
1022
"checker": "fping -q -- %%(host)s",
1023
"host": "",
1689
1024
}
1690
client_config = configparser.SafeConfigParser(client_defaults)
1691
client_config.read(os.path.join(server_settings[u"configdir"],
1692
u"clients.conf"))
1693
1694
global mandos_dbus_service
1695
mandos_dbus_service = None
1696
1697
tcp_server = MandosServer((server_settings[u"address"],
1698
server_settings[u"port"]),
1699
ClientHandler,
1700
interface=server_settings[u"interface"],
1701
use_ipv6=use_ipv6,
1702
gnutls_priority=
1703
server_settings[u"priority"],
1704
use_dbus=use_dbus)
1705
pidfilename = u"/var/run/mandos.pid"
1025
client_config = ConfigParser.SafeConfigParser(client_defaults)
1026
client_config.read(os.path.join(server_settings["configdir"],
1027
"clients.conf"))
1028
1029
clients = Set()
1030
tcp_server = IPv6_TCPServer((server_settings["address"],
1031
server_settings["port"]),
1032
TCP_handler,
1033
settings=server_settings,
1034
clients=clients, use_ipv6=use_ipv6)
1035
pidfilename = "/var/run/mandos.pid"
1706
1036
try:
1707
pidfile = open(pidfilename, u"w")
1037
pidfile = open(pidfilename, "w")
1708
1038
except IOError:
1709
logger.error(u"Could not open file %r", pidfilename)
1039
logger.error("Could not open file %r", pidfilename)
1710
1040
1711
1041
try:
1712
uid = pwd.getpwnam(u"_mandos").pw_uid
1713
gid = pwd.getpwnam(u"_mandos").pw_gid
1042
uid = pwd.getpwnam("_mandos").pw_uid
1043
gid = pwd.getpwnam("_mandos").pw_gid
1714
1044
except KeyError:
1715
1045
try:
1716
uid = pwd.getpwnam(u"mandos").pw_uid
1717
gid = pwd.getpwnam(u"mandos").pw_gid
1046
uid = pwd.getpwnam("mandos").pw_uid
1047
gid = pwd.getpwnam("mandos").pw_gid
1718
1048
except KeyError:
1719
1049
try:
1720
uid = pwd.getpwnam(u"nobody").pw_uid
1721
gid = pwd.getpwnam(u"nobody").pw_gid
1050
uid = pwd.getpwnam("nobody").pw_uid
1051
gid = pwd.getpwnam("nogroup").pw_gid
1722
1052
except KeyError:
1723
1053
uid = 65534
1724
1054
gid = 65534
1737
1067
1738
1068
@gnutls.library.types.gnutls_log_func
1739
1069
def debug_gnutls(level, string):
1740
logger.debug(u"GnuTLS: %s", string[:-1])
1070
logger.debug("GnuTLS: %s", string[:-1])
1741
1071
1742
1072
(gnutls.library.functions
1743
1073
.gnutls_global_set_log_function(debug_gnutls))
1744
1074
1075
global service
1076
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1077
service = AvahiService(name = server_settings["servicename"],
1078
servicetype = "_mandos._tcp",
1079
protocol = protocol)
1080
if server_settings["interface"]:
1081
service.interface = (if_nametoindex
1082
(server_settings["interface"]))
1083
1745
1084
global main_loop
1085
global bus
1086
global server
1746
1087
# From the Avahi example code
1747
1088
DBusGMainLoop(set_as_default=True )
1748
1089
main_loop = gobject.MainLoop()
1749
1090
bus = dbus.SystemBus()
1091
server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
1092
avahi.DBUS_PATH_SERVER),
1093
avahi.DBUS_INTERFACE_SERVER)
1750
1094
# End of Avahi example code
1751
1095
if use_dbus:
1752
try:
1753
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1754
bus, do_not_queue=True)
1755
except dbus.exceptions.NameExistsException, e:
1756
logger.error(unicode(e) + u", disabling D-Bus")
1757
use_dbus = False
1758
server_settings[u"use_dbus"] = False
1759
tcp_server.use_dbus = False
1760
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1761
service = AvahiService(name = server_settings[u"servicename"],
1762
servicetype = u"_mandos._tcp",
1763
protocol = protocol, bus = bus)
1764
if server_settings["interface"]:
1765
service.interface = (if_nametoindex
1766
(str(server_settings[u"interface"])))
1767
1768
client_class = Client
1769
if use_dbus:
1770
client_class = functools.partial(ClientDBus, bus = bus)
1771
def client_config_items(config, section):
1772
special_settings = {
1773
"approved_by_default":
1774
lambda: config.getboolean(section,
1775
"approved_by_default"),
1776
}
1777
for name, value in config.items(section):
1778
try:
1779
yield (name, special_settings[name]())
1780
except KeyError:
1781
yield (name, value)
1782
1783
tcp_server.clients.update(set(
1784
client_class(name = section,
1785
config= dict(client_config_items(
1786
client_config, section)))
1787
for section in client_config.sections()))
1788
if not tcp_server.clients:
1096
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1097
1098
clients.update(Set(Client(name = section,
1099
config
1100
= dict(client_config.items(section)),
1101
use_dbus = use_dbus)
1102
for section in client_config.sections()))
1103
if not clients:
1789
1104
logger.warning(u"No clients defined")
1790
1105
1791
1106
if debug:
1801
1116
daemon()
1802
1117
1803
1118
try:
1804
with pidfile:
1805
pid = os.getpid()
1806
pidfile.write(str(pid) + "\n")
1119
pid = os.getpid()
1120
pidfile.write(str(pid) + "\n")
1121
pidfile.close()
1807
1122
del pidfile
1808
1123
except IOError:
1809
1124
logger.error(u"Could not write to file %r with PID %d",
1813
1128
pass
1814
1129
del pidfilename
1815
1130
1131
def cleanup():
1132
"Cleanup function; run on exit"
1133
global group
1134
# From the Avahi example code
1135
if not group is None:
1136
group.Free()
1137
group = None
1138
# End of Avahi example code
1139
1140
while clients:
1141
client = clients.pop()
1142
client.disable_hook = None
1143
client.disable()
1144
1145
atexit.register(cleanup)
1146
1816
1147
if not debug:
1817
1148
signal.signal(signal.SIGINT, signal.SIG_IGN)
1818
1149
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1819
1150
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1820
1151
1821
1152
if use_dbus:
1822
class MandosDBusService(dbus.service.Object):
1153
class MandosServer(dbus.service.Object):
1823
1154
"""A D-Bus proxy object"""
1824
1155
def __init__(self):
1825
dbus.service.Object.__init__(self, bus, u"/")
1156
dbus.service.Object.__init__(self, bus, "/")
1826
1157
_interface = u"se.bsnet.fukt.Mandos"
1827
1158
1828
@dbus.service.signal(_interface, signature=u"o")
1829
def ClientAdded(self, objpath):
1830
"D-Bus signal"
1831
pass
1832
1833
@dbus.service.signal(_interface, signature=u"ss")
1834
def ClientNotFound(self, fingerprint, address):
1835
"D-Bus signal"
1836
pass
1837
1838
@dbus.service.signal(_interface, signature=u"os")
1159
@dbus.service.signal(_interface, signature="oa{sv}")
1160
def ClientAdded(self, objpath, properties):
1161
"D-Bus signal"
1162
pass
1163
1164
@dbus.service.signal(_interface, signature="os")
1839
1165
def ClientRemoved(self, objpath, name):
1840
1166
"D-Bus signal"
1841
1167
pass
1842
1168
1843
@dbus.service.method(_interface, out_signature=u"ao")
1169
@dbus.service.method(_interface, out_signature="ao")
1844
1170
def GetAllClients(self):
1845
1171
"D-Bus method"
1846
return dbus.Array(c.dbus_object_path
1847
for c in tcp_server.clients)
1172
return dbus.Array(c.dbus_object_path for c in clients)
1848
1173
1849
@dbus.service.method(_interface,
1850
out_signature=u"a{oa{sv}}")
1174
@dbus.service.method(_interface, out_signature="a{oa{sv}}")
1851
1175
def GetAllClientsWithProperties(self):
1852
1176
"D-Bus method"
1853
1177
return dbus.Dictionary(
1854
((c.dbus_object_path, c.GetAll(u""))
1855
for c in tcp_server.clients),
1856
signature=u"oa{sv}")
1178
((c.dbus_object_path, c.GetAllProperties())
1179
for c in clients),
1180
signature="oa{sv}")
1857
1181
1858
@dbus.service.method(_interface, in_signature=u"o")
1182
@dbus.service.method(_interface, in_signature="o")
1859
1183
def RemoveClient(self, object_path):
1860
1184
"D-Bus method"
1861
for c in tcp_server.clients:
1185
for c in clients:
1862
1186
if c.dbus_object_path == object_path:
1863
tcp_server.clients.remove(c)
1864
c.remove_from_connection()
1187
clients.remove(c)
1865
1188
# Don't signal anything except ClientRemoved
1866
c.disable(quiet=True)
1189
c.use_dbus = False
1190
c.disable()
1867
1191
# Emit D-Bus signal
1868
1192
self.ClientRemoved(object_path, c.name)
1869
1193
return
1870
raise KeyError(object_path)
1194
raise KeyError
1871
1195
1872
1196
del _interface
1873
1197
1874
mandos_dbus_service = MandosDBusService()
1875
1876
def cleanup():
1877
"Cleanup function; run on exit"
1878
service.cleanup()
1879
1880
while tcp_server.clients:
1881
client = tcp_server.clients.pop()
1882
if use_dbus:
1883
client.remove_from_connection()
1884
client.disable_hook = None
1885
# Don't signal anything except ClientRemoved
1886
client.disable(quiet=True)
1887
if use_dbus:
1888
# Emit D-Bus signal
1889
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
1890
client.name)
1891
1892
atexit.register(cleanup)
1893
1894
for client in tcp_server.clients:
1198
mandos_server = MandosServer()
1199
1200
for client in clients:
1895
1201
if use_dbus:
1896
1202
# Emit D-Bus signal
1897
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1203
mandos_server.ClientAdded(client.dbus_object_path,
1204
client.GetAllProperties())
1898
1205
client.enable()
1899
1206
1900
1207
tcp_server.enable()
1914
1221
1915
1222
try:
1916
1223
# From the Avahi example code
1224
server.connect_to_signal("StateChanged", server_state_changed)
1917
1225
try:
1918
service.activate()
1226
server_state_changed(server.GetState())
1919
1227
except dbus.exceptions.DBusException, error:
1920
1228
logger.critical(u"DBusException: %s", error)
1921
cleanup()
1922
1229
sys.exit(1)
1923
1230
# End of Avahi example code
1924
1231
1931
1238
main_loop.run()
1932
1239
except AvahiError, error:
1933
1240
logger.critical(u"AvahiError: %s", error)
1934
cleanup()
1935
1241
sys.exit(1)
1936
1242
except KeyboardInterrupt:
1937
1243
if debug:
1938
1244
print >> sys.stderr
1939
logger.debug(u"Server received KeyboardInterrupt")
1940
logger.debug(u"Server exiting")
1941
# Must run before the D-Bus bus name gets deregistered
1942
cleanup()
1245
logger.debug("Server received KeyboardInterrupt")
1246
logger.debug("Server exiting")
1943
1247
1944
1248
if __name__ == '__main__':
1945
1249
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0