#2048 use only gssapi_login in CLI
Merged 4 years ago by tkopecek. Opened 4 years ago by tkopecek.
tkopecek/koji issue1906a  into  master

file modified
+3 -8
@@ -575,17 +575,12 @@ 

      elif options.authtype == "kerberos" or has_krb_creds() and options.authtype is None:

          try:

              if getattr(options, 'keytab', None) and getattr(options, 'principal', None):

-                 session.krb_login(principal=options.principal, keytab=options.keytab,

-                                   proxyuser=runas)

+                 session.gssapi_login(principal=options.principal, keytab=options.keytab,

+                                      proxyuser=runas)

              else:

-                 session.krb_login(proxyuser=runas)

+                 session.gssapi_login(proxyuser=runas)

          except socket.error as e:

              warn(_("Could not connect to Kerberos authentication service: %s") % e.args[1])

-         except Exception as e:

-             if krbV is not None and isinstance(e, krbV.Krb5Error):

-                 error(_("Kerberos authentication failed: %s (%s)") % (e.args[1], e.args[0]))

-             else:

-                 raise

      if not noauth and not session.logged_in:

          error(_("Unable to log in, no authentication methods available"))

      ensure_connection(session)

@@ -34,6 +34,7 @@ 

          session.login.assert_not_called()

          session.ssl_login.assert_not_called()

          session.krb_login.assert_not_called()

+         session.gssapi_login.assert_not_called()

  

      def test_activate_session_ssl(self):

          session = mock.MagicMock()
@@ -48,6 +49,7 @@ 

                      proxyuser=None)

          session.login.assert_not_called()

          session.krb_login.assert_not_called()

+         session.gssapi_login.assert_not_called()

  

      def test_activate_session_ssl_implicit(self):

          session = mock.MagicMock()
@@ -63,6 +65,7 @@ 

                      proxyuser=None)

          session.login.assert_not_called()

          session.krb_login.assert_not_called()

+         session.gssapi_login.assert_not_called()

  

      def test_activate_session_pw(self):

          session = mock.MagicMock()
@@ -72,6 +75,7 @@ 

          session.login.assert_called_once_with()

          session.ssl_login.assert_not_called()

          session.krb_login.assert_not_called()

+         session.gssapi_login.assert_not_called()

  

      def test_activate_session_pw_implicit(self):

          session = mock.MagicMock()
@@ -82,6 +86,7 @@ 

          session.login.assert_called_once_with()

          session.ssl_login.assert_not_called()

          session.krb_login.assert_not_called()

+         session.gssapi_login.assert_not_called()

  

      def test_activate_session_krb(self):

          session = mock.MagicMock()
@@ -91,7 +96,8 @@ 

          activate_session(session, options)

          session.login.assert_not_called()

          session.ssl_login.assert_not_called()

-         session.krb_login.assert_called_once_with(proxyuser=None)

+         session.krb_login.assert_not_called()

+         session.gssapi_login.assert_called_once_with(proxyuser=None)

  

      def test_activate_session_krb_implicit(self):

          session = mock.MagicMock()
@@ -102,7 +108,8 @@ 

          activate_session(session, options)

          session.login.assert_not_called()

          session.ssl_login.assert_not_called()

-         session.krb_login.assert_called_once_with(proxyuser=None)

+         session.krb_login.assert_not_called()

+         session.gssapi_login.assert_called_once_with(proxyuser=None)

  

      def test_activate_session_krb_keytab(self):

          session = mock.MagicMock()
@@ -112,7 +119,8 @@ 

          activate_session(session, options)

          session.login.assert_not_called()

          session.ssl_login.assert_not_called()

-         session.krb_login.assert_called_once_with(principal='PRINCIPAL',

+         session.krb_login.assert_not_called()

+         session.gssapi_login.assert_called_once_with(principal='PRINCIPAL',

                      keytab='KEYTAB', proxyuser=None)

  

      def test_activate_session_no_method(self):
@@ -124,4 +132,5 @@ 

          session.login.assert_not_called()

          session.ssl_login.assert_not_called()

          session.krb_login.assert_not_called()

+         session.gssapi_login.assert_not_called()

          self.error.assert_called_once()

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

4 years ago

rebased onto 401327381368d7096c27c64faef57c26ae89cb34

4 years ago

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

4 years ago

pretty please pagure-ci rebuild

4 years ago

rebased onto a7dc98b

4 years ago

Commit 3bd42f1 fixes this pull-request

Pull-Request has been merged by tkopecek

4 years ago