From 1e5b1140d5b360362f3bae339536353390813ead Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Mon, 14 Oct 2024 19:37:09 +0200 Subject: [PATCH 1/4] [maven-release-plugin] prepare for next development iteration --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index b6dd7e4..a042fb9 100644 --- a/pom.xml +++ b/pom.xml @@ -10,14 +10,14 @@ plexus-sec-dispatcher - 4.0.1 + 4.0.2-SNAPSHOT Plexus Security Dispatcher Component scm:git:git@github.com:codehaus-plexus/plexus-sec-dispatcher.git scm:git:git@github.com:codehaus-plexus/plexus-sec-dispatcher.git - plexus-sec-dispatcher-4.0.1 + HEAD https://github.com/codehaus-plexus/plexus-sec-dispatcher.git @@ -34,7 +34,7 @@ 17 - 2024-10-14T17:37:01Z + 2024-10-14T17:37:09Z 2.0.16 From 54f7dd79832963f3aca1f9c84b871f2788076310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Boutemy?= Date: Wed, 16 Oct 2024 08:21:27 +0200 Subject: [PATCH 2/4] add Reproducible Central badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b3644d6..1b1a42d 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ Plexus-Sec-Dispatcher ===================== [![Maven Central](https://img.shields.io/maven-central/v/org.codehaus.plexus/plexus-sec-dispatcher.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.codehaus.plexus/plexus-sec-dispatcher) +[![Reproducible Builds](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/jvm-repo-rebuild/reproducible-central/master/content/org/codehaus/plexus/plexus-sec-dispatcher/badge.json)](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/codehaus/plexus/plexus-sec-dispatcher/README.md) The current master is now at https://github.com/codehaus-plexus/plexus-sec-dispatcher From ab6022a206f60f2cddc42a4c663121602df55ce2 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 15 Nov 2024 13:38:13 +0100 Subject: [PATCH 3/4] Do handle legacy as well (#79) It detects it, but decrypt did not handle them --- .../internal/DefaultSecDispatcher.java | 2 +- .../internal/DefaultSecDispatcherTest.java | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcher.java b/src/main/java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcher.java index 8cf5668..b0b692b 100644 --- a/src/main/java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcher.java +++ b/src/main/java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcher.java @@ -133,7 +133,7 @@ public String encrypt(String str, Map attr) throws SecDispatcher @Override public String decrypt(String str) throws SecDispatcherException, IOException { - if (!isEncryptedString(str)) return str; + if (!isAnyEncryptedString(str)) return str; String bare = unDecorate(str); Map attr = requireNonNull(stripAttributes(bare)); if (isLegacyEncryptedString(str)) { diff --git a/src/test/java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcherTest.java b/src/test/java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcherTest.java index c520b4e..8e27148 100644 --- a/src/test/java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcherTest.java +++ b/src/test/java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcherTest.java @@ -32,6 +32,8 @@ import org.codehaus.plexus.components.secdispatcher.model.SettingsSecurity; import org.codehaus.plexus.components.secdispatcher.model.io.stax.SecurityConfigurationStaxWriter; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -172,4 +174,23 @@ protected DefaultSecDispatcher construct() { new LegacyDispatcher()), CONFIG_PATH); } + + /** + * Test values created with Maven 3.9.9. + *

+ * master password: "masterpassword" + * password: "password" + */ + @ParameterizedTest + @ValueSource( + strings = { + "src/test/legacy/legacy-settings-security-1.xml", + "src/test/legacy/legacy-settings-security-2.xml" + }) + void legacy(String xml) throws Exception { + System.setProperty("settings.security", xml); + SecDispatcher secDispatcher = construct(); + String cleartext = secDispatcher.decrypt("{L6L/HbmrY+cH+sNkphnq3fguYepTpM04WlIXb8nB1pk=}"); + assertEquals("password", cleartext); + } } From ac4f21e808a0a1e572302069f2b8a16d1a7bb693 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 15 Nov 2024 13:39:12 +0100 Subject: [PATCH 4/4] [maven-release-plugin] prepare release plexus-sec-dispatcher-4.0.2 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a042fb9..fc41514 100644 --- a/pom.xml +++ b/pom.xml @@ -10,14 +10,14 @@ plexus-sec-dispatcher - 4.0.2-SNAPSHOT + 4.0.2 Plexus Security Dispatcher Component scm:git:git@github.com:codehaus-plexus/plexus-sec-dispatcher.git scm:git:git@github.com:codehaus-plexus/plexus-sec-dispatcher.git - HEAD + plexus-sec-dispatcher-4.0.2 https://github.com/codehaus-plexus/plexus-sec-dispatcher.git @@ -34,7 +34,7 @@ 17 - 2024-10-14T17:37:09Z + 2024-11-15T12:39:07Z 2.0.16