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