Trim master password when someone uses strange XML formatting (#82)

Fixes #80
codehaus-plexus · Dec 9, 2024 · c8a1b02 · c8a1b02
1 parent 8c04321
commit c8a1b02
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...a/org/codehaus/plexus/components/secdispatcher/internal/dispatchers/LegacyDispatcher.java b/...a/org/codehaus/plexus/components/secdispatcher/internal/dispatchers/LegacyDispatcher.java
@@ -152,9 +152,13 @@ private String getMasterMasterPasswordFromSettingsSecurityXml() {
         }
         if (Files.exists(xml)) {
             try (InputStream is = Files.newInputStream(xml)) {
-                return (String) XPathFactory.newInstance()
+                String result = (String) XPathFactory.newInstance()
                         .newXPath()
                         .evaluate("//master", new InputSource(is), XPathConstants.STRING);
+                if (result != null) {
+                    result = result.trim();
+                }
+                return result;
             } catch (Exception e) {
                 // just ignore whatever it is
             }

diff --git a/src/test/legacy/legacy-settings-security-2.xml b/src/test/legacy/legacy-settings-security-2.xml
@@ -1,4 +1,6 @@
 <settingsSecurity>
     <relocation>to the moon</relocation>
-    <master>{KDvsYOFLlXgH4LU8tvpzAGg5otiosZXvfdQq0yO86LU=}</master>
+    <master>
+        {KDvsYOFLlXgH4LU8tvpzAGg5otiosZXvfdQq0yO86LU=}
+    </master>
 </settingsSecurity>