From 8d3a7366374bd42dfb22bd8da87bb99370b42b59 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Dec 08 2016 23:37:02 +0000 Subject: [PATCH 1/2] allow setting no_ssl_verify in client config --- diff --git a/koji/__init__.py b/koji/__init__.py index 3407f74..f308f13 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -1587,6 +1587,7 @@ def read_config(profile_name, user_config=None): 'cert': None, 'ca': '', # FIXME: remove in next major release 'serverca': None, + 'no_ssl_verify': False, 'authtype': None } From a12f26b07df75d10f2c463b5cefbd05a5a438f53 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Dec 08 2016 23:37:02 +0000 Subject: [PATCH 2/2] add another pattern to is_requests_cert_error() --- diff --git a/koji/__init__.py b/koji/__init__.py index f308f13..144c2c5 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -1852,8 +1852,10 @@ def is_requests_cert_error(e): # Using str(e) is slightly ugly, but the error stacks in python-requests # are way more ugly. - if ('certificate revoked' in str(e) or - 'certificate expired' in str(e)): + errstr = str(e) + if ('certificate revoked' in errstr or + 'certificate expired' in errstr or + 'certificate verify failed' in errstr): return True return False