IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

rpc: allow overriding NSS DB directory in API config

Browse Source 
Add new `nss_dir` API config option to allow rpcclient to use a non-default
NSS DB for the connection.

https://fedorahosted.org/freeipa/ticket/4739

Reviewed-By: David Kupka <dkupka@redhat.com>
This commit is contained in:
Jan Cholasta 2016-05-25 12:24:12 +02:00
parent 43dc424041
commit e056b8dea2
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipalib/constants.py
View File

@ -129,6 +129,8 @@ DEFAULT_CONFIG = (
('rpc_protocol', 'jsonrpc'), ('rpc_protocol', 'jsonrpc'),
('nss_dir', paths.IPA_NSSDB_DIR),
# Define an inclusive range of SSL/TLS version support # Define an inclusive range of SSL/TLS version support
('tls_version_min', 'tls1.0'), ('tls_version_min', 'tls1.0'),
('tls_version_max', 'tls1.2'), ('tls_version_max', 'tls1.2'),

9
ipalib/rpc.py
View File

@ -57,7 +57,6 @@ from ipalib.request import context, Connection
from ipapython.ipa_log_manager import root_logger from ipapython.ipa_log_manager import root_logger
from ipapython import ipautil from ipapython import ipautil
from ipapython import kernel_keyring from ipapython import kernel_keyring
from ipaplatform.paths import paths
from ipapython.cookie import Cookie from ipapython.cookie import Cookie
from ipapython.dnsutil import DNSName from ipapython.dnsutil import DNSName
from ipalib.text import _ from ipalib.text import _
@ -489,7 +488,7 @@ class SSLTransport(LanguageAwareTransport):
if self._connection and host == self._connection[0]: if self._connection and host == self._connection[0]:
return self._connection[1] return self._connection[1]
dbdir = getattr(context, 'nss_dir', paths.IPA_NSSDB_DIR) dbdir = context.nss_dir
connection_dbdir = self.get_connection_dbdir() connection_dbdir = self.get_connection_dbdir()
if connection_dbdir: if connection_dbdir:
@ -869,6 +868,8 @@ class RPCClient(Connectible):
fallback = self.api.env.fallback fallback = self.api.env.fallback
if delegate is None: if delegate is None:
delegate = self.api.env.delegate delegate = self.api.env.delegate
if nss_dir is None:
nss_dir = self.api.env.nss_dir
try: try:
rpc_uri = self.env[self.env_rpc_uri_key] rpc_uri = self.env[self.env_rpc_uri_key]
principal = get_principal() principal = get_principal()
@ -880,9 +881,7 @@ class RPCClient(Connectible):
except (errors.CCacheError, ValueError): except (errors.CCacheError, ValueError):
# No session key, do full Kerberos auth # No session key, do full Kerberos auth
pass pass
# This might be dangerous. Use at your own risk! context.nss_dir = nss_dir
if nss_dir:
context.nss_dir = nss_dir
urls = self.get_url_list(rpc_uri) urls = self.get_url_list(rpc_uri)
serverproxy = None serverproxy = None
for url in urls: for url in urls: