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