#3599 Remove krbLogin API
Merged a year ago by tkopecek. Opened a year ago by jcupova.
jcupova/koji issue-3593  into  master

Remove krbLogin API
Jana Cupova • a year ago  
file modified
+2 -3
@@ -301,12 +301,12 @@ 

                  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 @@ 

      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)

file modified
-5
@@ -2491,11 +2491,6 @@ 

          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:

file modified
-4
@@ -763,10 +763,6 @@ 

      return context.session.login(*args, **opts)

  

  

- def krbLogin(*args, **opts):

-     return context.session.krbLogin(*args, **opts)

- 

- 

  def sslLogin(*args, **opts):

      """Login via SSL certificate

  

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready

a year ago

remove it also from koji/__init__.py

rebased onto 21c8c0f

a year ago

Please check git grep krbLogin - it's in more places.

I see only:

> git grep krbLogin
koji.spec:- PR#408 Support proxyuser=username in krbLogin

And I guess that we don't want to drop anything from changelog. Nothing else found there.

Whoops, my bad. You're correct.

Metadata Update from @relias-redhat:
- Pull-request tagged with: testing-done

a year ago

Commit eff32f4 fixes this pull-request

Pull-Request has been merged by tkopecek

a year ago