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