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