Remove DisableGSSAPIProxyDNFallback option on Hub

Fixes: https://pagure.io/koji/issue/3648
This commit is contained in:
Jana Cupova 2023-01-07 16:04:47 +01:00 committed by Tomas Kopecek
parent 6b3e8bf67e
commit 13ea7c1379
3 changed files with 0 additions and 16 deletions

View file

@ -369,14 +369,6 @@ class Session(object):
proxy_opt = 'ProxyDNs'
proxy_dns = [dn.strip() for dn in context.opts.get(proxy_opt, '').split(delimiter)]
# backwards compatible for GSSAPI.
# in old way, proxy user whitelist is ProxyDNs.
# TODO: this should be removed in future release
if authtype == koji.AUTHTYPES['GSSAPI'] and not context.opts.get(
'DisableGSSAPIProxyDNFallback', False):
proxy_dns += [dn.strip() for dn in
context.opts.get('ProxyDNs', '').split('|')]
if client_dn in proxy_dns:
# the user authorized to login other users
username = proxyuser

View file

@ -33,8 +33,6 @@ KojiDir = /mnt/koji
## Allowed Kerberos Realms separated by ','.
## Default value "*" indicates any Realm is allowed
# AllowedKrbRealms = *
## TODO: this option should be removed in future release
# DisableGSSAPIProxyDNFallback = False
## TODO: this option should be turned True in 1.34
# DisableURLSessions = False

View file

@ -445,8 +445,6 @@ def load_config(environ):
['ProxyPrincipals', 'string', ''],
['HostPrincipalFormat', 'string', None],
['AllowedKrbRealms', 'string', '*'],
# TODO: this option should be removed in future release
['DisableGSSAPIProxyDNFallback', 'boolean', False],
# TODO: this option should be turned True in 1.34
['DisableURLSessions', 'boolean', False],
@ -722,10 +720,6 @@ def server_setup(environ):
try:
setup_logging1()
opts = load_config(environ)
if opts['DisableGSSAPIProxyDNFallback']:
logger.warning(
'Hub option DisableGSSAPIProxyDNFallback is deprecated and '
'will be removed in 1.29')
setup_logging2(opts)
koji.util.setup_rlimits(opts)
plugins = load_plugins(opts)