From 21c8c0f68125a2ef5385fd99efc0150e29b1c704 Mon Sep 17 00:00:00 2001 From: Jana Cupova Date: Nov 24 2022 12:59:17 +0000 Subject: Remove krbLogin API Fixes: https://pagure.io/koji/issue/3593 --- diff --git a/hub/kojixmlrpc.py b/hub/kojixmlrpc.py index d98d85c..2d802ff 100644 --- a/hub/kojixmlrpc.py +++ b/hub/kojixmlrpc.py @@ -301,12 +301,12 @@ class ModXMLRPCRequestHandler(object): context.session.validate() except koji.AuthLockError: # might be ok, depending on method - if context.method not in ('exclusiveSession', 'login', 'krbLogin', 'logout'): + if context.method not in ('exclusiveSession', 'login', 'logout'): raise def enforce_lockout(self): if context.opts.get('LockOut') and \ - context.method not in ('login', 'krbLogin', 'sslLogin', 'logout') and \ + context.method not in ('login', 'sslLogin', 'logout') and \ not context.session.hasPerm('admin'): raise koji.ServerOffline("Server disabled for maintenance") @@ -858,7 +858,6 @@ def get_registry(opts, plugins): registry.register_instance(functions) registry.register_module(hostFunctions, "host") registry.register_function(koji.auth.login) - registry.register_function(koji.auth.krbLogin) registry.register_function(koji.auth.sslLogin) registry.register_function(koji.auth.logout) registry.register_function(koji.auth.subsession) diff --git a/koji/__init__.py b/koji/__init__.py index a479300..e1422d9 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -2491,11 +2491,6 @@ class ClientSession(object): sinfo = self.callMethod('subsession') return type(self)(self.baseurl, self.opts, sinfo) - def krb_login(self, principal=None, keytab=None, ccache=None, proxyuser=None, ctx=None): - util.deprecated("krb_login is deprecated, use gssapi_login instead") - return self.gssapi_login(principal=principal, keytab=keytab, - ccache=ccache, proxyuser=proxyuser) - def gssapi_login(self, principal=None, keytab=None, ccache=None, proxyuser=None, proxyauthtype=None): if not reqgssapi: diff --git a/koji/auth.py b/koji/auth.py index 77c3211..ddc84de 100644 --- a/koji/auth.py +++ b/koji/auth.py @@ -763,10 +763,6 @@ def login(*args, **opts): return context.session.login(*args, **opts) -def krbLogin(*args, **opts): - return context.session.krbLogin(*args, **opts) - - def sslLogin(*args, **opts): """Login via SSL certificate