This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new f01c43d91 Reject generate() on a closed signature generator (#2297)
f01c43d91 is described below
commit f01c43d9194c5f1774d6dd0f4b630f6f56112a52
Author: Sylwester Lachiewicz <[email protected]>
AuthorDate: Wed Nov 18 15:01:09 2026 +0100
Reject generate() on a closed signature generator (#2297)
* Reject generate() on a closed signature generator
close() deletes the temporary signature files once; generate() after it
leaked
them, and close() was not synchronized against the synchronized generate().
* Update
maven-resolver-generator-gnupg/src/main/java/org/eclipse/aether/generator/gnupg/GnupgSignatureArtifactGenerator.java
Co-authored-by: Guillaume Nodet - AI Bot <[email protected]>
* Update
maven-resolver-generator-sigstore/src/main/java/org/eclipse/aether/generator/sigstore/SigstoreSignatureArtifactGenerator.java
Co-authored-by: Guillaume Nodet - AI Bot <[email protected]>
---------
Co-authored-by: Guillaume Nodet - AI Bot <[email protected]>
---
.../generator/gnupg/GnupgSignatureArtifactGenerator.java | 5 ++++-
.../aether/generator/gnupg/GpgSignerFactoryTest.java | 15 +++++++++++++++
.../sigstore/SigstoreSignatureArtifactGenerator.java | 5 ++++-
.../generator/sigstore/SigstoreSignerFactoryTest.java | 12 ++++++++++++
4 files changed, 35 insertions(+), 2 deletions(-)
diff --git
a/maven-resolver-generator-gnupg/src/main/java/org/eclipse/aether/generator/gnupg/GnupgSignatureArtifactGenerator.java
b/maven-resolver-generator-gnupg/src/main/java/org/eclipse/aether/generator/gnupg/GnupgSignatureArtifactGenerator.java
index 67b657e88..e9b8b5996 100644
---
a/maven-resolver-generator-gnupg/src/main/java/org/eclipse/aether/generator/gnupg/GnupgSignatureArtifactGenerator.java
+++
b/maven-resolver-generator-gnupg/src/main/java/org/eclipse/aether/generator/gnupg/GnupgSignatureArtifactGenerator.java
@@ -84,6 +84,9 @@ final class GnupgSignatureArtifactGenerator implements
ArtifactGenerator {
@Override
public synchronized Collection<? extends Artifact> generate(Collection<?
extends Artifact> generatedArtifacts) {
+ if (closed.get()) {
+ throw new IllegalStateException("generator " + generatorId() + "
is closed");
+ }
try {
artifacts.addAll(generatedArtifacts);
@@ -152,7 +155,7 @@ final class GnupgSignatureArtifactGenerator implements
ArtifactGenerator {
}
@Override
- public void close() {
+ public synchronized void close() {
if (closed.compareAndSet(false, true)) {
signatureTempFiles.forEach(p -> {
try {
diff --git
a/maven-resolver-generator-gnupg/src/test/java/org/eclipse/aether/generator/gnupg/GpgSignerFactoryTest.java
b/maven-resolver-generator-gnupg/src/test/java/org/eclipse/aether/generator/gnupg/GpgSignerFactoryTest.java
index 94c4400a5..47f1a70b6 100644
---
a/maven-resolver-generator-gnupg/src/test/java/org/eclipse/aether/generator/gnupg/GpgSignerFactoryTest.java
+++
b/maven-resolver-generator-gnupg/src/test/java/org/eclipse/aether/generator/gnupg/GpgSignerFactoryTest.java
@@ -89,6 +89,21 @@ public class GpgSignerFactoryTest {
return session;
}
+ @Test
+ void generateAfterCloseIsRejected() throws Exception {
+ Path keyFile =
+
Paths.get("src/test/resources/gpg-signing/gpg-secret.key").toAbsolutePath();
+ String keyPass = "TheBigSecret";
+ GnupgSignatureArtifactGeneratorFactory factory = createFactory();
+ ArtifactGenerator signer = factory.newInstance(createSession(keyFile,
keyPass, false), new DeployRequest());
+ assertNotNull(signer);
+ signer.close();
+ assertThrows(
+ IllegalStateException.class,
+ () -> signer.generate(
+ Collections.singletonList(new
DefaultArtifact("org.apache.maven.resolver:test:jar:1.0"))));
+ }
+
@Test
void doNotSignNonRelevantArtifacts() throws Exception {
Path keyFile =
diff --git
a/maven-resolver-generator-sigstore/src/main/java/org/eclipse/aether/generator/sigstore/SigstoreSignatureArtifactGenerator.java
b/maven-resolver-generator-sigstore/src/main/java/org/eclipse/aether/generator/sigstore/SigstoreSignatureArtifactGenerator.java
index 472bcb6f0..0e9b231f8 100644
---
a/maven-resolver-generator-sigstore/src/main/java/org/eclipse/aether/generator/sigstore/SigstoreSignatureArtifactGenerator.java
+++
b/maven-resolver-generator-sigstore/src/main/java/org/eclipse/aether/generator/sigstore/SigstoreSignatureArtifactGenerator.java
@@ -76,6 +76,9 @@ final class SigstoreSignatureArtifactGenerator implements
ArtifactGenerator {
@Override
public synchronized Collection<? extends Artifact> generate(Collection<?
extends Artifact> generatedArtifacts) {
+ if (closed.get()) {
+ throw new IllegalStateException("generator " + generatorId() + "
is closed");
+ }
try {
artifacts.addAll(generatedArtifacts);
@@ -184,7 +187,7 @@ final class SigstoreSignatureArtifactGenerator implements
ArtifactGenerator {
}
@Override
- public void close() {
+ public synchronized void close() {
if (closed.compareAndSet(false, true)) {
signatureTempFiles.forEach(p -> {
try {
diff --git
a/maven-resolver-generator-sigstore/src/test/java/org/eclipse/aether/generator/sigstore/SigstoreSignerFactoryTest.java
b/maven-resolver-generator-sigstore/src/test/java/org/eclipse/aether/generator/sigstore/SigstoreSignerFactoryTest.java
index 5a32427be..e61129133 100644
---
a/maven-resolver-generator-sigstore/src/test/java/org/eclipse/aether/generator/sigstore/SigstoreSignerFactoryTest.java
+++
b/maven-resolver-generator-sigstore/src/test/java/org/eclipse/aether/generator/sigstore/SigstoreSignerFactoryTest.java
@@ -68,6 +68,18 @@ public class SigstoreSignerFactoryTest {
return session;
}
+ @Test
+ void generateAfterCloseIsRejected() throws Exception {
+ SigstoreSignatureArtifactGeneratorFactory factory = createFactory();
+ ArtifactGenerator signer = factory.newInstance(createSession(), new
DeployRequest());
+ assertNotNull(signer);
+ signer.close();
+ assertThrows(
+ IllegalStateException.class,
+ () -> signer.generate(
+ Collections.singletonList(new
DefaultArtifact("org.apache.maven.resolver:test:jar:1.0"))));
+ }
+
@Test
void doNotSignNonRelevantArtifacts() throws Exception {
SigstoreSignatureArtifactGeneratorFactory factory = createFactory();