From efb88784fd21ee690c73c68e819d3bef42e56274 Mon Sep 17 00:00:00 2001 From: Tomas Kopecek Date: Mar 24 2021 16:19:12 +0000 Subject: PR#2749: web: optional KojiHubCA usage Merges #2749 https://pagure.io/koji/pull-request/2749 Fixes: #2742 https://pagure.io/koji/issue/2742 web looking for hub CA even without SSL auth --- diff --git a/www/kojiweb/index.py b/www/kojiweb/index.py index 75f6651..87570fc 100644 --- a/www/kojiweb/index.py +++ b/www/kojiweb/index.py @@ -200,12 +200,12 @@ def _assertLogin(environ): def _getServer(environ): - koji_opts = environ['koji.options'] - opts = { - 'serverca': koji_opts.get('KojiHubCA', '') - } + options = environ['koji.options'] + opts = {} + if os.path.exists(options['KojiHubCA']): + opts['serverca'] = options['KojiHubCA'] - session = koji.ClientSession(koji_opts['KojiHubURL'], opts=opts) + session = koji.ClientSession(options['KojiHubURL'], opts=opts) environ['koji.currentLogin'] = _getUserCookie(environ) if environ['koji.currentLogin']: