You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/08/31 10:23:49 UTC
(maven-resolver) 02/04: Sanitize lock names derived from artifact coordinates
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch maven-resolver-1.9.x
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
commit 3733fe89cea3e6327bdc03d0dacf8e2dad77e9df
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Aug 30 22:42:12 2026 +0200
Sanitize lock names derived from artifact coordinates
The filesystem-friendly GAV/GAECV name mappers now pass every
coordinate field through PathUtils.stringToPathSegment, and
BasedirNameMapper rejects lock names that do not resolve under the
locks base directory, so the resolved lock path is always contained in
it. Port of the 2.0.x change to this line.
---
.../impl/synccontext/named/BasedirNameMapper.java | 18 +++++++++++++++-
.../impl/synccontext/named/GAECVNameMapper.java | 20 ++++++++---------
.../impl/synccontext/named/GAVNameMapper.java | 25 ++++++++++++++++------
3 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/BasedirNameMapper.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/BasedirNameMapper.java
index 3ce330aa6..8ac479146 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/BasedirNameMapper.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/BasedirNameMapper.java
@@ -61,10 +61,26 @@ public class BasedirNameMapper implements NameMapper {
final Path basedir = DirectoryUtils.resolveDirectory(session, ".locks", CONFIG_PROP_LOCKS_DIR, false);
return delegate.nameLocks(session, artifacts, metadatas).stream()
- .map(name -> basedir.resolve(name).toAbsolutePath().toString())
+ .map(name -> resolveContained(basedir, name))
.collect(Collectors.toList());
} catch (IOException e) {
throw new UncheckedIOException(e);
}
}
+
+ /**
+ * Resolves the delegate-provided lock name against the locks base directory, rejecting names that are
+ * not contained under it, as the file lock factory creates (and deletes on close) lock files at the
+ * resolved path.
+ *
+ * @since 1.9.28
+ */
+ private static String resolveContained(Path basedir, String name) {
+ Path resolved = basedir.resolve(name).toAbsolutePath();
+ if (!resolved.normalize().startsWith(basedir.toAbsolutePath().normalize())) {
+ throw new IllegalArgumentException(
+ "Lock name '" + name + "' is not contained in the locks base directory " + basedir);
+ }
+ return resolved.toString();
+ }
}
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAECVNameMapper.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAECVNameMapper.java
index 3d5344beb..07645eb5a 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAECVNameMapper.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAECVNameMapper.java
@@ -39,27 +39,27 @@ public class GAECVNameMapper extends GAVNameMapper {
@Override
protected String getArtifactName(Artifact artifact) {
- if (artifact.getClassifier().isEmpty()) {
+ if (fieldToSegment(artifact.getClassifier()).isEmpty()) {
return artifactPrefix
- + artifact.getGroupId()
+ + fieldToSegment(artifact.getGroupId())
+ fieldSeparator
- + artifact.getArtifactId()
+ + fieldToSegment(artifact.getArtifactId())
+ fieldSeparator
- + artifact.getExtension()
+ + fieldToSegment(artifact.getExtension())
+ fieldSeparator
- + artifact.getBaseVersion()
+ + fieldToSegment(artifact.getBaseVersion())
+ artifactSuffix;
} else {
return artifactPrefix
- + artifact.getGroupId()
+ + fieldToSegment(artifact.getGroupId())
+ fieldSeparator
- + artifact.getArtifactId()
+ + fieldToSegment(artifact.getArtifactId())
+ fieldSeparator
- + artifact.getExtension()
+ + fieldToSegment(artifact.getExtension())
+ fieldSeparator
- + artifact.getClassifier()
+ + fieldToSegment(artifact.getClassifier())
+ fieldSeparator
- + artifact.getBaseVersion()
+ + fieldToSegment(artifact.getBaseVersion())
+ artifactSuffix;
}
}
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapper.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapper.java
index 39c34eb2c..1ba3d8c55 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapper.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapper.java
@@ -91,13 +91,26 @@ public class GAVNameMapper implements NameMapper {
return keys;
}
+ /**
+ * Returns the given coordinate field in a form that is safe to use as (part of) a file name: when this
+ * mapper is {@link #isFileSystemFriendly()}, characters that act as path separators or are otherwise
+ * illegal in file names are replaced via {@link PathUtils#stringToPathSegment(String)}. File-system
+ * friendly names are resolved against the locks base directory by {@link BasedirNameMapper}, so every
+ * field must be a valid path segment.
+ *
+ * @since 1.9.28
+ */
+ protected String fieldToSegment(String field) {
+ return fileSystemFriendly ? PathUtils.stringToPathSegment(field) : field;
+ }
+
protected String getArtifactName(Artifact artifact) {
return artifactPrefix
- + artifact.getGroupId()
+ + fieldToSegment(artifact.getGroupId())
+ fieldSeparator
- + artifact.getArtifactId()
+ + fieldToSegment(artifact.getArtifactId())
+ fieldSeparator
- + artifact.getBaseVersion()
+ + fieldToSegment(artifact.getBaseVersion())
+ artifactSuffix;
}
@@ -106,11 +119,11 @@ public class GAVNameMapper implements NameMapper {
protected String getMetadataName(Metadata metadata) {
String name = metadataPrefix;
if (!metadata.getGroupId().isEmpty()) {
- name += metadata.getGroupId();
+ name += fieldToSegment(metadata.getGroupId());
if (!metadata.getArtifactId().isEmpty()) {
- name += fieldSeparator + metadata.getArtifactId();
+ name += fieldSeparator + fieldToSegment(metadata.getArtifactId());
if (!metadata.getVersion().isEmpty()) {
- name += fieldSeparator + metadata.getVersion();
+ name += fieldSeparator + fieldToSegment(metadata.getVersion());
}
}
if (!MAVEN_METADATA.equals(metadata.getType())) {