From 28e62d07870e54431a1e2f31b444c51d5eaa20a2 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Feb 04 2021 08:22:16 +0000
Subject: Authenticate to Koji using activate_session


Fixes: #4
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>

---

diff --git a/src/utils.py b/src/utils.py
index abd7101..427df32 100644
--- a/src/utils.py
+++ b/src/utils.py
@@ -304,23 +304,14 @@ def koji_connect(koji_config, authenticate, proxyuser=None):
     # NSS_NoDB_Init() during its initialization, which breaks our attempts to
     # initialize nss with our certificate database.
     import koji
+    import koji_cli.lib
 
     opts = {}
     opts['krb_rdns'] = koji_config.get('krb_rdns', 'no').lower() in ('yes',
                                                                      'true')
 
     session = koji.ClientSession(koji_config['server'], opts=opts)
-    if authenticate:
-        if koji_config['authtype'] == 'ssl':
-            session.ssl_login(koji_config['cert'], None,
-                              koji_config.get('serverca'), proxyuser=proxyuser)
-        elif koji_config['authtype'] == 'kerberos':
-            kwargs = {}
-            for opt in ('principal', 'keytab', 'ccache'):
-                if opt in koji_config:
-                    kwargs[opt] = koji_config[opt]
-
-            session.krb_login(proxyuser=proxyuser, **kwargs)
+    koji_cli.lib.activate_session(session, koji_config)
     try:
         version = session.getAPIVersion()
     except xmlrpc_client.ProtocolError: