Light, fluffy, and always free - The AWS Local Emulator alternative
fix(acm): correct wildcard validation record names (#2575)
Aniket Shukla88bf0a293155
diff --git a/src/main/java/io/github/hectorvent/floci/services/acm/AcmService.java b/src/main/java/io/github/hectorvent/floci/services/acm/AcmService.javaindex 519487bc39..fad547b8a8 100644--- a/src/main/java/io/github/hectorvent/floci/services/acm/AcmService.java+++ b/src/main/java/io/github/hectorvent/floci/services/acm/AcmService.java@@ -18,7 +18,8 @@ import org.jboss.logging.Logger;import java.io.IOException;import java.io.InputStream;import java.nio.charset.StandardCharsets;-import java.security.SecureRandom;+import java.security.MessageDigest;+import java.security.NoSuchAlgorithmException;import java.security.cert.X509Certificate;import java.time.Instant;import java.util.*;@@ -46,8 +47,6 @@ public class AcmService implements ResourceProvider {private static final int MAX_TAG_VALUE_LENGTH = 256;private static final int MAX_SANS = 100;private static final int MAX_DOMAIN_LENGTH = 253;- private static final SecureRandom SECURE_RANDOM = new SecureRandom();-private final StorageBackend<String, Certificate> store;private final CertificateGenerator certificateGenerator;private final RegionResolver regionResolver;@@ -661,8 +660,9 @@ public class AcmService implements ResourceProvider {*/private DomainValidation generateDomainValidation(String domain, ValidationMethod method, CertificateType type) {String validationToken = generateValidationToken(domain);+ String validationDomain = baseDomain(domain);ResourceRecord resourceRecord = new ResourceRecord(- "_" + validationToken.substring(0, 32) + "." + domain + ".",+ "_" + validationToken.substring(0, 32) + "." + validationDomain + ".","CNAME","_" + validationToken.substring(32) + ".acm-validations.aws.");@@ -681,9 +681,19 @@ public class AcmService implements ResourceProvider {}private String generateValidationToken(String domain) {- byte[] randomBytes = new byte[32];- SECURE_RANDOM.nextBytes(randomBytes);- return HexFormat.of().formatHex(randomBytes);+ String tokenInput = regionResolver.getAccountId() + ":" + baseDomain(domain);+ try {+ return HexFormat.of().formatHex(+ MessageDigest.getInstance("SHA-256").digest(tokenInput.getBytes(StandardCharsets.UTF_8))+ );+ } catch (NoSuchAlgorithmException e) {+ throw new IllegalStateException("SHA-256 is unavailable", e);+ }+ }++ private static String baseDomain(String domain) {+ String stripped = domain.startsWith("*.") ? domain.substring(2) : domain;+ return stripped.toLowerCase(Locale.ROOT);}private String buildCertificateArn(String region, String certId) {diff --git a/src/test/java/io/github/hectorvent/floci/services/acm/AcmEdgeCaseTest.java b/src/test/java/io/github/hectorvent/floci/services/acm/AcmEdgeCaseTest.javaindex 7be9268d44..49ceec4996 100644--- a/src/test/java/io/github/hectorvent/floci/services/acm/AcmEdgeCaseTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/acm/AcmEdgeCaseTest.java@@ -6,12 +6,15 @@ import org.junit.jupiter.api.BeforeAll;import org.junit.jupiter.api.Test;import java.util.List;+import java.util.Map;import java.util.UUID;import java.util.stream.Collectors;import java.util.stream.IntStream;import static io.restassured.RestAssured.given;import static org.hamcrest.Matchers.*;+import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertNotEquals;/*** Tests for edge cases: wildcard domains, max SANs (100), max tags (50).@@ -26,11 +29,45 @@ class AcmEdgeCaseTest {RestAssuredJsonUtils.configureAwsContentTypes();}+ private static String requestCertificate(String domain) {+ return given()+ .header("X-Amz-Target", "CertificateManager.RequestCertificate")+ .contentType(ACM_CONTENT_TYPE)+ .body("""+ {+ "DomainName": "%s"+ }+ """.formatted(domain))+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("CertificateArn", startsWith("arn:aws:acm:"))+ .extract().jsonPath().getString("CertificateArn");+ }++ private static Map<String, String> validationRecord(String certificateArn) {+ return given()+ .header("X-Amz-Target", "CertificateManager.DescribeCertificate")+ .contentType(ACM_CONTENT_TYPE)+ .body("""+ {+ "CertificateArn": "%s"+ }+ """.formatted(certificateArn))+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .extract().jsonPath()+ .getMap("Certificate.DomainValidationOptions[0].ResourceRecord");+ }+// ==================== Wildcard Domain Tests ====================@Testvoid wildcardDomainAsPrimary() {- given()+ String certificateArn = given().header("X-Amz-Target", "CertificateManager.RequestCertificate").contentType(ACM_CONTENT_TYPE).body("""@@ -42,43 +79,106 @@ class AcmEdgeCaseTest {.post("/").then().statusCode(200)- .body("CertificateArn", startsWith("arn:aws:acm:"));+ .body("CertificateArn", startsWith("arn:aws:acm:"))+ .extract().jsonPath().getString("CertificateArn");++ given()+ .header("X-Amz-Target", "CertificateManager.DescribeCertificate")+ .contentType(ACM_CONTENT_TYPE)+ .body("""+ {+ "CertificateArn": "%s"+ }+ """.formatted(certificateArn))+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body("Certificate.DomainValidationOptions[0].DomainName", equalTo("*.example.com"))+ .body("Certificate.DomainValidationOptions[0].ResourceRecord.Name",+ matchesPattern("^_[0-9a-f]{32}\\.example\\.com\\.$"));}@Testvoid wildcardDomainAsSan() {- given()+ String certificateArn = given().header("X-Amz-Target", "CertificateManager.RequestCertificate").contentType(ACM_CONTENT_TYPE).body("""{"DomainName": "example.com",- "SubjectAlternativeNames": ["*.example.com", "www.example.com"]+ "SubjectAlternativeNames": ["*.EXAMPLE.com", "www.example.com"]}""").when().post("/").then().statusCode(200)- .body("CertificateArn", startsWith("arn:aws:acm:"));+ .body("CertificateArn", startsWith("arn:aws:acm:"))+ .extract().jsonPath().getString("CertificateArn");++ var validationOptions = given()+ .header("X-Amz-Target", "CertificateManager.DescribeCertificate")+ .contentType(ACM_CONTENT_TYPE)+ .body("""+ {+ "CertificateArn": "%s"+ }+ """.formatted(certificateArn))+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .extract().jsonPath();++ String baseRecordName = validationOptions.getString(+ "Certificate.DomainValidationOptions.find { it.DomainName == 'example.com' }.ResourceRecord.Name");+ String baseRecordValue = validationOptions.getString(+ "Certificate.DomainValidationOptions.find { it.DomainName == 'example.com' }.ResourceRecord.Value");+ String wildcardRecordName = validationOptions.getString(+ "Certificate.DomainValidationOptions.find { it.DomainName == '*.EXAMPLE.com' }.ResourceRecord.Name");+ String wildcardRecordValue = validationOptions.getString(+ "Certificate.DomainValidationOptions.find { it.DomainName == '*.EXAMPLE.com' }.ResourceRecord.Value");+ String distinctRecordName = validationOptions.getString(+ "Certificate.DomainValidationOptions.find { it.DomainName == 'www.example.com' }.ResourceRecord.Name");+ String distinctRecordValue = validationOptions.getString(+ "Certificate.DomainValidationOptions.find { it.DomainName == 'www.example.com' }.ResourceRecord.Value");++ assertEquals(baseRecordName, wildcardRecordName);+ assertEquals(baseRecordValue, wildcardRecordValue);+ assertNotEquals(baseRecordName, distinctRecordName);+ assertNotEquals(baseRecordValue, distinctRecordValue);}@Testvoid nestedWildcardDomain() {// AWS allows wildcards only at the leftmost position+ String certificateArn = requestCertificate("*.api.example.com");+given()- .header("X-Amz-Target", "CertificateManager.RequestCertificate")+ .header("X-Amz-Target", "CertificateManager.DescribeCertificate").contentType(ACM_CONTENT_TYPE).body("""{- "DomainName": "*.api.example.com"+ "CertificateArn": "%s"}- """)+ """.formatted(certificateArn)).when().post("/").then().statusCode(200)- .body("CertificateArn", startsWith("arn:aws:acm:"));+ .body("Certificate.DomainValidationOptions[0].ResourceRecord.Name",+ matchesPattern("^_[0-9a-f]{32}\\.api\\.example\\.com\\.$"));+ }++ @Test+ void validationRecordIsStableAcrossCertificates() {+ String domain = "stable-" + UUID.randomUUID() + ".example.com";+ String firstCertificateArn = requestCertificate(domain);+ String secondCertificateArn = requestCertificate(domain);++ assertNotEquals(firstCertificateArn, secondCertificateArn);+ assertEquals(validationRecord(firstCertificateArn), validationRecord(secondCertificateArn));}// ==================== Max SANs Tests ====================