import ceph 16.2.6

[ceph.git] / ceph / src / pybind / mgr / dashboard / services / access_control.py

diff --git a/ceph/src/pybind/mgr/dashboard/services/access_control.py b/ceph/src/pybind/mgr/dashboard/services/access_control.py
index 175e3bebfa70a7ac7a60ee05c8cfb2d28a9cb628..27d849cc4456739a0668533f20d216c67c3a14a0 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/services/access_control.py
+++ b/ceph/src/pybind/mgr/dashboard/services/access_control.py
@@ -25,6 +25,7 @@ from ..security import Permission, Scope
 from ..settings import Settings
 
 logger = logging.getLogger('access_control')
+DEFAULT_FILE_DESC = 'password/secret'
 
 
 # password hashing algorithm
@@ -575,7 +576,7 @@ def load_access_control_db():
 # CLI dashboard access control scope commands
 
 @CLIWriteCommand('dashboard set-login-credentials')
-@CLICheckNonemptyFileInput
+@CLICheckNonemptyFileInput(desc=DEFAULT_FILE_DESC)
 def set_login_credentials_cmd(_, username: str, inbuf: str):
     '''
     Set the login credentials. Password read from -i <file>
@@ -714,7 +715,7 @@ def ac_user_show_cmd(_, username: Optional[str] = None):
 
 
 @CLIWriteCommand('dashboard ac-user-create')
-@CLICheckNonemptyFileInput
+@CLICheckNonemptyFileInput(desc=DEFAULT_FILE_DESC)
 def ac_user_create_cmd(_, username: str, inbuf: str,
                        rolename: Optional[str] = None,
                        name: Optional[str] = None,
@@ -868,7 +869,7 @@ def ac_user_del_roles_cmd(_, username: str, roles: Sequence[str]):
 
 
 @CLIWriteCommand('dashboard ac-user-set-password')
-@CLICheckNonemptyFileInput
+@CLICheckNonemptyFileInput(desc=DEFAULT_FILE_DESC)
 def ac_user_set_password(_, username: str, inbuf: str,
                          force_password: bool = False):
     '''
@@ -890,7 +891,7 @@ def ac_user_set_password(_, username: str, inbuf: str,
 
 
 @CLIWriteCommand('dashboard ac-user-set-password-hash')
-@CLICheckNonemptyFileInput
+@CLICheckNonemptyFileInput(desc=DEFAULT_FILE_DESC)
 def ac_user_set_password_hash(_, username: str, inbuf: str):
     '''
     Set user password bcrypt hash from -i <file>