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