From 9df7f1b6741aa1ad08232f31e140d614da869e07 Mon Sep 17 00:00:00 2001
From: Ondrej Nosek <onosek@redhat.com>
Date: Tue, 19 May 2020 00:10:01 +0200
Subject: [PATCH 1/2] Switch from krb_login to gssapi_login

Replaces deprecated method krb_login.

JIRA: RHELCMP-567
Resolves: rhbz#1830430
Fixes: #498

Signed-off-by: Ondrej Nosek <onosek@redhat.com>
---
 pyrpkg/__init__.py     |  4 +---
 tests/test_commands.py | 16 ++++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py
index 7da3de7..5d5d55d 100644
--- a/pyrpkg/__init__.py
+++ b/pyrpkg/__init__.py
@@ -301,7 +301,6 @@ class Commands(object):
             'topurl': 'http://localhost/kojiroot',
             'use_fast_upload': None,
             'weburl': 'http://localhost/koji',
-            'krb_rdns': None,
             }
 
         # Process the configs in order, global, user, then any option passed
@@ -323,7 +322,6 @@ class Commands(object):
             'offline_retry_interval': config.getint,
             'retry_interval': config.getint,
             'timeout': config.getint,
-            'krb_rdns': config.getboolean,
             }
 
         if config.has_section(build_client_name):
@@ -376,7 +374,7 @@ class Commands(object):
 
             if self._load_krb_user():
                 try:
-                    session.krb_login(proxyuser=self.runas)
+                    session.gssapi_login(proxyuser=self.runas)
                 except Exception as e:
                     self.log.error('Kerberos authentication fails: %s', e)
             else:
diff --git a/tests/test_commands.py b/tests/test_commands.py
index 40e64ce..d07508c 100644
--- a/tests/test_commands.py
+++ b/tests/test_commands.py
@@ -672,33 +672,33 @@ class TestLoginKojiSession(CommandTestCase):
         self.session.login.assert_called_once()
 
     @patch('pyrpkg.Commands._load_krb_user', return_value=False)
-    def test_krb_login_fails_if_no_valid_credential(self, _load_krb_user):
+    def test_gssapi_login_fails_if_no_valid_credential(self, _load_krb_user):
         self.koji_config['authtype'] = 'kerberos'
         self.cmd.realms = ['FEDORAPROJECT.ORG']
 
         self.cmd.login_koji_session(self.koji_config, self.session)
 
-        self.session.krb_login.assert_not_called()
+        self.session.gssapi_login.assert_not_called()
         self.assertEqual(2, self.cmd.log.warning.call_count)
 
     @patch('pyrpkg.Commands._load_krb_user', return_value=True)
-    def test_krb_login_fails(self, _load_krb_user):
+    def test_gssapi_login_fails(self, _load_krb_user):
         self.koji_config['authtype'] = 'kerberos'
-        # Simulate ClientSession.krb_login fails and error is raised.
-        self.session.krb_login.side_effect = Exception
+        # Simulate ClientSession.gssapi_login fails and error is raised.
+        self.session.gssapi_login.side_effect = Exception
 
         self.cmd.login_koji_session(self.koji_config, self.session)
 
-        self.session.krb_login.assert_called_once_with(proxyuser=None)
+        self.session.gssapi_login.assert_called_once_with(proxyuser=None)
         self.cmd.log.error.assert_called_once()
 
     @patch('pyrpkg.Commands._load_krb_user', return_value=True)
-    def test_successful_krb_login(self, _load_krb_user):
+    def test_successful_gssapi_login(self, _load_krb_user):
         self.koji_config['authtype'] = 'kerberos'
 
         self.cmd.login_koji_session(self.koji_config, self.session)
 
-        self.session.krb_login.assert_called_once_with(proxyuser=None)
+        self.session.gssapi_login.assert_called_once_with(proxyuser=None)
 
 
 class TestConstructBuildURL(CommandTestCase):
-- 
2.21.3