From: Nizamudeen A Date: Tue, 8 Dec 2020 10:22:46 +0000 (+0530) Subject: mgr/dashboard: Updating the inbuilt ssl providers error X-Git-Tag: v15.2.9~105^2~1 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4875786b4d4e55916f70a2469650e1bc9ba6cdb7;p=ceph.git mgr/dashboard: Updating the inbuilt ssl providers error Fixes: https://tracker.ceph.com/issues/48490 Signed-off-by: Nizamudeen A (cherry picked from commit 0c890ea5e8589970c68c8c9ed94e8ac5a6da88ad) --- diff --git a/src/pybind/mgr/dashboard/cherrypy_backports.py b/src/pybind/mgr/dashboard/cherrypy_backports.py index d11b541fab1a1..51a5c721fd53a 100644 --- a/src/pybind/mgr/dashboard/cherrypy_backports.py +++ b/src/pybind/mgr/dashboard/cherrypy_backports.py @@ -95,11 +95,16 @@ def accept_exceptions_from_builtin_ssl(v): # Check if it's one of the known errors # Errors that are caught by PyOpenSSL, but thrown by # built-in ssl - _block_errors = ('unknown protocol', 'unknown ca', - 'unknown_ca', 'inappropriate fallback', + _block_errors = ('unknown protocol', 'unknown ca', 'unknown_ca', + 'unknown error', + 'https proxy request', 'inappropriate fallback', 'wrong version number', 'no shared cipher', 'certificate unknown', - 'ccs received early') + 'ccs received early', + 'certificate verify failed', # client cert w/o trusted CA + 'version too low', # caused by SSL3 connections + 'unsupported protocol', # caused by TLS1 connections + ) for error_text in _block_errors: if error_text in e.args[1].lower(): # Accepted error, let's pass