This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch maven-4.0.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-4.0.x by this push:
new d44cd4391a [Backport maven-4.0.x] #13537: Fix #9075: Insecure mirrors
are only whitelisted when defined in global settings (#13992)
d44cd4391a is described below
commit d44cd4391ace5f55942301f45b99179a2b3848f2
Author: Guillaume Nodet <[email protected]>
AuthorDate: Mon Nov 16 15:55:51 2026 +0100
[Backport maven-4.0.x] #13537: Fix #9075: Insecure mirrors are only
whitelisted when defined in global settings (#13992)
Port of #13537 to maven-4.0.x.
- MavenSettingsMerger#shallowMergeById: append recessive elements to
dominant
instead of prepending at index 0, so user (dominant) mirrors precede
global
(recessive) mirrors. This ensures the maven-default-http-blocker from
global
settings does not silently block user-defined insecure mirrors.
- DefaultSettingsBuilder.SETTINGS_MERGER: promote to static final, add
getMirrorKey, getServerKey, getProxyKey, getProfileKey overrides that key
all IdentifiableBase elements by id (not object identity).
- SettingsUtilsV4.merge: use SETTINGS_MERGER with sourceDominant=false so
dominant settings values override recessive ones; remove stale
SettingsMerger
import.
- Add MavenSettingsMergerTest (new) and extend SettingsUtilsTest and
DefaultSettingsBuilderFactoryTest with mirror-ordering and precedence
tests.
Equivalent of merge commit 7bfe05bc609eb7703b2a18133f5a22340a0e3d2a.
---
.../maven/settings/merge/MavenSettingsMerger.java | 2 +-
.../settings/merge/MavenSettingsMergerTest.java | 173 +++++++++++++++++++++
.../apache/maven/settings/SettingsUtilsTest.java | 74 +++++++++
.../apache/maven/impl/DefaultSettingsBuilder.java | 26 +++-
.../org/apache/maven/impl/SettingsUtilsV4.java | 3 +-
.../impl/DefaultSettingsBuilderFactoryTest.java | 96 ++++++++++++
6 files changed, 370 insertions(+), 4 deletions(-)
diff --git
a/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
index 96a85eaa0a..14ef6f8271 100644
---
a/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
+++
b/compat/maven-settings-builder/src/main/java/org/apache/maven/settings/merge/MavenSettingsMerger.java
@@ -108,7 +108,7 @@ private static <T extends IdentifiableBase> void
shallowMergeById(
}
}
- dominant.addAll(0, identifiables);
+ dominant.addAll(identifiables);
}
/**
diff --git
a/compat/maven-settings-builder/src/test/java/org/apache/maven/settings/merge/MavenSettingsMergerTest.java
b/compat/maven-settings-builder/src/test/java/org/apache/maven/settings/merge/MavenSettingsMergerTest.java
new file mode 100644
index 0000000000..0a3005e417
--- /dev/null
+++
b/compat/maven-settings-builder/src/test/java/org/apache/maven/settings/merge/MavenSettingsMergerTest.java
@@ -0,0 +1,173 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.settings.merge;
+
+import java.util.List;
+
+import org.apache.maven.settings.Mirror;
+import org.apache.maven.settings.Profile;
+import org.apache.maven.settings.Proxy;
+import org.apache.maven.settings.Repository;
+import org.apache.maven.settings.Server;
+import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.TrackableBase;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class MavenSettingsMergerTest {
+
+ private MavenSettingsMerger merger;
+
+ @BeforeEach
+ void setUp() {
+ merger = new MavenSettingsMerger();
+ }
+
+ /**
+ * Verifies that mirrors defined in dominant settings (e.g., user settings)
+ * precede mirrors in recessive settings (e.g., global settings).
+ * This ensures user-defined insecure repository mirrors take precedence
+ * over maven-default-http-blocker (MNG-7841).
+ */
+ @Test
+ void testDominantMirrorsPrecedeRecessiveMirrors() {
+ Settings dominant = new Settings();
+ Mirror userMirror = new Mirror();
+ userMirror.setId("user-mirror");
+ userMirror.setMirrorOf("insecure-repo");
+ userMirror.setUrl("http://insecure.example.com/");
+ dominant.addMirror(userMirror);
+
+ Settings recessive = new Settings();
+ Mirror defaultBlocker = new Mirror();
+ defaultBlocker.setId("maven-default-http-blocker");
+ defaultBlocker.setMirrorOf("external:http:*");
+ defaultBlocker.setUrl("http://0.0.0.0/");
+ defaultBlocker.setBlocked(true);
+ recessive.addMirror(defaultBlocker);
+
+ merger.merge(dominant, recessive, TrackableBase.GLOBAL_LEVEL);
+
+ List<Mirror> mirrors = dominant.getMirrors();
+ assertEquals(2, mirrors.size());
+ assertEquals("user-mirror", mirrors.get(0).getId());
+ assertEquals("maven-default-http-blocker", mirrors.get(1).getId());
+ assertTrue(mirrors.get(1).isBlocked());
+ }
+
+ @Test
+ void testDominantMirrorOverridesRecessiveWithSameId() {
+ Settings dominant = new Settings();
+ Mirror userMirror = new Mirror();
+ userMirror.setId("maven-default-http-blocker");
+ userMirror.setMirrorOf("external:http:*");
+ userMirror.setUrl("http://allowed.example.com/");
+ userMirror.setBlocked(false);
+ dominant.addMirror(userMirror);
+
+ Settings recessive = new Settings();
+ Mirror defaultBlocker = new Mirror();
+ defaultBlocker.setId("maven-default-http-blocker");
+ defaultBlocker.setMirrorOf("external:http:*");
+ defaultBlocker.setUrl("http://0.0.0.0/");
+ defaultBlocker.setBlocked(true);
+ recessive.addMirror(defaultBlocker);
+
+ merger.merge(dominant, recessive, TrackableBase.GLOBAL_LEVEL);
+
+ List<Mirror> mirrors = dominant.getMirrors();
+ assertEquals(1, mirrors.size());
+ assertEquals("maven-default-http-blocker", mirrors.get(0).getId());
+ assertEquals("http://allowed.example.com/", mirrors.get(0).getUrl());
+ assertFalse(mirrors.get(0).isBlocked());
+ }
+
+ @Test
+ void testDominantPrecedenceForIdentifiables() {
+ Settings dominant = new Settings();
+ Server dominantServer = new Server();
+ dominantServer.setId("server-1");
+ dominant.addServer(dominantServer);
+
+ Proxy dominantProxy = new Proxy();
+ dominantProxy.setId("proxy-1");
+ dominant.addProxy(dominantProxy);
+
+ Profile dominantProfile = new Profile();
+ dominantProfile.setId("profile-1");
+ dominant.addProfile(dominantProfile);
+
+ Repository dominantRepo = new Repository();
+ dominantRepo.setId("repo-1");
+ dominant.addRepository(dominantRepo);
+
+ Settings recessive = new Settings();
+ Server recessiveServer = new Server();
+ recessiveServer.setId("server-2");
+ recessive.addServer(recessiveServer);
+
+ Proxy recessiveProxy = new Proxy();
+ recessiveProxy.setId("proxy-2");
+ recessive.addProxy(recessiveProxy);
+
+ Profile recessiveProfile = new Profile();
+ recessiveProfile.setId("profile-2");
+ recessive.addProfile(recessiveProfile);
+
+ Repository recessiveRepo = new Repository();
+ recessiveRepo.setId("repo-2");
+ recessive.addRepository(recessiveRepo);
+
+ merger.merge(dominant, recessive, TrackableBase.GLOBAL_LEVEL);
+
+ assertEquals("server-1", dominant.getServers().get(0).getId());
+ assertEquals("server-2", dominant.getServers().get(1).getId());
+
+ assertEquals("proxy-1", dominant.getProxies().get(0).getId());
+ assertEquals("proxy-2", dominant.getProxies().get(1).getId());
+
+ assertEquals("profile-1", dominant.getProfiles().get(0).getId());
+ assertEquals("profile-2", dominant.getProfiles().get(1).getId());
+
+ assertEquals("repo-1", dominant.getRepositories().get(0).getId());
+ assertEquals("repo-2", dominant.getRepositories().get(1).getId());
+ }
+
+ @Test
+ void testLocalRepositoryMerging() {
+ Settings dominant = new Settings();
+ dominant.setLocalRepository("/dominant/path");
+
+ Settings recessive = new Settings();
+ recessive.setLocalRepository("/recessive/path");
+
+ merger.merge(dominant, recessive, TrackableBase.GLOBAL_LEVEL);
+ assertEquals("/dominant/path", dominant.getLocalRepository());
+
+ Settings dominantEmpty = new Settings();
+ Settings recessive2 = new Settings();
+ recessive2.setLocalRepository("/recessive/path");
+ merger.merge(dominantEmpty, recessive2, TrackableBase.GLOBAL_LEVEL);
+ assertEquals("/recessive/path", dominantEmpty.getLocalRepository());
+ }
+}
diff --git
a/impl/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
b/impl/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
index 791b0df197..6f154995a0 100644
---
a/impl/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
+++
b/impl/maven-core/src/test/java/org/apache/maven/settings/SettingsUtilsTest.java
@@ -155,4 +155,78 @@ void testRoundTripProfiles() {
p.getPluginRepositories().size(),
clone.getPluginRepositories().size());
// TODO deep compare the lists
}
+
+ @Test
+ void testDominantMirrorsPrecedeRecessiveMirrors() {
+ org.apache.maven.api.settings.Mirror dominantMirror =
org.apache.maven.api.settings.Mirror.newBuilder()
+ .id("user-mirror")
+ .mirrorOf("insecure-repo")
+ .url("http://insecure.example.com/")
+ .build();
+ org.apache.maven.api.settings.Mirror recessiveMirror =
org.apache.maven.api.settings.Mirror.newBuilder()
+ .id("maven-default-http-blocker")
+ .mirrorOf("external:http:*")
+ .url("http://0.0.0.0/")
+ .blocked(true)
+ .build();
+
+ Settings dominant =
+ Settings.newBuilder().mirrors(List.of(dominantMirror)).build();
+ Settings recessive =
+
Settings.newBuilder().mirrors(List.of(recessiveMirror)).build();
+
+ Settings merged = SettingsUtilsV4.merge(dominant, recessive);
+
+ List<org.apache.maven.api.settings.Mirror> mirrors =
merged.getMirrors();
+ assertNotNull(mirrors);
+ assertEquals(2, mirrors.size());
+ assertEquals("user-mirror", mirrors.get(0).getId());
+ assertEquals("maven-default-http-blocker", mirrors.get(1).getId());
+ }
+
+ @Test
+ void testDominantMirrorWinsOnConflict() {
+ org.apache.maven.api.settings.Mirror dominantMirror =
org.apache.maven.api.settings.Mirror.newBuilder()
+ .id("shared-mirror")
+ .url("http://dominant.example.com/")
+ .build();
+ org.apache.maven.api.settings.Mirror recessiveMirror =
org.apache.maven.api.settings.Mirror.newBuilder()
+ .id("shared-mirror")
+ .url("http://recessive.example.com/")
+ .build();
+
+ Settings dominant =
+ Settings.newBuilder().mirrors(List.of(dominantMirror)).build();
+ Settings recessive =
+
Settings.newBuilder().mirrors(List.of(recessiveMirror)).build();
+
+ Settings merged = SettingsUtilsV4.merge(dominant, recessive);
+
+ List<org.apache.maven.api.settings.Mirror> mirrors =
merged.getMirrors();
+ assertNotNull(mirrors);
+ assertEquals(1, mirrors.size());
+ assertEquals("shared-mirror", mirrors.get(0).getId());
+ assertEquals("http://dominant.example.com/", mirrors.get(0).getUrl());
+ }
+
+ @Test
+ void testDominantSettingsValuesPrecedeRecessive() {
+ Settings dominant =
+
Settings.newBuilder().localRepository("/dominant/path").build();
+ Settings recessive =
+
Settings.newBuilder().localRepository("/recessive/path").build();
+
+ Settings merged = SettingsUtilsV4.merge(dominant, recessive);
+ assertEquals("/dominant/path", merged.getLocalRepository());
+ }
+
+ @Test
+ void testRecessiveSettingsValuesFillGaps() {
+ Settings dominant = Settings.newBuilder().build();
+ Settings recessive =
+
Settings.newBuilder().localRepository("/recessive/path").build();
+
+ Settings merged = SettingsUtilsV4.merge(dominant, recessive);
+ assertEquals("/recessive/path", merged.getLocalRepository());
+ }
}
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java
index f80a8ce5e1..f57784ac4a 100644
---
a/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java
+++
b/impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java
@@ -53,6 +53,7 @@
import org.apache.maven.api.services.xml.XmlReaderRequest;
import org.apache.maven.api.settings.Activation;
import org.apache.maven.api.settings.IdentifiableBase;
+import org.apache.maven.api.settings.Mirror;
import org.apache.maven.api.settings.Profile;
import org.apache.maven.api.settings.Proxy;
import org.apache.maven.api.settings.Repository;
@@ -73,13 +74,36 @@ public class DefaultSettingsBuilder implements
SettingsBuilder {
private final DefaultSettingsValidator settingsValidator = new
DefaultSettingsValidator();
- private final SettingsMerger settingsMerger = new SettingsMerger() {
+ // Package-private so SettingsUtilsV4 can reuse the same configured merger
instance.
+ static final SettingsMerger SETTINGS_MERGER = new SettingsMerger() {
@Override
protected KeyComputer<Repository> getRepositoryKey() {
return IdentifiableBase::getId;
}
+
+ @Override
+ protected KeyComputer<Mirror> getMirrorKey() {
+ return IdentifiableBase::getId;
+ }
+
+ @Override
+ protected KeyComputer<Server> getServerKey() {
+ return IdentifiableBase::getId;
+ }
+
+ @Override
+ protected KeyComputer<Proxy> getProxyKey() {
+ return IdentifiableBase::getId;
+ }
+
+ @Override
+ protected KeyComputer<Profile> getProfileKey() {
+ return IdentifiableBase::getId;
+ }
};
+ private final SettingsMerger settingsMerger = SETTINGS_MERGER;
+
private final SettingsXmlFactory settingsXmlFactory;
private final Interpolator interpolator;
diff --git
a/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java
b/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java
index 04266d4890..01b108625a 100644
--- a/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java
+++ b/impl/maven-impl/src/main/java/org/apache/maven/impl/SettingsUtilsV4.java
@@ -52,7 +52,6 @@
import org.apache.maven.api.settings.Repository;
import org.apache.maven.api.settings.RepositoryPolicy;
import org.apache.maven.api.settings.Settings;
-import org.apache.maven.settings.v4.SettingsMerger;
/**
* Several convenience methods to handle settings
@@ -69,7 +68,7 @@ private SettingsUtilsV4() {
* @param recessive
*/
public static Settings merge(Settings dominant, Settings recessive) {
- return new SettingsMerger().merge(dominant, recessive, true,
Collections.emptyMap());
+ return DefaultSettingsBuilder.SETTINGS_MERGER.merge(dominant,
recessive, false, Collections.emptyMap());
}
/**
diff --git
a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsBuilderFactoryTest.java
b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsBuilderFactoryTest.java
index 54ad610681..a709be95d7 100644
---
a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsBuilderFactoryTest.java
+++
b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultSettingsBuilderFactoryTest.java
@@ -18,6 +18,9 @@
*/
package org.apache.maven.impl;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -31,8 +34,10 @@
import org.apache.maven.api.services.SettingsBuilderException;
import org.apache.maven.api.services.SettingsBuilderRequest;
import org.apache.maven.api.services.SettingsBuilderResult;
+import org.apache.maven.api.services.Source;
import org.apache.maven.api.services.Sources;
import org.apache.maven.api.services.xml.SettingsXmlFactory;
+import org.apache.maven.api.settings.Mirror;
import org.apache.maven.api.settings.Proxy;
import org.apache.maven.api.settings.Server;
import org.apache.maven.api.settings.Settings;
@@ -370,4 +375,95 @@ void bothReposDefinedDoesNotInjectCentral() {
private Path getSettings(String name) {
return Paths.get("src/test/resources/settings/" + name +
".xml").toAbsolutePath();
}
+
+ @Test
+ void testMergeUserSettingsOverInstallationSettings() {
+ SettingsBuilder builder =
+ new DefaultSettingsBuilder(new DefaultSettingsXmlFactory(),
new DefaultInterpolator(), Map.of());
+
+ Source userSource = new Source() {
+ @Override
+ public Path getPath() {
+ return null;
+ }
+
+ @Override
+ public InputStream openStream() {
+ String xml = "<settings
xmlns='http://maven.apache.org/SETTINGS/1.0.0'>"
+ + "<mirrors>"
+ + "<mirror>"
+ + "<id>shared-mirror</id>"
+ + "<url>http://dominant.example.com/</url>"
+ + "<mirrorOf>central</mirrorOf>"
+ + "</mirror>"
+ + "</mirrors>"
+ + "</settings>";
+ return new
ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8));
+ }
+
+ @Override
+ public String getLocation() {
+ return "user-settings.xml";
+ }
+
+ @Override
+ public Source resolve(String relative) {
+ return null;
+ }
+ };
+
+ Source installationSource = new Source() {
+ @Override
+ public Path getPath() {
+ return null;
+ }
+
+ @Override
+ public InputStream openStream() {
+ String xml = "<settings
xmlns='http://maven.apache.org/SETTINGS/1.0.0'>"
+ + "<mirrors>"
+ + "<mirror>"
+ + "<id>shared-mirror</id>"
+ + "<url>http://recessive.example.com/</url>"
+ + "<mirrorOf>central</mirrorOf>"
+ + "</mirror>"
+ + "<mirror>"
+ + "<id>maven-default-http-blocker</id>"
+ + "<url>http://0.0.0.0/</url>"
+ + "<mirrorOf>external:http:*</mirrorOf>"
+ + "<blocked>true</blocked>"
+ + "</mirror>"
+ + "</mirrors>"
+ + "</settings>";
+ return new
ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8));
+ }
+
+ @Override
+ public String getLocation() {
+ return "installation-settings.xml";
+ }
+
+ @Override
+ public Source resolve(String relative) {
+ return null;
+ }
+ };
+
+ SettingsBuilderRequest request = SettingsBuilderRequest.builder()
+ .session(session)
+ .userSettingsSource(userSource)
+ .installationSettingsSource(installationSource)
+ .build();
+
+ SettingsBuilderResult result = builder.build(request);
+ assertNotNull(result);
+ Settings effective = result.getEffectiveSettings();
+ assertNotNull(effective);
+
+ List<Mirror> mirrors = effective.getMirrors();
+ assertEquals(2, mirrors.size());
+ assertEquals("shared-mirror", mirrors.get(0).getId());
+ assertEquals("http://dominant.example.com/", mirrors.get(0).getUrl());
+ assertEquals("maven-default-http-blocker", mirrors.get(1).getId());
+ }
}