mgr/dashboard: The /rgw/status endpoint does not check for running se…

…rvice Fixes: https://tracker.ceph.com/issues/48542 Signed-off-by: Volker Theile <[email protected]>
selroc · Dec 10, 2020 · 3cfe054 · 3cfe054
1 parent b32c6f1
commit 3cfe054
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/pybind/mgr/dashboard/controllers/rgw.py b/src/pybind/mgr/dashboard/controllers/rgw.py
@@ -49,6 +49,8 @@ class Rgw(BaseController):
     def status(self):
         status = {'available': False, 'message': None}
         try:
+            if not CephService.get_service_list('rgw'):
+                raise LookupError('No RGW service is running.')
             instance = RgwClient.admin_instance()
             # Check if the service is online.
             if not instance.is_service_online():  # pragma: no cover - no complexity there

diff --git a/src/pybind/mgr/dashboard/tests/test_rgw.py b/src/pybind/mgr/dashboard/tests/test_rgw.py
@@ -3,10 +3,24 @@
 except ImportError:
     import unittest.mock as mock
 
-from ..controllers.rgw import RgwUser
+from .. import mgr
+from ..controllers.rgw import Rgw, RgwUser
 from . import ControllerTestCase  # pylint: disable=no-name-in-module
 
 
+class RgwControllerTestCase(ControllerTestCase):
+    @classmethod
+    def setup_server(cls):
+        Rgw._cp_config['tools.authenticate.on'] = False  # pylint: disable=protected-access
+        cls.setup_controllers([Rgw], '/test')
+
+    def test_status_no_service(self):
+        mgr.list_servers.return_value = []
+        self._get('/test/api/rgw/status')
+        self.assertStatus(200)
+        self.assertJsonBody({'available': False, 'message': 'No RGW service is running.'})
+
+
 class RgwUserControllerTestCase(ControllerTestCase):
     @classmethod
     def setup_server(cls):