Use the container-provided settings decrypter

Fixes #33220
quarkusio · May 12, 2023 · 55f7ea1 · 55f7ea1
1 parent efc0f9b
commit 55f7ea1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 334 deletions.
diff --git a/...ven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java b/...ven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java
@@ -43,6 +43,8 @@
 import org.apache.maven.settings.building.SettingsBuildingResult;
 import org.apache.maven.settings.building.SettingsProblem;
 import org.apache.maven.settings.crypto.DefaultSettingsDecryptionRequest;
+import org.apache.maven.settings.crypto.SettingsDecrypter;
+import org.apache.maven.settings.crypto.SettingsDecryptionRequest;
 import org.apache.maven.settings.crypto.SettingsDecryptionResult;
 import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -116,6 +118,7 @@ public class BootstrapMavenContext {
     private boolean preferPomsFromWorkspace;
     private Boolean effectiveModelBuilder;
     private Boolean wsModuleParentHierarchy;
+    private SettingsDecrypter settingsDecrypter;
 
     public static BootstrapMavenContextConfig<?> config() {
         return new BootstrapMavenContextConfig<>();
@@ -275,6 +278,10 @@ public List<RemoteRepository> getRemotePluginRepositories() throws BootstrapMave
         return remotePluginRepos == null ? remotePluginRepos = resolveRemotePluginRepos() : remotePluginRepos;
     }
 
+    private SettingsDecrypter getSettingsDecrypter() {
+        return settingsDecrypter == null ? settingsDecrypter = newSettingsDecrypter() : settingsDecrypter;
+    }
+
     public Settings getEffectiveSettings() throws BootstrapMavenException {
         if (settings != null) {
             return settings;
@@ -441,10 +448,10 @@ private DefaultRepositorySystemSession newRepositorySystemSession() throws Boots
             }
         }
 
-        final DefaultSettingsDecryptionRequest decrypt = new DefaultSettingsDecryptionRequest();
+        final SettingsDecryptionRequest decrypt = new DefaultSettingsDecryptionRequest();
         decrypt.setProxies(settings.getProxies());
         decrypt.setServers(settings.getServers());
-        final SettingsDecryptionResult decrypted = new SettingsDecrypterImpl().decrypt(decrypt);
+        final SettingsDecryptionResult decrypted = getSettingsDecrypter().decrypt(decrypt);
         if (!decrypted.getProblems().isEmpty() && log.isDebugEnabled()) {
             // this is how maven handles these
             for (SettingsProblem p : decrypted.getProblems()) {
@@ -748,6 +755,11 @@ public RemoteRepositoryManager newRemoteRepositoryManager() {
         return remoteRepoManager;
     }
 
+    private SettingsDecrypter newSettingsDecrypter() {
+        initRepoSystemAndManager();
+        return settingsDecrypter;
+    }
+
     private void initRepoSystemAndManager() {
         final MavenFactory factory = configureMavenFactory();
         if (repoSystem == null) {
@@ -756,6 +768,9 @@ private void initRepoSystemAndManager() {
         if (remoteRepoManager == null) {
             remoteRepoManager = factory.getContainer().requireBean(RemoteRepositoryManager.class);
         }
+        if (settingsDecrypter == null) {
+            settingsDecrypter = factory.getContainer().requireBean(SettingsDecrypter.class);
+        }
     }
 
     protected MavenFactory configureMavenFactory() {

diff --git a/...p/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SecDispatcherImpl.java b/...p/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SecDispatcherImpl.java
diff --git a/...ven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SettingsDecrypterImpl.java b/...ven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/SettingsDecrypterImpl.java
diff --git a/...olver/src/main/java/io/quarkus/bootstrap/resolver/maven/SettingsDecryptionResultImpl.java b/...olver/src/main/java/io/quarkus/bootstrap/resolver/maven/SettingsDecryptionResultImpl.java