Add test, fixes

Author: cstamas

src/main/java/org/codehaus/plexus/components/secdispatcher/internal/dispatchers/ForwardingDispatcher.java

@@ -13,22 +13,23 @@
 
 package org.codehaus.plexus.components.secdispatcher.internal.dispatchers;
 
-import org.codehaus.plexus.components.secdispatcher.Dispatcher;
-import org.codehaus.plexus.components.secdispatcher.DispatcherMeta;
-import org.codehaus.plexus.components.secdispatcher.MasterSource;
-import org.codehaus.plexus.components.secdispatcher.MasterSourceMeta;
-import org.codehaus.plexus.components.secdispatcher.SecDispatcher;
-import org.codehaus.plexus.components.secdispatcher.SecDispatcherException;
-
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.codehaus.plexus.components.secdispatcher.Dispatcher;
+import org.codehaus.plexus.components.secdispatcher.DispatcherMeta;
+import org.codehaus.plexus.components.secdispatcher.MasterSource;
+import org.codehaus.plexus.components.secdispatcher.MasterSourceMeta;
+import org.codehaus.plexus.components.secdispatcher.SecDispatcher;
+import org.codehaus.plexus.components.secdispatcher.SecDispatcherException;
+
 /**
  * This dispatcher forwards requests fully to defined sources.
  */
@@ -58,29 +59,26 @@ public String displayName() {
 
     @Override
     public Collection<Field> fields() {
-        return List.of(
-                Field.builder(CONF_SOURCE)
-                        .optional(false)
-                        .description("Source of the password")
-                        .options(sources.entrySet().stream()
-                                .map(e -> {
-                                    MasterSource ms = e.getValue();
-                                    if (ms instanceof MasterSourceMeta m) {
-                                        Field.Builder b =
-                                                Field.builder(e.getKey()).description(m.description());
-                                        if (m.configTemplate().isPresent()) {
-                                            b.defaultValue(m.configTemplate().get());
-                                        }
-                                        return b.build();
-                                    } else {
-                                        return Field.builder(e.getKey())
-                                                .description(e.getKey()
-                                                        + "(Field not described, needs manual configuration)")
-                                                .build();
-                                    }
-                                })
-                                .toList())
-                        .build());
+        return List.of(Field.builder(CONF_SOURCE)
+                .optional(false)
+                .description("Source of the password")
+                .options(sources.entrySet().stream()
+                        .map(e -> {
+                            MasterSource ms = e.getValue();
+                            if (ms instanceof MasterSourceMeta m) {
+                                Field.Builder b = Field.builder(e.getKey()).description(m.description());
+                                if (m.configTemplate().isPresent()) {
+                                    b.defaultValue(m.configTemplate().get());
+                                }
+                                return b.build();
+                            } else {
+                                return Field.builder(e.getKey())
+                                        .description(e.getKey() + "(Field not described, needs manual configuration)")
+                                        .build();
+                            }
+                        })
+                        .toList())
+                .build());
     }
 
     @Override

src/test/java/org/codehaus/plexus/components/secdispatcher/internal/DefaultSecDispatcherTest.java

@@ -22,6 +22,7 @@
 
 import org.codehaus.plexus.components.secdispatcher.SecDispatcher;
 import org.codehaus.plexus.components.secdispatcher.internal.cipher.AESGCMNoPadding;
+import org.codehaus.plexus.components.secdispatcher.internal.dispatchers.ForwardingDispatcher;
 import org.codehaus.plexus.components.secdispatcher.internal.dispatchers.LegacyDispatcher;
 import org.codehaus.plexus.components.secdispatcher.internal.dispatchers.MasterDispatcher;
 import org.codehaus.plexus.components.secdispatcher.internal.sources.EnvMasterSource;
@@ -80,6 +81,18 @@ void masterWithSystemPropertyRoundTrip() throws Exception {
         roundtrip();
     }
 
+    @Test
+    void forwardingWithEnvDecrypt() throws Exception {
+        saveSec("forwarding", Map.of("source", "env"));
+        decryptForwarding("{[name=forwarding,version=something]env:MASTER_PASSWORD}", "masterPw");
+    }
+
+    @Test
+    void forwardingWithSystemPropertyDecrypt() throws Exception {
+        saveSec("forwarding", Map.of("source", "system-property"));
+        decryptForwarding("{[name=forwarding,version=something]system-property:masterPassword}", "masterPw");
+    }
+
     @Test
     void validate() throws Exception {
         saveSec("master", Map.of("source", "system-property:masterPassword", "cipher", AESGCMNoPadding.CIPHER_ALG));
@@ -157,7 +170,7 @@ void detection() {
     protected void roundtrip() throws Exception {
         DefaultSecDispatcher sd = construct();
 
-        assertEquals(2, sd.availableDispatchers().size());
+        assertEquals(3, sd.availableDispatchers().size());
         String encrypted = sd.encrypt("supersecret", Map.of(SecDispatcher.DISPATCHER_NAME_ATTR, "master", "a", "b"));
         // example:
         // {[name=master,cipher=AES/GCM/NoPadding,a=b]vvq66pZ7rkvzSPStGTI9q4QDnsmuDwo+LtjraRel2b0XpcGJFdXcYAHAS75HUA6GLpcVtEkmyQ==}
@@ -170,6 +183,14 @@ protected void roundtrip() throws Exception {
         assertEquals("supersecret", pass);
     }
 
+    protected void decryptForwarding(String encrypted, String decrypted) throws Exception {
+        DefaultSecDispatcher sd = construct();
+
+        assertEquals(3, sd.availableDispatchers().size());
+        String pass = sd.decrypt(encrypted);
+        assertEquals(decrypted, pass);
+    }
+
     protected DefaultSecDispatcher construct() {
         return new DefaultSecDispatcher(
                 Map.of(
@@ -184,7 +205,15 @@ protected DefaultSecDispatcher construct() {
                                         GpgAgentMasterSource.NAME,
                                         new GpgAgentMasterSource())),
                         "legacy",
-                        new LegacyDispatcher()),
+                        new LegacyDispatcher(),
+                        "forwarding",
+                        new ForwardingDispatcher(Map.of(
+                                EnvMasterSource.NAME,
+                                new EnvMasterSource(),
+                                SystemPropertyMasterSource.NAME,
+                                new SystemPropertyMasterSource(),
+                                GpgAgentMasterSource.NAME,
+                                new GpgAgentMasterSource()))),
                 CONFIG_PATH);
     }