particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modify activate_session to be easily used without CLI

Browse source 
Related: https://pagure.io/koji/issue/436
This commit is contained in:
Tomas Kopecek 2017-06-28 15:00:50 +02:00 • committed by Mike McLean
parent c9719ace3f
commit bc43f8bdfc
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cli/koji_cli/lib.py
View file

@ -540,21 +540,25 @@ def has_krb_creds():
def activate_session(session, options):
"""Test and login the session is applicable"""
if options.authtype == "noauth" or options.noauth:
if isinstance(options, dict):
options = optparse.Values(options)
noauth = options.authtype == "noauth" or getattr(options, 'noauth', False)
if noauth:
#skip authentication
pass
elif options.authtype == "ssl" or os.path.isfile(options.cert) and options.authtype is None:
# authenticate using SSL client cert
session.ssl_login(options.cert, None, options.serverca, proxyuser=options.runas)
elif options.authtype == "password" or options.user and options.authtype is None:
elif options.authtype == "password" or getattr(options, 'user', None) and options.authtype is None:
# authenticate using user/password
session.login()
elif options.authtype == "kerberos" or has_krb_creds() and options.authtype is None:
try:
runas = getattr(options, 'runas', None)
if options.keytab and options.principal:
session.krb_login(principal=options.principal, keytab=options.keytab, proxyuser=options.runas)
session.krb_login(principal=options.principal, keytab=options.keytab, proxyuser=runas)
else:
session.krb_login(proxyuser=options.runas)
session.krb_login(proxyuser=runas)
except socket.error as e:
warn(_("Could not connect to Kerberos authentication service: %s") % e.args[1])
except Exception as e:
@ -562,7 +566,7 @@ def activate_session(session, options):
error(_("Kerberos authentication failed: %s (%s)") % (e.args[1], e.args[0]))
else:
raise
if not options.noauth and options.authtype != "noauth" and not session.logged_in:
if not noauth and not session.logged_in:
error(_("Unable to log in, no authentication methods available"))
ensure_connection(session)
if options.debug: