Skip to content

Trim master password when someone uses strange XML formatting #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 9, 2024
Merged

Trim master password when someone uses strange XML formatting #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...a/org/codehaus/plexus/components/secdispatcher/internal/dispatchers/LegacyDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
4 changes: 3 additions & 1 deletion src/test/legacy/legacy-settings-security-2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<settingsSecurity>
<relocation>to the moon</relocation>
<master>{KDvsYOFLlXgH4LU8tvpzAGg5otiosZXvfdQq0yO86LU=}</master>
<master>
{KDvsYOFLlXgH4LU8tvpzAGg5otiosZXvfdQq0yO86LU=}
</master>
</settingsSecurity>
Loading