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