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