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