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

client-install: Fix kinits with non-default Kerberos config file

Browse Source 
https://fedorahosted.org/freeipa/ticket/4808

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
This commit is contained in:
Jan Cholasta 2015-05-20 14:23:30 +00:00
parent 9d8ac395c0
commit 454e8691cf
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ipa-client/ipa-install/ipa-client-install
View File

@ -2441,7 +2441,8 @@ def install(options, env, fstore, statestore):
stdin = sys.stdin.readline() stdin = sys.stdin.readline()
try: try:
ipautil.kinit_password(principal, stdin, ccache_name) ipautil.kinit_password(principal, stdin, ccache_name,
config=krb_name)
except RuntimeError as e: except RuntimeError as e:
print_port_conf_info() print_port_conf_info()
root_logger.error("Kerberos authentication failed: %s" % e) root_logger.error("Kerberos authentication failed: %s" % e)
@ -2452,6 +2453,7 @@ def install(options, env, fstore, statestore):
try: try:
ipautil.kinit_keytab(host_principal, options.keytab, ipautil.kinit_keytab(host_principal, options.keytab,
ccache_name, ccache_name,
config=krb_name,
attempts=options.kinit_attempts) attempts=options.kinit_attempts)
except Krb5Error as e: except Krb5Error as e:
print_port_conf_info() print_port_conf_info()
@ -2530,6 +2532,7 @@ def install(options, env, fstore, statestore):
try: try:
ipautil.kinit_keytab(host_principal, paths.KRB5_KEYTAB, ipautil.kinit_keytab(host_principal, paths.KRB5_KEYTAB,
CCACHE_FILE, CCACHE_FILE,
config=krb_name,
attempts=options.kinit_attempts) attempts=options.kinit_attempts)
env['KRB5CCNAME'] = os.environ['KRB5CCNAME'] = CCACHE_FILE env['KRB5CCNAME'] = os.environ['KRB5CCNAME'] = CCACHE_FILE
except Krb5Error as e: except Krb5Error as e:

21
ipapython/ipautil.py
View File

@ -1186,7 +1186,7 @@ def wait_for_open_socket(socket_name, timeout=0):
raise e raise e
def kinit_keytab(principal, keytab, ccache_name, attempts=1): def kinit_keytab(principal, keytab, ccache_name, config=None, attempts=1):
""" """
Given a ccache_path, keytab file and a principal kinit as that user. Given a ccache_path, keytab file and a principal kinit as that user.
@ -1199,6 +1199,11 @@ def kinit_keytab(principal, keytab, ccache_name, attempts=1):
% (principal, keytab)) % (principal, keytab))
root_logger.debug("using ccache %s" % ccache_name) root_logger.debug("using ccache %s" % ccache_name)
for attempt in range(1, attempts + 1): for attempt in range(1, attempts + 1):
old_config = os.environ.get('KRB5_CONFIG')
if config is not None:
os.environ['KRB5_CONFIG'] = config
else:
os.environ.pop('KRB5_CONFIG', None)
try: try:
krbcontext = krbV.default_context() krbcontext = krbV.default_context()
ktab = krbV.Keytab(name=keytab, context=krbcontext) ktab = krbV.Keytab(name=keytab, context=krbcontext)
@ -1221,9 +1226,15 @@ def kinit_keytab(principal, keytab, ccache_name, attempts=1):
raise raise
root_logger.debug("Waiting 5 seconds before next retry") root_logger.debug("Waiting 5 seconds before next retry")
time.sleep(5) time.sleep(5)
finally:
if old_config is not None:
os.environ['KRB5_CONFIG'] = old_config
else:
os.environ.pop('KRB5_CONFIG', None)
def kinit_password(principal, password, ccache_name, armor_ccache_name=None): def kinit_password(principal, password, ccache_name, config=None,
armor_ccache_name=None):
""" """
perform interactive kinit as principal using password. If using FAST for perform interactive kinit as principal using password. If using FAST for
web-based authentication, use armor_ccache_path to specify http service web-based authentication, use armor_ccache_path to specify http service
@ -1236,9 +1247,13 @@ def kinit_password(principal, password, ccache_name, armor_ccache_name=None):
% armor_ccache_name) % armor_ccache_name)
args.extend(['-T', armor_ccache_name]) args.extend(['-T', armor_ccache_name])
env = {'LC_ALL': 'C'}
if config is not None:
env['KRB5_CONFIG'] = config
# this workaround enables us to capture stderr and put it # this workaround enables us to capture stderr and put it
# into the raised exception in case of unsuccessful authentication # into the raised exception in case of unsuccessful authentication
(stdout, stderr, retcode) = run(args, stdin=password, env={'LC_ALL': 'C'}, (stdout, stderr, retcode) = run(args, stdin=password, env=env,
raiseonerr=False) raiseonerr=False)
if retcode: if retcode:
raise RuntimeError(stderr) raise RuntimeError(stderr)