From: Ernesto Puerta <epuertat@redhat.com>
Date: Wed, 29 Jun 2022 18:09:21 +0000 (+0200)
Subject: mgr/dashboard: don't log tracebacks on 404s
X-Git-Tag: v16.2.11~426^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F47093%2Fhead;p=ceph.git

mgr/dashboard: don't log tracebacks on 404s

Currently we're logging tracebacks on expected request errors as 404,
401, etc. This may cause confusion to users, which might think that
something really wrong was happening there.

This should be extended to many DashboardExceptions that simply return
expected HTTP error codes (403, 415, 3xx, etc).

Fixes: https://tracker.ceph.com/issues/55720
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
(cherry picked from commit 3928fe91a4b8c313a52e38cab9ba31e54ff1ae51)
---

diff --git a/src/pybind/mgr/dashboard/services/exception.py b/src/pybind/mgr/dashboard/services/exception.py
index c280e17d4371..2ac53c94a86a 100644
--- a/src/pybind/mgr/dashboard/services/exception.py
+++ b/src/pybind/mgr/dashboard/services/exception.py
@@ -45,15 +45,14 @@ def dashboard_exception_handler(handler, *args, **kwargs):
     try:
         with handle_rados_error(component=None):  # make the None controller the fallback.
             return handler(*args, **kwargs)
-    # Don't catch cherrypy.* Exceptions.
+    # pylint: disable=try-except-raise
+    except (cherrypy.HTTPRedirect, cherrypy.NotFound, cherrypy.HTTPError):
+        raise
     except (ViewCacheNoDataException, DashboardException) as error:
         logger.exception('Dashboard Exception')
         cherrypy.response.headers['Content-Type'] = 'application/json'
         cherrypy.response.status = getattr(error, 'status', 400)
         return json.dumps(serialize_dashboard_exception(error)).encode('utf-8')
-    except cherrypy.HTTPRedirect:
-        # No internal errors
-        raise
     except Exception as error:
         logger.exception('Internal Server Error')
         raise error