MB-53547 MB-53550 Merge branch 'cheshire-cat' into neo

* cheshire-cat:
  MB-53550 Fix 'master-password' command
  MB-53550 [BP] Don't leak cookie in master-password
  MB-53547 [BP] Pass password to erlang in env

Change-Id: I85283976f87d9dd7ee78819e72e251861a34a080

Author: jamesl33

cbmgr.py

@@ -1679,15 +1679,18 @@ def prompt_for_master_pwd(self, node, cookie, password, cb_cfg_path):
         if password == '':
             password = getpass.getpass("\nEnter master password:")
 
-        name = 'executioner@cb.local'
-        args = ['-pa', CB_NS_EBIN_PATH, CB_BABYSITTER_EBIN_PATH, '-noinput', '-name', name, '-proto_dist', 'cb',
-                '-eval', 'erlang:set_cookie(node(), list_to_atom(os:getenv("CB_COOKIE"))).', '-epmd_module', 'cb_epmd',
-                '-kernel'] + CB_INETRC_OPT + \
-            ['dist_config_file', f'"{dist_cfg_file}"', '-run', 'encryption_service',
-             'remote_set_password', node]
+        args = [
+            '-pa', CB_NS_EBIN_PATH, CB_BABYSITTER_EBIN_PATH,
+            '-noinput',
+            '-name', 'executioner@cb.local',
+            '-proto_dist', 'cb',
+            '-epmd_module', 'cb_epmd',
+            '-kernel', *CB_INETRC_OPT, 'dist_config_file', f'"{dist_cfg_file}"',
+            '-eval', 'erlang:set_cookie(node(), list_to_atom(os:getenv("CB_COOKIE"))).',
+            '-run', 'encryption_service', 'remote_set_password', node,
+        ]
 
         rc, out, err = self.run_process("erl", args, extra_env={'SETPASSWORD': password, 'CB_COOKIE': cookie})
-
         if rc == 0:
             print("SUCCESS: Password accepted. Node started booting.")
         elif rc == 101: