Light, fluffy, and always free - The AWS Local Emulator alternative
refactor(auth): dedupe SigV4 Authorization header parsing (#3719)
Priamo Germosen03ead297a3bd
diff --git a/src/main/java/io/github/hectorvent/floci/core/common/auth/SigV4AuthorizationHeader.java b/src/main/java/io/github/hectorvent/floci/core/common/auth/SigV4AuthorizationHeader.javanew file mode 100644index 0000000000..0782114100--- /dev/null+++ b/src/main/java/io/github/hectorvent/floci/core/common/auth/SigV4AuthorizationHeader.java@@ -0,0 +1,41 @@+package io.github.hectorvent.floci.core.common.auth;++import java.util.LinkedHashMap;+import java.util.Map;++/**+ * The {@code Credential}/{@code SignedHeaders}/{@code Signature} parameters carried by an+ * {@code AWS4-HMAC-SHA256 Authorization} header, split out of its raw comma-separated value.+ * Shared by every SigV4 verifier in this codebase that accepts a header-signed request:+ * {@code ExecuteApiSigV4Authorizer} (API Gateway) and {@code IamAuthValidator} (AppSync) both+ * parsed this independently before this class existed.+ */+public record SigV4AuthorizationHeader(String credential, String signedHeaders, String signature) {++ private static final String ALGORITHM = "AWS4-HMAC-SHA256";++ /**+ * Returns null when {@code authorization} is null or does not start with the expected+ * algorithm. A parameter missing from an otherwise well-formed header comes back null on the+ * record instead, left for the caller to reject alongside whatever else it requires (e.g. an+ * {@code X-Amz-Date} it reads from a different source than this header).+ */+ public static SigV4AuthorizationHeader parse(String authorization) {+ if (authorization == null) {+ return null;+ }+ String trimmed = authorization.trim();+ if (!trimmed.regionMatches(true, 0, ALGORITHM, 0, ALGORITHM.length())) {+ return null;+ }+ Map<String, String> parameters = new LinkedHashMap<>();+ for (String part : trimmed.substring(ALGORITHM.length()).split(",")) {+ int equals = part.indexOf('=');+ if (equals > 0) {+ parameters.put(part.substring(0, equals).trim(), part.substring(equals + 1).trim());+ }+ }+ return new SigV4AuthorizationHeader(+ parameters.get("Credential"), parameters.get("SignedHeaders"), parameters.get("Signature"));+ }+}diff --git a/src/main/java/io/github/hectorvent/floci/services/apigateway/ExecuteApiSigV4Authorizer.java b/src/main/java/io/github/hectorvent/floci/services/apigateway/ExecuteApiSigV4Authorizer.javaindex aa3b37174d..9ceffa0c31 100644--- a/src/main/java/io/github/hectorvent/floci/services/apigateway/ExecuteApiSigV4Authorizer.java+++ b/src/main/java/io/github/hectorvent/floci/services/apigateway/ExecuteApiSigV4Authorizer.java@@ -2,6 +2,7 @@ package io.github.hectorvent.floci.services.apigateway;import io.github.hectorvent.floci.core.common.RegionResolver;import io.github.hectorvent.floci.core.common.auth.CredentialScope;+import io.github.hectorvent.floci.core.common.auth.SigV4AuthorizationHeader;import io.github.hectorvent.floci.core.common.auth.SigV4RequestValidator;import io.github.hectorvent.floci.services.iam.IamService;import io.github.hectorvent.floci.services.iam.model.AccessKey;@@ -22,10 +23,8 @@ import java.time.ZoneOffset;import java.time.format.DateTimeFormatter;import java.util.ArrayList;import java.util.Comparator;-import java.util.LinkedHashMap;import java.util.List;import java.util.Locale;-import java.util.Map;/*** Verifies the SigV4 signature on an execute-api data-plane request, so a route or method whose@@ -348,28 +347,20 @@ public class ExecuteApiSigV4Authorizer {String amzDate, Long expiresSeconds) {}private static SignedRequest headerSignedRequest(String authorization, HttpHeaders headers) {- String trimmed = authorization.trim();- if (!trimmed.regionMatches(true, 0, ALGORITHM, 0, ALGORITHM.length())) {+ SigV4AuthorizationHeader parsed = SigV4AuthorizationHeader.parse(authorization);+ if (parsed == null) {return null;}- Map<String, String> parameters = new LinkedHashMap<>();- for (String part : trimmed.substring(ALGORITHM.length()).split(",")) {- int equals = part.indexOf('=');- if (equals > 0) {- parameters.put(part.substring(0, equals).trim(), part.substring(equals + 1).trim());- }- }- String credential = parameters.get("Credential");- String signedHeaders = parameters.get("SignedHeaders");- String signature = parameters.get("Signature");String amzDate = headers.getHeaderString("X-Amz-Date");if (amzDate == null || amzDate.isBlank()) {amzDate = headers.getHeaderString("Date");}- if (isBlank(credential) || isBlank(signedHeaders) || isBlank(signature) || isBlank(amzDate)) {+ if (isBlank(parsed.credential()) || isBlank(parsed.signedHeaders())+ || isBlank(parsed.signature()) || isBlank(amzDate)) {return null;}- return new SignedRequest(credential, signedHeaders.toLowerCase(Locale.ROOT), signature, amzDate, null);+ return new SignedRequest(parsed.credential(), parsed.signedHeaders().toLowerCase(Locale.ROOT),+ parsed.signature(), amzDate, null);}private static SignedRequest presignedRequest(MultivaluedMap<String, String> queryParameters) {diff --git a/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/auth/IamAuthValidator.java b/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/auth/IamAuthValidator.javaindex 462d71dcb4..2d5cb80a4d 100644--- a/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/auth/IamAuthValidator.java+++ b/src/main/java/io/github/hectorvent/floci/services/appsync/graphql/auth/IamAuthValidator.java@@ -3,6 +3,7 @@ package io.github.hectorvent.floci.services.appsync.graphql.auth;import io.github.hectorvent.floci.core.common.AwsRegions;import io.github.hectorvent.floci.core.common.AccountResolver;import io.github.hectorvent.floci.core.common.auth.CredentialScope;+import io.github.hectorvent.floci.core.common.auth.SigV4AuthorizationHeader;import io.github.hectorvent.floci.core.common.auth.SigV4RequestValidator;import io.github.hectorvent.floci.services.appsync.graphql.AppSyncTransportException;import io.github.hectorvent.floci.services.iam.IamPolicyEvaluator;@@ -17,7 +18,6 @@ import java.security.MessageDigest;import java.time.Instant;import java.time.ZoneOffset;import java.time.format.DateTimeFormatter;-import java.util.LinkedHashMap;import java.util.Locale;import java.util.Map;@@ -212,28 +212,17 @@ public class IamAuthValidator {* regardless.*/private static SignedRequest headerSignedRequest(String authorization, Map<String, String> requestHeaders) {- if (authorization == null) {+ SigV4AuthorizationHeader parsed = SigV4AuthorizationHeader.parse(authorization);+ if (parsed == null) {return null;}- String trimmed = authorization.trim();- if (!trimmed.regionMatches(true, 0, ALGORITHM, 0, ALGORITHM.length())) {- return null;- }- Map<String, String> parameters = new LinkedHashMap<>();- for (String part : trimmed.substring(ALGORITHM.length()).split(",")) {- int equals = part.indexOf('=');- if (equals > 0) {- parameters.put(part.substring(0, equals).trim(), part.substring(equals + 1).trim());- }- }- String credential = parameters.get("Credential");- String signedHeaders = parameters.get("SignedHeaders");- String signature = parameters.get("Signature");String amzDate = header(requestHeaders, "X-Amz-Date");- if (isBlank(credential) || isBlank(signedHeaders) || isBlank(signature) || isBlank(amzDate)) {+ if (isBlank(parsed.credential()) || isBlank(parsed.signedHeaders())+ || isBlank(parsed.signature()) || isBlank(amzDate)) {return null;}- return new SignedRequest(credential, signedHeaders.toLowerCase(Locale.ROOT), signature, amzDate);+ return new SignedRequest(parsed.credential(), parsed.signedHeaders().toLowerCase(Locale.ROOT),+ parsed.signature(), amzDate);}private static String canonicalHeaders(String signedHeaders, Map<String, String> requestHeaders) {