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