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 410
- compare with another revision
- download diff
- download tarball
- view history from revision 410
- Committer: Teddy Hogeborn
- Date: 2009-11-19 18:31:28 UTC
- Revision ID: teddy@fukt.bsnet.se-20091119183128-ttstewh61xmtnil1
* Makefile (LINK_FORTIFY_LD): Bug fix: removed "-fPIE".
* mandos-keygen: Bug fix: Fix quoting for the "--password" option.
* mandos-keygen: Bug fix: Fix quoting for the "--password" option.
- 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")
316
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))
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
def dbus_service_property(dbus_interface, signature="v",
565
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):
566
492
"""Decorators for marking methods of a DBusObjectWithProperties to
567
493
become properties on the D-Bus.
568
494
573
499
dbus.service.method, except there is only "signature", since the
574
500
type from Get() and the type sent to Set() is the same.
575
501
"""
576
# Encoding deeply encoded byte arrays is not supported yet by the
577
# "Set" method, so we fail early here:
578
if byte_arrays and signature != "ay":
579
raise ValueError("Byte arrays not supported for non-'ay'"
580
" signature %r" % signature)
581
502
def decorator(func):
582
503
func._dbus_is_property = True
583
504
func._dbus_interface = dbus_interface
584
505
func._dbus_signature = signature
585
506
func._dbus_access = access
586
507
func._dbus_name = func.__name__
587
if func._dbus_name.endswith("_dbus_property"):
508
if func._dbus_name.endswith(u"_dbus_property"):
588
509
func._dbus_name = func._dbus_name[:-14]
589
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
510
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
590
511
return func
591
512
return decorator
592
513
620
541
621
542
@staticmethod
622
543
def _is_dbus_property(obj):
623
return getattr(obj, "_dbus_is_property", False)
544
return getattr(obj, u"_dbus_is_property", False)
624
545
625
546
def _get_all_dbus_properties(self):
626
547
"""Returns a generator of (name, attribute) pairs
634
555
property with the specified name and interface.
635
556
"""
636
557
for name in (property_name,
637
property_name + "_dbus_property"):
558
property_name + u"_dbus_property"):
638
559
prop = getattr(self, name, None)
639
560
if (prop is None
640
561
or not self._is_dbus_property(prop)
644
565
continue
645
566
return prop
646
567
# No such property
647
raise DBusPropertyNotFound(self.dbus_object_path + ":"
648
+ interface_name + "."
568
raise DBusPropertyNotFound(self.dbus_object_path + u":"
569
+ interface_name + u"."
649
570
+ property_name)
650
571
651
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
652
out_signature="v")
572
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
573
out_signature=u"v")
653
574
def Get(self, interface_name, property_name):
654
575
"""Standard D-Bus property Get() method, see D-Bus standard.
655
576
"""
656
577
prop = self._get_dbus_property(interface_name, property_name)
657
if prop._dbus_access == "write":
578
if prop._dbus_access == u"write":
658
579
raise DBusPropertyAccessException(property_name)
659
580
value = prop()
660
if not hasattr(value, "variant_level"):
581
if not hasattr(value, u"variant_level"):
661
582
return value
662
583
return type(value)(value, variant_level=value.variant_level+1)
663
584
664
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
585
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
665
586
def Set(self, interface_name, property_name, value):
666
587
"""Standard D-Bus property Set() method, see D-Bus standard.
667
588
"""
668
589
prop = self._get_dbus_property(interface_name, property_name)
669
if prop._dbus_access == "read":
590
if prop._dbus_access == u"read":
670
591
raise DBusPropertyAccessException(property_name)
671
if prop._dbus_get_args_options["byte_arrays"]:
672
# The byte_arrays option is not supported yet on
673
# signatures other than "ay".
674
if prop._dbus_signature != "ay":
675
raise ValueError
592
if prop._dbus_get_args_options[u"byte_arrays"]:
676
593
value = dbus.ByteArray(''.join(unichr(byte)
677
594
for byte in value))
678
595
prop(value)
679
596
680
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
681
out_signature="a{sv}")
597
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
598
out_signature=u"a{sv}")
682
599
def GetAll(self, interface_name):
683
600
"""Standard D-Bus property GetAll() method, see D-Bus
684
601
standard.
692
609
# Interface non-empty but did not match
693
610
continue
694
611
# Ignore write-only properties
695
if prop._dbus_access == "write":
612
if prop._dbus_access == u"write":
696
613
continue
697
614
value = prop()
698
if not hasattr(value, "variant_level"):
615
if not hasattr(value, u"variant_level"):
699
616
all[name] = value
700
617
continue
701
618
all[name] = type(value)(value, variant_level=
702
619
value.variant_level+1)
703
return dbus.Dictionary(all, signature="sv")
620
return dbus.Dictionary(all, signature=u"sv")
704
621
705
622
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
706
out_signature="s",
623
out_signature=u"s",
707
624
path_keyword='object_path',
708
625
connection_keyword='connection')
709
626
def Introspect(self, object_path, connection):
714
631
try:
715
632
document = xml.dom.minidom.parseString(xmlstring)
716
633
def make_tag(document, name, prop):
717
e = document.createElement("property")
718
e.setAttribute("name", name)
719
e.setAttribute("type", prop._dbus_signature)
720
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)
721
638
return e
722
for if_tag in document.getElementsByTagName("interface"):
639
for if_tag in document.getElementsByTagName(u"interface"):
723
640
for tag in (make_tag(document, name, prop)
724
641
for name, prop
725
642
in self._get_all_dbus_properties()
726
643
if prop._dbus_interface
727
== if_tag.getAttribute("name")):
644
== if_tag.getAttribute(u"name")):
728
645
if_tag.appendChild(tag)
729
646
# Add the names to the return values for the
730
647
# "org.freedesktop.DBus.Properties" methods
731
if (if_tag.getAttribute("name")
732
== "org.freedesktop.DBus.Properties"):
733
for cn in if_tag.getElementsByTagName("method"):
734
if cn.getAttribute("name") == "Get":
735
for arg in cn.getElementsByTagName("arg"):
736
if (arg.getAttribute("direction")
737
== "out"):
738
arg.setAttribute("name", "value")
739
elif cn.getAttribute("name") == "GetAll":
740
for arg in cn.getElementsByTagName("arg"):
741
if (arg.getAttribute("direction")
742
== "out"):
743
arg.setAttribute("name", "props")
744
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")
745
662
document.unlink()
746
663
except (AttributeError, xml.dom.DOMException,
747
xml.parsers.expat.ExpatError) as error:
748
logger.error("Failed to override Introspection method",
664
xml.parsers.expat.ExpatError), error:
665
logger.error(u"Failed to override Introspection method",
749
666
error)
750
667
return xmlstring
751
668
752
669
753
def datetime_to_dbus (dt, variant_level=0):
754
"""Convert a UTC datetime.datetime() to a D-Bus type."""
755
if dt is None:
756
return dbus.String("", variant_level = variant_level)
757
return dbus.String(dt.isoformat(),
758
variant_level=variant_level)
759
760
670
class ClientDBus(Client, DBusObjectWithProperties):
761
671
"""A Client class using D-Bus
762
672
764
674
dbus_object_path: dbus.ObjectPath
765
675
bus: dbus.SystemBus()
766
676
"""
767
768
runtime_expansions = (Client.runtime_expansions
769
+ ("dbus_object_path",))
770
771
677
# dbus.service.Object doesn't use super(), so we can't either.
772
678
773
679
def __init__(self, bus = None, *args, **kwargs):
774
self._approvals_pending = 0
775
680
self.bus = bus
776
681
Client.__init__(self, *args, **kwargs)
777
682
# Only now, when this client is initialized, can it show up on
778
683
# the D-Bus
779
client_object_name = unicode(self.name).translate(
780
{ord("."): ord("_"),
781
ord("-"): ord("_")})
782
684
self.dbus_object_path = (dbus.ObjectPath
783
("/clients/" + client_object_name))
685
(u"/clients/"
686
+ self.name.replace(u".", u"_")))
784
687
DBusObjectWithProperties.__init__(self, self.bus,
785
688
self.dbus_object_path)
786
787
def notifychangeproperty(transform_func,
788
dbus_name, type_func=lambda x: x,
789
variant_level=1):
790
""" Modify a variable so that its a property that announce its
791
changes to DBus.
792
transform_fun: Function that takes a value and transform it to
793
DBus type.
794
dbus_name: DBus name of the variable
795
type_func: Function that transform the value before sending it
796
to DBus
797
variant_level: DBus variant level. default: 1
798
"""
799
real_value = [None,]
800
def setter(self, value):
801
old_value = real_value[0]
802
real_value[0] = value
803
if hasattr(self, "dbus_object_path"):
804
if type_func(old_value) != type_func(real_value[0]):
805
dbus_value = transform_func(type_func(real_value[0]),
806
variant_level)
807
self.PropertyChanged(dbus.String(dbus_name),
808
dbus_value)
809
810
return property(lambda self: real_value[0], setter)
811
812
813
expires = notifychangeproperty(datetime_to_dbus, "Expires")
814
approvals_pending = notifychangeproperty(dbus.Boolean,
815
"ApprovalPending",
816
type_func = bool)
817
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
818
last_enabled = notifychangeproperty(datetime_to_dbus,
819
"LastEnabled")
820
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
821
type_func = lambda checker: checker is not None)
822
last_checked_ok = notifychangeproperty(datetime_to_dbus,
823
"LastCheckedOK")
824
last_approval_request = notifychangeproperty(datetime_to_dbus,
825
"LastApprovalRequest")
826
approved_by_default = notifychangeproperty(dbus.Boolean,
827
"ApprovedByDefault")
828
approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
829
type_func = _timedelta_to_milliseconds)
830
approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
831
type_func = _timedelta_to_milliseconds)
832
host = notifychangeproperty(dbus.String, "Host")
833
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
834
type_func = _timedelta_to_milliseconds)
835
extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
836
type_func = _timedelta_to_milliseconds)
837
interval = notifychangeproperty(dbus.UInt16, "Interval",
838
type_func = _timedelta_to_milliseconds)
839
checker_command = notifychangeproperty(dbus.String, "Checker")
840
841
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
842
717
843
718
def __del__(self, *args, **kwargs):
844
719
try:
845
720
self.remove_from_connection()
846
721
except LookupError:
847
722
pass
848
if hasattr(DBusObjectWithProperties, "__del__"):
723
if hasattr(DBusObjectWithProperties, u"__del__"):
849
724
DBusObjectWithProperties.__del__(self, *args, **kwargs)
850
725
Client.__del__(self, *args, **kwargs)
851
726
853
728
*args, **kwargs):
854
729
self.checker_callback_tag = None
855
730
self.checker = None
731
# Emit D-Bus signal
732
self.PropertyChanged(dbus.String(u"checker_running"),
733
dbus.Boolean(False, variant_level=1))
856
734
if os.WIFEXITED(condition):
857
735
exitstatus = os.WEXITSTATUS(condition)
858
736
# Emit D-Bus signal
867
745
868
746
return Client.checker_callback(self, pid, condition, command,
869
747
*args, **kwargs)
870
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
871
758
def start_checker(self, *args, **kwargs):
872
759
old_checker = self.checker
873
760
if self.checker is not None:
880
767
and old_checker_pid != self.checker.pid):
881
768
# Emit D-Bus signal
882
769
self.CheckerStarted(self.current_checker_command)
883
return r
884
885
def _reset_approved(self):
886
self._approved = None
887
return False
888
889
def approve(self, value=True):
890
self.send_changedstate()
891
self._approved = value
892
gobject.timeout_add(_timedelta_to_milliseconds
893
(self.approval_duration),
894
self._reset_approved)
895
896
897
## D-Bus methods, signals & properties
898
_interface = "se.bsnet.fukt.Mandos.Client"
899
900
## 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()
901
791
902
792
# CheckerCompleted - signal
903
@dbus.service.signal(_interface, signature="nxs")
793
@dbus.service.signal(_interface, signature=u"nxs")
904
794
def CheckerCompleted(self, exitcode, waitstatus, command):
905
795
"D-Bus signal"
906
796
pass
907
797
908
798
# CheckerStarted - signal
909
@dbus.service.signal(_interface, signature="s")
799
@dbus.service.signal(_interface, signature=u"s")
910
800
def CheckerStarted(self, command):
911
801
"D-Bus signal"
912
802
pass
913
803
914
804
# PropertyChanged - signal
915
@dbus.service.signal(_interface, signature="sv")
805
@dbus.service.signal(_interface, signature=u"sv")
916
806
def PropertyChanged(self, property, value):
917
807
"D-Bus signal"
918
808
pass
920
810
# GotSecret - signal
921
811
@dbus.service.signal(_interface)
922
812
def GotSecret(self):
923
"""D-Bus signal
924
Is sent after a successful transfer of secret from the Mandos
925
server to mandos-client
926
"""
813
"D-Bus signal"
927
814
pass
928
815
929
816
# Rejected - signal
930
@dbus.service.signal(_interface, signature="s")
931
def Rejected(self, reason):
817
@dbus.service.signal(_interface)
818
def Rejected(self):
932
819
"D-Bus signal"
933
820
pass
934
821
935
# NeedApproval - signal
936
@dbus.service.signal(_interface, signature="tb")
937
def NeedApproval(self, timeout, default):
938
"D-Bus signal"
939
return self.need_approval()
940
941
## Methods
942
943
# Approve - method
944
@dbus.service.method(_interface, in_signature="b")
945
def Approve(self, value):
946
self.approve(value)
947
948
# CheckedOK - method
949
@dbus.service.method(_interface)
950
def CheckedOK(self):
951
self.checked_ok()
952
953
822
# Enable - method
954
823
@dbus.service.method(_interface)
955
824
def Enable(self):
973
842
def StopChecker(self):
974
843
self.stop_checker()
975
844
976
## Properties
977
978
# ApprovalPending - property
979
@dbus_service_property(_interface, signature="b", access="read")
980
def ApprovalPending_dbus_property(self):
981
return dbus.Boolean(bool(self.approvals_pending))
982
983
# ApprovedByDefault - property
984
@dbus_service_property(_interface, signature="b",
985
access="readwrite")
986
def ApprovedByDefault_dbus_property(self, value=None):
987
if value is None: # get
988
return dbus.Boolean(self.approved_by_default)
989
self.approved_by_default = bool(value)
990
991
# ApprovalDelay - property
992
@dbus_service_property(_interface, signature="t",
993
access="readwrite")
994
def ApprovalDelay_dbus_property(self, value=None):
995
if value is None: # get
996
return dbus.UInt64(self.approval_delay_milliseconds())
997
self.approval_delay = datetime.timedelta(0, 0, 0, value)
998
999
# ApprovalDuration - property
1000
@dbus_service_property(_interface, signature="t",
1001
access="readwrite")
1002
def ApprovalDuration_dbus_property(self, value=None):
1003
if value is None: # get
1004
return dbus.UInt64(_timedelta_to_milliseconds(
1005
self.approval_duration))
1006
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1007
1008
# Name - property
1009
@dbus_service_property(_interface, signature="s", access="read")
1010
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):
1011
848
return dbus.String(self.name)
1012
849
1013
# Fingerprint - property
1014
@dbus_service_property(_interface, signature="s", access="read")
1015
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):
1016
853
return dbus.String(self.fingerprint)
1017
854
1018
# Host - property
1019
@dbus_service_property(_interface, signature="s",
1020
access="readwrite")
1021
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):
1022
859
if value is None: # get
1023
860
return dbus.String(self.host)
1024
861
self.host = value
1025
1026
# Created - property
1027
@dbus_service_property(_interface, signature="s", access="read")
1028
def Created_dbus_property(self):
1029
return dbus.String(datetime_to_dbus(self.created))
1030
1031
# LastEnabled - property
1032
@dbus_service_property(_interface, signature="s", access="read")
1033
def LastEnabled_dbus_property(self):
1034
return datetime_to_dbus(self.last_enabled)
1035
1036
# Enabled - property
1037
@dbus_service_property(_interface, signature="b",
1038
access="readwrite")
1039
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):
1040
882
if value is None: # get
1041
883
return dbus.Boolean(self.enabled)
1042
884
if value:
1044
886
else:
1045
887
self.disable()
1046
888
1047
# LastCheckedOK - property
1048
@dbus_service_property(_interface, signature="s",
1049
access="readwrite")
1050
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):
1051
893
if value is not None:
1052
894
self.checked_ok()
1053
895
return
1054
return datetime_to_dbus(self.last_checked_ok)
1055
1056
# Expires - property
1057
@dbus_service_property(_interface, signature="s", access="read")
1058
def Expires_dbus_property(self):
1059
return datetime_to_dbus(self.expires)
1060
1061
# LastApprovalRequest - property
1062
@dbus_service_property(_interface, signature="s", access="read")
1063
def LastApprovalRequest_dbus_property(self):
1064
return datetime_to_dbus(self.last_approval_request)
1065
1066
# Timeout - property
1067
@dbus_service_property(_interface, signature="t",
1068
access="readwrite")
1069
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):
1070
905
if value is None: # get
1071
906
return dbus.UInt64(self.timeout_milliseconds())
1072
907
self.timeout = datetime.timedelta(0, 0, 0, value)
1073
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:
1074
912
return
1075
913
# Reschedule timeout
1076
914
gobject.source_remove(self.disable_initiator_tag)
1077
915
self.disable_initiator_tag = None
1078
self.expires = None
1079
916
time_to_die = (self.
1080
917
_timedelta_to_milliseconds((self
1081
918
.last_checked_ok
1086
923
# The timeout has passed
1087
924
self.disable()
1088
925
else:
1089
self.expires = (datetime.datetime.utcnow()
1090
+ datetime.timedelta(milliseconds = time_to_die))
1091
926
self.disable_initiator_tag = (gobject.timeout_add
1092
927
(time_to_die, self.disable))
1093
1094
# ExtendedTimeout - property
1095
@dbus_service_property(_interface, signature="t",
1096
access="readwrite")
1097
def ExtendedTimeout_dbus_property(self, value=None):
1098
if value is None: # get
1099
return dbus.UInt64(self.extended_timeout_milliseconds())
1100
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1101
1102
# Interval - property
1103
@dbus_service_property(_interface, signature="t",
1104
access="readwrite")
1105
def Interval_dbus_property(self, value=None):
928
929
# interval - property
930
@dbus_service_property(_interface, signature=u"t",
931
access=u"readwrite")
932
def interval_dbus_property(self, value=None):
1106
933
if value is None: # get
1107
934
return dbus.UInt64(self.interval_milliseconds())
1108
935
self.interval = datetime.timedelta(0, 0, 0, value)
1109
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:
1110
940
return
1111
941
# Reschedule checker run
1112
942
gobject.source_remove(self.checker_initiator_tag)
1114
944
(value, self.start_checker))
1115
945
self.start_checker() # Start one now, too
1116
946
1117
# Checker - property
1118
@dbus_service_property(_interface, signature="s",
1119
access="readwrite")
1120
def Checker_dbus_property(self, value=None):
947
# checker - property
948
@dbus_service_property(_interface, signature=u"s",
949
access=u"readwrite")
950
def checker_dbus_property(self, value=None):
1121
951
if value is None: # get
1122
952
return dbus.String(self.checker_command)
1123
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))
1124
958
1125
# CheckerRunning - property
1126
@dbus_service_property(_interface, signature="b",
1127
access="readwrite")
1128
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):
1129
963
if value is None: # get
1130
964
return dbus.Boolean(self.checker is not None)
1131
965
if value:
1133
967
else:
1134
968
self.stop_checker()
1135
969
1136
# ObjectPath - property
1137
@dbus_service_property(_interface, signature="o", access="read")
1138
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):
1139
973
return self.dbus_object_path # is already a dbus.ObjectPath
1140
974
1141
# Secret = property
1142
@dbus_service_property(_interface, signature="ay",
1143
access="write", byte_arrays=True)
1144
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):
1145
979
self.secret = str(value)
1146
980
1147
981
del _interface
1148
982
1149
983
1150
class ProxyClient(object):
1151
def __init__(self, child_pipe, fpr, address):
1152
self._pipe = child_pipe
1153
self._pipe.send(('init', fpr, address))
1154
if not self._pipe.recv():
1155
raise KeyError()
1156
1157
def __getattribute__(self, name):
1158
if(name == '_pipe'):
1159
return super(ProxyClient, self).__getattribute__(name)
1160
self._pipe.send(('getattr', name))
1161
data = self._pipe.recv()
1162
if data[0] == 'data':
1163
return data[1]
1164
if data[0] == 'function':
1165
def func(*args, **kwargs):
1166
self._pipe.send(('funcall', name, args, kwargs))
1167
return self._pipe.recv()[1]
1168
return func
1169
1170
def __setattr__(self, name, value):
1171
if(name == '_pipe'):
1172
return super(ProxyClient, self).__setattr__(name, value)
1173
self._pipe.send(('setattr', name, value))
1174
1175
1176
984
class ClientHandler(socketserver.BaseRequestHandler, object):
1177
985
"""A class to handle client connections.
1178
986
1180
988
Note: This will run in its own forked process."""
1181
989
1182
990
def handle(self):
1183
with contextlib.closing(self.server.child_pipe) as child_pipe:
1184
logger.info("TCP connection from: %s",
1185
unicode(self.client_address))
1186
logger.debug("Pipe FD: %d",
1187
self.server.child_pipe.fileno())
1188
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:
1189
996
session = (gnutls.connection
1190
997
.ClientSession(self.request,
1191
998
gnutls.connection
1192
999
.X509Credentials()))
1193
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
1194
1010
# Note: gnutls.connection.X509Credentials is really a
1195
1011
# generic GnuTLS certificate credentials object so long as
1196
1012
# no X.509 keys are added to it. Therefore, we can use it
1197
1013
# here despite using OpenPGP certificates.
1198
1199
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1200
# "+AES-256-CBC", "+SHA1",
1201
# "+COMP-NULL", "+CTYPE-OPENPGP",
1202
# "+DHE-DSS"))
1014
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"))
1203
1019
# Use a fallback default, since this MUST be set.
1204
1020
priority = self.server.gnutls_priority
1205
1021
if priority is None:
1206
priority = "NORMAL"
1022
priority = u"NORMAL"
1207
1023
(gnutls.library.functions
1208
1024
.gnutls_priority_set_direct(session._c_object,
1209
1025
priority, None))
1210
1211
# Start communication using the Mandos protocol
1212
# Get protocol number
1213
line = self.request.makefile().readline()
1214
logger.debug("Protocol version: %r", line)
1215
try:
1216
if int(line.strip().split()[0]) > 1:
1217
raise RuntimeError
1218
except (ValueError, IndexError, RuntimeError) as error:
1219
logger.error("Unknown protocol version: %s", error)
1220
return
1221
1222
# Start GnuTLS connection
1026
1223
1027
try:
1224
1028
session.handshake()
1225
except gnutls.errors.GNUTLSError as error:
1226
logger.warning("Handshake failed: %s", error)
1029
except gnutls.errors.GNUTLSError, error:
1030
logger.warning(u"Handshake failed: %s", error)
1227
1031
# Do not run session.bye() here: the session is not
1228
1032
# established. Just abandon the request.
1229
1033
return
1230
logger.debug("Handshake succeeded")
1231
1232
approval_required = False
1034
logger.debug(u"Handshake succeeded")
1233
1035
try:
1234
try:
1235
fpr = self.fingerprint(self.peer_certificate
1236
(session))
1237
except (TypeError,
1238
gnutls.errors.GNUTLSError) as error:
1239
logger.warning("Bad certificate: %s", error)
1240
return
1241
logger.debug("Fingerprint: %s", fpr)
1242
1243
try:
1244
client = ProxyClient(child_pipe, fpr,
1245
self.client_address)
1246
except KeyError:
1247
return
1248
1249
if client.approval_delay:
1250
delay = client.approval_delay
1251
client.approvals_pending += 1
1252
approval_required = True
1253
1254
while True:
1255
if not client.enabled:
1256
logger.info("Client %s is disabled",
1257
client.name)
1258
if self.server.use_dbus:
1259
# Emit D-Bus signal
1260
client.Rejected("Disabled")
1261
return
1262
1263
if client._approved or not client.approval_delay:
1264
#We are approved or approval is disabled
1265
break
1266
elif client._approved is None:
1267
logger.info("Client %s needs approval",
1268
client.name)
1269
if self.server.use_dbus:
1270
# Emit D-Bus signal
1271
client.NeedApproval(
1272
client.approval_delay_milliseconds(),
1273
client.approved_by_default)
1274
else:
1275
logger.warning("Client %s was not approved",
1276
client.name)
1277
if self.server.use_dbus:
1278
# Emit D-Bus signal
1279
client.Rejected("Denied")
1280
return
1281
1282
#wait until timeout or approved
1283
#x = float(client._timedelta_to_milliseconds(delay))
1284
time = datetime.datetime.now()
1285
client.changedstate.acquire()
1286
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1287
client.changedstate.release()
1288
time2 = datetime.datetime.now()
1289
if (time2 - time) >= delay:
1290
if not client.approved_by_default:
1291
logger.warning("Client %s timed out while"
1292
" waiting for approval",
1293
client.name)
1294
if self.server.use_dbus:
1295
# Emit D-Bus signal
1296
client.Rejected("Approval timed out")
1297
return
1298
else:
1299
break
1300
else:
1301
delay -= time2 - time
1302
1303
sent_size = 0
1304
while sent_size < len(client.secret):
1305
try:
1306
sent = session.send(client.secret[sent_size:])
1307
except gnutls.errors.GNUTLSError as error:
1308
logger.warning("gnutls send failed")
1309
return
1310
logger.debug("Sent: %d, remaining: %d",
1311
sent, len(client.secret)
1312
- (sent_size + sent))
1313
sent_size += sent
1314
1315
logger.info("Sending secret to %s", client.name)
1316
# bump the timeout as if seen
1317
client.checked_ok(client.extended_timeout)
1318
if self.server.use_dbus:
1319
# Emit D-Bus signal
1320
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)
1321
1042
1322
finally:
1323
if approval_required:
1324
client.approvals_pending -= 1
1325
try:
1326
session.bye()
1327
except gnutls.errors.GNUTLSError as error:
1328
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()
1329
1068
1330
1069
@staticmethod
1331
1070
def peer_certificate(session):
1341
1080
.gnutls_certificate_get_peers
1342
1081
(session._c_object, ctypes.byref(list_size)))
1343
1082
if not bool(cert_list) and list_size.value != 0:
1344
raise gnutls.errors.GNUTLSError("error getting peer"
1345
" certificate")
1083
raise gnutls.errors.GNUTLSError(u"error getting peer"
1084
u" certificate")
1346
1085
if list_size.value == 0:
1347
1086
return None
1348
1087
cert = cert_list[0]
1374
1113
if crtverify.value != 0:
1375
1114
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1376
1115
raise (gnutls.errors.CertificateSecurityError
1377
("Verify failed"))
1116
(u"Verify failed"))
1378
1117
# New buffer for the fingerprint
1379
1118
buf = ctypes.create_string_buffer(20)
1380
1119
buf_len = ctypes.c_size_t()
1387
1126
# Convert the buffer to a Python bytestring
1388
1127
fpr = ctypes.string_at(buf, buf_len.value)
1389
1128
# Convert the bytestring to hexadecimal notation
1390
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1129
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1391
1130
return hex_fpr
1392
1131
1393
1132
1394
class MultiprocessingMixIn(object):
1395
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1396
def sub_process_main(self, request, address):
1397
try:
1398
self.finish_request(request, address)
1399
except:
1400
self.handle_error(request, address)
1401
self.close_request(request)
1402
1403
def process_request(self, request, address):
1404
"""Start a new process to process the request."""
1405
multiprocessing.Process(target = self.sub_process_main,
1406
args = (request, address)).start()
1407
1408
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1409
""" adds a pipe to the MixIn """
1133
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1134
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1410
1135
def process_request(self, request, client_address):
1411
1136
"""Overrides and wraps the original process_request().
1412
1137
1413
1138
This function creates a new pipe in self.pipe
1414
1139
"""
1415
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1416
1417
super(MultiprocessingMixInWithPipe,
1140
self.pipe = os.pipe()
1141
super(ForkingMixInWithPipe,
1418
1142
self).process_request(request, client_address)
1419
self.child_pipe.close()
1420
self.add_pipe(parent_pipe)
1421
1422
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):
1423
1146
"""Dummy function; override as necessary"""
1424
raise NotImplementedError
1425
1426
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1147
os.close(pipe)
1148
1149
1150
class IPv6_TCPServer(ForkingMixInWithPipe,
1427
1151
socketserver.TCPServer, object):
1428
1152
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1429
1153
1445
1169
bind to an address or port if they were not specified."""
1446
1170
if self.interface is not None:
1447
1171
if SO_BINDTODEVICE is None:
1448
logger.error("SO_BINDTODEVICE does not exist;"
1449
" cannot bind to interface %s",
1172
logger.error(u"SO_BINDTODEVICE does not exist;"
1173
u" cannot bind to interface %s",
1450
1174
self.interface)
1451
1175
else:
1452
1176
try:
1453
1177
self.socket.setsockopt(socket.SOL_SOCKET,
1454
1178
SO_BINDTODEVICE,
1455
1179
str(self.interface
1456
+ '\0'))
1457
except socket.error as error:
1180
+ u'\0'))
1181
except socket.error, error:
1458
1182
if error[0] == errno.EPERM:
1459
logger.error("No permission to"
1460
" bind to interface %s",
1183
logger.error(u"No permission to"
1184
u" bind to interface %s",
1461
1185
self.interface)
1462
1186
elif error[0] == errno.ENOPROTOOPT:
1463
logger.error("SO_BINDTODEVICE not available;"
1464
" cannot bind to interface %s",
1187
logger.error(u"SO_BINDTODEVICE not available;"
1188
u" cannot bind to interface %s",
1465
1189
self.interface)
1466
1190
else:
1467
1191
raise
1469
1193
if self.server_address[0] or self.server_address[1]:
1470
1194
if not self.server_address[0]:
1471
1195
if self.address_family == socket.AF_INET6:
1472
any_address = "::" # in6addr_any
1196
any_address = u"::" # in6addr_any
1473
1197
else:
1474
1198
any_address = socket.INADDR_ANY
1475
1199
self.server_address = (any_address,
1514
1238
return socketserver.TCPServer.server_activate(self)
1515
1239
def enable(self):
1516
1240
self.enabled = True
1517
def add_pipe(self, parent_pipe):
1241
def add_pipe(self, pipe):
1518
1242
# Call "handle_ipc" for both data and EOF events
1519
gobject.io_add_watch(parent_pipe.fileno(),
1520
gobject.IO_IN | gobject.IO_HUP,
1521
functools.partial(self.handle_ipc,
1522
parent_pipe = parent_pipe))
1523
1524
def handle_ipc(self, source, condition, parent_pipe=None,
1525
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={}):
1526
1246
condition_names = {
1527
gobject.IO_IN: "IN", # There is data to read.
1528
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
1529
1249
# blocking).
1530
gobject.IO_PRI: "PRI", # There is urgent data to read.
1531
gobject.IO_ERR: "ERR", # Error condition.
1532
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
1533
1253
# broken, usually for pipes and
1534
1254
# sockets).
1535
1255
}
1537
1257
for cond, name in
1538
1258
condition_names.iteritems()
1539
1259
if cond & condition)
1540
# error or the other end of multiprocessing.Pipe has closed
1541
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1542
return False
1543
1544
# Read a request from the child
1545
request = parent_pipe.recv()
1546
command = request[0]
1547
1548
if command == 'init':
1549
fpr = request[1]
1550
address = request[2]
1551
1552
for c in self.clients:
1553
if c.fingerprint == fpr:
1554
client = c
1555
break
1556
else:
1557
logger.info("Client not found for fingerprint: %s, ad"
1558
"dress: %s", fpr, address)
1559
if self.use_dbus:
1560
# Emit D-Bus signal
1561
mandos_dbus_service.ClientNotFound(fpr, address[0])
1562
parent_pipe.send(False)
1563
return False
1564
1565
gobject.io_add_watch(parent_pipe.fileno(),
1566
gobject.IO_IN | gobject.IO_HUP,
1567
functools.partial(self.handle_ipc,
1568
parent_pipe = parent_pipe,
1569
client_object = client))
1570
parent_pipe.send(True)
1571
# remove the old hook in favor of the new above hook on same fileno
1572
return False
1573
if command == 'funcall':
1574
funcname = request[1]
1575
args = request[2]
1576
kwargs = request[3]
1577
1578
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1579
1580
if command == 'getattr':
1581
attrname = request[1]
1582
if callable(client_object.__getattribute__(attrname)):
1583
parent_pipe.send(('function',))
1584
else:
1585
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1586
1587
if command == 'setattr':
1588
attrname = request[1]
1589
value = request[2]
1590
setattr(client_object, attrname, value)
1591
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
fpr, address = args.split(None, 1)
1284
logger.warning(u"Client not found for fingerprint: %s, ad"
1285
u"dress: %s", fpr, address)
1286
if self.use_dbus:
1287
# Emit D-Bus signal
1288
mandos_dbus_service.ClientNotFound(fpr, address)
1289
elif cmd == u"INVALID":
1290
for client in self.clients:
1291
if client.name == args:
1292
logger.warning(u"Client %s is invalid", args)
1293
if self.use_dbus:
1294
# Emit D-Bus signal
1295
client.Rejected()
1296
break
1297
else:
1298
logger.error(u"Unknown client %s is invalid", args)
1299
elif cmd == u"SENDING":
1300
for client in self.clients:
1301
if client.name == args:
1302
logger.info(u"Sending secret to %s", client.name)
1303
client.checked_ok()
1304
if self.use_dbus:
1305
# Emit D-Bus signal
1306
client.GotSecret()
1307
break
1308
else:
1309
logger.error(u"Sending secret to unknown client %s",
1310
args)
1311
else:
1312
logger.error(u"Unknown IPC command: %r", cmdline)
1313
1314
# Keep calling this function
1592
1315
return True
1593
1316
1594
1317
1595
1318
def string_to_delta(interval):
1596
1319
"""Parse a string and return a datetime.timedelta
1597
1320
1598
>>> string_to_delta('7d')
1321
>>> string_to_delta(u'7d')
1599
1322
datetime.timedelta(7)
1600
>>> string_to_delta('60s')
1323
>>> string_to_delta(u'60s')
1601
1324
datetime.timedelta(0, 60)
1602
>>> string_to_delta('60m')
1325
>>> string_to_delta(u'60m')
1603
1326
datetime.timedelta(0, 3600)
1604
>>> string_to_delta('24h')
1327
>>> string_to_delta(u'24h')
1605
1328
datetime.timedelta(1)
1606
>>> string_to_delta('1w')
1329
>>> string_to_delta(u'1w')
1607
1330
datetime.timedelta(7)
1608
>>> string_to_delta('5m 30s')
1331
>>> string_to_delta(u'5m 30s')
1609
1332
datetime.timedelta(0, 330)
1610
1333
"""
1611
1334
timevalue = datetime.timedelta(0)
1613
1336
try:
1614
1337
suffix = unicode(s[-1])
1615
1338
value = int(s[:-1])
1616
if suffix == "d":
1339
if suffix == u"d":
1617
1340
delta = datetime.timedelta(value)
1618
elif suffix == "s":
1341
elif suffix == u"s":
1619
1342
delta = datetime.timedelta(0, value)
1620
elif suffix == "m":
1343
elif suffix == u"m":
1621
1344
delta = datetime.timedelta(0, 0, 0, 0, value)
1622
elif suffix == "h":
1345
elif suffix == u"h":
1623
1346
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1624
elif suffix == "w":
1347
elif suffix == u"w":
1625
1348
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1626
1349
else:
1627
raise ValueError("Unknown suffix %r" % suffix)
1628
except (ValueError, IndexError) as e:
1629
raise ValueError(*(e.args))
1350
raise ValueError(u"Unknown suffix %r" % suffix)
1351
except (ValueError, IndexError), e:
1352
raise ValueError(e.message)
1630
1353
timevalue += delta
1631
1354
return timevalue
1632
1355
1638
1361
global if_nametoindex
1639
1362
try:
1640
1363
if_nametoindex = (ctypes.cdll.LoadLibrary
1641
(ctypes.util.find_library("c"))
1364
(ctypes.util.find_library(u"c"))
1642
1365
.if_nametoindex)
1643
1366
except (OSError, AttributeError):
1644
logger.warning("Doing if_nametoindex the hard way")
1367
logger.warning(u"Doing if_nametoindex the hard way")
1645
1368
def if_nametoindex(interface):
1646
1369
"Get an interface index the hard way, i.e. using fcntl()"
1647
1370
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1648
with contextlib.closing(socket.socket()) as s:
1371
with closing(socket.socket()) as s:
1649
1372
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1650
struct.pack(str("16s16x"),
1373
struct.pack(str(u"16s16x"),
1651
1374
interface))
1652
interface_index = struct.unpack(str("I"),
1375
interface_index = struct.unpack(str(u"I"),
1653
1376
ifreq[16:20])[0]
1654
1377
return interface_index
1655
1378
return if_nametoindex(interface)
1663
1386
sys.exit()
1664
1387
os.setsid()
1665
1388
if not nochdir:
1666
os.chdir("/")
1389
os.chdir(u"/")
1667
1390
if os.fork():
1668
1391
sys.exit()
1669
1392
if not noclose:
1671
1394
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1672
1395
if not stat.S_ISCHR(os.fstat(null).st_mode):
1673
1396
raise OSError(errno.ENODEV,
1674
"%s not a character device"
1397
u"%s not a character device"
1675
1398
% os.path.devnull)
1676
1399
os.dup2(null, sys.stdin.fileno())
1677
1400
os.dup2(null, sys.stdout.fileno())
1685
1408
##################################################################
1686
1409
# Parsing of options, both command line and config file
1687
1410
1688
parser = argparse.ArgumentParser()
1689
parser.add_argument("-v", "--version", action="version",
1690
version = "%%(prog)s %s" % version,
1691
help="show version number and exit")
1692
parser.add_argument("-i", "--interface", metavar="IF",
1693
help="Bind to interface IF")
1694
parser.add_argument("-a", "--address",
1695
help="Address to listen for requests on")
1696
parser.add_argument("-p", "--port", type=int,
1697
help="Port number to receive requests on")
1698
parser.add_argument("--check", action="store_true",
1699
help="Run self-test")
1700
parser.add_argument("--debug", action="store_true",
1701
help="Debug mode; run in foreground and log"
1702
" to terminal")
1703
parser.add_argument("--debuglevel", metavar="LEVEL",
1704
help="Debug level for stdout output")
1705
parser.add_argument("--priority", help="GnuTLS"
1706
" priority string (see GnuTLS documentation)")
1707
parser.add_argument("--servicename",
1708
metavar="NAME", help="Zeroconf service name")
1709
parser.add_argument("--configdir",
1710
default="/etc/mandos", metavar="DIR",
1711
help="Directory to search for configuration"
1712
" files")
1713
parser.add_argument("--no-dbus", action="store_false",
1714
dest="use_dbus", help="Do not provide D-Bus"
1715
" system bus interface")
1716
parser.add_argument("--no-ipv6", action="store_false",
1717
dest="use_ipv6", help="Do not use IPv6")
1718
options = parser.parse_args()
1411
parser = optparse.OptionParser(version = "%%prog %s" % version)
1412
parser.add_option("-i", u"--interface", type=u"string",
1413
metavar="IF", help=u"Bind to interface IF")
1414
parser.add_option("-a", u"--address", type=u"string",
1415
help=u"Address to listen for requests on")
1416
parser.add_option("-p", u"--port", type=u"int",
1417
help=u"Port number to receive requests on")
1418
parser.add_option("--check", action=u"store_true",
1419
help=u"Run self-test")
1420
parser.add_option("--debug", action=u"store_true",
1421
help=u"Debug mode; run in foreground and log to"
1422
u" terminal")
1423
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1424
u" priority string (see GnuTLS documentation)")
1425
parser.add_option("--servicename", type=u"string",
1426
metavar=u"NAME", help=u"Zeroconf service name")
1427
parser.add_option("--configdir", type=u"string",
1428
default=u"/etc/mandos", metavar=u"DIR",
1429
help=u"Directory to search for configuration"
1430
u" files")
1431
parser.add_option("--no-dbus", action=u"store_false",
1432
dest=u"use_dbus", help=u"Do not provide D-Bus"
1433
u" system bus interface")
1434
parser.add_option("--no-ipv6", action=u"store_false",
1435
dest=u"use_ipv6", help=u"Do not use IPv6")
1436
options = parser.parse_args()[0]
1719
1437
1720
1438
if options.check:
1721
1439
import doctest
1723
1441
sys.exit()
1724
1442
1725
1443
# Default values for config file for server-global settings
1726
server_defaults = { "interface": "",
1727
"address": "",
1728
"port": "",
1729
"debug": "False",
1730
"priority":
1731
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1732
"servicename": "Mandos",
1733
"use_dbus": "True",
1734
"use_ipv6": "True",
1735
"debuglevel": "",
1444
server_defaults = { u"interface": u"",
1445
u"address": u"",
1446
u"port": u"",
1447
u"debug": u"False",
1448
u"priority":
1449
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1450
u"servicename": u"Mandos",
1451
u"use_dbus": u"True",
1452
u"use_ipv6": u"True",
1736
1453
}
1737
1454
1738
1455
# Parse config file for server-global settings
1739
1456
server_config = configparser.SafeConfigParser(server_defaults)
1740
1457
del server_defaults
1741
1458
server_config.read(os.path.join(options.configdir,
1742
"mandos.conf"))
1459
u"mandos.conf"))
1743
1460
# Convert the SafeConfigParser object to a dict
1744
1461
server_settings = server_config.defaults()
1745
1462
# Use the appropriate methods on the non-string config options
1746
for option in ("debug", "use_dbus", "use_ipv6"):
1747
server_settings[option] = server_config.getboolean("DEFAULT",
1463
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1464
server_settings[option] = server_config.getboolean(u"DEFAULT",
1748
1465
option)
1749
1466
if server_settings["port"]:
1750
server_settings["port"] = server_config.getint("DEFAULT",
1751
"port")
1467
server_settings["port"] = server_config.getint(u"DEFAULT",
1468
u"port")
1752
1469
del server_config
1753
1470
1754
1471
# Override the settings from the config file with command line
1755
1472
# options, if set.
1756
for option in ("interface", "address", "port", "debug",
1757
"priority", "servicename", "configdir",
1758
"use_dbus", "use_ipv6", "debuglevel"):
1473
for option in (u"interface", u"address", u"port", u"debug",
1474
u"priority", u"servicename", u"configdir",
1475
u"use_dbus", u"use_ipv6"):
1759
1476
value = getattr(options, option)
1760
1477
if value is not None:
1761
1478
server_settings[option] = value
1769
1486
##################################################################
1770
1487
1771
1488
# For convenience
1772
debug = server_settings["debug"]
1773
debuglevel = server_settings["debuglevel"]
1774
use_dbus = server_settings["use_dbus"]
1775
use_ipv6 = server_settings["use_ipv6"]
1776
1777
if server_settings["servicename"] != "Mandos":
1489
debug = server_settings[u"debug"]
1490
use_dbus = server_settings[u"use_dbus"]
1491
use_ipv6 = server_settings[u"use_ipv6"]
1492
1493
if not debug:
1494
syslogger.setLevel(logging.WARNING)
1495
console.setLevel(logging.WARNING)
1496
1497
if server_settings[u"servicename"] != u"Mandos":
1778
1498
syslogger.setFormatter(logging.Formatter
1779
('Mandos (%s) [%%(process)d]:'
1780
' %%(levelname)s: %%(message)s'
1781
% server_settings["servicename"]))
1499
(u'Mandos (%s) [%%(process)d]:'
1500
u' %%(levelname)s: %%(message)s'
1501
% server_settings[u"servicename"]))
1782
1502
1783
1503
# Parse config file with clients
1784
client_defaults = { "timeout": "5m",
1785
"extended_timeout": "15m",
1786
"interval": "2m",
1787
"checker": "fping -q -- %%(host)s",
1788
"host": "",
1789
"approval_delay": "0s",
1790
"approval_duration": "1s",
1504
client_defaults = { u"timeout": u"1h",
1505
u"interval": u"5m",
1506
u"checker": u"fping -q -- %%(host)s",
1507
u"host": u"",
1791
1508
}
1792
1509
client_config = configparser.SafeConfigParser(client_defaults)
1793
client_config.read(os.path.join(server_settings["configdir"],
1794
"clients.conf"))
1510
client_config.read(os.path.join(server_settings[u"configdir"],
1511
u"clients.conf"))
1795
1512
1796
1513
global mandos_dbus_service
1797
1514
mandos_dbus_service = None
1798
1515
1799
tcp_server = MandosServer((server_settings["address"],
1800
server_settings["port"]),
1516
tcp_server = MandosServer((server_settings[u"address"],
1517
server_settings[u"port"]),
1801
1518
ClientHandler,
1802
interface=(server_settings["interface"]
1803
or None),
1519
interface=server_settings[u"interface"],
1804
1520
use_ipv6=use_ipv6,
1805
1521
gnutls_priority=
1806
server_settings["priority"],
1522
server_settings[u"priority"],
1807
1523
use_dbus=use_dbus)
1808
if not debug:
1809
pidfilename = "/var/run/mandos.pid"
1810
try:
1811
pidfile = open(pidfilename, "w")
1812
except IOError:
1813
logger.error("Could not open file %r", pidfilename)
1524
pidfilename = u"/var/run/mandos.pid"
1525
try:
1526
pidfile = open(pidfilename, u"w")
1527
except IOError:
1528
logger.error(u"Could not open file %r", pidfilename)
1814
1529
1815
1530
try:
1816
uid = pwd.getpwnam("_mandos").pw_uid
1817
gid = pwd.getpwnam("_mandos").pw_gid
1531
uid = pwd.getpwnam(u"_mandos").pw_uid
1532
gid = pwd.getpwnam(u"_mandos").pw_gid
1818
1533
except KeyError:
1819
1534
try:
1820
uid = pwd.getpwnam("mandos").pw_uid
1821
gid = pwd.getpwnam("mandos").pw_gid
1535
uid = pwd.getpwnam(u"mandos").pw_uid
1536
gid = pwd.getpwnam(u"mandos").pw_gid
1822
1537
except KeyError:
1823
1538
try:
1824
uid = pwd.getpwnam("nobody").pw_uid
1825
gid = pwd.getpwnam("nobody").pw_gid
1539
uid = pwd.getpwnam(u"nobody").pw_uid
1540
gid = pwd.getpwnam(u"nobody").pw_gid
1826
1541
except KeyError:
1827
1542
uid = 65534
1828
1543
gid = 65534
1829
1544
try:
1830
1545
os.setgid(gid)
1831
1546
os.setuid(uid)
1832
except OSError as error:
1547
except OSError, error:
1833
1548
if error[0] != errno.EPERM:
1834
1549
raise error
1835
1550
1836
if not debug and not debuglevel:
1837
syslogger.setLevel(logging.WARNING)
1838
console.setLevel(logging.WARNING)
1839
if debuglevel:
1840
level = getattr(logging, debuglevel.upper())
1841
syslogger.setLevel(level)
1842
console.setLevel(level)
1843
1551
# Enable all possible GnuTLS debugging
1844
1552
if debug:
1845
# Enable all possible GnuTLS debugging
1846
1847
1553
# "Use a log level over 10 to enable all debugging options."
1848
1554
# - GnuTLS manual
1849
1555
gnutls.library.functions.gnutls_global_set_log_level(11)
1850
1556
1851
1557
@gnutls.library.types.gnutls_log_func
1852
1558
def debug_gnutls(level, string):
1853
logger.debug("GnuTLS: %s", string[:-1])
1559
logger.debug(u"GnuTLS: %s", string[:-1])
1854
1560
1855
1561
(gnutls.library.functions
1856
1562
.gnutls_global_set_log_function(debug_gnutls))
1857
1858
# Redirect stdin so all checkers get /dev/null
1859
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1860
os.dup2(null, sys.stdin.fileno())
1861
if null > 2:
1862
os.close(null)
1863
else:
1864
# No console logging
1865
logger.removeHandler(console)
1866
1867
# Need to fork before connecting to D-Bus
1868
if not debug:
1869
# Close all input and output, do double fork, etc.
1870
daemon()
1871
1563
1872
1564
global main_loop
1873
1565
# From the Avahi example code
1877
1569
# End of Avahi example code
1878
1570
if use_dbus:
1879
1571
try:
1880
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1572
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1881
1573
bus, do_not_queue=True)
1882
except dbus.exceptions.NameExistsException as e:
1883
logger.error(unicode(e) + ", disabling D-Bus")
1574
except dbus.exceptions.NameExistsException, e:
1575
logger.error(unicode(e) + u", disabling D-Bus")
1884
1576
use_dbus = False
1885
server_settings["use_dbus"] = False
1577
server_settings[u"use_dbus"] = False
1886
1578
tcp_server.use_dbus = False
1887
1579
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1888
service = AvahiService(name = server_settings["servicename"],
1889
servicetype = "_mandos._tcp",
1580
service = AvahiService(name = server_settings[u"servicename"],
1581
servicetype = u"_mandos._tcp",
1890
1582
protocol = protocol, bus = bus)
1891
1583
if server_settings["interface"]:
1892
1584
service.interface = (if_nametoindex
1893
(str(server_settings["interface"])))
1894
1895
global multiprocessing_manager
1896
multiprocessing_manager = multiprocessing.Manager()
1585
(str(server_settings[u"interface"])))
1897
1586
1898
1587
client_class = Client
1899
1588
if use_dbus:
1900
1589
client_class = functools.partial(ClientDBus, bus = bus)
1901
def client_config_items(config, section):
1902
special_settings = {
1903
"approved_by_default":
1904
lambda: config.getboolean(section,
1905
"approved_by_default"),
1906
}
1907
for name, value in config.items(section):
1908
try:
1909
yield (name, special_settings[name]())
1910
except KeyError:
1911
yield (name, value)
1912
1913
1590
tcp_server.clients.update(set(
1914
1591
client_class(name = section,
1915
config= dict(client_config_items(
1916
client_config, section)))
1592
config= dict(client_config.items(section)))
1917
1593
for section in client_config.sections()))
1918
1594
if not tcp_server.clients:
1919
logger.warning("No clients defined")
1920
1595
logger.warning(u"No clients defined")
1596
1597
if debug:
1598
# Redirect stdin so all checkers get /dev/null
1599
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1600
os.dup2(null, sys.stdin.fileno())
1601
if null > 2:
1602
os.close(null)
1603
else:
1604
# No console logging
1605
logger.removeHandler(console)
1606
# Close all input and output, do double fork, etc.
1607
daemon()
1608
1609
try:
1610
with closing(pidfile):
1611
pid = os.getpid()
1612
pidfile.write(str(pid) + "\n")
1613
del pidfile
1614
except IOError:
1615
logger.error(u"Could not write to file %r with PID %d",
1616
pidfilename, pid)
1617
except NameError:
1618
# "pidfile" was never created
1619
pass
1620
del pidfilename
1621
1921
1622
if not debug:
1922
try:
1923
with pidfile:
1924
pid = os.getpid()
1925
pidfile.write(str(pid) + "\n".encode("utf-8"))
1926
del pidfile
1927
except IOError:
1928
logger.error("Could not write to file %r with PID %d",
1929
pidfilename, pid)
1930
except NameError:
1931
# "pidfile" was never created
1932
pass
1933
del pidfilename
1934
1935
1623
signal.signal(signal.SIGINT, signal.SIG_IGN)
1936
1937
1624
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1938
1625
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1939
1626
1941
1628
class MandosDBusService(dbus.service.Object):
1942
1629
"""A D-Bus proxy object"""
1943
1630
def __init__(self):
1944
dbus.service.Object.__init__(self, bus, "/")
1945
_interface = "se.bsnet.fukt.Mandos"
1631
dbus.service.Object.__init__(self, bus, u"/")
1632
_interface = u"se.bsnet.fukt.Mandos"
1946
1633
1947
@dbus.service.signal(_interface, signature="o")
1948
def ClientAdded(self, objpath):
1634
@dbus.service.signal(_interface, signature=u"oa{sv}")
1635
def ClientAdded(self, objpath, properties):
1949
1636
"D-Bus signal"
1950
1637
pass
1951
1638
1952
@dbus.service.signal(_interface, signature="ss")
1639
@dbus.service.signal(_interface, signature=u"ss")
1953
1640
def ClientNotFound(self, fingerprint, address):
1954
1641
"D-Bus signal"
1955
1642
pass
1956
1643
1957
@dbus.service.signal(_interface, signature="os")
1644
@dbus.service.signal(_interface, signature=u"os")
1958
1645
def ClientRemoved(self, objpath, name):
1959
1646
"D-Bus signal"
1960
1647
pass
1961
1648
1962
@dbus.service.method(_interface, out_signature="ao")
1649
@dbus.service.method(_interface, out_signature=u"ao")
1963
1650
def GetAllClients(self):
1964
1651
"D-Bus method"
1965
1652
return dbus.Array(c.dbus_object_path
1966
1653
for c in tcp_server.clients)
1967
1654
1968
1655
@dbus.service.method(_interface,
1969
out_signature="a{oa{sv}}")
1656
out_signature=u"a{oa{sv}}")
1970
1657
def GetAllClientsWithProperties(self):
1971
1658
"D-Bus method"
1972
1659
return dbus.Dictionary(
1973
((c.dbus_object_path, c.GetAll(""))
1660
((c.dbus_object_path, c.GetAll(u""))
1974
1661
for c in tcp_server.clients),
1975
signature="oa{sv}")
1662
signature=u"oa{sv}")
1976
1663
1977
@dbus.service.method(_interface, in_signature="o")
1664
@dbus.service.method(_interface, in_signature=u"o")
1978
1665
def RemoveClient(self, object_path):
1979
1666
"D-Bus method"
1980
1667
for c in tcp_server.clients:
2013
1700
for client in tcp_server.clients:
2014
1701
if use_dbus:
2015
1702
# Emit D-Bus signal
2016
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1703
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1704
client.GetAll(u""))
2017
1705
client.enable()
2018
1706
2019
1707
tcp_server.enable()
2022
1710
# Find out what port we got
2023
1711
service.port = tcp_server.socket.getsockname()[1]
2024
1712
if use_ipv6:
2025
logger.info("Now listening on address %r, port %d,"
1713
logger.info(u"Now listening on address %r, port %d,"
2026
1714
" flowinfo %d, scope_id %d"
2027
1715
% tcp_server.socket.getsockname())
2028
1716
else: # IPv4
2029
logger.info("Now listening on address %r, port %d"
1717
logger.info(u"Now listening on address %r, port %d"
2030
1718
% tcp_server.socket.getsockname())
2031
1719
2032
1720
#service.interface = tcp_server.socket.getsockname()[3]
2035
1723
# From the Avahi example code
2036
1724
try:
2037
1725
service.activate()
2038
except dbus.exceptions.DBusException as error:
2039
logger.critical("DBusException: %s", error)
1726
except dbus.exceptions.DBusException, error:
1727
logger.critical(u"DBusException: %s", error)
2040
1728
cleanup()
2041
1729
sys.exit(1)
2042
1730
# End of Avahi example code
2046
1734
(tcp_server.handle_request
2047
1735
(*args[2:], **kwargs) or True))
2048
1736
2049
logger.debug("Starting main loop")
1737
logger.debug(u"Starting main loop")
2050
1738
main_loop.run()
2051
except AvahiError as error:
2052
logger.critical("AvahiError: %s", error)
1739
except AvahiError, error:
1740
logger.critical(u"AvahiError: %s", error)
2053
1741
cleanup()
2054
1742
sys.exit(1)
2055
1743
except KeyboardInterrupt:
2056
1744
if debug:
2057
print("", file=sys.stderr)
2058
logger.debug("Server received KeyboardInterrupt")
2059
logger.debug("Server exiting")
1745
print >> sys.stderr
1746
logger.debug(u"Server received KeyboardInterrupt")
1747
logger.debug(u"Server exiting")
2060
1748
# Must run before the D-Bus bus name gets deregistered
2061
1749
cleanup()
2062
1750
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0