To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 279
- compare with another revision
- download diff
- download tarball
- view history from revision 279
- Committer: Teddy Hogeborn
- Date: 2010-10-07 18:42:26 UTC
- Revision ID: teddy@fukt.bsnet.se-20101007184226-yl55rd8g1t64t9nj
Tags: version-1.2.2-1
* Makefile (version): Changed to "1.2.2".
* NEWS (Version 1.2.2): New entry.
* debian/changelog (1.2.2-1): - '' -
* NEWS (Version 1.2.2): New entry.
* debian/changelog (1.2.2-1): - '' -
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.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
609
648
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
649
out_signature="v")
610
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
611
out_signature=u"v")
650
612
def Get(self, interface_name, property_name):
651
613
"""Standard D-Bus property Get() method, see D-Bus standard.
652
614
"""
653
615
prop = self._get_dbus_property(interface_name, property_name)
654
if prop._dbus_access == "write":
616
if prop._dbus_access == u"write":
655
617
raise DBusPropertyAccessException(property_name)
656
618
value = prop()
657
if not hasattr(value, "variant_level"):
619
if not hasattr(value, u"variant_level"):
658
620
return value
659
621
return type(value)(value, variant_level=value.variant_level+1)
660
622
661
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
623
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
662
624
def Set(self, interface_name, property_name, value):
663
625
"""Standard D-Bus property Set() method, see D-Bus standard.
664
626
"""
665
627
prop = self._get_dbus_property(interface_name, property_name)
666
if prop._dbus_access == "read":
628
if prop._dbus_access == u"read":
667
629
raise DBusPropertyAccessException(property_name)
668
if prop._dbus_get_args_options["byte_arrays"]:
630
if prop._dbus_get_args_options[u"byte_arrays"]:
669
631
# The byte_arrays option is not supported yet on
670
632
# signatures other than "ay".
671
if prop._dbus_signature != "ay":
633
if prop._dbus_signature != u"ay":
672
634
raise ValueError
673
635
value = dbus.ByteArray(''.join(unichr(byte)
674
636
for byte in value))
675
637
prop(value)
676
638
677
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
678
out_signature="a{sv}")
639
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
640
out_signature=u"a{sv}")
679
641
def GetAll(self, interface_name):
680
642
"""Standard D-Bus property GetAll() method, see D-Bus
681
643
standard.
682
644
683
645
Note: Will not include properties with access="write".
684
646
"""
685
647
all = {}
689
651
# Interface non-empty but did not match
690
652
continue
691
653
# Ignore write-only properties
692
if prop._dbus_access == "write":
654
if prop._dbus_access == u"write":
693
655
continue
694
656
value = prop()
695
if not hasattr(value, "variant_level"):
657
if not hasattr(value, u"variant_level"):
696
658
all[name] = value
697
659
continue
698
660
all[name] = type(value)(value, variant_level=
699
661
value.variant_level+1)
700
return dbus.Dictionary(all, signature="sv")
662
return dbus.Dictionary(all, signature=u"sv")
701
663
702
664
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
703
out_signature="s",
665
out_signature=u"s",
704
666
path_keyword='object_path',
705
667
connection_keyword='connection')
706
668
def Introspect(self, object_path, connection):
711
673
try:
712
674
document = xml.dom.minidom.parseString(xmlstring)
713
675
def make_tag(document, name, prop):
714
e = document.createElement("property")
715
e.setAttribute("name", name)
716
e.setAttribute("type", prop._dbus_signature)
717
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)
718
680
return e
719
for if_tag in document.getElementsByTagName("interface"):
681
for if_tag in document.getElementsByTagName(u"interface"):
720
682
for tag in (make_tag(document, name, prop)
721
683
for name, prop
722
684
in self._get_all_dbus_properties()
723
685
if prop._dbus_interface
724
== if_tag.getAttribute("name")):
686
== if_tag.getAttribute(u"name")):
725
687
if_tag.appendChild(tag)
726
688
# Add the names to the return values for the
727
689
# "org.freedesktop.DBus.Properties" methods
728
if (if_tag.getAttribute("name")
729
== "org.freedesktop.DBus.Properties"):
730
for cn in if_tag.getElementsByTagName("method"):
731
if cn.getAttribute("name") == "Get":
732
for arg in cn.getElementsByTagName("arg"):
733
if (arg.getAttribute("direction")
734
== "out"):
735
arg.setAttribute("name", "value")
736
elif cn.getAttribute("name") == "GetAll":
737
for arg in cn.getElementsByTagName("arg"):
738
if (arg.getAttribute("direction")
739
== "out"):
740
arg.setAttribute("name", "props")
741
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")
742
704
document.unlink()
743
705
except (AttributeError, xml.dom.DOMException,
744
xml.parsers.expat.ExpatError) as error:
745
logger.error("Failed to override Introspection method",
706
xml.parsers.expat.ExpatError), error:
707
logger.error(u"Failed to override Introspection method",
746
708
error)
747
709
return xmlstring
748
710
749
711
750
def datetime_to_dbus (dt, variant_level=0):
751
"""Convert a UTC datetime.datetime() to a D-Bus type."""
752
if dt is None:
753
return dbus.String("", variant_level = variant_level)
754
return dbus.String(dt.isoformat(),
755
variant_level=variant_level)
756
757
class transitional_dbus_metaclass(DBusObjectWithProperties.__metaclass__):
758
def __new__(mcs, name, bases, attr):
759
for attrname, old_dbusobj in inspect.getmembers(bases[0]):
760
new_interface = getattr(old_dbusobj, "_dbus_interface", "").replace("se.bsnet.fukt.", "se.recompile.")
761
if (getattr(old_dbusobj, "_dbus_is_signal", False)
762
and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
763
unwrappedfunc = dict(zip(old_dbusobj.func_code.co_freevars,
764
old_dbusobj.__closure__))["func"].cell_contents
765
newfunc = types.FunctionType(unwrappedfunc.func_code,
766
unwrappedfunc.func_globals,
767
unwrappedfunc.func_name,
768
unwrappedfunc.func_defaults,
769
unwrappedfunc.func_closure)
770
new_dbusfunc = dbus.service.signal(
771
new_interface, old_dbusobj._dbus_signature)(newfunc)
772
attr["_transitional_" + attrname] = new_dbusfunc
773
774
def fixscope(func1, func2):
775
def newcall(*args, **kwargs):
776
func1(*args, **kwargs)
777
func2(*args, **kwargs)
778
return newcall
779
780
attr[attrname] = fixscope(old_dbusobj, new_dbusfunc)
781
782
elif (getattr(old_dbusobj, "_dbus_is_method", False)
783
and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
784
new_dbusfunc = (dbus.service.method
785
(new_interface,
786
old_dbusobj._dbus_in_signature,
787
old_dbusobj._dbus_out_signature)
788
(types.FunctionType
789
(old_dbusobj.func_code,
790
old_dbusobj.func_globals,
791
old_dbusobj.func_name,
792
old_dbusobj.func_defaults,
793
old_dbusobj.func_closure)))
794
795
attr[attrname] = new_dbusfunc
796
elif (getattr(old_dbusobj, "_dbus_is_property", False)
797
and old_dbusobj._dbus_interface.startswith("se.bsnet.fukt.Mandos")):
798
new_dbusfunc = (dbus_service_property
799
(new_interface,
800
old_dbusobj._dbus_signature,
801
old_dbusobj._dbus_access,
802
old_dbusobj._dbus_get_args_options["byte_arrays"])
803
(types.FunctionType
804
(old_dbusobj.func_code,
805
old_dbusobj.func_globals,
806
old_dbusobj.func_name,
807
old_dbusobj.func_defaults,
808
old_dbusobj.func_closure)))
809
810
attr[attrname] = new_dbusfunc
811
return type.__new__(mcs, name, bases, attr)
812
813
712
class ClientDBus(Client, DBusObjectWithProperties):
814
713
"""A Client class using D-Bus
815
714
819
718
"""
820
719
821
720
runtime_expansions = (Client.runtime_expansions
822
+ ("dbus_object_path",))
721
+ (u"dbus_object_path",))
823
722
824
723
# dbus.service.Object doesn't use super(), so we can't either.
825
724
830
729
# Only now, when this client is initialized, can it show up on
831
730
# the D-Bus
832
731
client_object_name = unicode(self.name).translate(
833
{ord("."): ord("_"),
834
ord("-"): ord("_")})
732
{ord(u"."): ord(u"_"),
733
ord(u"-"): ord(u"_")})
835
734
self.dbus_object_path = (dbus.ObjectPath
836
("/clients/" + client_object_name))
735
(u"/clients/" + client_object_name))
837
736
DBusObjectWithProperties.__init__(self, self.bus,
838
737
self.dbus_object_path)
839
738
840
def notifychangeproperty(transform_func,
841
dbus_name, type_func=lambda x: x,
842
variant_level=1):
843
""" Modify a variable so that its a property that announce its
844
changes to DBus.
845
transform_fun: Function that takes a value and transform it to
846
DBus type.
847
dbus_name: DBus name of the variable
848
type_func: Function that transform the value before sending it
849
to DBus
850
variant_level: DBus variant level. default: 1
851
"""
852
real_value = [None,]
853
def setter(self, value):
854
old_value = real_value[0]
855
real_value[0] = value
856
if hasattr(self, "dbus_object_path"):
857
if type_func(old_value) != type_func(real_value[0]):
858
dbus_value = transform_func(type_func(real_value[0]),
859
variant_level)
860
self.PropertyChanged(dbus.String(dbus_name),
861
dbus_value)
862
863
return property(lambda self: real_value[0], setter)
864
865
866
expires = notifychangeproperty(datetime_to_dbus, "Expires")
867
approvals_pending = notifychangeproperty(dbus.Boolean,
868
"ApprovalPending",
869
type_func = bool)
870
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
871
last_enabled = notifychangeproperty(datetime_to_dbus,
872
"LastEnabled")
873
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
874
type_func = lambda checker: checker is not None)
875
last_checked_ok = notifychangeproperty(datetime_to_dbus,
876
"LastCheckedOK")
877
last_approval_request = notifychangeproperty(datetime_to_dbus,
878
"LastApprovalRequest")
879
approved_by_default = notifychangeproperty(dbus.Boolean,
880
"ApprovedByDefault")
881
approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
882
type_func = _timedelta_to_milliseconds)
883
approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
884
type_func = _timedelta_to_milliseconds)
885
host = notifychangeproperty(dbus.String, "Host")
886
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
887
type_func = _timedelta_to_milliseconds)
888
extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
889
type_func = _timedelta_to_milliseconds)
890
interval = notifychangeproperty(dbus.UInt16, "Interval",
891
type_func = _timedelta_to_milliseconds)
892
checker_command = notifychangeproperty(dbus.String, "Checker")
893
894
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
895
782
896
783
def __del__(self, *args, **kwargs):
897
784
try:
898
785
self.remove_from_connection()
899
786
except LookupError:
900
787
pass
901
if hasattr(DBusObjectWithProperties, "__del__"):
788
if hasattr(DBusObjectWithProperties, u"__del__"):
902
789
DBusObjectWithProperties.__del__(self, *args, **kwargs)
903
790
Client.__del__(self, *args, **kwargs)
904
791
906
793
*args, **kwargs):
907
794
self.checker_callback_tag = None
908
795
self.checker = None
796
# Emit D-Bus signal
797
self.PropertyChanged(dbus.String(u"CheckerRunning"),
798
dbus.Boolean(False, variant_level=1))
909
799
if os.WIFEXITED(condition):
910
800
exitstatus = os.WEXITSTATUS(condition)
911
801
# Emit D-Bus signal
921
811
return Client.checker_callback(self, pid, condition, command,
922
812
*args, **kwargs)
923
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
924
832
def start_checker(self, *args, **kwargs):
925
833
old_checker = self.checker
926
834
if self.checker is not None:
933
841
and old_checker_pid != self.checker.pid):
934
842
# Emit D-Bus signal
935
843
self.CheckerStarted(self.current_checker_command)
844
self.PropertyChanged(
845
dbus.String(u"CheckerRunning"),
846
dbus.Boolean(True, variant_level=1))
936
847
return r
937
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
938
858
def _reset_approved(self):
939
859
self._approved = None
940
860
return False
942
862
def approve(self, value=True):
943
863
self.send_changedstate()
944
864
self._approved = value
945
gobject.timeout_add(_timedelta_to_milliseconds
865
gobject.timeout_add(self._timedelta_to_milliseconds
946
866
(self.approval_duration),
947
867
self._reset_approved)
948
868
949
869
950
870
## D-Bus methods, signals & properties
951
_interface = "se.bsnet.fukt.Mandos.Client"
871
_interface = u"se.bsnet.fukt.Mandos.Client"
952
872
953
873
## Signals
954
874
955
875
# CheckerCompleted - signal
956
@dbus.service.signal(_interface, signature="nxs")
876
@dbus.service.signal(_interface, signature=u"nxs")
957
877
def CheckerCompleted(self, exitcode, waitstatus, command):
958
878
"D-Bus signal"
959
879
pass
960
880
961
881
# CheckerStarted - signal
962
@dbus.service.signal(_interface, signature="s")
882
@dbus.service.signal(_interface, signature=u"s")
963
883
def CheckerStarted(self, command):
964
884
"D-Bus signal"
965
885
pass
966
886
967
887
# PropertyChanged - signal
968
@dbus.service.signal(_interface, signature="sv")
888
@dbus.service.signal(_interface, signature=u"sv")
969
889
def PropertyChanged(self, property, value):
970
890
"D-Bus signal"
971
891
pass
980
900
pass
981
901
982
902
# Rejected - signal
983
@dbus.service.signal(_interface, signature="s")
903
@dbus.service.signal(_interface, signature=u"s")
984
904
def Rejected(self, reason):
985
905
"D-Bus signal"
986
906
pass
987
907
988
908
# NeedApproval - signal
989
@dbus.service.signal(_interface, signature="tb")
909
@dbus.service.signal(_interface, signature=u"tb")
990
910
def NeedApproval(self, timeout, default):
991
911
"D-Bus signal"
992
912
return self.need_approval()
994
914
## Methods
995
915
996
916
# Approve - method
997
@dbus.service.method(_interface, in_signature="b")
917
@dbus.service.method(_interface, in_signature=u"b")
998
918
def Approve(self, value):
999
919
self.approve(value)
1000
920
1001
921
# CheckedOK - method
1002
922
@dbus.service.method(_interface)
1003
923
def CheckedOK(self):
1004
self.checked_ok()
924
return self.checked_ok()
1005
925
1006
926
# Enable - method
1007
927
@dbus.service.method(_interface)
1029
949
## Properties
1030
950
1031
951
# ApprovalPending - property
1032
@dbus_service_property(_interface, signature="b", access="read")
952
@dbus_service_property(_interface, signature=u"b", access=u"read")
1033
953
def ApprovalPending_dbus_property(self):
1034
954
return dbus.Boolean(bool(self.approvals_pending))
1035
955
1036
956
# ApprovedByDefault - property
1037
@dbus_service_property(_interface, signature="b",
1038
access="readwrite")
957
@dbus_service_property(_interface, signature=u"b",
958
access=u"readwrite")
1039
959
def ApprovedByDefault_dbus_property(self, value=None):
1040
960
if value is None: # get
1041
961
return dbus.Boolean(self.approved_by_default)
1042
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))
1043
966
1044
967
# ApprovalDelay - property
1045
@dbus_service_property(_interface, signature="t",
1046
access="readwrite")
968
@dbus_service_property(_interface, signature=u"t",
969
access=u"readwrite")
1047
970
def ApprovalDelay_dbus_property(self, value=None):
1048
971
if value is None: # get
1049
972
return dbus.UInt64(self.approval_delay_milliseconds())
1050
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))
1051
977
1052
978
# ApprovalDuration - property
1053
@dbus_service_property(_interface, signature="t",
1054
access="readwrite")
979
@dbus_service_property(_interface, signature=u"t",
980
access=u"readwrite")
1055
981
def ApprovalDuration_dbus_property(self, value=None):
1056
982
if value is None: # get
1057
return dbus.UInt64(_timedelta_to_milliseconds(
983
return dbus.UInt64(self._timedelta_to_milliseconds(
1058
984
self.approval_duration))
1059
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))
1060
989
1061
990
# Name - property
1062
@dbus_service_property(_interface, signature="s", access="read")
991
@dbus_service_property(_interface, signature=u"s", access=u"read")
1063
992
def Name_dbus_property(self):
1064
993
return dbus.String(self.name)
1065
994
1066
995
# Fingerprint - property
1067
@dbus_service_property(_interface, signature="s", access="read")
996
@dbus_service_property(_interface, signature=u"s", access=u"read")
1068
997
def Fingerprint_dbus_property(self):
1069
998
return dbus.String(self.fingerprint)
1070
999
1071
1000
# Host - property
1072
@dbus_service_property(_interface, signature="s",
1073
access="readwrite")
1001
@dbus_service_property(_interface, signature=u"s",
1002
access=u"readwrite")
1074
1003
def Host_dbus_property(self, value=None):
1075
1004
if value is None: # get
1076
1005
return dbus.String(self.host)
1077
1006
self.host = value
1007
# Emit D-Bus signal
1008
self.PropertyChanged(dbus.String(u"Host"),
1009
dbus.String(value, variant_level=1))
1078
1010
1079
1011
# Created - property
1080
@dbus_service_property(_interface, signature="s", access="read")
1012
@dbus_service_property(_interface, signature=u"s", access=u"read")
1081
1013
def Created_dbus_property(self):
1082
return dbus.String(datetime_to_dbus(self.created))
1014
return dbus.String(self._datetime_to_dbus(self.created))
1083
1015
1084
1016
# LastEnabled - property
1085
@dbus_service_property(_interface, signature="s", access="read")
1017
@dbus_service_property(_interface, signature=u"s", access=u"read")
1086
1018
def LastEnabled_dbus_property(self):
1087
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))
1088
1022
1089
1023
# Enabled - property
1090
@dbus_service_property(_interface, signature="b",
1091
access="readwrite")
1024
@dbus_service_property(_interface, signature=u"b",
1025
access=u"readwrite")
1092
1026
def Enabled_dbus_property(self, value=None):
1093
1027
if value is None: # get
1094
1028
return dbus.Boolean(self.enabled)
1098
1032
self.disable()
1099
1033
1100
1034
# LastCheckedOK - property
1101
@dbus_service_property(_interface, signature="s",
1102
access="readwrite")
1035
@dbus_service_property(_interface, signature=u"s",
1036
access=u"readwrite")
1103
1037
def LastCheckedOK_dbus_property(self, value=None):
1104
1038
if value is not None:
1105
1039
self.checked_ok()
1106
1040
return
1107
return datetime_to_dbus(self.last_checked_ok)
1108
1109
# Expires - property
1110
@dbus_service_property(_interface, signature="s", access="read")
1111
def Expires_dbus_property(self):
1112
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))
1113
1045
1114
1046
# LastApprovalRequest - property
1115
@dbus_service_property(_interface, signature="s", access="read")
1047
@dbus_service_property(_interface, signature=u"s", access=u"read")
1116
1048
def LastApprovalRequest_dbus_property(self):
1117
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))
1118
1054
1119
1055
# Timeout - property
1120
@dbus_service_property(_interface, signature="t",
1121
access="readwrite")
1056
@dbus_service_property(_interface, signature=u"t",
1057
access=u"readwrite")
1122
1058
def Timeout_dbus_property(self, value=None):
1123
1059
if value is None: # get
1124
1060
return dbus.UInt64(self.timeout_milliseconds())
1125
1061
self.timeout = datetime.timedelta(0, 0, 0, value)
1126
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:
1127
1066
return
1128
1067
# Reschedule timeout
1129
1068
gobject.source_remove(self.disable_initiator_tag)
1130
1069
self.disable_initiator_tag = None
1131
self.expires = None
1132
1070
time_to_die = (self.
1133
1071
_timedelta_to_milliseconds((self
1134
1072
.last_checked_ok
1139
1077
# The timeout has passed
1140
1078
self.disable()
1141
1079
else:
1142
self.expires = (datetime.datetime.utcnow()
1143
+ datetime.timedelta(milliseconds = time_to_die))
1144
1080
self.disable_initiator_tag = (gobject.timeout_add
1145
1081
(time_to_die, self.disable))
1146
1082
1147
# ExtendedTimeout - property
1148
@dbus_service_property(_interface, signature="t",
1149
access="readwrite")
1150
def ExtendedTimeout_dbus_property(self, value=None):
1151
if value is None: # get
1152
return dbus.UInt64(self.extended_timeout_milliseconds())
1153
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1154
1155
1083
# Interval - property
1156
@dbus_service_property(_interface, signature="t",
1157
access="readwrite")
1084
@dbus_service_property(_interface, signature=u"t",
1085
access=u"readwrite")
1158
1086
def Interval_dbus_property(self, value=None):
1159
1087
if value is None: # get
1160
1088
return dbus.UInt64(self.interval_milliseconds())
1161
1089
self.interval = datetime.timedelta(0, 0, 0, value)
1162
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:
1163
1094
return
1164
1095
# Reschedule checker run
1165
1096
gobject.source_remove(self.checker_initiator_tag)
1166
1097
self.checker_initiator_tag = (gobject.timeout_add
1167
1098
(value, self.start_checker))
1168
1099
self.start_checker() # Start one now, too
1169
1100
1170
1101
# Checker - property
1171
@dbus_service_property(_interface, signature="s",
1172
access="readwrite")
1102
@dbus_service_property(_interface, signature=u"s",
1103
access=u"readwrite")
1173
1104
def Checker_dbus_property(self, value=None):
1174
1105
if value is None: # get
1175
1106
return dbus.String(self.checker_command)
1176
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))
1177
1112
1178
1113
# CheckerRunning - property
1179
@dbus_service_property(_interface, signature="b",
1180
access="readwrite")
1114
@dbus_service_property(_interface, signature=u"b",
1115
access=u"readwrite")
1181
1116
def CheckerRunning_dbus_property(self, value=None):
1182
1117
if value is None: # get
1183
1118
return dbus.Boolean(self.checker is not None)
1187
1122
self.stop_checker()
1188
1123
1189
1124
# ObjectPath - property
1190
@dbus_service_property(_interface, signature="o", access="read")
1125
@dbus_service_property(_interface, signature=u"o", access=u"read")
1191
1126
def ObjectPath_dbus_property(self):
1192
1127
return self.dbus_object_path # is already a dbus.ObjectPath
1193
1128
1194
1129
# Secret = property
1195
@dbus_service_property(_interface, signature="ay",
1196
access="write", byte_arrays=True)
1130
@dbus_service_property(_interface, signature=u"ay",
1131
access=u"write", byte_arrays=True)
1197
1132
def Secret_dbus_property(self, value):
1198
1133
self.secret = str(value)
1199
1134
1206
1141
self._pipe.send(('init', fpr, address))
1207
1142
if not self._pipe.recv():
1208
1143
raise KeyError()
1209
1144
1210
1145
def __getattribute__(self, name):
1211
1146
if(name == '_pipe'):
1212
1147
return super(ProxyClient, self).__getattribute__(name)
1219
1154
self._pipe.send(('funcall', name, args, kwargs))
1220
1155
return self._pipe.recv()[1]
1221
1156
return func
1222
1157
1223
1158
def __setattr__(self, name, value):
1224
1159
if(name == '_pipe'):
1225
1160
return super(ProxyClient, self).__setattr__(name, value)
1226
1161
self._pipe.send(('setattr', name, value))
1227
1162
1228
class ClientDBusTransitional(ClientDBus):
1229
__metaclass__ = transitional_dbus_metaclass
1230
1163
1231
1164
class ClientHandler(socketserver.BaseRequestHandler, object):
1232
1165
"""A class to handle client connections.
1236
1169
1237
1170
def handle(self):
1238
1171
with contextlib.closing(self.server.child_pipe) as child_pipe:
1239
logger.info("TCP connection from: %s",
1172
logger.info(u"TCP connection from: %s",
1240
1173
unicode(self.client_address))
1241
logger.debug("Pipe FD: %d",
1174
logger.debug(u"Pipe FD: %d",
1242
1175
self.server.child_pipe.fileno())
1243
1176
1244
1177
session = (gnutls.connection
1245
1178
.ClientSession(self.request,
1246
1179
gnutls.connection
1247
1180
.X509Credentials()))
1248
1181
1249
1182
# Note: gnutls.connection.X509Credentials is really a
1250
1183
# generic GnuTLS certificate credentials object so long as
1251
1184
# no X.509 keys are added to it. Therefore, we can use it
1252
1185
# here despite using OpenPGP certificates.
1253
1254
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1255
# "+AES-256-CBC", "+SHA1",
1256
# "+COMP-NULL", "+CTYPE-OPENPGP",
1257
# "+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"))
1258
1191
# Use a fallback default, since this MUST be set.
1259
1192
priority = self.server.gnutls_priority
1260
1193
if priority is None:
1261
priority = "NORMAL"
1194
priority = u"NORMAL"
1262
1195
(gnutls.library.functions
1263
1196
.gnutls_priority_set_direct(session._c_object,
1264
1197
priority, None))
1265
1198
1266
1199
# Start communication using the Mandos protocol
1267
1200
# Get protocol number
1268
1201
line = self.request.makefile().readline()
1269
logger.debug("Protocol version: %r", line)
1202
logger.debug(u"Protocol version: %r", line)
1270
1203
try:
1271
1204
if int(line.strip().split()[0]) > 1:
1272
1205
raise RuntimeError
1273
except (ValueError, IndexError, RuntimeError) as error:
1274
logger.error("Unknown protocol version: %s", error)
1206
except (ValueError, IndexError, RuntimeError), error:
1207
logger.error(u"Unknown protocol version: %s", error)
1275
1208
return
1276
1209
1277
1210
# Start GnuTLS connection
1278
1211
try:
1279
1212
session.handshake()
1280
except gnutls.errors.GNUTLSError as error:
1281
logger.warning("Handshake failed: %s", error)
1213
except gnutls.errors.GNUTLSError, error:
1214
logger.warning(u"Handshake failed: %s", error)
1282
1215
# Do not run session.bye() here: the session is not
1283
1216
# established. Just abandon the request.
1284
1217
return
1285
logger.debug("Handshake succeeded")
1286
1218
logger.debug(u"Handshake succeeded")
1219
1287
1220
approval_required = False
1288
1221
try:
1289
1222
try:
1290
1223
fpr = self.fingerprint(self.peer_certificate
1291
1224
(session))
1292
except (TypeError,
1293
gnutls.errors.GNUTLSError) as error:
1294
logger.warning("Bad certificate: %s", error)
1225
except (TypeError, gnutls.errors.GNUTLSError), error:
1226
logger.warning(u"Bad certificate: %s", error)
1295
1227
return
1296
logger.debug("Fingerprint: %s", fpr)
1297
1228
logger.debug(u"Fingerprint: %s", fpr)
1229
1298
1230
try:
1299
1231
client = ProxyClient(child_pipe, fpr,
1300
1232
self.client_address)
1308
1240
1309
1241
while True:
1310
1242
if not client.enabled:
1311
logger.info("Client %s is disabled",
1243
logger.warning(u"Client %s is disabled",
1312
1244
client.name)
1313
1245
if self.server.use_dbus:
1314
1246
# Emit D-Bus signal
1319
1251
#We are approved or approval is disabled
1320
1252
break
1321
1253
elif client._approved is None:
1322
logger.info("Client %s needs approval",
1254
logger.info(u"Client %s needs approval",
1323
1255
client.name)
1324
1256
if self.server.use_dbus:
1325
1257
# Emit D-Bus signal
1327
1259
client.approval_delay_milliseconds(),
1328
1260
client.approved_by_default)
1329
1261
else:
1330
logger.warning("Client %s was not approved",
1262
logger.warning(u"Client %s was not approved",
1331
1263
client.name)
1332
1264
if self.server.use_dbus:
1333
1265
# Emit D-Bus signal
1359
1291
while sent_size < len(client.secret):
1360
1292
try:
1361
1293
sent = session.send(client.secret[sent_size:])
1362
except gnutls.errors.GNUTLSError as error:
1294
except (gnutls.errors.GNUTLSError), error:
1363
1295
logger.warning("gnutls send failed")
1364
1296
return
1365
logger.debug("Sent: %d, remaining: %d",
1297
logger.debug(u"Sent: %d, remaining: %d",
1366
1298
sent, len(client.secret)
1367
1299
- (sent_size + sent))
1368
1300
sent_size += sent
1369
1370
logger.info("Sending secret to %s", client.name)
1301
1302
logger.info(u"Sending secret to %s", client.name)
1371
1303
# bump the timeout as if seen
1372
client.checked_ok(client.extended_timeout)
1304
client.checked_ok()
1373
1305
if self.server.use_dbus:
1374
1306
# Emit D-Bus signal
1375
1307
client.GotSecret()
1379
1311
client.approvals_pending -= 1
1380
1312
try:
1381
1313
session.bye()
1382
except gnutls.errors.GNUTLSError as error:
1314
except (gnutls.errors.GNUTLSError), error:
1383
1315
logger.warning("GnuTLS bye failed")
1384
1316
1385
1317
@staticmethod
1396
1328
.gnutls_certificate_get_peers
1397
1329
(session._c_object, ctypes.byref(list_size)))
1398
1330
if not bool(cert_list) and list_size.value != 0:
1399
raise gnutls.errors.GNUTLSError("error getting peer"
1400
" certificate")
1331
raise gnutls.errors.GNUTLSError(u"error getting peer"
1332
u" certificate")
1401
1333
if list_size.value == 0:
1402
1334
return None
1403
1335
cert = cert_list[0]
1429
1361
if crtverify.value != 0:
1430
1362
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1431
1363
raise (gnutls.errors.CertificateSecurityError
1432
("Verify failed"))
1364
(u"Verify failed"))
1433
1365
# New buffer for the fingerprint
1434
1366
buf = ctypes.create_string_buffer(20)
1435
1367
buf_len = ctypes.c_size_t()
1442
1374
# Convert the buffer to a Python bytestring
1443
1375
fpr = ctypes.string_at(buf, buf_len.value)
1444
1376
# Convert the bytestring to hexadecimal notation
1445
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1377
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1446
1378
return hex_fpr
1447
1379
1448
1380
1460
1392
multiprocessing.Process(target = self.sub_process_main,
1461
1393
args = (request, address)).start()
1462
1394
1463
1464
1395
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1465
1396
""" adds a pipe to the MixIn """
1466
1397
def process_request(self, request, client_address):
1469
1400
This function creates a new pipe in self.pipe
1470
1401
"""
1471
1402
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1472
1403
1473
1404
super(MultiprocessingMixInWithPipe,
1474
1405
self).process_request(request, client_address)
1475
1406
self.child_pipe.close()
1476
1407
self.add_pipe(parent_pipe)
1477
1408
1478
1409
def add_pipe(self, parent_pipe):
1479
1410
"""Dummy function; override as necessary"""
1480
raise NotImplementedError
1481
1411
pass
1482
1412
1483
1413
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1484
1414
socketserver.TCPServer, object):
1502
1432
bind to an address or port if they were not specified."""
1503
1433
if self.interface is not None:
1504
1434
if SO_BINDTODEVICE is None:
1505
logger.error("SO_BINDTODEVICE does not exist;"
1506
" cannot bind to interface %s",
1435
logger.error(u"SO_BINDTODEVICE does not exist;"
1436
u" cannot bind to interface %s",
1507
1437
self.interface)
1508
1438
else:
1509
1439
try:
1510
1440
self.socket.setsockopt(socket.SOL_SOCKET,
1511
1441
SO_BINDTODEVICE,
1512
1442
str(self.interface
1513
+ '\0'))
1514
except socket.error as error:
1443
+ u'\0'))
1444
except socket.error, error:
1515
1445
if error[0] == errno.EPERM:
1516
logger.error("No permission to"
1517
" bind to interface %s",
1446
logger.error(u"No permission to"
1447
u" bind to interface %s",
1518
1448
self.interface)
1519
1449
elif error[0] == errno.ENOPROTOOPT:
1520
logger.error("SO_BINDTODEVICE not available;"
1521
" cannot bind to interface %s",
1450
logger.error(u"SO_BINDTODEVICE not available;"
1451
u" cannot bind to interface %s",
1522
1452
self.interface)
1523
1453
else:
1524
1454
raise
1526
1456
if self.server_address[0] or self.server_address[1]:
1527
1457
if not self.server_address[0]:
1528
1458
if self.address_family == socket.AF_INET6:
1529
any_address = "::" # in6addr_any
1459
any_address = u"::" # in6addr_any
1530
1460
else:
1531
1461
any_address = socket.INADDR_ANY
1532
1462
self.server_address = (any_address,
1581
1511
def handle_ipc(self, source, condition, parent_pipe=None,
1582
1512
client_object=None):
1583
1513
condition_names = {
1584
gobject.IO_IN: "IN", # There is data to read.
1585
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
1586
1516
# blocking).
1587
gobject.IO_PRI: "PRI", # There is urgent data to read.
1588
gobject.IO_ERR: "ERR", # Error condition.
1589
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
1590
1520
# broken, usually for pipes and
1591
1521
# sockets).
1592
1522
}
1611
1541
client = c
1612
1542
break
1613
1543
else:
1614
logger.info("Client not found for fingerprint: %s, ad"
1615
"dress: %s", fpr, address)
1544
logger.warning(u"Client not found for fingerprint: %s, ad"
1545
u"dress: %s", fpr, address)
1616
1546
if self.use_dbus:
1617
1547
# Emit D-Bus signal
1618
1548
mandos_dbus_service.ClientNotFound(fpr, address[0])
1633
1563
kwargs = request[3]
1634
1564
1635
1565
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1636
1566
1637
1567
if command == 'getattr':
1638
1568
attrname = request[1]
1639
1569
if callable(client_object.__getattribute__(attrname)):
1645
1575
attrname = request[1]
1646
1576
value = request[2]
1647
1577
setattr(client_object, attrname, value)
1648
1578
1649
1579
return True
1650
1580
1651
1581
1652
1582
def string_to_delta(interval):
1653
1583
"""Parse a string and return a datetime.timedelta
1654
1584
1655
>>> string_to_delta('7d')
1585
>>> string_to_delta(u'7d')
1656
1586
datetime.timedelta(7)
1657
>>> string_to_delta('60s')
1587
>>> string_to_delta(u'60s')
1658
1588
datetime.timedelta(0, 60)
1659
>>> string_to_delta('60m')
1589
>>> string_to_delta(u'60m')
1660
1590
datetime.timedelta(0, 3600)
1661
>>> string_to_delta('24h')
1591
>>> string_to_delta(u'24h')
1662
1592
datetime.timedelta(1)
1663
>>> string_to_delta('1w')
1593
>>> string_to_delta(u'1w')
1664
1594
datetime.timedelta(7)
1665
>>> string_to_delta('5m 30s')
1595
>>> string_to_delta(u'5m 30s')
1666
1596
datetime.timedelta(0, 330)
1667
1597
"""
1668
1598
timevalue = datetime.timedelta(0)
1670
1600
try:
1671
1601
suffix = unicode(s[-1])
1672
1602
value = int(s[:-1])
1673
if suffix == "d":
1603
if suffix == u"d":
1674
1604
delta = datetime.timedelta(value)
1675
elif suffix == "s":
1605
elif suffix == u"s":
1676
1606
delta = datetime.timedelta(0, value)
1677
elif suffix == "m":
1607
elif suffix == u"m":
1678
1608
delta = datetime.timedelta(0, 0, 0, 0, value)
1679
elif suffix == "h":
1609
elif suffix == u"h":
1680
1610
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1681
elif suffix == "w":
1611
elif suffix == u"w":
1682
1612
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1683
1613
else:
1684
raise ValueError("Unknown suffix %r" % suffix)
1685
except (ValueError, IndexError) as e:
1686
raise ValueError(*(e.args))
1614
raise ValueError(u"Unknown suffix %r" % suffix)
1615
except (ValueError, IndexError), e:
1616
raise ValueError(e.message)
1687
1617
timevalue += delta
1688
1618
return timevalue
1689
1619
1695
1625
global if_nametoindex
1696
1626
try:
1697
1627
if_nametoindex = (ctypes.cdll.LoadLibrary
1698
(ctypes.util.find_library("c"))
1628
(ctypes.util.find_library(u"c"))
1699
1629
.if_nametoindex)
1700
1630
except (OSError, AttributeError):
1701
logger.warning("Doing if_nametoindex the hard way")
1631
logger.warning(u"Doing if_nametoindex the hard way")
1702
1632
def if_nametoindex(interface):
1703
1633
"Get an interface index the hard way, i.e. using fcntl()"
1704
1634
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1705
1635
with contextlib.closing(socket.socket()) as s:
1706
1636
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1707
struct.pack(str("16s16x"),
1637
struct.pack(str(u"16s16x"),
1708
1638
interface))
1709
interface_index = struct.unpack(str("I"),
1639
interface_index = struct.unpack(str(u"I"),
1710
1640
ifreq[16:20])[0]
1711
1641
return interface_index
1712
1642
return if_nametoindex(interface)
1720
1650
sys.exit()
1721
1651
os.setsid()
1722
1652
if not nochdir:
1723
os.chdir("/")
1653
os.chdir(u"/")
1724
1654
if os.fork():
1725
1655
sys.exit()
1726
1656
if not noclose:
1728
1658
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1729
1659
if not stat.S_ISCHR(os.fstat(null).st_mode):
1730
1660
raise OSError(errno.ENODEV,
1731
"%s not a character device"
1661
u"%s not a character device"
1732
1662
% os.path.devnull)
1733
1663
os.dup2(null, sys.stdin.fileno())
1734
1664
os.dup2(null, sys.stdout.fileno())
1742
1672
##################################################################
1743
1673
# Parsing of options, both command line and config file
1744
1674
1745
parser = argparse.ArgumentParser()
1746
parser.add_argument("-v", "--version", action="version",
1747
version = "%%(prog)s %s" % version,
1748
help="show version number and exit")
1749
parser.add_argument("-i", "--interface", metavar="IF",
1750
help="Bind to interface IF")
1751
parser.add_argument("-a", "--address",
1752
help="Address to listen for requests on")
1753
parser.add_argument("-p", "--port", type=int,
1754
help="Port number to receive requests on")
1755
parser.add_argument("--check", action="store_true",
1756
help="Run self-test")
1757
parser.add_argument("--debug", action="store_true",
1758
help="Debug mode; run in foreground and log"
1759
" to terminal")
1760
parser.add_argument("--debuglevel", metavar="LEVEL",
1761
help="Debug level for stdout output")
1762
parser.add_argument("--priority", help="GnuTLS"
1763
" priority string (see GnuTLS documentation)")
1764
parser.add_argument("--servicename",
1765
metavar="NAME", help="Zeroconf service name")
1766
parser.add_argument("--configdir",
1767
default="/etc/mandos", metavar="DIR",
1768
help="Directory to search for configuration"
1769
" files")
1770
parser.add_argument("--no-dbus", action="store_false",
1771
dest="use_dbus", help="Do not provide D-Bus"
1772
" system bus interface")
1773
parser.add_argument("--no-ipv6", action="store_false",
1774
dest="use_ipv6", help="Do not use IPv6")
1775
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]
1776
1703
1777
1704
if options.check:
1778
1705
import doctest
1780
1707
sys.exit()
1781
1708
1782
1709
# Default values for config file for server-global settings
1783
server_defaults = { "interface": "",
1784
"address": "",
1785
"port": "",
1786
"debug": "False",
1787
"priority":
1788
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1789
"servicename": "Mandos",
1790
"use_dbus": "True",
1791
"use_ipv6": "True",
1792
"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"",
1793
1720
}
1794
1721
1795
1722
# Parse config file for server-global settings
1796
1723
server_config = configparser.SafeConfigParser(server_defaults)
1797
1724
del server_defaults
1798
1725
server_config.read(os.path.join(options.configdir,
1799
"mandos.conf"))
1726
u"mandos.conf"))
1800
1727
# Convert the SafeConfigParser object to a dict
1801
1728
server_settings = server_config.defaults()
1802
1729
# Use the appropriate methods on the non-string config options
1803
for option in ("debug", "use_dbus", "use_ipv6"):
1804
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",
1805
1732
option)
1806
1733
if server_settings["port"]:
1807
server_settings["port"] = server_config.getint("DEFAULT",
1808
"port")
1734
server_settings["port"] = server_config.getint(u"DEFAULT",
1735
u"port")
1809
1736
del server_config
1810
1737
1811
1738
# Override the settings from the config file with command line
1812
1739
# options, if set.
1813
for option in ("interface", "address", "port", "debug",
1814
"priority", "servicename", "configdir",
1815
"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"):
1816
1743
value = getattr(options, option)
1817
1744
if value is not None:
1818
1745
server_settings[option] = value
1826
1753
##################################################################
1827
1754
1828
1755
# For convenience
1829
debug = server_settings["debug"]
1830
debuglevel = server_settings["debuglevel"]
1831
use_dbus = server_settings["use_dbus"]
1832
use_ipv6 = server_settings["use_ipv6"]
1833
1834
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":
1835
1762
syslogger.setFormatter(logging.Formatter
1836
('Mandos (%s) [%%(process)d]:'
1837
' %%(levelname)s: %%(message)s'
1838
% server_settings["servicename"]))
1763
(u'Mandos (%s) [%%(process)d]:'
1764
u' %%(levelname)s: %%(message)s'
1765
% server_settings[u"servicename"]))
1839
1766
1840
1767
# Parse config file with clients
1841
client_defaults = { "timeout": "5m",
1842
"extended_timeout": "15m",
1843
"interval": "2m",
1844
"checker": "fping -q -- %%(host)s",
1845
"host": "",
1846
"approval_delay": "0s",
1847
"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",
1848
1774
}
1849
1775
client_config = configparser.SafeConfigParser(client_defaults)
1850
client_config.read(os.path.join(server_settings["configdir"],
1851
"clients.conf"))
1776
client_config.read(os.path.join(server_settings[u"configdir"],
1777
u"clients.conf"))
1852
1778
1853
1779
global mandos_dbus_service
1854
1780
mandos_dbus_service = None
1855
1781
1856
tcp_server = MandosServer((server_settings["address"],
1857
server_settings["port"]),
1782
tcp_server = MandosServer((server_settings[u"address"],
1783
server_settings[u"port"]),
1858
1784
ClientHandler,
1859
interface=(server_settings["interface"]
1785
interface=(server_settings[u"interface"]
1860
1786
or None),
1861
1787
use_ipv6=use_ipv6,
1862
1788
gnutls_priority=
1863
server_settings["priority"],
1789
server_settings[u"priority"],
1864
1790
use_dbus=use_dbus)
1865
1791
if not debug:
1866
pidfilename = "/var/run/mandos.pid"
1792
pidfilename = u"/var/run/mandos.pid"
1867
1793
try:
1868
pidfile = open(pidfilename, "w")
1794
pidfile = open(pidfilename, u"w")
1869
1795
except IOError:
1870
logger.error("Could not open file %r", pidfilename)
1796
logger.error(u"Could not open file %r", pidfilename)
1871
1797
1872
1798
try:
1873
uid = pwd.getpwnam("_mandos").pw_uid
1874
gid = pwd.getpwnam("_mandos").pw_gid
1799
uid = pwd.getpwnam(u"_mandos").pw_uid
1800
gid = pwd.getpwnam(u"_mandos").pw_gid
1875
1801
except KeyError:
1876
1802
try:
1877
uid = pwd.getpwnam("mandos").pw_uid
1878
gid = pwd.getpwnam("mandos").pw_gid
1803
uid = pwd.getpwnam(u"mandos").pw_uid
1804
gid = pwd.getpwnam(u"mandos").pw_gid
1879
1805
except KeyError:
1880
1806
try:
1881
uid = pwd.getpwnam("nobody").pw_uid
1882
gid = pwd.getpwnam("nobody").pw_gid
1807
uid = pwd.getpwnam(u"nobody").pw_uid
1808
gid = pwd.getpwnam(u"nobody").pw_gid
1883
1809
except KeyError:
1884
1810
uid = 65534
1885
1811
gid = 65534
1886
1812
try:
1887
1813
os.setgid(gid)
1888
1814
os.setuid(uid)
1889
except OSError as error:
1815
except OSError, error:
1890
1816
if error[0] != errno.EPERM:
1891
1817
raise error
1892
1818
1897
1823
level = getattr(logging, debuglevel.upper())
1898
1824
syslogger.setLevel(level)
1899
1825
console.setLevel(level)
1900
1826
1901
1827
if debug:
1902
1828
# Enable all possible GnuTLS debugging
1903
1829
1907
1833
1908
1834
@gnutls.library.types.gnutls_log_func
1909
1835
def debug_gnutls(level, string):
1910
logger.debug("GnuTLS: %s", string[:-1])
1836
logger.debug(u"GnuTLS: %s", string[:-1])
1911
1837
1912
1838
(gnutls.library.functions
1913
1839
.gnutls_global_set_log_function(debug_gnutls))
1921
1847
# No console logging
1922
1848
logger.removeHandler(console)
1923
1849
1924
# Need to fork before connecting to D-Bus
1925
if not debug:
1926
# Close all input and output, do double fork, etc.
1927
daemon()
1928
1850
1929
1851
global main_loop
1930
1852
# From the Avahi example code
1934
1856
# End of Avahi example code
1935
1857
if use_dbus:
1936
1858
try:
1937
bus_name = dbus.service.BusName("se.recompile.Mandos",
1859
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1938
1860
bus, do_not_queue=True)
1939
bus_name_transitional = dbus.service.BusName("se.bsnet.fukt.Mandos",
1940
bus, do_not_queue=True)
1941
except dbus.exceptions.NameExistsException as e:
1942
logger.error(unicode(e) + ", disabling D-Bus")
1861
except dbus.exceptions.NameExistsException, e:
1862
logger.error(unicode(e) + u", disabling D-Bus")
1943
1863
use_dbus = False
1944
server_settings["use_dbus"] = False
1864
server_settings[u"use_dbus"] = False
1945
1865
tcp_server.use_dbus = False
1946
1866
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1947
service = AvahiService(name = server_settings["servicename"],
1948
servicetype = "_mandos._tcp",
1867
service = AvahiService(name = server_settings[u"servicename"],
1868
servicetype = u"_mandos._tcp",
1949
1869
protocol = protocol, bus = bus)
1950
1870
if server_settings["interface"]:
1951
1871
service.interface = (if_nametoindex
1952
(str(server_settings["interface"])))
1953
1872
(str(server_settings[u"interface"])))
1873
1874
if not debug:
1875
# Close all input and output, do double fork, etc.
1876
daemon()
1877
1954
1878
global multiprocessing_manager
1955
1879
multiprocessing_manager = multiprocessing.Manager()
1956
1880
1957
1881
client_class = Client
1958
1882
if use_dbus:
1959
client_class = functools.partial(ClientDBusTransitional, bus = bus)
1883
client_class = functools.partial(ClientDBus, bus = bus)
1960
1884
def client_config_items(config, section):
1961
1885
special_settings = {
1962
1886
"approved_by_default":
1975
1899
client_config, section)))
1976
1900
for section in client_config.sections()))
1977
1901
if not tcp_server.clients:
1978
logger.warning("No clients defined")
1902
logger.warning(u"No clients defined")
1979
1903
1980
1904
if not debug:
1981
1905
try:
1982
1906
with pidfile:
1983
1907
pid = os.getpid()
1984
pidfile.write(str(pid) + "\n".encode("utf-8"))
1908
pidfile.write(str(pid) + "\n")
1985
1909
del pidfile
1986
1910
except IOError:
1987
logger.error("Could not write to file %r with PID %d",
1911
logger.error(u"Could not write to file %r with PID %d",
1988
1912
pidfilename, pid)
1989
1913
except NameError:
1990
1914
# "pidfile" was never created
1992
1916
del pidfilename
1993
1917
1994
1918
signal.signal(signal.SIGINT, signal.SIG_IGN)
1995
1919
1996
1920
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1997
1921
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1998
1922
2000
1924
class MandosDBusService(dbus.service.Object):
2001
1925
"""A D-Bus proxy object"""
2002
1926
def __init__(self):
2003
dbus.service.Object.__init__(self, bus, "/")
2004
_interface = "se.bsnet.fukt.Mandos"
1927
dbus.service.Object.__init__(self, bus, u"/")
1928
_interface = u"se.bsnet.fukt.Mandos"
2005
1929
2006
@dbus.service.signal(_interface, signature="o")
1930
@dbus.service.signal(_interface, signature=u"o")
2007
1931
def ClientAdded(self, objpath):
2008
1932
"D-Bus signal"
2009
1933
pass
2010
1934
2011
@dbus.service.signal(_interface, signature="ss")
1935
@dbus.service.signal(_interface, signature=u"ss")
2012
1936
def ClientNotFound(self, fingerprint, address):
2013
1937
"D-Bus signal"
2014
1938
pass
2015
1939
2016
@dbus.service.signal(_interface, signature="os")
1940
@dbus.service.signal(_interface, signature=u"os")
2017
1941
def ClientRemoved(self, objpath, name):
2018
1942
"D-Bus signal"
2019
1943
pass
2020
1944
2021
@dbus.service.method(_interface, out_signature="ao")
1945
@dbus.service.method(_interface, out_signature=u"ao")
2022
1946
def GetAllClients(self):
2023
1947
"D-Bus method"
2024
1948
return dbus.Array(c.dbus_object_path
2025
1949
for c in tcp_server.clients)
2026
1950
2027
1951
@dbus.service.method(_interface,
2028
out_signature="a{oa{sv}}")
1952
out_signature=u"a{oa{sv}}")
2029
1953
def GetAllClientsWithProperties(self):
2030
1954
"D-Bus method"
2031
1955
return dbus.Dictionary(
2032
((c.dbus_object_path, c.GetAll(""))
1956
((c.dbus_object_path, c.GetAll(u""))
2033
1957
for c in tcp_server.clients),
2034
signature="oa{sv}")
1958
signature=u"oa{sv}")
2035
1959
2036
@dbus.service.method(_interface, in_signature="o")
1960
@dbus.service.method(_interface, in_signature=u"o")
2037
1961
def RemoveClient(self, object_path):
2038
1962
"D-Bus method"
2039
1963
for c in tcp_server.clients:
2049
1973
2050
1974
del _interface
2051
1975
2052
class MandosDBusServiceTransitional(MandosDBusService):
2053
__metaclass__ = transitional_dbus_metaclass
2054
mandos_dbus_service = MandosDBusServiceTransitional()
1976
mandos_dbus_service = MandosDBusService()
2055
1977
2056
1978
def cleanup():
2057
1979
"Cleanup function; run on exit"
2083
2005
# Find out what port we got
2084
2006
service.port = tcp_server.socket.getsockname()[1]
2085
2007
if use_ipv6:
2086
logger.info("Now listening on address %r, port %d,"
2008
logger.info(u"Now listening on address %r, port %d,"
2087
2009
" flowinfo %d, scope_id %d"
2088
2010
% tcp_server.socket.getsockname())
2089
2011
else: # IPv4
2090
logger.info("Now listening on address %r, port %d"
2012
logger.info(u"Now listening on address %r, port %d"
2091
2013
% tcp_server.socket.getsockname())
2092
2014
2093
2015
#service.interface = tcp_server.socket.getsockname()[3]
2096
2018
# From the Avahi example code
2097
2019
try:
2098
2020
service.activate()
2099
except dbus.exceptions.DBusException as error:
2100
logger.critical("DBusException: %s", error)
2021
except dbus.exceptions.DBusException, error:
2022
logger.critical(u"DBusException: %s", error)
2101
2023
cleanup()
2102
2024
sys.exit(1)
2103
2025
# End of Avahi example code
2107
2029
(tcp_server.handle_request
2108
2030
(*args[2:], **kwargs) or True))
2109
2031
2110
logger.debug("Starting main loop")
2032
logger.debug(u"Starting main loop")
2111
2033
main_loop.run()
2112
except AvahiError as error:
2113
logger.critical("AvahiError: %s", error)
2034
except AvahiError, error:
2035
logger.critical(u"AvahiError: %s", error)
2114
2036
cleanup()
2115
2037
sys.exit(1)
2116
2038
except KeyboardInterrupt:
2117
2039
if debug:
2118
print("", file=sys.stderr)
2119
logger.debug("Server received KeyboardInterrupt")
2120
logger.debug("Server exiting")
2040
print >> sys.stderr
2041
logger.debug(u"Server received KeyboardInterrupt")
2042
logger.debug(u"Server exiting")
2121
2043
# Must run before the D-Bus bus name gets deregistered
2122
2044
cleanup()
2123
2045
2124
2125
2046
if __name__ == '__main__':
2126
2047
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0