Merge pull request #46271 from Ladicek/maven-fix-discovering-settings…

…-security-xml Maven Resolver: fix discovering settings-security.xml
quarkusio · Feb 14, 2025 · 6c4d7b2 · 6c4d7b2
2 parents 9fcb390 + b435ed7
commit 6c4d7b2
Showing 1 changed file with 11 additions and 0 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
@@ -533,7 +533,18 @@ private DefaultRepositorySystemSession newRepositorySystemSession() throws Boots
         DefaultSettingsDecryptionRequest decrypt = new DefaultSettingsDecryptionRequest();
         decrypt.setProxies(settings.getProxies());
         decrypt.setServers(settings.getServers());
+        // need to set `settings-security.xml` location extra, because it isn't discovered
+        // by BeanBag when constructing `DefaultSecDispatcher`
+        File settingsSecurityXml = null;
+        boolean setSettingsSecurity = !System.getProperties().containsKey(SETTINGS_SECURITY)
+                && (settingsSecurityXml = new File(getUserMavenConfigurationHome(), "settings-security.xml")).exists();
+        if (setSettingsSecurity) {
+            System.setProperty(SETTINGS_SECURITY, settingsSecurityXml.toString());
+        }
         SettingsDecryptionResult decrypted = getSettingsDecrypter().decrypt(decrypt);
+        if (setSettingsSecurity) {
+            System.clearProperty(SETTINGS_SECURITY);
+        }
 
         if (!decrypted.getProblems().isEmpty() && log.isDebugEnabled()) {
             for (SettingsProblem problem : decrypted.getProblems()) {