Fixes

Author: cstamas

pom.xml

@@ -103,6 +103,15 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <environmentVariables>
+            <MASTER_PASSWORD>masterPw</MASTER_PASSWORD>
+          </environmentVariables>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>

src/main/java/org/codehaus/plexus/components/secdispatcher/internal/sources/EnvMasterPasswordSource.java

@@ -39,9 +39,9 @@ public String handle(URI uri) throws SecDispatcherException {
         if (!NAME.equals(uri.getScheme())) {
             return null;
         }
-        String value = System.getenv(uri.getSchemeSpecificPart());
+        String value = System.getenv(uri.getPath().substring(1));
         if (value == null) {
-            throw new SecDispatcherException("Environment variable '" + uri.getSchemeSpecificPart() + "' not found");
+            throw new SecDispatcherException("Environment variable '" + uri.getPath() + "' not found");
         }
         return value;
     }

src/main/java/org/codehaus/plexus/components/secdispatcher/internal/sources/SystemPropertyMasterPasswordSource.java

@@ -39,9 +39,9 @@ public String handle(URI uri) throws SecDispatcherException {
         if (!NAME.equals(uri.getScheme())) {
             return null;
         }
-        String value = System.getProperty(uri.getSchemeSpecificPart());
+        String value = System.getProperty(uri.getPath().substring(1));
         if (value == null) {
-            throw new SecDispatcherException("System property '" + uri.getSchemeSpecificPart() + "' not found");
+            throw new SecDispatcherException("System property '" + uri.getPath() + "' not found");
         }
         return value;
     }

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

@@ -106,7 +106,7 @@ void testDecrypt() throws Exception {
         DefaultSecDispatcher sd = new DefaultSecDispatcher(
                 new DefaultPlexusCipher(),
                 Map.of("static", new StaticMasterPasswordSource(masterPassword)),
-                Map.of("magic", new StaticPasswordDecryptor("magic")),
+                Map.of(),
                 DefaultSecDispatcher.DEFAULT_CONFIGURATION);
 
         String pass = sd.decrypt(passwordEncrypted);
@@ -119,7 +119,7 @@ void testDecrypt() throws Exception {
     @Test
     void testDecryptSystemProperty() throws Exception {
         System.setProperty("foobar", masterPassword);
-        saveSec("system-property:foobar");
+        saveSec("system-property:/foobar");
         // /run/user/1000/gnupg/S.gpg-agent
         DefaultSecDispatcher sd = new DefaultSecDispatcher(
                 new DefaultPlexusCipher(),
@@ -130,7 +130,30 @@ void testDecryptSystemProperty() throws Exception {
                         new EnvMasterPasswordSource(),
                         "gpg",
                         new GpgAgentMasterPasswordSource()),
-                Map.of("magic", new StaticPasswordDecryptor("magic")),
+                Map.of(),
+                DefaultSecDispatcher.DEFAULT_CONFIGURATION);
+
+        String pass = sd.decrypt(passwordEncrypted);
+
+        assertNotNull(pass);
+
+        assertEquals(password, pass);
+    }
+
+    @Test
+    void testDecryptEnv() throws Exception {
+        saveSec("env:/MASTER_PASSWORD");
+        // /run/user/1000/gnupg/S.gpg-agent
+        DefaultSecDispatcher sd = new DefaultSecDispatcher(
+                new DefaultPlexusCipher(),
+                Map.of(
+                        "prop",
+                        new SystemPropertyMasterPasswordSource(),
+                        "env",
+                        new EnvMasterPasswordSource(),
+                        "gpg",
+                        new GpgAgentMasterPasswordSource()),
+                Map.of(),
                 DefaultSecDispatcher.DEFAULT_CONFIGURATION);
 
         String pass = sd.decrypt(passwordEncrypted);
@@ -153,7 +176,7 @@ void testDecryptGpg() throws Exception {
                         new EnvMasterPasswordSource(),
                         "gpg",
                         new GpgAgentMasterPasswordSource()),
-                Map.of("magic", new StaticPasswordDecryptor("magic")),
+                Map.of(),
                 DefaultSecDispatcher.DEFAULT_CONFIGURATION);
 
         String pass = sd.decrypt(passwordEncrypted);