Skip to content

Legacy passwords may have leading or trailing comment. #83

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 3 commits into from
Dec 9, 2024
Merged

Legacy passwords may have leading or trailing comment. #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
184af52
Legacy passwords may have leading or trailing comment.
cstamas Dec 9, 2024
d1facd6
Remux it
cstamas Dec 9, 2024
50cfd4c
Reshuffle more, i forgot
cstamas Dec 9, 2024
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
40 changes: 29 additions & 11 deletions ...main/java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,17 @@ public String encrypt(String str, Map<String, String> attr) throws SecDispatcher

@Override
public String decrypt(String str) throws SecDispatcherException, IOException {
if (!isAnyEncryptedString(str)) return str;
String bare = unDecorate(str);
Map<String, String> attr = requireNonNull(stripAttributes(bare));
String bare;
Map<String, String> attr;
if (isLegacyEncryptedString(str)) {
bare = unDecorateLegacy(str);
attr = new HashMap<>();
attr.put(DISPATCHER_NAME_ATTR, LegacyDispatcher.NAME);
} else if (isEncryptedString(str)) {
bare = unDecorate(str);
attr = requireNonNull(stripAttributes(bare));
} else {
return str;
}
String name = attr.get(DISPATCHER_NAME_ATTR);
Dispatcher dispatcher = dispatchers.get(name);
Expand Down Expand Up @@ -172,14 +178,20 @@ public boolean isEncryptedString(String str) {
*/
@Override
public boolean isLegacyEncryptedString(String str) {
boolean looksLike = str != null
&& !str.isBlank()
&& str.startsWith(SHIELD_BEGIN)
&& str.endsWith(SHIELD_END)
&& !unDecorate(str).contains(SHIELD_BEGIN)
&& !unDecorate(str).contains(SHIELD_END);
if (looksLike) {
return stripAttributes(unDecorate(str)).isEmpty();
if (str != null && str.contains(SHIELD_BEGIN)) {
str = str.substring(str.indexOf(SHIELD_BEGIN));
if (str.contains(SHIELD_END)) {
str = str.substring(0, str.indexOf(SHIELD_END) + 1);
String undecorated = unDecorate(str);
boolean looksLike = !str.isBlank()
&& str.startsWith(SHIELD_BEGIN)
&& str.endsWith(SHIELD_END)
&& !undecorated.contains(SHIELD_BEGIN)
&& !undecorated.contains(SHIELD_END);
if (looksLike) {
return stripAttributes(undecorated).isEmpty();
}
}
}
return false;
}
Expand Down Expand Up @@ -309,4 +321,10 @@ protected Map<String, String> stripAttributes(String str) {
protected String unDecorate(String str) {
return str.substring(SHIELD_BEGIN.length(), str.length() - SHIELD_END.length());
}

protected String unDecorateLegacy(String str) {
str = str.substring(str.indexOf(SHIELD_BEGIN));
str = str.substring(0, str.indexOf(SHIELD_END) + 1);
return unDecorate(str);
}
}
19 changes: 19 additions & 0 deletions .../java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,29 @@ void detection() {

assertFalse(secDispatcher.isEncryptedString("{foo}"));
assertTrue(secDispatcher.isLegacyEncryptedString("{foo}"));
assertFalse(secDispatcher.isEncryptedString("Oleg was here {foo}"));
assertTrue(secDispatcher.isLegacyEncryptedString("Oleg was here {foo}"));
assertTrue(secDispatcher.isLegacyEncryptedString("Oleg {foo} was here"));

assertFalse(secDispatcher.isEncryptedString("{12345678901234567890123456789012345678901234567890}"));
assertTrue(secDispatcher.isLegacyEncryptedString("{12345678901234567890123456789012345678901234567890}"));
assertFalse(
secDispatcher.isEncryptedString("Oleg was here {12345678901234567890123456789012345678901234567890}"));
assertTrue(secDispatcher.isLegacyEncryptedString(
"{12345678901234567890123456789012345678901234567890} Oleg was here"));
assertTrue(secDispatcher.isLegacyEncryptedString(
"Oleg {12345678901234567890123456789012345678901234567890} was here"));

// contains {} in the middle
assertFalse(secDispatcher.isEncryptedString("{KDvsYOFLlX{}gH4LU8tvpzAGg5otiosZXvfdQq0yO86LU=}"));
assertFalse(secDispatcher.isLegacyEncryptedString("{KDvsYOFLlX{}gH4LU8tvpzAGg5otiosZXvfdQq0yO86LU=}"));
assertFalse(secDispatcher.isLegacyEncryptedString(
"Oleg was here {KDvsYOFLlX{}gH4LU8tvpzAGg5otiosZXvfdQq0yO86LU=}"));

assertFalse(secDispatcher.isEncryptedString("{KDvsYOFLlXgH4LU8tvpzAGg5otiosZXvfdQq0yO86LU=}"));
assertTrue(secDispatcher.isLegacyEncryptedString("{KDvsYOFLlXgH4LU8tvpzAGg5otiosZXvfdQq0yO86LU=}"));
assertTrue(
secDispatcher.isLegacyEncryptedString("Oleg was here {KDvsYOFLlXgH4LU8tvpzAGg5otiosZXvfdQq0yO86LU=}"));

assertTrue(
secDispatcher.isEncryptedString(
Expand Down Expand Up @@ -192,5 +205,11 @@ void legacy(String xml) throws Exception {
SecDispatcher secDispatcher = construct();
String cleartext = secDispatcher.decrypt("{L6L/HbmrY+cH+sNkphnq3fguYepTpM04WlIXb8nB1pk=}");
assertEquals("password", cleartext);

cleartext = secDispatcher.decrypt("Oleg was here {L6L/HbmrY+cH+sNkphnq3fguYepTpM04WlIXb8nB1pk=}");
assertEquals("password", cleartext);

cleartext = secDispatcher.decrypt("Oleg {L6L/HbmrY+cH+sNkphnq3fguYepTpM04WlIXb8nB1pk=} was here");
assertEquals("password", cleartext);
}
}
Loading