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 493
- compare with another revision
- download diff
- download tarball
- view history from revision 493
- Committer: Teddy Hogeborn
- Date: 2011-08-08 21:12:37 UTC
- Revision ID: teddy@fukt.bsnet.se-20110808211237-jejsz5brjytrjot8
* Makefile (DOCS): Added "intro.8mandos".
(intro.8mandos, intro.8mandos.xhtml): New.
* README: Replaced text with link, reference and short summary.
* intro.xml: New.
* mandos-clients.conf.xml (SEE ALSO): Added "intro(8mandos)".
* mandos-ctl.xml (SEE ALSO): - '' -
* mandos-keygen.xml (SEE ALSO): - '' -
* mandos-monitor.xml (SEE ALSO): - '' -
* mandos.conf.xml (SEE ALSO): - '' -
* mandos.xml (SEE ALSO): - '' -
* plugin-runner.xml (SEE ALSO): - '' -
* plugins.d/askpass-fifo.xml (SEE ALSO): - '' -
* plugins.d/mandos-client.xml (SEE ALSO): - '' -
* plugins.d/password-prompt.xml (SEE ALSO): - '' -
* plugins.d/plymouth.xml (SEE ALSO): - '' -
* plugins.d/splashy.xml (SEE ALSO): - '' -
* plugins.d/usplash.xml (SEE ALSO): - '' -
(intro.8mandos, intro.8mandos.xhtml): New.
* README: Replaced text with link, reference and short summary.
* intro.xml: New.
* mandos-clients.conf.xml (SEE ALSO): Added "intro(8mandos)".
* mandos-ctl.xml (SEE ALSO): - '' -
* mandos-keygen.xml (SEE ALSO): - '' -
* mandos-monitor.xml (SEE ALSO): - '' -
* mandos.conf.xml (SEE ALSO): - '' -
* mandos.xml (SEE ALSO): - '' -
* plugin-runner.xml (SEE ALSO): - '' -
* plugins.d/askpass-fifo.xml (SEE ALSO): - '' -
* plugins.d/mandos-client.xml (SEE ALSO): - '' -
* plugins.d/password-prompt.xml (SEE ALSO): - '' -
* plugins.d/plymouth.xml (SEE ALSO): - '' -
* plugins.d/splashy.xml (SEE ALSO): - '' -
* plugins.d/usplash.xml (SEE ALSO): - '' -
- files added:
- DBUS-API
- debian/source
- files modified:
- .bzrignore
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008,2009 Teddy Hogeborn
15
# Copyright © 2008,2009 Björn Påhlsson
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
31
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
#
33
33
34
from __future__ import division, with_statement, absolute_import
34
from __future__ import (division, absolute_import, print_function,
35
unicode_literals)
35
36
36
37
import SocketServer as socketserver
37
38
import socket
38
import optparse
39
import argparse
39
40
import datetime
40
41
import errno
41
42
import gnutls.crypto
60
61
import fcntl
61
62
import functools
62
63
import cPickle as pickle
63
import select
64
import multiprocessing
64
65
65
66
import dbus
66
67
import dbus.service
81
82
SO_BINDTODEVICE = None
82
83
83
84
84
version = "1.0.14"
85
version = "1.3.1"
85
86
86
logger = logging.Logger(u'mandos')
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
87
89
syslogger = (logging.handlers.SysLogHandler
88
90
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
89
address = "/dev/log"))
91
address = str("/dev/log")))
90
92
syslogger.setFormatter(logging.Formatter
91
(u'Mandos [%(process)d]: %(levelname)s:'
92
u' %(message)s'))
93
('Mandos [%(process)d]: %(levelname)s:'
94
' %(message)s'))
93
95
logger.addHandler(syslogger)
94
96
95
97
console = logging.StreamHandler()
96
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
97
u' %(levelname)s:'
98
u' %(message)s'))
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
' %(levelname)s:'
100
' %(message)s'))
99
101
logger.addHandler(console)
100
102
101
103
class AvahiError(Exception):
118
120
Attributes:
119
121
interface: integer; avahi.IF_UNSPEC or an interface index.
120
122
Used to optionally bind to the specified interface.
121
name: string; Example: u'Mandos'
122
type: string; Example: u'_mandos._tcp'.
123
name: string; Example: 'Mandos'
124
type: string; Example: '_mandos._tcp'.
123
125
See <http://www.dns-sd.org/ServiceTypes.html>
124
126
port: integer; what port to announce
125
127
TXT: list of strings; TXT record for the service
134
136
"""
135
137
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
136
138
servicetype = None, port = None, TXT = None,
137
domain = u"", host = u"", max_renames = 32768,
139
domain = "", host = "", max_renames = 32768,
138
140
protocol = avahi.PROTO_UNSPEC, bus = None):
139
141
self.interface = interface
140
142
self.name = name
149
151
self.group = None # our entry group
150
152
self.server = None
151
153
self.bus = bus
154
self.entry_group_state_changed_match = None
152
155
def rename(self):
153
156
"""Derived from the Avahi example code"""
154
157
if self.rename_count >= self.max_renames:
155
logger.critical(u"No suitable Zeroconf service name found"
156
u" after %i retries, exiting.",
158
logger.critical("No suitable Zeroconf service name found"
159
" after %i retries, exiting.",
157
160
self.rename_count)
158
raise AvahiServiceError(u"Too many renames")
159
self.name = self.server.GetAlternativeServiceName(self.name)
160
logger.info(u"Changing Zeroconf service name to %r ...",
161
unicode(self.name))
161
raise AvahiServiceError("Too many renames")
162
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
163
logger.info("Changing Zeroconf service name to %r ...",
164
self.name)
162
165
syslogger.setFormatter(logging.Formatter
163
(u'Mandos (%s) [%%(process)d]:'
164
u' %%(levelname)s: %%(message)s'
166
('Mandos (%s) [%%(process)d]:'
167
' %%(levelname)s: %%(message)s'
165
168
% self.name))
166
169
self.remove()
167
self.add()
170
try:
171
self.add()
172
except dbus.exceptions.DBusException as error:
173
logger.critical("DBusException: %s", error)
174
self.cleanup()
175
os._exit(1)
168
176
self.rename_count += 1
169
177
def remove(self):
170
178
"""Derived from the Avahi example code"""
179
if self.entry_group_state_changed_match is not None:
180
self.entry_group_state_changed_match.remove()
181
self.entry_group_state_changed_match = None
171
182
if self.group is not None:
172
183
self.group.Reset()
173
184
def add(self):
174
185
"""Derived from the Avahi example code"""
186
self.remove()
175
187
if self.group is None:
176
188
self.group = dbus.Interface(
177
189
self.bus.get_object(avahi.DBUS_NAME,
178
190
self.server.EntryGroupNew()),
179
191
avahi.DBUS_INTERFACE_ENTRY_GROUP)
180
self.group.connect_to_signal('StateChanged',
181
self
182
.entry_group_state_changed)
183
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
192
self.entry_group_state_changed_match = (
193
self.group.connect_to_signal(
194
'StateChanged', self .entry_group_state_changed))
195
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
184
196
self.name, self.type)
185
197
self.group.AddService(
186
198
self.interface,
193
205
self.group.Commit()
194
206
def entry_group_state_changed(self, state, error):
195
207
"""Derived from the Avahi example code"""
196
logger.debug(u"Avahi entry group state change: %i", state)
208
logger.debug("Avahi entry group state change: %i", state)
197
209
198
210
if state == avahi.ENTRY_GROUP_ESTABLISHED:
199
logger.debug(u"Zeroconf service established.")
211
logger.debug("Zeroconf service established.")
200
212
elif state == avahi.ENTRY_GROUP_COLLISION:
201
logger.warning(u"Zeroconf service name collision.")
213
logger.info("Zeroconf service name collision.")
202
214
self.rename()
203
215
elif state == avahi.ENTRY_GROUP_FAILURE:
204
logger.critical(u"Avahi: Error in group state changed %s",
216
logger.critical("Avahi: Error in group state changed %s",
205
217
unicode(error))
206
raise AvahiGroupError(u"State changed: %s"
218
raise AvahiGroupError("State changed: %s"
207
219
% unicode(error))
208
220
def cleanup(self):
209
221
"""Derived from the Avahi example code"""
210
222
if self.group is not None:
211
self.group.Free()
223
try:
224
self.group.Free()
225
except (dbus.exceptions.UnknownMethodException,
226
dbus.exceptions.DBusException) as e:
227
pass
212
228
self.group = None
213
def server_state_changed(self, state):
229
self.remove()
230
def server_state_changed(self, state, error=None):
214
231
"""Derived from the Avahi example code"""
215
logger.debug(u"Avahi server state change: %i", state)
216
if state == avahi.SERVER_COLLISION:
217
logger.error(u"Zeroconf server name collision")
218
self.remove()
232
logger.debug("Avahi server state change: %i", state)
233
bad_states = { avahi.SERVER_INVALID:
234
"Zeroconf server invalid",
235
avahi.SERVER_REGISTERING: None,
236
avahi.SERVER_COLLISION:
237
"Zeroconf server name collision",
238
avahi.SERVER_FAILURE:
239
"Zeroconf server failure" }
240
if state in bad_states:
241
if bad_states[state] is not None:
242
if error is None:
243
logger.error(bad_states[state])
244
else:
245
logger.error(bad_states[state] + ": %r", error)
246
self.cleanup()
219
247
elif state == avahi.SERVER_RUNNING:
220
248
self.add()
249
else:
250
if error is None:
251
logger.debug("Unknown state: %r", state)
252
else:
253
logger.debug("Unknown state: %r: %r", state, error)
221
254
def activate(self):
222
255
"""Derived from the Avahi example code"""
223
256
if self.server is None:
224
257
self.server = dbus.Interface(
225
258
self.bus.get_object(avahi.DBUS_NAME,
226
avahi.DBUS_PATH_SERVER),
259
avahi.DBUS_PATH_SERVER,
260
follow_name_owner_changes=True),
227
261
avahi.DBUS_INTERFACE_SERVER)
228
self.server.connect_to_signal(u"StateChanged",
262
self.server.connect_to_signal("StateChanged",
229
263
self.server_state_changed)
230
264
self.server_state_changed(self.server.GetState())
231
265
234
268
"""A representation of a client host served by this server.
235
269
236
270
Attributes:
237
name: string; from the config file, used in log messages and
238
D-Bus identifiers
271
_approved: bool(); 'None' if not yet approved/disapproved
272
approval_delay: datetime.timedelta(); Time to wait for approval
273
approval_duration: datetime.timedelta(); Duration of one approval
274
checker: subprocess.Popen(); a running checker process used
275
to see if the client lives.
276
'None' if no process is running.
277
checker_callback_tag: a gobject event source tag, or None
278
checker_command: string; External command which is run to check
279
if client lives. %() expansions are done at
280
runtime with vars(self) as dict, so that for
281
instance %(name)s can be used in the command.
282
checker_initiator_tag: a gobject event source tag, or None
283
created: datetime.datetime(); (UTC) object creation
284
current_checker_command: string; current running checker_command
285
disable_hook: If set, called by disable() as disable_hook(self)
286
disable_initiator_tag: a gobject event source tag, or None
287
enabled: bool()
239
288
fingerprint: string (40 or 32 hexadecimal digits); used to
240
289
uniquely identify the client
241
secret: bytestring; sent verbatim (over TLS) to client
242
290
host: string; available for use by the checker command
243
created: datetime.datetime(); (UTC) object creation
291
interval: datetime.timedelta(); How often to start a new checker
292
last_approval_request: datetime.datetime(); (UTC) or None
293
last_checked_ok: datetime.datetime(); (UTC) or None
244
294
last_enabled: datetime.datetime(); (UTC)
245
enabled: bool()
246
last_checked_ok: datetime.datetime(); (UTC) or None
295
name: string; from the config file, used in log messages and
296
D-Bus identifiers
297
secret: bytestring; sent verbatim (over TLS) to client
247
298
timeout: datetime.timedelta(); How long from last_checked_ok
248
299
until this client is disabled
249
interval: datetime.timedelta(); How often to start a new checker
250
disable_hook: If set, called by disable() as disable_hook(self)
251
checker: subprocess.Popen(); a running checker process used
252
to see if the client lives.
253
'None' if no process is running.
254
checker_initiator_tag: a gobject event source tag, or None
255
disable_initiator_tag: - '' -
256
checker_callback_tag: - '' -
257
checker_command: string; External command which is run to check if
258
client lives. %() expansions are done at
259
runtime with vars(self) as dict, so that for
260
instance %(name)s can be used in the command.
261
current_checker_command: string; current running checker_command
300
runtime_expansions: Allowed attributes for runtime expansion.
262
301
"""
263
302
303
runtime_expansions = ("approval_delay", "approval_duration",
304
"created", "enabled", "fingerprint",
305
"host", "interval", "last_checked_ok",
306
"last_enabled", "name", "timeout")
307
264
308
@staticmethod
265
309
def _timedelta_to_milliseconds(td):
266
310
"Convert a datetime.timedelta() to milliseconds"
275
319
def interval_milliseconds(self):
276
320
"Return the 'interval' attribute in milliseconds"
277
321
return self._timedelta_to_milliseconds(self.interval)
322
323
def approval_delay_milliseconds(self):
324
return self._timedelta_to_milliseconds(self.approval_delay)
278
325
279
326
def __init__(self, name = None, disable_hook=None, config=None):
280
327
"""Note: the 'checker' key in 'config' sets the
283
330
self.name = name
284
331
if config is None:
285
332
config = {}
286
logger.debug(u"Creating client %r", self.name)
333
logger.debug("Creating client %r", self.name)
287
334
# Uppercase and remove spaces from fingerprint for later
288
335
# comparison purposes with return value from the fingerprint()
289
336
# function
290
self.fingerprint = (config[u"fingerprint"].upper()
291
.replace(u" ", u""))
292
logger.debug(u" Fingerprint: %s", self.fingerprint)
293
if u"secret" in config:
294
self.secret = config[u"secret"].decode(u"base64")
295
elif u"secfile" in config:
337
self.fingerprint = (config["fingerprint"].upper()
338
.replace(" ", ""))
339
logger.debug(" Fingerprint: %s", self.fingerprint)
340
if "secret" in config:
341
self.secret = config["secret"].decode("base64")
342
elif "secfile" in config:
296
343
with open(os.path.expanduser(os.path.expandvars
297
(config[u"secfile"])),
344
(config["secfile"])),
298
345
"rb") as secfile:
299
346
self.secret = secfile.read()
300
347
else:
301
raise TypeError(u"No secret or secfile for client %s"
348
raise TypeError("No secret or secfile for client %s"
302
349
% self.name)
303
self.host = config.get(u"host", u"")
350
self.host = config.get("host", "")
304
351
self.created = datetime.datetime.utcnow()
305
352
self.enabled = False
353
self.last_approval_request = None
306
354
self.last_enabled = None
307
355
self.last_checked_ok = None
308
self.timeout = string_to_delta(config[u"timeout"])
309
self.interval = string_to_delta(config[u"interval"])
356
self.timeout = string_to_delta(config["timeout"])
357
self.interval = string_to_delta(config["interval"])
310
358
self.disable_hook = disable_hook
311
359
self.checker = None
312
360
self.checker_initiator_tag = None
313
361
self.disable_initiator_tag = None
314
362
self.checker_callback_tag = None
315
self.checker_command = config[u"checker"]
363
self.checker_command = config["checker"]
316
364
self.current_checker_command = None
317
365
self.last_connect = None
366
self._approved = None
367
self.approved_by_default = config.get("approved_by_default",
368
True)
369
self.approvals_pending = 0
370
self.approval_delay = string_to_delta(
371
config["approval_delay"])
372
self.approval_duration = string_to_delta(
373
config["approval_duration"])
374
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
318
375
376
def send_changedstate(self):
377
self.changedstate.acquire()
378
self.changedstate.notify_all()
379
self.changedstate.release()
380
319
381
def enable(self):
320
382
"""Start this client's checker and timeout hooks"""
321
if getattr(self, u"enabled", False):
383
if getattr(self, "enabled", False):
322
384
# Already enabled
323
385
return
386
self.send_changedstate()
324
387
self.last_enabled = datetime.datetime.utcnow()
325
388
# Schedule a new checker to be started an 'interval' from now,
326
389
# and every interval from then on.
340
403
if not getattr(self, "enabled", False):
341
404
return False
342
405
if not quiet:
343
logger.info(u"Disabling client %s", self.name)
344
if getattr(self, u"disable_initiator_tag", False):
406
self.send_changedstate()
407
if not quiet:
408
logger.info("Disabling client %s", self.name)
409
if getattr(self, "disable_initiator_tag", False):
345
410
gobject.source_remove(self.disable_initiator_tag)
346
411
self.disable_initiator_tag = None
347
if getattr(self, u"checker_initiator_tag", False):
412
if getattr(self, "checker_initiator_tag", False):
348
413
gobject.source_remove(self.checker_initiator_tag)
349
414
self.checker_initiator_tag = None
350
415
self.stop_checker()
365
430
if os.WIFEXITED(condition):
366
431
exitstatus = os.WEXITSTATUS(condition)
367
432
if exitstatus == 0:
368
logger.info(u"Checker for %(name)s succeeded",
433
logger.info("Checker for %(name)s succeeded",
369
434
vars(self))
370
435
self.checked_ok()
371
436
else:
372
logger.info(u"Checker for %(name)s failed",
437
logger.info("Checker for %(name)s failed",
373
438
vars(self))
374
439
else:
375
logger.warning(u"Checker for %(name)s crashed?",
440
logger.warning("Checker for %(name)s crashed?",
376
441
vars(self))
377
442
378
443
def checked_ok(self):
387
452
(self.timeout_milliseconds(),
388
453
self.disable))
389
454
455
def need_approval(self):
456
self.last_approval_request = datetime.datetime.utcnow()
457
390
458
def start_checker(self):
391
459
"""Start a new checker subprocess if one is not running.
392
460
404
472
# If a checker exists, make sure it is not a zombie
405
473
try:
406
474
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
407
except (AttributeError, OSError), error:
475
except (AttributeError, OSError) as error:
408
476
if (isinstance(error, OSError)
409
477
and error.errno != errno.ECHILD):
410
478
raise error
411
479
else:
412
480
if pid:
413
logger.warning(u"Checker was a zombie")
481
logger.warning("Checker was a zombie")
414
482
gobject.source_remove(self.checker_callback_tag)
415
483
self.checker_callback(pid, status,
416
484
self.current_checker_command)
421
489
command = self.checker_command % self.host
422
490
except TypeError:
423
491
# Escape attributes for the shell
424
escaped_attrs = dict((key,
425
re.escape(unicode(str(val),
426
errors=
427
u'replace')))
428
for key, val in
429
vars(self).iteritems())
492
escaped_attrs = dict(
493
(attr,
494
re.escape(unicode(str(getattr(self, attr, "")),
495
errors=
496
'replace')))
497
for attr in
498
self.runtime_expansions)
499
430
500
try:
431
501
command = self.checker_command % escaped_attrs
432
except TypeError, error:
433
logger.error(u'Could not format string "%s":'
434
u' %s', self.checker_command, error)
502
except TypeError as error:
503
logger.error('Could not format string "%s":'
504
' %s', self.checker_command, error)
435
505
return True # Try again later
436
506
self.current_checker_command = command
437
507
try:
438
logger.info(u"Starting checker %r for %s",
508
logger.info("Starting checker %r for %s",
439
509
command, self.name)
440
510
# We don't need to redirect stdout and stderr, since
441
511
# in normal mode, that is already done by daemon(),
443
513
# always replaced by /dev/null.)
444
514
self.checker = subprocess.Popen(command,
445
515
close_fds=True,
446
shell=True, cwd=u"/")
516
shell=True, cwd="/")
447
517
self.checker_callback_tag = (gobject.child_watch_add
448
518
(self.checker.pid,
449
519
self.checker_callback,
454
524
if pid:
455
525
gobject.source_remove(self.checker_callback_tag)
456
526
self.checker_callback(pid, status, command)
457
except OSError, error:
458
logger.error(u"Failed to start subprocess: %s",
527
except OSError as error:
528
logger.error("Failed to start subprocess: %s",
459
529
error)
460
530
# Re-run this periodically if run by gobject.timeout_add
461
531
return True
465
535
if self.checker_callback_tag:
466
536
gobject.source_remove(self.checker_callback_tag)
467
537
self.checker_callback_tag = None
468
if getattr(self, u"checker", None) is None:
538
if getattr(self, "checker", None) is None:
469
539
return
470
logger.debug(u"Stopping checker for %(name)s", vars(self))
540
logger.debug("Stopping checker for %(name)s", vars(self))
471
541
try:
472
542
os.kill(self.checker.pid, signal.SIGTERM)
473
543
#time.sleep(0.5)
474
544
#if self.checker.poll() is None:
475
545
# os.kill(self.checker.pid, signal.SIGKILL)
476
except OSError, error:
546
except OSError as error:
477
547
if error.errno != errno.ESRCH: # No such process
478
548
raise
479
549
self.checker = None
480
550
481
482
def dbus_service_property(dbus_interface, signature=u"v",
483
access=u"readwrite", byte_arrays=False):
551
def dbus_service_property(dbus_interface, signature="v",
552
access="readwrite", byte_arrays=False):
484
553
"""Decorators for marking methods of a DBusObjectWithProperties to
485
554
become properties on the D-Bus.
486
555
493
562
"""
494
563
# Encoding deeply encoded byte arrays is not supported yet by the
495
564
# "Set" method, so we fail early here:
496
if byte_arrays and signature != u"ay":
497
raise ValueError(u"Byte arrays not supported for non-'ay'"
498
u" signature %r" % signature)
565
if byte_arrays and signature != "ay":
566
raise ValueError("Byte arrays not supported for non-'ay'"
567
" signature %r" % signature)
499
568
def decorator(func):
500
569
func._dbus_is_property = True
501
570
func._dbus_interface = dbus_interface
502
571
func._dbus_signature = signature
503
572
func._dbus_access = access
504
573
func._dbus_name = func.__name__
505
if func._dbus_name.endswith(u"_dbus_property"):
574
if func._dbus_name.endswith("_dbus_property"):
506
575
func._dbus_name = func._dbus_name[:-14]
507
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
576
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
508
577
return func
509
578
return decorator
510
579
538
607
539
608
@staticmethod
540
609
def _is_dbus_property(obj):
541
return getattr(obj, u"_dbus_is_property", False)
610
return getattr(obj, "_dbus_is_property", False)
542
611
543
612
def _get_all_dbus_properties(self):
544
613
"""Returns a generator of (name, attribute) pairs
552
621
property with the specified name and interface.
553
622
"""
554
623
for name in (property_name,
555
property_name + u"_dbus_property"):
624
property_name + "_dbus_property"):
556
625
prop = getattr(self, name, None)
557
626
if (prop is None
558
627
or not self._is_dbus_property(prop)
562
631
continue
563
632
return prop
564
633
# No such property
565
raise DBusPropertyNotFound(self.dbus_object_path + u":"
566
+ interface_name + u"."
634
raise DBusPropertyNotFound(self.dbus_object_path + ":"
635
+ interface_name + "."
567
636
+ property_name)
568
637
569
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
570
out_signature=u"v")
638
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
639
out_signature="v")
571
640
def Get(self, interface_name, property_name):
572
641
"""Standard D-Bus property Get() method, see D-Bus standard.
573
642
"""
574
643
prop = self._get_dbus_property(interface_name, property_name)
575
if prop._dbus_access == u"write":
644
if prop._dbus_access == "write":
576
645
raise DBusPropertyAccessException(property_name)
577
646
value = prop()
578
if not hasattr(value, u"variant_level"):
647
if not hasattr(value, "variant_level"):
579
648
return value
580
649
return type(value)(value, variant_level=value.variant_level+1)
581
650
582
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
651
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
583
652
def Set(self, interface_name, property_name, value):
584
653
"""Standard D-Bus property Set() method, see D-Bus standard.
585
654
"""
586
655
prop = self._get_dbus_property(interface_name, property_name)
587
if prop._dbus_access == u"read":
656
if prop._dbus_access == "read":
588
657
raise DBusPropertyAccessException(property_name)
589
if prop._dbus_get_args_options[u"byte_arrays"]:
658
if prop._dbus_get_args_options["byte_arrays"]:
590
659
# The byte_arrays option is not supported yet on
591
660
# signatures other than "ay".
592
if prop._dbus_signature != u"ay":
661
if prop._dbus_signature != "ay":
593
662
raise ValueError
594
663
value = dbus.ByteArray(''.join(unichr(byte)
595
664
for byte in value))
596
665
prop(value)
597
666
598
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
599
out_signature=u"a{sv}")
667
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
668
out_signature="a{sv}")
600
669
def GetAll(self, interface_name):
601
670
"""Standard D-Bus property GetAll() method, see D-Bus
602
671
standard.
610
679
# Interface non-empty but did not match
611
680
continue
612
681
# Ignore write-only properties
613
if prop._dbus_access == u"write":
682
if prop._dbus_access == "write":
614
683
continue
615
684
value = prop()
616
if not hasattr(value, u"variant_level"):
685
if not hasattr(value, "variant_level"):
617
686
all[name] = value
618
687
continue
619
688
all[name] = type(value)(value, variant_level=
620
689
value.variant_level+1)
621
return dbus.Dictionary(all, signature=u"sv")
690
return dbus.Dictionary(all, signature="sv")
622
691
623
692
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
624
out_signature=u"s",
693
out_signature="s",
625
694
path_keyword='object_path',
626
695
connection_keyword='connection')
627
696
def Introspect(self, object_path, connection):
632
701
try:
633
702
document = xml.dom.minidom.parseString(xmlstring)
634
703
def make_tag(document, name, prop):
635
e = document.createElement(u"property")
636
e.setAttribute(u"name", name)
637
e.setAttribute(u"type", prop._dbus_signature)
638
e.setAttribute(u"access", prop._dbus_access)
704
e = document.createElement("property")
705
e.setAttribute("name", name)
706
e.setAttribute("type", prop._dbus_signature)
707
e.setAttribute("access", prop._dbus_access)
639
708
return e
640
for if_tag in document.getElementsByTagName(u"interface"):
709
for if_tag in document.getElementsByTagName("interface"):
641
710
for tag in (make_tag(document, name, prop)
642
711
for name, prop
643
712
in self._get_all_dbus_properties()
644
713
if prop._dbus_interface
645
== if_tag.getAttribute(u"name")):
714
== if_tag.getAttribute("name")):
646
715
if_tag.appendChild(tag)
647
716
# Add the names to the return values for the
648
717
# "org.freedesktop.DBus.Properties" methods
649
if (if_tag.getAttribute(u"name")
650
== u"org.freedesktop.DBus.Properties"):
651
for cn in if_tag.getElementsByTagName(u"method"):
652
if cn.getAttribute(u"name") == u"Get":
653
for arg in cn.getElementsByTagName(u"arg"):
654
if (arg.getAttribute(u"direction")
655
== u"out"):
656
arg.setAttribute(u"name", u"value")
657
elif cn.getAttribute(u"name") == u"GetAll":
658
for arg in cn.getElementsByTagName(u"arg"):
659
if (arg.getAttribute(u"direction")
660
== u"out"):
661
arg.setAttribute(u"name", u"props")
662
xmlstring = document.toxml(u"utf-8")
718
if (if_tag.getAttribute("name")
719
== "org.freedesktop.DBus.Properties"):
720
for cn in if_tag.getElementsByTagName("method"):
721
if cn.getAttribute("name") == "Get":
722
for arg in cn.getElementsByTagName("arg"):
723
if (arg.getAttribute("direction")
724
== "out"):
725
arg.setAttribute("name", "value")
726
elif cn.getAttribute("name") == "GetAll":
727
for arg in cn.getElementsByTagName("arg"):
728
if (arg.getAttribute("direction")
729
== "out"):
730
arg.setAttribute("name", "props")
731
xmlstring = document.toxml("utf-8")
663
732
document.unlink()
664
733
except (AttributeError, xml.dom.DOMException,
665
xml.parsers.expat.ExpatError), error:
666
logger.error(u"Failed to override Introspection method",
734
xml.parsers.expat.ExpatError) as error:
735
logger.error("Failed to override Introspection method",
667
736
error)
668
737
return xmlstring
669
738
675
744
dbus_object_path: dbus.ObjectPath
676
745
bus: dbus.SystemBus()
677
746
"""
747
748
runtime_expansions = (Client.runtime_expansions
749
+ ("dbus_object_path",))
750
678
751
# dbus.service.Object doesn't use super(), so we can't either.
679
752
680
753
def __init__(self, bus = None, *args, **kwargs):
754
self._approvals_pending = 0
681
755
self.bus = bus
682
756
Client.__init__(self, *args, **kwargs)
683
757
# Only now, when this client is initialized, can it show up on
684
758
# the D-Bus
759
client_object_name = unicode(self.name).translate(
760
{ord("."): ord("_"),
761
ord("-"): ord("_")})
685
762
self.dbus_object_path = (dbus.ObjectPath
686
(u"/clients/"
687
+ self.name.replace(u".", u"_")))
763
("/clients/" + client_object_name))
688
764
DBusObjectWithProperties.__init__(self, self.bus,
689
765
self.dbus_object_path)
766
767
def _get_approvals_pending(self):
768
return self._approvals_pending
769
def _set_approvals_pending(self, value):
770
old_value = self._approvals_pending
771
self._approvals_pending = value
772
bval = bool(value)
773
if (hasattr(self, "dbus_object_path")
774
and bval is not bool(old_value)):
775
dbus_bool = dbus.Boolean(bval, variant_level=1)
776
self.PropertyChanged(dbus.String("ApprovalPending"),
777
dbus_bool)
778
779
approvals_pending = property(_get_approvals_pending,
780
_set_approvals_pending)
781
del _get_approvals_pending, _set_approvals_pending
690
782
691
783
@staticmethod
692
784
def _datetime_to_dbus(dt, variant_level=0):
695
787
variant_level=variant_level)
696
788
697
789
def enable(self):
698
oldstate = getattr(self, u"enabled", False)
790
oldstate = getattr(self, "enabled", False)
699
791
r = Client.enable(self)
700
792
if oldstate != self.enabled:
701
793
# Emit D-Bus signals
702
self.PropertyChanged(dbus.String(u"enabled"),
794
self.PropertyChanged(dbus.String("Enabled"),
703
795
dbus.Boolean(True, variant_level=1))
704
796
self.PropertyChanged(
705
dbus.String(u"last_enabled"),
797
dbus.String("LastEnabled"),
706
798
self._datetime_to_dbus(self.last_enabled,
707
799
variant_level=1))
708
800
return r
709
801
710
802
def disable(self, quiet = False):
711
oldstate = getattr(self, u"enabled", False)
803
oldstate = getattr(self, "enabled", False)
712
804
r = Client.disable(self, quiet=quiet)
713
805
if not quiet and oldstate != self.enabled:
714
806
# Emit D-Bus signal
715
self.PropertyChanged(dbus.String(u"enabled"),
807
self.PropertyChanged(dbus.String("Enabled"),
716
808
dbus.Boolean(False, variant_level=1))
717
809
return r
718
810
721
813
self.remove_from_connection()
722
814
except LookupError:
723
815
pass
724
if hasattr(DBusObjectWithProperties, u"__del__"):
816
if hasattr(DBusObjectWithProperties, "__del__"):
725
817
DBusObjectWithProperties.__del__(self, *args, **kwargs)
726
818
Client.__del__(self, *args, **kwargs)
727
819
730
822
self.checker_callback_tag = None
731
823
self.checker = None
732
824
# Emit D-Bus signal
733
self.PropertyChanged(dbus.String(u"checker_running"),
825
self.PropertyChanged(dbus.String("CheckerRunning"),
734
826
dbus.Boolean(False, variant_level=1))
735
827
if os.WIFEXITED(condition):
736
828
exitstatus = os.WEXITSTATUS(condition)
748
840
*args, **kwargs)
749
841
750
842
def checked_ok(self, *args, **kwargs):
751
r = Client.checked_ok(self, *args, **kwargs)
843
Client.checked_ok(self, *args, **kwargs)
752
844
# Emit D-Bus signal
753
845
self.PropertyChanged(
754
dbus.String(u"last_checked_ok"),
846
dbus.String("LastCheckedOK"),
755
847
(self._datetime_to_dbus(self.last_checked_ok,
756
848
variant_level=1)))
849
850
def need_approval(self, *args, **kwargs):
851
r = Client.need_approval(self, *args, **kwargs)
852
# Emit D-Bus signal
853
self.PropertyChanged(
854
dbus.String("LastApprovalRequest"),
855
(self._datetime_to_dbus(self.last_approval_request,
856
variant_level=1)))
757
857
return r
758
858
759
859
def start_checker(self, *args, **kwargs):
769
869
# Emit D-Bus signal
770
870
self.CheckerStarted(self.current_checker_command)
771
871
self.PropertyChanged(
772
dbus.String(u"checker_running"),
872
dbus.String("CheckerRunning"),
773
873
dbus.Boolean(True, variant_level=1))
774
874
return r
775
875
776
876
def stop_checker(self, *args, **kwargs):
777
old_checker = getattr(self, u"checker", None)
877
old_checker = getattr(self, "checker", None)
778
878
r = Client.stop_checker(self, *args, **kwargs)
779
879
if (old_checker is not None
780
and getattr(self, u"checker", None) is None):
781
self.PropertyChanged(dbus.String(u"checker_running"),
880
and getattr(self, "checker", None) is None):
881
self.PropertyChanged(dbus.String("CheckerRunning"),
782
882
dbus.Boolean(False, variant_level=1))
783
883
return r
884
885
def _reset_approved(self):
886
self._approved = None
887
return False
888
889
def approve(self, value=True):
890
self.send_changedstate()
891
self._approved = value
892
gobject.timeout_add(self._timedelta_to_milliseconds
893
(self.approval_duration),
894
self._reset_approved)
895
784
896
785
897
## D-Bus methods, signals & properties
786
_interface = u"se.bsnet.fukt.Mandos.Client"
898
_interface = "se.bsnet.fukt.Mandos.Client"
787
899
788
900
## Signals
789
901
790
902
# CheckerCompleted - signal
791
@dbus.service.signal(_interface, signature=u"nxs")
903
@dbus.service.signal(_interface, signature="nxs")
792
904
def CheckerCompleted(self, exitcode, waitstatus, command):
793
905
"D-Bus signal"
794
906
pass
795
907
796
908
# CheckerStarted - signal
797
@dbus.service.signal(_interface, signature=u"s")
909
@dbus.service.signal(_interface, signature="s")
798
910
def CheckerStarted(self, command):
799
911
"D-Bus signal"
800
912
pass
801
913
802
914
# PropertyChanged - signal
803
@dbus.service.signal(_interface, signature=u"sv")
915
@dbus.service.signal(_interface, signature="sv")
804
916
def PropertyChanged(self, property, value):
805
917
"D-Bus signal"
806
918
pass
808
920
# GotSecret - signal
809
921
@dbus.service.signal(_interface)
810
922
def GotSecret(self):
811
"D-Bus signal"
923
"""D-Bus signal
924
Is sent after a successful transfer of secret from the Mandos
925
server to mandos-client
926
"""
812
927
pass
813
928
814
929
# Rejected - signal
815
@dbus.service.signal(_interface)
816
def Rejected(self):
930
@dbus.service.signal(_interface, signature="s")
931
def Rejected(self, reason):
817
932
"D-Bus signal"
818
933
pass
819
934
935
# NeedApproval - signal
936
@dbus.service.signal(_interface, signature="tb")
937
def NeedApproval(self, timeout, default):
938
"D-Bus signal"
939
return self.need_approval()
940
820
941
## Methods
821
942
943
# Approve - method
944
@dbus.service.method(_interface, in_signature="b")
945
def Approve(self, value):
946
self.approve(value)
947
822
948
# CheckedOK - method
823
949
@dbus.service.method(_interface)
824
950
def CheckedOK(self):
825
return self.checked_ok()
951
self.checked_ok()
826
952
827
953
# Enable - method
828
954
@dbus.service.method(_interface)
849
975
850
976
## Properties
851
977
852
# name - property
853
@dbus_service_property(_interface, signature=u"s", access=u"read")
854
def name_dbus_property(self):
978
# ApprovalPending - property
979
@dbus_service_property(_interface, signature="b", access="read")
980
def ApprovalPending_dbus_property(self):
981
return dbus.Boolean(bool(self.approvals_pending))
982
983
# ApprovedByDefault - property
984
@dbus_service_property(_interface, signature="b",
985
access="readwrite")
986
def ApprovedByDefault_dbus_property(self, value=None):
987
if value is None: # get
988
return dbus.Boolean(self.approved_by_default)
989
self.approved_by_default = bool(value)
990
# Emit D-Bus signal
991
self.PropertyChanged(dbus.String("ApprovedByDefault"),
992
dbus.Boolean(value, variant_level=1))
993
994
# ApprovalDelay - property
995
@dbus_service_property(_interface, signature="t",
996
access="readwrite")
997
def ApprovalDelay_dbus_property(self, value=None):
998
if value is None: # get
999
return dbus.UInt64(self.approval_delay_milliseconds())
1000
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1001
# Emit D-Bus signal
1002
self.PropertyChanged(dbus.String("ApprovalDelay"),
1003
dbus.UInt64(value, variant_level=1))
1004
1005
# ApprovalDuration - property
1006
@dbus_service_property(_interface, signature="t",
1007
access="readwrite")
1008
def ApprovalDuration_dbus_property(self, value=None):
1009
if value is None: # get
1010
return dbus.UInt64(self._timedelta_to_milliseconds(
1011
self.approval_duration))
1012
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1013
# Emit D-Bus signal
1014
self.PropertyChanged(dbus.String("ApprovalDuration"),
1015
dbus.UInt64(value, variant_level=1))
1016
1017
# Name - property
1018
@dbus_service_property(_interface, signature="s", access="read")
1019
def Name_dbus_property(self):
855
1020
return dbus.String(self.name)
856
1021
857
# fingerprint - property
858
@dbus_service_property(_interface, signature=u"s", access=u"read")
859
def fingerprint_dbus_property(self):
1022
# Fingerprint - property
1023
@dbus_service_property(_interface, signature="s", access="read")
1024
def Fingerprint_dbus_property(self):
860
1025
return dbus.String(self.fingerprint)
861
1026
862
# host - property
863
@dbus_service_property(_interface, signature=u"s",
864
access=u"readwrite")
865
def host_dbus_property(self, value=None):
1027
# Host - property
1028
@dbus_service_property(_interface, signature="s",
1029
access="readwrite")
1030
def Host_dbus_property(self, value=None):
866
1031
if value is None: # get
867
1032
return dbus.String(self.host)
868
1033
self.host = value
869
1034
# Emit D-Bus signal
870
self.PropertyChanged(dbus.String(u"host"),
1035
self.PropertyChanged(dbus.String("Host"),
871
1036
dbus.String(value, variant_level=1))
872
1037
873
# created - property
874
@dbus_service_property(_interface, signature=u"s", access=u"read")
875
def created_dbus_property(self):
1038
# Created - property
1039
@dbus_service_property(_interface, signature="s", access="read")
1040
def Created_dbus_property(self):
876
1041
return dbus.String(self._datetime_to_dbus(self.created))
877
1042
878
# last_enabled - property
879
@dbus_service_property(_interface, signature=u"s", access=u"read")
880
def last_enabled_dbus_property(self):
1043
# LastEnabled - property
1044
@dbus_service_property(_interface, signature="s", access="read")
1045
def LastEnabled_dbus_property(self):
881
1046
if self.last_enabled is None:
882
return dbus.String(u"")
1047
return dbus.String("")
883
1048
return dbus.String(self._datetime_to_dbus(self.last_enabled))
884
1049
885
# enabled - property
886
@dbus_service_property(_interface, signature=u"b",
887
access=u"readwrite")
888
def enabled_dbus_property(self, value=None):
1050
# Enabled - property
1051
@dbus_service_property(_interface, signature="b",
1052
access="readwrite")
1053
def Enabled_dbus_property(self, value=None):
889
1054
if value is None: # get
890
1055
return dbus.Boolean(self.enabled)
891
1056
if value:
893
1058
else:
894
1059
self.disable()
895
1060
896
# last_checked_ok - property
897
@dbus_service_property(_interface, signature=u"s",
898
access=u"readwrite")
899
def last_checked_ok_dbus_property(self, value=None):
1061
# LastCheckedOK - property
1062
@dbus_service_property(_interface, signature="s",
1063
access="readwrite")
1064
def LastCheckedOK_dbus_property(self, value=None):
900
1065
if value is not None:
901
1066
self.checked_ok()
902
1067
return
903
1068
if self.last_checked_ok is None:
904
return dbus.String(u"")
1069
return dbus.String("")
905
1070
return dbus.String(self._datetime_to_dbus(self
906
1071
.last_checked_ok))
907
1072
908
# timeout - property
909
@dbus_service_property(_interface, signature=u"t",
910
access=u"readwrite")
911
def timeout_dbus_property(self, value=None):
1073
# LastApprovalRequest - property
1074
@dbus_service_property(_interface, signature="s", access="read")
1075
def LastApprovalRequest_dbus_property(self):
1076
if self.last_approval_request is None:
1077
return dbus.String("")
1078
return dbus.String(self.
1079
_datetime_to_dbus(self
1080
.last_approval_request))
1081
1082
# Timeout - property
1083
@dbus_service_property(_interface, signature="t",
1084
access="readwrite")
1085
def Timeout_dbus_property(self, value=None):
912
1086
if value is None: # get
913
1087
return dbus.UInt64(self.timeout_milliseconds())
914
1088
self.timeout = datetime.timedelta(0, 0, 0, value)
915
1089
# Emit D-Bus signal
916
self.PropertyChanged(dbus.String(u"timeout"),
1090
self.PropertyChanged(dbus.String("Timeout"),
917
1091
dbus.UInt64(value, variant_level=1))
918
if getattr(self, u"disable_initiator_tag", None) is None:
1092
if getattr(self, "disable_initiator_tag", None) is None:
919
1093
return
920
1094
# Reschedule timeout
921
1095
gobject.source_remove(self.disable_initiator_tag)
933
1107
self.disable_initiator_tag = (gobject.timeout_add
934
1108
(time_to_die, self.disable))
935
1109
936
# interval - property
937
@dbus_service_property(_interface, signature=u"t",
938
access=u"readwrite")
939
def interval_dbus_property(self, value=None):
1110
# Interval - property
1111
@dbus_service_property(_interface, signature="t",
1112
access="readwrite")
1113
def Interval_dbus_property(self, value=None):
940
1114
if value is None: # get
941
1115
return dbus.UInt64(self.interval_milliseconds())
942
1116
self.interval = datetime.timedelta(0, 0, 0, value)
943
1117
# Emit D-Bus signal
944
self.PropertyChanged(dbus.String(u"interval"),
1118
self.PropertyChanged(dbus.String("Interval"),
945
1119
dbus.UInt64(value, variant_level=1))
946
if getattr(self, u"checker_initiator_tag", None) is None:
1120
if getattr(self, "checker_initiator_tag", None) is None:
947
1121
return
948
1122
# Reschedule checker run
949
1123
gobject.source_remove(self.checker_initiator_tag)
951
1125
(value, self.start_checker))
952
1126
self.start_checker() # Start one now, too
953
1127
954
# checker - property
955
@dbus_service_property(_interface, signature=u"s",
956
access=u"readwrite")
957
def checker_dbus_property(self, value=None):
1128
# Checker - property
1129
@dbus_service_property(_interface, signature="s",
1130
access="readwrite")
1131
def Checker_dbus_property(self, value=None):
958
1132
if value is None: # get
959
1133
return dbus.String(self.checker_command)
960
1134
self.checker_command = value
961
1135
# Emit D-Bus signal
962
self.PropertyChanged(dbus.String(u"checker"),
1136
self.PropertyChanged(dbus.String("Checker"),
963
1137
dbus.String(self.checker_command,
964
1138
variant_level=1))
965
1139
966
# checker_running - property
967
@dbus_service_property(_interface, signature=u"b",
968
access=u"readwrite")
969
def checker_running_dbus_property(self, value=None):
1140
# CheckerRunning - property
1141
@dbus_service_property(_interface, signature="b",
1142
access="readwrite")
1143
def CheckerRunning_dbus_property(self, value=None):
970
1144
if value is None: # get
971
1145
return dbus.Boolean(self.checker is not None)
972
1146
if value:
974
1148
else:
975
1149
self.stop_checker()
976
1150
977
# object_path - property
978
@dbus_service_property(_interface, signature=u"o", access=u"read")
979
def object_path_dbus_property(self):
1151
# ObjectPath - property
1152
@dbus_service_property(_interface, signature="o", access="read")
1153
def ObjectPath_dbus_property(self):
980
1154
return self.dbus_object_path # is already a dbus.ObjectPath
981
1155
982
# secret = property
983
@dbus_service_property(_interface, signature=u"ay",
984
access=u"write", byte_arrays=True)
985
def secret_dbus_property(self, value):
1156
# Secret = property
1157
@dbus_service_property(_interface, signature="ay",
1158
access="write", byte_arrays=True)
1159
def Secret_dbus_property(self, value):
986
1160
self.secret = str(value)
987
1161
988
1162
del _interface
989
1163
990
1164
1165
class ProxyClient(object):
1166
def __init__(self, child_pipe, fpr, address):
1167
self._pipe = child_pipe
1168
self._pipe.send(('init', fpr, address))
1169
if not self._pipe.recv():
1170
raise KeyError()
1171
1172
def __getattribute__(self, name):
1173
if(name == '_pipe'):
1174
return super(ProxyClient, self).__getattribute__(name)
1175
self._pipe.send(('getattr', name))
1176
data = self._pipe.recv()
1177
if data[0] == 'data':
1178
return data[1]
1179
if data[0] == 'function':
1180
def func(*args, **kwargs):
1181
self._pipe.send(('funcall', name, args, kwargs))
1182
return self._pipe.recv()[1]
1183
return func
1184
1185
def __setattr__(self, name, value):
1186
if(name == '_pipe'):
1187
return super(ProxyClient, self).__setattr__(name, value)
1188
self._pipe.send(('setattr', name, value))
1189
1190
991
1191
class ClientHandler(socketserver.BaseRequestHandler, object):
992
1192
"""A class to handle client connections.
993
1193
995
1195
Note: This will run in its own forked process."""
996
1196
997
1197
def handle(self):
998
logger.info(u"TCP connection from: %s",
999
unicode(self.client_address))
1000
logger.debug(u"IPC Pipe FD: %d",
1001
self.server.child_pipe[1].fileno())
1002
# Open IPC pipe to parent process
1003
with contextlib.nested(self.server.child_pipe[1],
1004
self.server.parent_pipe[0]
1005
) as (ipc, ipc_return):
1198
with contextlib.closing(self.server.child_pipe) as child_pipe:
1199
logger.info("TCP connection from: %s",
1200
unicode(self.client_address))
1201
logger.debug("Pipe FD: %d",
1202
self.server.child_pipe.fileno())
1203
1006
1204
session = (gnutls.connection
1007
1205
.ClientSession(self.request,
1008
1206
gnutls.connection
1009
1207
.X509Credentials()))
1010
1208
1011
1209
# Note: gnutls.connection.X509Credentials is really a
1012
1210
# generic GnuTLS certificate credentials object so long as
1013
1211
# no X.509 keys are added to it. Therefore, we can use it
1014
1212
# here despite using OpenPGP certificates.
1015
1016
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1017
# u"+AES-256-CBC", u"+SHA1",
1018
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1019
# u"+DHE-DSS"))
1213
1214
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1215
# "+AES-256-CBC", "+SHA1",
1216
# "+COMP-NULL", "+CTYPE-OPENPGP",
1217
# "+DHE-DSS"))
1020
1218
# Use a fallback default, since this MUST be set.
1021
1219
priority = self.server.gnutls_priority
1022
1220
if priority is None:
1023
priority = u"NORMAL"
1221
priority = "NORMAL"
1024
1222
(gnutls.library.functions
1025
1223
.gnutls_priority_set_direct(session._c_object,
1026
1224
priority, None))
1027
1225
1028
1226
# Start communication using the Mandos protocol
1029
1227
# Get protocol number
1030
1228
line = self.request.makefile().readline()
1031
logger.debug(u"Protocol version: %r", line)
1229
logger.debug("Protocol version: %r", line)
1032
1230
try:
1033
1231
if int(line.strip().split()[0]) > 1:
1034
1232
raise RuntimeError
1035
except (ValueError, IndexError, RuntimeError), error:
1036
logger.error(u"Unknown protocol version: %s", error)
1233
except (ValueError, IndexError, RuntimeError) as error:
1234
logger.error("Unknown protocol version: %s", error)
1037
1235
return
1038
1236
1039
1237
# Start GnuTLS connection
1040
1238
try:
1041
1239
session.handshake()
1042
except gnutls.errors.GNUTLSError, error:
1043
logger.warning(u"Handshake failed: %s", error)
1240
except gnutls.errors.GNUTLSError as error:
1241
logger.warning("Handshake failed: %s", error)
1044
1242
# Do not run session.bye() here: the session is not
1045
1243
# established. Just abandon the request.
1046
1244
return
1047
logger.debug(u"Handshake succeeded")
1245
logger.debug("Handshake succeeded")
1246
1247
approval_required = False
1048
1248
try:
1049
1249
try:
1050
1250
fpr = self.fingerprint(self.peer_certificate
1051
1251
(session))
1052
except (TypeError, gnutls.errors.GNUTLSError), error:
1053
logger.warning(u"Bad certificate: %s", error)
1252
except (TypeError,
1253
gnutls.errors.GNUTLSError) as error:
1254
logger.warning("Bad certificate: %s", error)
1054
1255
return
1055
logger.debug(u"Fingerprint: %s", fpr)
1256
logger.debug("Fingerprint: %s", fpr)
1056
1257
1057
for c in self.server.clients:
1058
if c.fingerprint == fpr:
1059
client = c
1258
try:
1259
client = ProxyClient(child_pipe, fpr,
1260
self.client_address)
1261
except KeyError:
1262
return
1263
1264
if client.approval_delay:
1265
delay = client.approval_delay
1266
client.approvals_pending += 1
1267
approval_required = True
1268
1269
while True:
1270
if not client.enabled:
1271
logger.info("Client %s is disabled",
1272
client.name)
1273
if self.server.use_dbus:
1274
# Emit D-Bus signal
1275
client.Rejected("Disabled")
1276
return
1277
1278
if client._approved or not client.approval_delay:
1279
#We are approved or approval is disabled
1060
1280
break
1061
else:
1062
ipc.write(u"NOTFOUND %s %s\n"
1063
% (fpr, unicode(self.client_address)))
1064
return
1065
1066
class ClientProxy(object):
1067
"""Client proxy object. Not for calling methods."""
1068
def __init__(self, client):
1069
self.client = client
1070
def __getattr__(self, name):
1071
if name.startswith("ipc_"):
1072
def tempfunc():
1073
ipc.write("%s %s\n" % (name[4:].upper(),
1074
self.client.name))
1075
return tempfunc
1076
if not hasattr(self.client, name):
1077
raise AttributeError
1078
ipc.write(u"GETATTR %s %s\n"
1079
% (name, self.client.fingerprint))
1080
return pickle.load(ipc_return)
1081
clientproxy = ClientProxy(client)
1082
# Have to check if client.enabled, since it is
1083
# possible that the client was disabled since the
1084
# GnuTLS session was established.
1085
if not clientproxy.enabled:
1086
clientproxy.ipc_disabled()
1087
return
1088
1089
clientproxy.ipc_sending()
1281
elif client._approved is None:
1282
logger.info("Client %s needs approval",
1283
client.name)
1284
if self.server.use_dbus:
1285
# Emit D-Bus signal
1286
client.NeedApproval(
1287
client.approval_delay_milliseconds(),
1288
client.approved_by_default)
1289
else:
1290
logger.warning("Client %s was not approved",
1291
client.name)
1292
if self.server.use_dbus:
1293
# Emit D-Bus signal
1294
client.Rejected("Denied")
1295
return
1296
1297
#wait until timeout or approved
1298
#x = float(client._timedelta_to_milliseconds(delay))
1299
time = datetime.datetime.now()
1300
client.changedstate.acquire()
1301
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1302
client.changedstate.release()
1303
time2 = datetime.datetime.now()
1304
if (time2 - time) >= delay:
1305
if not client.approved_by_default:
1306
logger.warning("Client %s timed out while"
1307
" waiting for approval",
1308
client.name)
1309
if self.server.use_dbus:
1310
# Emit D-Bus signal
1311
client.Rejected("Approval timed out")
1312
return
1313
else:
1314
break
1315
else:
1316
delay -= time2 - time
1317
1090
1318
sent_size = 0
1091
1319
while sent_size < len(client.secret):
1092
sent = session.send(client.secret[sent_size:])
1093
logger.debug(u"Sent: %d, remaining: %d",
1320
try:
1321
sent = session.send(client.secret[sent_size:])
1322
except gnutls.errors.GNUTLSError as error:
1323
logger.warning("gnutls send failed")
1324
return
1325
logger.debug("Sent: %d, remaining: %d",
1094
1326
sent, len(client.secret)
1095
1327
- (sent_size + sent))
1096
1328
sent_size += sent
1329
1330
logger.info("Sending secret to %s", client.name)
1331
# bump the timeout as if seen
1332
client.checked_ok()
1333
if self.server.use_dbus:
1334
# Emit D-Bus signal
1335
client.GotSecret()
1336
1097
1337
finally:
1098
session.bye()
1338
if approval_required:
1339
client.approvals_pending -= 1
1340
try:
1341
session.bye()
1342
except gnutls.errors.GNUTLSError as error:
1343
logger.warning("GnuTLS bye failed")
1099
1344
1100
1345
@staticmethod
1101
1346
def peer_certificate(session):
1111
1356
.gnutls_certificate_get_peers
1112
1357
(session._c_object, ctypes.byref(list_size)))
1113
1358
if not bool(cert_list) and list_size.value != 0:
1114
raise gnutls.errors.GNUTLSError(u"error getting peer"
1115
u" certificate")
1359
raise gnutls.errors.GNUTLSError("error getting peer"
1360
" certificate")
1116
1361
if list_size.value == 0:
1117
1362
return None
1118
1363
cert = cert_list[0]
1144
1389
if crtverify.value != 0:
1145
1390
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1146
1391
raise (gnutls.errors.CertificateSecurityError
1147
(u"Verify failed"))
1392
("Verify failed"))
1148
1393
# New buffer for the fingerprint
1149
1394
buf = ctypes.create_string_buffer(20)
1150
1395
buf_len = ctypes.c_size_t()
1157
1402
# Convert the buffer to a Python bytestring
1158
1403
fpr = ctypes.string_at(buf, buf_len.value)
1159
1404
# Convert the bytestring to hexadecimal notation
1160
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1405
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1161
1406
return hex_fpr
1162
1407
1163
1408
1164
class ForkingMixInWithPipes(socketserver.ForkingMixIn, object):
1165
"""Like socketserver.ForkingMixIn, but also pass a pipe pair."""
1409
class MultiprocessingMixIn(object):
1410
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1411
def sub_process_main(self, request, address):
1412
try:
1413
self.finish_request(request, address)
1414
except:
1415
self.handle_error(request, address)
1416
self.close_request(request)
1417
1418
def process_request(self, request, address):
1419
"""Start a new process to process the request."""
1420
multiprocessing.Process(target = self.sub_process_main,
1421
args = (request, address)).start()
1422
1423
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1424
""" adds a pipe to the MixIn """
1166
1425
def process_request(self, request, client_address):
1167
1426
"""Overrides and wraps the original process_request().
1168
1427
1169
1428
This function creates a new pipe in self.pipe
1170
1429
"""
1171
# Child writes to child_pipe
1172
self.child_pipe = map(os.fdopen, os.pipe(), u"rw", (1, 0))
1173
# Parent writes to parent_pipe
1174
self.parent_pipe = map(os.fdopen, os.pipe(), u"rw", (1, 0))
1175
super(ForkingMixInWithPipes,
1430
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1431
1432
super(MultiprocessingMixInWithPipe,
1176
1433
self).process_request(request, client_address)
1177
# Close unused ends for parent
1178
self.parent_pipe[0].close() # close read end
1179
self.child_pipe[1].close() # close write end
1180
self.add_pipe_fds(self.child_pipe[0], self.parent_pipe[1])
1181
def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
1434
self.child_pipe.close()
1435
self.add_pipe(parent_pipe)
1436
1437
def add_pipe(self, parent_pipe):
1182
1438
"""Dummy function; override as necessary"""
1183
child_pipe_fd.close()
1184
parent_pipe_fd.close()
1185
1186
1187
class IPv6_TCPServer(ForkingMixInWithPipes,
1439
raise NotImplementedError
1440
1441
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1188
1442
socketserver.TCPServer, object):
1189
1443
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1190
1444
1206
1460
bind to an address or port if they were not specified."""
1207
1461
if self.interface is not None:
1208
1462
if SO_BINDTODEVICE is None:
1209
logger.error(u"SO_BINDTODEVICE does not exist;"
1210
u" cannot bind to interface %s",
1463
logger.error("SO_BINDTODEVICE does not exist;"
1464
" cannot bind to interface %s",
1211
1465
self.interface)
1212
1466
else:
1213
1467
try:
1214
1468
self.socket.setsockopt(socket.SOL_SOCKET,
1215
1469
SO_BINDTODEVICE,
1216
1470
str(self.interface
1217
+ u'\0'))
1218
except socket.error, error:
1471
+ '\0'))
1472
except socket.error as error:
1219
1473
if error[0] == errno.EPERM:
1220
logger.error(u"No permission to"
1221
u" bind to interface %s",
1474
logger.error("No permission to"
1475
" bind to interface %s",
1222
1476
self.interface)
1223
1477
elif error[0] == errno.ENOPROTOOPT:
1224
logger.error(u"SO_BINDTODEVICE not available;"
1225
u" cannot bind to interface %s",
1478
logger.error("SO_BINDTODEVICE not available;"
1479
" cannot bind to interface %s",
1226
1480
self.interface)
1227
1481
else:
1228
1482
raise
1230
1484
if self.server_address[0] or self.server_address[1]:
1231
1485
if not self.server_address[0]:
1232
1486
if self.address_family == socket.AF_INET6:
1233
any_address = u"::" # in6addr_any
1487
any_address = "::" # in6addr_any
1234
1488
else:
1235
1489
any_address = socket.INADDR_ANY
1236
1490
self.server_address = (any_address,
1275
1529
return socketserver.TCPServer.server_activate(self)
1276
1530
def enable(self):
1277
1531
self.enabled = True
1278
def add_pipe_fds(self, child_pipe_fd, parent_pipe_fd):
1532
def add_pipe(self, parent_pipe):
1279
1533
# Call "handle_ipc" for both data and EOF events
1280
gobject.io_add_watch(child_pipe_fd.fileno(),
1534
gobject.io_add_watch(parent_pipe.fileno(),
1281
1535
gobject.IO_IN | gobject.IO_HUP,
1282
1536
functools.partial(self.handle_ipc,
1283
reply = parent_pipe_fd,
1284
sender= child_pipe_fd))
1285
def handle_ipc(self, source, condition, reply=None, sender=None):
1537
parent_pipe = parent_pipe))
1538
1539
def handle_ipc(self, source, condition, parent_pipe=None,
1540
client_object=None):
1286
1541
condition_names = {
1287
gobject.IO_IN: u"IN", # There is data to read.
1288
gobject.IO_OUT: u"OUT", # Data can be written (without
1542
gobject.IO_IN: "IN", # There is data to read.
1543
gobject.IO_OUT: "OUT", # Data can be written (without
1289
1544
# blocking).
1290
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1291
gobject.IO_ERR: u"ERR", # Error condition.
1292
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1545
gobject.IO_PRI: "PRI", # There is urgent data to read.
1546
gobject.IO_ERR: "ERR", # Error condition.
1547
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1293
1548
# broken, usually for pipes and
1294
1549
# sockets).
1295
1550
}
1297
1552
for cond, name in
1298
1553
condition_names.iteritems()
1299
1554
if cond & condition)
1300
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1301
conditions_string)
1302
1303
# Read a line from the file object
1304
cmdline = sender.readline()
1305
if not cmdline: # Empty line means end of file
1306
# close the IPC pipes
1307
sender.close()
1308
reply.close()
1309
1310
# Stop calling this function
1311
return False
1312
1313
logger.debug(u"IPC command: %r", cmdline)
1314
1315
# Parse and act on command
1316
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1317
1318
if cmd == u"NOTFOUND":
1319
fpr, address = args.split(None, 1)
1320
logger.warning(u"Client not found for fingerprint: %s, ad"
1321
u"dress: %s", fpr, address)
1322
if self.use_dbus:
1323
# Emit D-Bus signal
1324
mandos_dbus_service.ClientNotFound(fpr, address)
1325
elif cmd == u"DISABLED":
1326
for client in self.clients:
1327
if client.name == args:
1328
logger.warning(u"Client %s is disabled", args)
1329
if self.use_dbus:
1330
# Emit D-Bus signal
1331
client.Rejected()
1332
break
1333
else:
1334
logger.error(u"Unknown client %s is disabled", args)
1335
elif cmd == u"SENDING":
1336
for client in self.clients:
1337
if client.name == args:
1338
logger.info(u"Sending secret to %s", client.name)
1339
client.checked_ok()
1340
if self.use_dbus:
1341
# Emit D-Bus signal
1342
client.GotSecret()
1343
break
1344
else:
1345
logger.error(u"Sending secret to unknown client %s",
1346
args)
1347
elif cmd == u"GETATTR":
1348
attr_name, fpr = args.split(None, 1)
1349
for client in self.clients:
1350
if client.fingerprint == fpr:
1351
attr_value = getattr(client, attr_name, None)
1352
logger.debug("IPC reply: %r", attr_value)
1353
pickle.dump(attr_value, reply)
1354
break
1355
else:
1356
logger.error(u"Client %s on address %s requesting "
1357
u"attribute %s not found", fpr, address,
1358
attr_name)
1359
pickle.dump(None, reply)
1360
else:
1361
logger.error(u"Unknown IPC command: %r", cmdline)
1362
1363
# Keep calling this function
1555
# error or the other end of multiprocessing.Pipe has closed
1556
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1557
return False
1558
1559
# Read a request from the child
1560
request = parent_pipe.recv()
1561
command = request[0]
1562
1563
if command == 'init':
1564
fpr = request[1]
1565
address = request[2]
1566
1567
for c in self.clients:
1568
if c.fingerprint == fpr:
1569
client = c
1570
break
1571
else:
1572
logger.info("Client not found for fingerprint: %s, ad"
1573
"dress: %s", fpr, address)
1574
if self.use_dbus:
1575
# Emit D-Bus signal
1576
mandos_dbus_service.ClientNotFound(fpr, address[0])
1577
parent_pipe.send(False)
1578
return False
1579
1580
gobject.io_add_watch(parent_pipe.fileno(),
1581
gobject.IO_IN | gobject.IO_HUP,
1582
functools.partial(self.handle_ipc,
1583
parent_pipe = parent_pipe,
1584
client_object = client))
1585
parent_pipe.send(True)
1586
# remove the old hook in favor of the new above hook on same fileno
1587
return False
1588
if command == 'funcall':
1589
funcname = request[1]
1590
args = request[2]
1591
kwargs = request[3]
1592
1593
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1594
1595
if command == 'getattr':
1596
attrname = request[1]
1597
if callable(client_object.__getattribute__(attrname)):
1598
parent_pipe.send(('function',))
1599
else:
1600
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1601
1602
if command == 'setattr':
1603
attrname = request[1]
1604
value = request[2]
1605
setattr(client_object, attrname, value)
1606
1364
1607
return True
1365
1608
1366
1609
1367
1610
def string_to_delta(interval):
1368
1611
"""Parse a string and return a datetime.timedelta
1369
1612
1370
>>> string_to_delta(u'7d')
1613
>>> string_to_delta('7d')
1371
1614
datetime.timedelta(7)
1372
>>> string_to_delta(u'60s')
1615
>>> string_to_delta('60s')
1373
1616
datetime.timedelta(0, 60)
1374
>>> string_to_delta(u'60m')
1617
>>> string_to_delta('60m')
1375
1618
datetime.timedelta(0, 3600)
1376
>>> string_to_delta(u'24h')
1619
>>> string_to_delta('24h')
1377
1620
datetime.timedelta(1)
1378
>>> string_to_delta(u'1w')
1621
>>> string_to_delta('1w')
1379
1622
datetime.timedelta(7)
1380
>>> string_to_delta(u'5m 30s')
1623
>>> string_to_delta('5m 30s')
1381
1624
datetime.timedelta(0, 330)
1382
1625
"""
1383
1626
timevalue = datetime.timedelta(0)
1385
1628
try:
1386
1629
suffix = unicode(s[-1])
1387
1630
value = int(s[:-1])
1388
if suffix == u"d":
1631
if suffix == "d":
1389
1632
delta = datetime.timedelta(value)
1390
elif suffix == u"s":
1633
elif suffix == "s":
1391
1634
delta = datetime.timedelta(0, value)
1392
elif suffix == u"m":
1635
elif suffix == "m":
1393
1636
delta = datetime.timedelta(0, 0, 0, 0, value)
1394
elif suffix == u"h":
1637
elif suffix == "h":
1395
1638
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1396
elif suffix == u"w":
1639
elif suffix == "w":
1397
1640
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1398
1641
else:
1399
raise ValueError(u"Unknown suffix %r" % suffix)
1400
except (ValueError, IndexError), e:
1401
raise ValueError(e.message)
1642
raise ValueError("Unknown suffix %r" % suffix)
1643
except (ValueError, IndexError) as e:
1644
raise ValueError(*(e.args))
1402
1645
timevalue += delta
1403
1646
return timevalue
1404
1647
1410
1653
global if_nametoindex
1411
1654
try:
1412
1655
if_nametoindex = (ctypes.cdll.LoadLibrary
1413
(ctypes.util.find_library(u"c"))
1656
(ctypes.util.find_library("c"))
1414
1657
.if_nametoindex)
1415
1658
except (OSError, AttributeError):
1416
logger.warning(u"Doing if_nametoindex the hard way")
1659
logger.warning("Doing if_nametoindex the hard way")
1417
1660
def if_nametoindex(interface):
1418
1661
"Get an interface index the hard way, i.e. using fcntl()"
1419
1662
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1420
1663
with contextlib.closing(socket.socket()) as s:
1421
1664
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1422
struct.pack(str(u"16s16x"),
1665
struct.pack(str("16s16x"),
1423
1666
interface))
1424
interface_index = struct.unpack(str(u"I"),
1667
interface_index = struct.unpack(str("I"),
1425
1668
ifreq[16:20])[0]
1426
1669
return interface_index
1427
1670
return if_nametoindex(interface)
1435
1678
sys.exit()
1436
1679
os.setsid()
1437
1680
if not nochdir:
1438
os.chdir(u"/")
1681
os.chdir("/")
1439
1682
if os.fork():
1440
1683
sys.exit()
1441
1684
if not noclose:
1443
1686
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1444
1687
if not stat.S_ISCHR(os.fstat(null).st_mode):
1445
1688
raise OSError(errno.ENODEV,
1446
u"%s not a character device"
1689
"%s not a character device"
1447
1690
% os.path.devnull)
1448
1691
os.dup2(null, sys.stdin.fileno())
1449
1692
os.dup2(null, sys.stdout.fileno())
1457
1700
##################################################################
1458
1701
# Parsing of options, both command line and config file
1459
1702
1460
parser = optparse.OptionParser(version = "%%prog %s" % version)
1461
parser.add_option("-i", u"--interface", type=u"string",
1462
metavar="IF", help=u"Bind to interface IF")
1463
parser.add_option("-a", u"--address", type=u"string",
1464
help=u"Address to listen for requests on")
1465
parser.add_option("-p", u"--port", type=u"int",
1466
help=u"Port number to receive requests on")
1467
parser.add_option("--check", action=u"store_true",
1468
help=u"Run self-test")
1469
parser.add_option("--debug", action=u"store_true",
1470
help=u"Debug mode; run in foreground and log to"
1471
u" terminal")
1472
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1473
u" priority string (see GnuTLS documentation)")
1474
parser.add_option("--servicename", type=u"string",
1475
metavar=u"NAME", help=u"Zeroconf service name")
1476
parser.add_option("--configdir", type=u"string",
1477
default=u"/etc/mandos", metavar=u"DIR",
1478
help=u"Directory to search for configuration"
1479
u" files")
1480
parser.add_option("--no-dbus", action=u"store_false",
1481
dest=u"use_dbus", help=u"Do not provide D-Bus"
1482
u" system bus interface")
1483
parser.add_option("--no-ipv6", action=u"store_false",
1484
dest=u"use_ipv6", help=u"Do not use IPv6")
1485
options = parser.parse_args()[0]
1703
parser = argparse.ArgumentParser()
1704
parser.add_argument("-v", "--version", action="version",
1705
version = "%%(prog)s %s" % version,
1706
help="show version number and exit")
1707
parser.add_argument("-i", "--interface", metavar="IF",
1708
help="Bind to interface IF")
1709
parser.add_argument("-a", "--address",
1710
help="Address to listen for requests on")
1711
parser.add_argument("-p", "--port", type=int,
1712
help="Port number to receive requests on")
1713
parser.add_argument("--check", action="store_true",
1714
help="Run self-test")
1715
parser.add_argument("--debug", action="store_true",
1716
help="Debug mode; run in foreground and log"
1717
" to terminal")
1718
parser.add_argument("--debuglevel", metavar="LEVEL",
1719
help="Debug level for stdout output")
1720
parser.add_argument("--priority", help="GnuTLS"
1721
" priority string (see GnuTLS documentation)")
1722
parser.add_argument("--servicename",
1723
metavar="NAME", help="Zeroconf service name")
1724
parser.add_argument("--configdir",
1725
default="/etc/mandos", metavar="DIR",
1726
help="Directory to search for configuration"
1727
" files")
1728
parser.add_argument("--no-dbus", action="store_false",
1729
dest="use_dbus", help="Do not provide D-Bus"
1730
" system bus interface")
1731
parser.add_argument("--no-ipv6", action="store_false",
1732
dest="use_ipv6", help="Do not use IPv6")
1733
options = parser.parse_args()
1486
1734
1487
1735
if options.check:
1488
1736
import doctest
1490
1738
sys.exit()
1491
1739
1492
1740
# Default values for config file for server-global settings
1493
server_defaults = { u"interface": u"",
1494
u"address": u"",
1495
u"port": u"",
1496
u"debug": u"False",
1497
u"priority":
1498
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1499
u"servicename": u"Mandos",
1500
u"use_dbus": u"True",
1501
u"use_ipv6": u"True",
1741
server_defaults = { "interface": "",
1742
"address": "",
1743
"port": "",
1744
"debug": "False",
1745
"priority":
1746
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1747
"servicename": "Mandos",
1748
"use_dbus": "True",
1749
"use_ipv6": "True",
1750
"debuglevel": "",
1502
1751
}
1503
1752
1504
1753
# Parse config file for server-global settings
1505
1754
server_config = configparser.SafeConfigParser(server_defaults)
1506
1755
del server_defaults
1507
1756
server_config.read(os.path.join(options.configdir,
1508
u"mandos.conf"))
1757
"mandos.conf"))
1509
1758
# Convert the SafeConfigParser object to a dict
1510
1759
server_settings = server_config.defaults()
1511
1760
# Use the appropriate methods on the non-string config options
1512
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1513
server_settings[option] = server_config.getboolean(u"DEFAULT",
1761
for option in ("debug", "use_dbus", "use_ipv6"):
1762
server_settings[option] = server_config.getboolean("DEFAULT",
1514
1763
option)
1515
1764
if server_settings["port"]:
1516
server_settings["port"] = server_config.getint(u"DEFAULT",
1517
u"port")
1765
server_settings["port"] = server_config.getint("DEFAULT",
1766
"port")
1518
1767
del server_config
1519
1768
1520
1769
# Override the settings from the config file with command line
1521
1770
# options, if set.
1522
for option in (u"interface", u"address", u"port", u"debug",
1523
u"priority", u"servicename", u"configdir",
1524
u"use_dbus", u"use_ipv6"):
1771
for option in ("interface", "address", "port", "debug",
1772
"priority", "servicename", "configdir",
1773
"use_dbus", "use_ipv6", "debuglevel"):
1525
1774
value = getattr(options, option)
1526
1775
if value is not None:
1527
1776
server_settings[option] = value
1535
1784
##################################################################
1536
1785
1537
1786
# For convenience
1538
debug = server_settings[u"debug"]
1539
use_dbus = server_settings[u"use_dbus"]
1540
use_ipv6 = server_settings[u"use_ipv6"]
1541
1542
if not debug:
1543
syslogger.setLevel(logging.WARNING)
1544
console.setLevel(logging.WARNING)
1545
1546
if server_settings[u"servicename"] != u"Mandos":
1787
debug = server_settings["debug"]
1788
debuglevel = server_settings["debuglevel"]
1789
use_dbus = server_settings["use_dbus"]
1790
use_ipv6 = server_settings["use_ipv6"]
1791
1792
if server_settings["servicename"] != "Mandos":
1547
1793
syslogger.setFormatter(logging.Formatter
1548
(u'Mandos (%s) [%%(process)d]:'
1549
u' %%(levelname)s: %%(message)s'
1550
% server_settings[u"servicename"]))
1794
('Mandos (%s) [%%(process)d]:'
1795
' %%(levelname)s: %%(message)s'
1796
% server_settings["servicename"]))
1551
1797
1552
1798
# Parse config file with clients
1553
client_defaults = { u"timeout": u"1h",
1554
u"interval": u"5m",
1555
u"checker": u"fping -q -- %%(host)s",
1556
u"host": u"",
1799
client_defaults = { "timeout": "1h",
1800
"interval": "5m",
1801
"checker": "fping -q -- %%(host)s",
1802
"host": "",
1803
"approval_delay": "0s",
1804
"approval_duration": "1s",
1557
1805
}
1558
1806
client_config = configparser.SafeConfigParser(client_defaults)
1559
client_config.read(os.path.join(server_settings[u"configdir"],
1560
u"clients.conf"))
1807
client_config.read(os.path.join(server_settings["configdir"],
1808
"clients.conf"))
1561
1809
1562
1810
global mandos_dbus_service
1563
1811
mandos_dbus_service = None
1564
1812
1565
tcp_server = MandosServer((server_settings[u"address"],
1566
server_settings[u"port"]),
1813
tcp_server = MandosServer((server_settings["address"],
1814
server_settings["port"]),
1567
1815
ClientHandler,
1568
interface=(server_settings[u"interface"]
1816
interface=(server_settings["interface"]
1569
1817
or None),
1570
1818
use_ipv6=use_ipv6,
1571
1819
gnutls_priority=
1572
server_settings[u"priority"],
1820
server_settings["priority"],
1573
1821
use_dbus=use_dbus)
1574
pidfilename = u"/var/run/mandos.pid"
1575
try:
1576
pidfile = open(pidfilename, u"w")
1577
except IOError:
1578
logger.error(u"Could not open file %r", pidfilename)
1822
if not debug:
1823
pidfilename = "/var/run/mandos.pid"
1824
try:
1825
pidfile = open(pidfilename, "w")
1826
except IOError:
1827
logger.error("Could not open file %r", pidfilename)
1579
1828
1580
1829
try:
1581
uid = pwd.getpwnam(u"_mandos").pw_uid
1582
gid = pwd.getpwnam(u"_mandos").pw_gid
1830
uid = pwd.getpwnam("_mandos").pw_uid
1831
gid = pwd.getpwnam("_mandos").pw_gid
1583
1832
except KeyError:
1584
1833
try:
1585
uid = pwd.getpwnam(u"mandos").pw_uid
1586
gid = pwd.getpwnam(u"mandos").pw_gid
1834
uid = pwd.getpwnam("mandos").pw_uid
1835
gid = pwd.getpwnam("mandos").pw_gid
1587
1836
except KeyError:
1588
1837
try:
1589
uid = pwd.getpwnam(u"nobody").pw_uid
1590
gid = pwd.getpwnam(u"nobody").pw_gid
1838
uid = pwd.getpwnam("nobody").pw_uid
1839
gid = pwd.getpwnam("nobody").pw_gid
1591
1840
except KeyError:
1592
1841
uid = 65534
1593
1842
gid = 65534
1594
1843
try:
1595
1844
os.setgid(gid)
1596
1845
os.setuid(uid)
1597
except OSError, error:
1846
except OSError as error:
1598
1847
if error[0] != errno.EPERM:
1599
1848
raise error
1600
1849
1601
# Enable all possible GnuTLS debugging
1850
if not debug and not debuglevel:
1851
syslogger.setLevel(logging.WARNING)
1852
console.setLevel(logging.WARNING)
1853
if debuglevel:
1854
level = getattr(logging, debuglevel.upper())
1855
syslogger.setLevel(level)
1856
console.setLevel(level)
1857
1602
1858
if debug:
1859
# Enable all possible GnuTLS debugging
1860
1603
1861
# "Use a log level over 10 to enable all debugging options."
1604
1862
# - GnuTLS manual
1605
1863
gnutls.library.functions.gnutls_global_set_log_level(11)
1606
1864
1607
1865
@gnutls.library.types.gnutls_log_func
1608
1866
def debug_gnutls(level, string):
1609
logger.debug(u"GnuTLS: %s", string[:-1])
1867
logger.debug("GnuTLS: %s", string[:-1])
1610
1868
1611
1869
(gnutls.library.functions
1612
1870
.gnutls_global_set_log_function(debug_gnutls))
1871
1872
# Redirect stdin so all checkers get /dev/null
1873
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1874
os.dup2(null, sys.stdin.fileno())
1875
if null > 2:
1876
os.close(null)
1877
else:
1878
# No console logging
1879
logger.removeHandler(console)
1880
1881
# Need to fork before connecting to D-Bus
1882
if not debug:
1883
# Close all input and output, do double fork, etc.
1884
daemon()
1613
1885
1614
1886
global main_loop
1615
1887
# From the Avahi example code
1619
1891
# End of Avahi example code
1620
1892
if use_dbus:
1621
1893
try:
1622
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1894
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1623
1895
bus, do_not_queue=True)
1624
except dbus.exceptions.NameExistsException, e:
1625
logger.error(unicode(e) + u", disabling D-Bus")
1896
except dbus.exceptions.NameExistsException as e:
1897
logger.error(unicode(e) + ", disabling D-Bus")
1626
1898
use_dbus = False
1627
server_settings[u"use_dbus"] = False
1899
server_settings["use_dbus"] = False
1628
1900
tcp_server.use_dbus = False
1629
1901
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1630
service = AvahiService(name = server_settings[u"servicename"],
1631
servicetype = u"_mandos._tcp",
1902
service = AvahiService(name = server_settings["servicename"],
1903
servicetype = "_mandos._tcp",
1632
1904
protocol = protocol, bus = bus)
1633
1905
if server_settings["interface"]:
1634
1906
service.interface = (if_nametoindex
1635
(str(server_settings[u"interface"])))
1907
(str(server_settings["interface"])))
1908
1909
global multiprocessing_manager
1910
multiprocessing_manager = multiprocessing.Manager()
1636
1911
1637
1912
client_class = Client
1638
1913
if use_dbus:
1639
1914
client_class = functools.partial(ClientDBus, bus = bus)
1915
def client_config_items(config, section):
1916
special_settings = {
1917
"approved_by_default":
1918
lambda: config.getboolean(section,
1919
"approved_by_default"),
1920
}
1921
for name, value in config.items(section):
1922
try:
1923
yield (name, special_settings[name]())
1924
except KeyError:
1925
yield (name, value)
1926
1640
1927
tcp_server.clients.update(set(
1641
1928
client_class(name = section,
1642
config= dict(client_config.items(section)))
1929
config= dict(client_config_items(
1930
client_config, section)))
1643
1931
for section in client_config.sections()))
1644
1932
if not tcp_server.clients:
1645
logger.warning(u"No clients defined")
1646
1647
if debug:
1648
# Redirect stdin so all checkers get /dev/null
1649
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1650
os.dup2(null, sys.stdin.fileno())
1651
if null > 2:
1652
os.close(null)
1653
else:
1654
# No console logging
1655
logger.removeHandler(console)
1656
# Close all input and output, do double fork, etc.
1657
daemon()
1658
1659
try:
1660
with pidfile:
1661
pid = os.getpid()
1662
pidfile.write(str(pid) + "\n")
1663
del pidfile
1664
except IOError:
1665
logger.error(u"Could not write to file %r with PID %d",
1666
pidfilename, pid)
1667
except NameError:
1668
# "pidfile" was never created
1669
pass
1670
del pidfilename
1671
1933
logger.warning("No clients defined")
1934
1672
1935
if not debug:
1936
try:
1937
with pidfile:
1938
pid = os.getpid()
1939
pidfile.write(str(pid) + "\n".encode("utf-8"))
1940
del pidfile
1941
except IOError:
1942
logger.error("Could not write to file %r with PID %d",
1943
pidfilename, pid)
1944
except NameError:
1945
# "pidfile" was never created
1946
pass
1947
del pidfilename
1948
1673
1949
signal.signal(signal.SIGINT, signal.SIG_IGN)
1950
1674
1951
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1675
1952
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1676
1953
1678
1955
class MandosDBusService(dbus.service.Object):
1679
1956
"""A D-Bus proxy object"""
1680
1957
def __init__(self):
1681
dbus.service.Object.__init__(self, bus, u"/")
1682
_interface = u"se.bsnet.fukt.Mandos"
1958
dbus.service.Object.__init__(self, bus, "/")
1959
_interface = "se.bsnet.fukt.Mandos"
1683
1960
1684
@dbus.service.signal(_interface, signature=u"o")
1961
@dbus.service.signal(_interface, signature="o")
1685
1962
def ClientAdded(self, objpath):
1686
1963
"D-Bus signal"
1687
1964
pass
1688
1965
1689
@dbus.service.signal(_interface, signature=u"ss")
1966
@dbus.service.signal(_interface, signature="ss")
1690
1967
def ClientNotFound(self, fingerprint, address):
1691
1968
"D-Bus signal"
1692
1969
pass
1693
1970
1694
@dbus.service.signal(_interface, signature=u"os")
1971
@dbus.service.signal(_interface, signature="os")
1695
1972
def ClientRemoved(self, objpath, name):
1696
1973
"D-Bus signal"
1697
1974
pass
1698
1975
1699
@dbus.service.method(_interface, out_signature=u"ao")
1976
@dbus.service.method(_interface, out_signature="ao")
1700
1977
def GetAllClients(self):
1701
1978
"D-Bus method"
1702
1979
return dbus.Array(c.dbus_object_path
1703
1980
for c in tcp_server.clients)
1704
1981
1705
1982
@dbus.service.method(_interface,
1706
out_signature=u"a{oa{sv}}")
1983
out_signature="a{oa{sv}}")
1707
1984
def GetAllClientsWithProperties(self):
1708
1985
"D-Bus method"
1709
1986
return dbus.Dictionary(
1710
((c.dbus_object_path, c.GetAll(u""))
1987
((c.dbus_object_path, c.GetAll(""))
1711
1988
for c in tcp_server.clients),
1712
signature=u"oa{sv}")
1989
signature="oa{sv}")
1713
1990
1714
@dbus.service.method(_interface, in_signature=u"o")
1991
@dbus.service.method(_interface, in_signature="o")
1715
1992
def RemoveClient(self, object_path):
1716
1993
"D-Bus method"
1717
1994
for c in tcp_server.clients:
1759
2036
# Find out what port we got
1760
2037
service.port = tcp_server.socket.getsockname()[1]
1761
2038
if use_ipv6:
1762
logger.info(u"Now listening on address %r, port %d,"
2039
logger.info("Now listening on address %r, port %d,"
1763
2040
" flowinfo %d, scope_id %d"
1764
2041
% tcp_server.socket.getsockname())
1765
2042
else: # IPv4
1766
logger.info(u"Now listening on address %r, port %d"
2043
logger.info("Now listening on address %r, port %d"
1767
2044
% tcp_server.socket.getsockname())
1768
2045
1769
2046
#service.interface = tcp_server.socket.getsockname()[3]
1772
2049
# From the Avahi example code
1773
2050
try:
1774
2051
service.activate()
1775
except dbus.exceptions.DBusException, error:
1776
logger.critical(u"DBusException: %s", error)
2052
except dbus.exceptions.DBusException as error:
2053
logger.critical("DBusException: %s", error)
1777
2054
cleanup()
1778
2055
sys.exit(1)
1779
2056
# End of Avahi example code
1783
2060
(tcp_server.handle_request
1784
2061
(*args[2:], **kwargs) or True))
1785
2062
1786
logger.debug(u"Starting main loop")
2063
logger.debug("Starting main loop")
1787
2064
main_loop.run()
1788
except AvahiError, error:
1789
logger.critical(u"AvahiError: %s", error)
2065
except AvahiError as error:
2066
logger.critical("AvahiError: %s", error)
1790
2067
cleanup()
1791
2068
sys.exit(1)
1792
2069
except KeyboardInterrupt:
1793
2070
if debug:
1794
print >> sys.stderr
1795
logger.debug(u"Server received KeyboardInterrupt")
1796
logger.debug(u"Server exiting")
2071
print("", file=sys.stderr)
2072
logger.debug("Server received KeyboardInterrupt")
2073
logger.debug("Server exiting")
1797
2074
# Must run before the D-Bus bus name gets deregistered
1798
2075
cleanup()
1799
2076
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0