Merge pull request #67 from NethServer/passwordQuoted

Remove bash expansion of the bind password NethServer/dev#6992
NethServer · Aug 6, 2024 · bb0033b · bb0033b
2 parents 657c91d + 6ef90d8
commit bb0033b
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/imageroot/actions/configure-module/20config b/imageroot/actions/configure-module/20config
@@ -16,7 +16,14 @@ def domain_setup(mail_domain, user_domain):
     user_domain_uri = "ldapneth://accountprovider" + ":" + user_domain["port"]
     user_domain_admin = user_domain["bind_dn"]
 
-    user_domain_password = subprocess.check_output(['podman', 'run', '--rm', os.environ["WEBTOP_WEBAPP_IMAGE"], 'bash', '-c', "echo -n " + user_domain["bind_password"] + " | java -classpath /usr/share/webtop/ WebtopPassEncode"], text=True).splitlines().pop()
+    user_domain_password = subprocess.check_output(
+        [
+            'podman', 'run', '--replace', '--name', 'webtop-pass-encode', '--rm', '-i', os.environ["WEBTOP_WEBAPP_IMAGE"],
+            "java", "-classpath", "/usr/share/webtop/", "WebtopPassEncode"
+        ],
+        input=user_domain["bind_password"],
+        text=True
+    ).strip()
 
     user_domain_parameters = {
             "loginDn": user_domain["base_dn"],