mgr/dashboard: Remove username, password fileds from -Cluster/Manager Modules/dashboard

Username, password fields are empty in Cluster/Manager Modules/dashboard.Since this functionality is when dashboard supported single user-password, now we need to remove these fields from here.

Fixes: https://tracker.ceph.com/issues/49645
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit d8fba40d982bb1ad824961aa210475bd7aa51524)

Conflicts:
	src/pybind/mgr/dashboard/services/access_control.py(no check_migrate_v0_to_current and check_migrate_v1_to_current methods in nautilus)
	src/pybind/mgr/dashboard/tests/test_access_control.py(no test_load_v2 method in nautilus, 'time' import no longer needed with new changes)

diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py
index 1a521d00b59dd21d875e65d46caf3b387225c740..fa4fe3cdc136190f4e2ab9cab26450a50d113ebf 100644 (file)
--- a/src/pybind/mgr/dashboard/module.py
+++ b/src/pybind/mgr/dashboard/module.py
@@ -263,9 +263,7 @@ class Module(MgrModule, CherryPyConfig):
         Option(name='server_port', type='int', default=8080),
         Option(name='ssl_server_port', type='int', default=8443),
         Option(name='jwt_token_ttl', type='int', default=28800),
-        Option(name='password', type='str', default=''),
         Option(name='url_prefix', type='str', default=''),
-        Option(name='username', type='str', default=''),
         Option(name='key_file', type='str', default=''),
         Option(name='crt_file', type='str', default=''),
         Option(name='ssl', type='bool', default=True),

diff --git a/src/pybind/mgr/dashboard/services/access_control.py b/src/pybind/mgr/dashboard/services/access_control.py
index 4a09991a9e67cba48c7f992d6efc1450d3b794a7..084b3643e187db88bbf543aa9cf45a4a89ab5115 100644 (file)
--- a/src/pybind/mgr/dashboard/services/access_control.py
+++ b/src/pybind/mgr/dashboard/services/access_control.py
@@ -334,24 +334,6 @@ class AccessControlDB(object):
             version = cls.VERSION
         return "{}{}".format(cls.ACDB_CONFIG_KEY, version)
 
-    def check_and_update_db(self):
-        logger.debug("AC: Checking for previews DB versions")
-        if self.VERSION == 1:  # current version
-            # check if there is username/password from previous version
-            username = mgr.get_module_option('username', None)
-            password = mgr.get_module_option('password', None)
-            if username and password:
-                logger.debug("AC: Found single user credentials: user=%s",
-                             username)
-                # found user credentials
-                user = self.create_user(username, "", None, None)
-                # password is already hashed, so setting manually
-                user.password = password
-                user.add_roles([ADMIN_ROLE])
-                self.save()
-        else:
-            raise NotImplementedError()
-
     @classmethod
     def load(cls):
         logger.info("AC: Loading user roles DB version=%s", cls.VERSION)
@@ -360,8 +342,6 @@ class AccessControlDB(object):
         if json_db is None:
             logger.debug("AC: No DB v%s found, creating new...", cls.VERSION)
             db = cls(cls.VERSION, {}, {})
-            # check if we can update from a previous version database
-            db.check_and_update_db()
             return db
 
         db = json.loads(json_db)

diff --git a/src/pybind/mgr/dashboard/tests/test_access_control.py b/src/pybind/mgr/dashboard/tests/test_access_control.py
index 1f0f804a5fea30e170c1966eb1307ffc10b278a1..c83629a51d71fd6d425fc9cb6284077ae18a3e1e 100644 (file)
--- a/src/pybind/mgr/dashboard/tests/test_access_control.py
+++ b/src/pybind/mgr/dashboard/tests/test_access_control.py
@@ -5,7 +5,6 @@ from __future__ import absolute_import
 import errno
 import json
 import tempfile
-import time
 import unittest
 
 from mgr_module import ERROR_MSG_EMPTY_INPUT_FILE
@@ -625,69 +624,3 @@ class AccessControlTest(unittest.TestCase, CLICommandTestMixin):
         })
         self.validate_persistent_user('admin', ['read-only'], pass_hash,
                                       'admin User', 'admin@user.com')
-
-    def test_load_v1(self):
-        self.CONFIG_KEY_DICT['accessdb_v1'] = '''
-            {{
-                "users": {{
-                    "admin": {{
-                        "username": "admin",
-                        "password":
-                "$2b$12$sd0Az7mm3FaJl8kN3b/xwOuztaN0sWUwC1SJqjM4wcDw/s5cmGbLK",
-                        "roles": ["block-manager", "test_role"],
-                        "name": "admin User",
-                        "email": "admin@user.com",
-                        "lastUpdate": {}
-                    }}
-                }},
-                "roles": {{
-                    "test_role": {{
-                        "name": "test_role",
-                        "description": "Test Role",
-                        "scopes_permissions": {{
-                            "{}": ["{}", "{}"],
-                            "{}": ["{}"]
-                        }}
-                    }}
-                }},
-                "version": 1
-            }}
-        '''.format(int(round(time.time())), Scope.ISCSI, Permission.READ,
-                   Permission.UPDATE, Scope.POOL, Permission.CREATE)
-
-        load_access_control_db()
-        role = self.exec_cmd('ac-role-show', rolename="test_role")
-        self.assertDictEqual(role, {
-            'name': 'test_role',
-            'description': "Test Role",
-            'scopes_permissions': {
-                Scope.ISCSI: [Permission.READ, Permission.UPDATE],
-                Scope.POOL: [Permission.CREATE]
-            }
-        })
-        user = self.exec_cmd('ac-user-show', username="admin")
-        self.assertDictEqual(user, {
-            'username': 'admin',
-            'lastUpdate': user['lastUpdate'],
-            'password':
-                "$2b$12$sd0Az7mm3FaJl8kN3b/xwOuztaN0sWUwC1SJqjM4wcDw/s5cmGbLK",
-            'name': 'admin User',
-            'email': 'admin@user.com',
-            'roles': ['block-manager', 'test_role']
-        })
-
-    def test_update_from_previous_version_v1(self):
-        self.CONFIG_KEY_DICT['username'] = 'admin'
-        self.CONFIG_KEY_DICT['password'] = \
-            '$2b$12$sd0Az7mm3FaJl8kN3b/xwOuztaN0sWUwC1SJqjM4wcDw/s5cmGbLK'
-        load_access_control_db()
-        user = self.exec_cmd('ac-user-show', username="admin")
-        self.assertDictEqual(user, {
-            'username': 'admin',
-            'lastUpdate': user['lastUpdate'],
-            'password':
-                "$2b$12$sd0Az7mm3FaJl8kN3b/xwOuztaN0sWUwC1SJqjM4wcDw/s5cmGbLK",
-            'name': None,
-            'email': None,
-            'roles': ['administrator']
-        })