]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: Updating the inbuilt ssl providers error
authorNizamudeen A <nia@redhat.com>
Tue, 8 Dec 2020 10:22:46 +0000 (15:52 +0530)
committerNizamudeen A <nia@redhat.com>
Wed, 9 Dec 2020 17:00:14 +0000 (22:30 +0530)
Fixes: https://tracker.ceph.com/issues/48490
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 0c890ea5e8589970c68c8c9ed94e8ac5a6da88ad)

src/pybind/mgr/dashboard/cherrypy_backports.py

index d11b541fab1a178c7b6b3bb0479795e31436e1b1..51a5c721fd53abc9ad694a2f5787b000980c7d90 100644 (file)
@@ -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