Light, fluffy, and always free - The AWS Local Emulator alternative
fix(iam): derive the AWS managed policy catalog per partition (#4742)
Hector Ventura99c1c4129aa0
diff --git a/docs/configuration/partitions.md b/docs/configuration/partitions.mdindex 25308353fc..5f986aee65 100644--- a/docs/configuration/partitions.md+++ b/docs/configuration/partitions.md@@ -113,6 +113,12 @@ did before.- **XML namespaces** and the S3 canned-ACL group URIs (`http://acs.amazonaws.com/groups/...`)are identifiers, not hosts.- **AWS managed policy ARNs** keep the literal `aws` account slot: `arn:aws-cn:iam::aws:policy/AdministratorAccess`.+ The catalog Floci bundles is the commercial one; every other partition's is derived from it on+ first use, with the partition in every ARN (what AWS's own SAM translator does) and the+ partition's DNS suffix in the region-bearing `kms:ViaService` hosts (`s3.*.amazonaws.com.cn`).+ Service principals and service-linked role paths are the same in every partition and are left+ alone. Whether AWS's China or GovCloud documents differ in content beyond that is an open+ question below.## Partition-absent servicesdiff --git a/src/main/java/io/github/hectorvent/floci/services/iam/AwsManagedPolicies.java b/src/main/java/io/github/hectorvent/floci/services/iam/AwsManagedPolicies.javaindex 8a8e7d3e27..617b4acf9d 100644--- a/src/main/java/io/github/hectorvent/floci/services/iam/AwsManagedPolicies.java+++ b/src/main/java/io/github/hectorvent/floci/services/iam/AwsManagedPolicies.java@@ -4,6 +4,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;import com.fasterxml.jackson.databind.JsonNode;import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;+import io.github.hectorvent.floci.core.common.AwsArnUtils;+import io.github.hectorvent.floci.core.common.AwsPartition;+import io.github.hectorvent.floci.core.common.AwsPartitions;import io.quarkus.runtime.annotations.RegisterForReflection;import org.jboss.logging.Logger;@@ -15,6 +18,8 @@ import java.time.format.DateTimeParseException;import java.util.ArrayList;import java.util.List;import java.util.Map;+import java.util.concurrent.ConcurrentHashMap;+import java.util.regex.Matcher;import java.util.regex.Pattern;/**@@ -42,12 +47,35 @@ import java.util.regex.Pattern;* managed policy's history down to five versions. A policy missing from the versions file* keeps the {@code v1} default so a partial refresh degrades to the old behaviour instead of* dropping the policy.+ *+ * <p>The bundled data is the commercial partition's. Every other partition's catalog is+ * derived from it on first use ({@link #forPartition}): the ARN prefix and every+ * {@code arn:aws:} inside a document take the partition ({@code arn:aws-cn:iam::aws:policy/...},+ * which is what AWS's own SAM translator does, {@code samtranslator/translator/arn_generator.py}),+ * and the region-bearing hostnames a {@code kms:ViaService} condition names+ * ({@code s3.*.amazonaws.com}) take the partition's DNS suffix. Bare service principals+ * ({@code ec2.amazonaws.com}) and service-linked role paths are the same in every partition and+ * are left alone, as is the {@code ::aws:policy/} owner slot. Whether AWS's China or GovCloud+ * documents differ in content beyond that is not known; see the open questions in+ * {@code docs/configuration/partitions.md}.*/final class AwsManagedPolicies {private static final Logger LOG = Logger.getLogger(AwsManagedPolicies.class);- static final String ARN_PREFIX = "arn:aws:iam::aws:policy";+ private static final String COMMERCIAL_PARTITION = "aws";+ /** {@code arn:<partition>:iam::aws:policy/}, the owner slot literally {@code aws} in every partition. */+ private static final Pattern MANAGED_POLICY_ARN = Pattern.compile(+ "^arn:(" + AwsArnUtils.PARTITION_REGEX + "):iam::aws:policy/");+ /** Every commercial ARN inside a document; the whole prefix up to and including the second colon. */+ private static final Pattern COMMERCIAL_ARN = Pattern.compile("arn:aws:"); // partition-literal: the commercial prefix this rewrites away+ /**+ * A hostname whose label before the commercial suffix is a region or the {@code *} that+ * stands for one ({@code s3.*.amazonaws.com}, {@code s3.us-east-1.amazonaws.com}); a bare+ * principal has no such label and never matches.+ */+ private static final Pattern REGION_BEARING_HOST = Pattern.compile(+ "\\.(\\*|[a-z]{2,4}-[a-z-]+-\\d)\\.amazonaws\\.com(?![.\\w-])"); // partition-literal: the commercial suffix this rewrites awayprivate static final String CATALOG_RESOURCE_NAME = "iam/managed-policies.yaml";private static final String DOCUMENTS_RESOURCE_NAME = "iam/managed-policy-documents.json";@@ -59,24 +87,73 @@ final class AwsManagedPolicies {/*** One resolvable AWS managed policy.*+ * @param partition the partition whose catalog holds it, which its ARN names* @param document the document of the policy's current default version* @param defaultVersionId the version id AWS reports for that document, e.g. {@code v3}* @param createDate when AWS first published the policy, or {@code null} if unknown* @param updateDate when AWS published the current default version, or {@code null}* if unknown*/- record ManagedPolicyDef(String name, String path, String description, String document,+ record ManagedPolicyDef(String partition, String name, String path, String description, String document,String defaultVersionId, Instant createDate, Instant updateDate) {String arn() {- return ARN_PREFIX + path + name;+ return arnPrefix(partition) + path + name;}}+ /** The commercial catalog, byte-identical to the bundled data. */static final List<ManagedPolicyDef> POLICIES = load();+ private static final Map<String, List<ManagedPolicyDef>> BY_PARTITION = new ConcurrentHashMap<>();+private AwsManagedPolicies() {}+ /** {@code arn:<partition>:iam::aws:policy}, without the trailing slash of the path. */+ static String arnPrefix(String partition) {+ return "arn:" + partition + ":iam::aws:policy";+ }++ /** True for an AWS managed policy ARN in any partition ({@code arn:aws-cn:iam::aws:policy/...}). */+ static boolean isManagedPolicyArn(String arn) {+ return arn != null && MANAGED_POLICY_ARN.matcher(arn).find();+ }++ /**+ * The catalog of {@code partition}: the bundled commercial data for {@code aws}, a derived+ * view otherwise, built once per partition. Bounded by the published partitions.+ *+ * @throws IllegalArgumentException when {@code partition} is not a published partition id+ */+ static List<ManagedPolicyDef> forPartition(String partition) {+ if (COMMERCIAL_PARTITION.equals(partition)) {+ return POLICIES;+ }+ AwsPartition target = AwsPartitions.find(partition).orElseThrow(() ->+ new IllegalArgumentException("Not a published AWS partition: " + partition));+ return BY_PARTITION.computeIfAbsent(target.id(), id -> derive(target));+ }++ private static List<ManagedPolicyDef> derive(AwsPartition partition) {+ long started = System.nanoTime();+ String arnPrefix = "arn:" + partition.id() + ":";+ List<ManagedPolicyDef> derived = new ArrayList<>(POLICIES.size());+ for (ManagedPolicyDef def : POLICIES) {+ derived.add(new ManagedPolicyDef(partition.id(), def.name(), def.path(), def.description(),+ rewriteDocument(def.document(), arnPrefix, partition.dnsSuffix()),+ def.defaultVersionId(), def.createDate(), def.updateDate()));+ }+ LOG.debugv("Derived the {0} managed policy catalog ({1} policies) in {2} ms",+ partition.id(), derived.size(), (System.nanoTime() - started) / 1_000_000);+ return List.copyOf(derived);+ }++ static String rewriteDocument(String document, String arnPrefix, String dnsSuffix) {+ String rewritten = COMMERCIAL_ARN.matcher(document).replaceAll(Matcher.quoteReplacement(arnPrefix));+ Matcher hosts = REGION_BEARING_HOST.matcher(rewritten);+ return hosts.replaceAll(match -> Matcher.quoteReplacement("." + match.group(1) + "." + dnsSuffix));+ }+private static List<ManagedPolicyDef> load() {try (InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream(CATALOG_RESOURCE_NAME)) {@@ -100,7 +177,8 @@ final class AwsManagedPolicies {continue;}VersionEntry version = versions.get(entry.name);- defs.add(new ManagedPolicyDef(entry.name, entry.path, entry.description, document.toString(),+ defs.add(new ManagedPolicyDef(COMMERCIAL_PARTITION, entry.name, entry.path, entry.description,+ document.toString(),defaultVersionId(entry.name, version),parseDate(entry.name, "createDate", version == null ? null : version.createDate),parseDate(entry.name, "updateDate", version == null ? null : version.updateDate)));diff --git a/src/main/java/io/github/hectorvent/floci/services/iam/IamService.java b/src/main/java/io/github/hectorvent/floci/services/iam/IamService.javaindex de48706a05..52c89ab7c0 100644--- a/src/main/java/io/github/hectorvent/floci/services/iam/IamService.java+++ b/src/main/java/io/github/hectorvent/floci/services/iam/IamService.java@@ -43,6 +43,7 @@ import java.time.format.DateTimeFormatter;import java.util.Base64;import java.util.Optional;import java.util.Set;+import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.ThreadLocalRandom;import java.util.ArrayList;import java.util.LinkedHashMap;@@ -176,11 +177,13 @@ public class IamService implements SessionAccountLookup, ResourceProvider {private final Object resourceNameLock = new Object();/**- * AWS-managed policies (arn:aws:iam::aws:policy/...), keyed by ARN. These are global —- * not owned by any account — so they live here rather than in the account-partitioned- * {@link #policies} store, and {@link #getPolicy} resolves them for any caller.+ * AWS-managed policies ({@code arn:<partition>:iam::aws:policy/...}), keyed by ARN, one map+ * per partition and built on first use. These are global: not owned by any account, so they+ * live here rather than in the account-partitioned {@link #policies} store, and+ * {@link #getPolicy} resolves them for any caller. The partition comes from the ARN a+ * caller names, so a China ARN resolves under any signing scope and lists in China scope.*/- private final Map<String, IamPolicy> awsManagedPolicies = buildAwsManagedPolicies();+ private final Map<String, Map<String, IamPolicy>> awsManagedPoliciesByPartition = new ConcurrentHashMap<>();@Injectpublic IamService(StorageFactory storageFactory, EmulatorConfig config, RegionResolver regionResolver) {@@ -317,9 +320,24 @@ public class IamService implements SessionAccountLookup, ResourceProvider {seedConfiguredAccountAlias();}- private static Map<String, IamPolicy> buildAwsManagedPolicies() {+ private Map<String, IamPolicy> awsManagedPolicies(String partition) {+ return awsManagedPoliciesByPartition.computeIfAbsent(partition, IamService::buildAwsManagedPolicies);+ }++ /** The managed policy catalog of the partition an ARN names, or empty for an unpublished one. */+ private Map<String, IamPolicy> awsManagedPoliciesFor(String managedPolicyArn) {+ try {+ return awsManagedPolicies(AwsArnUtils.parse(managedPolicyArn).partition());+ } catch (IllegalArgumentException ignored) {+ // Only reached for an ARN that already matched the managed-policy pattern but names a+ // partition AWS does not publish: no catalog exists there, so no policy resolves.+ return Map.of();+ }+ }++ private static Map<String, IamPolicy> buildAwsManagedPolicies(String partition) {Map<String, IamPolicy> catalog = new LinkedHashMap<>();- for (AwsManagedPolicies.ManagedPolicyDef def : AwsManagedPolicies.POLICIES) {+ for (AwsManagedPolicies.ManagedPolicyDef def : AwsManagedPolicies.forPartition(partition)) {String arn = def.arn();// The bundled document is the policy's current default version, served under the// version id AWS actually reports for it (v3 for AmazonS3ReadOnlyAccess, v1 for@@ -348,7 +366,8 @@ public class IamService implements SessionAccountLookup, ResourceProvider {* megabyte of persisted state and several seconds of startup for nothing.*/void seedAwsManagedPolicies() {- LOG.debugv("AWS managed policy catalog available: {0} policies", awsManagedPolicies.size());+ LOG.debugv("AWS managed policy catalog available: {0} policies",+ awsManagedPolicies(regionResolver.getDefaultPartition()).size());}private void seedConfiguredAccountAlias() {@@ -369,7 +388,8 @@ public class IamService implements SessionAccountLookup, ResourceProvider {}private void seedDefaultDeployerPrincipal() {- String adminPolicyArn = AwsManagedPolicies.ARN_PREFIX + "/AdministratorAccess";+ String adminPolicyArn = AwsManagedPolicies.arnPrefix(regionResolver.getDefaultPartition())+ + "/AdministratorAccess";IamUser user = users.get(DEFAULT_DEPLOYER_USER).orElseGet(() -> {String userId = "AIDA" + randomId(16);@@ -921,7 +941,7 @@ public class IamService implements SessionAccountLookup, ResourceProvider {String arn = iamArn("policy", normalizedPath, policyName);boolean nameTaken = resourcesInCurrentAccount(policies).filter(existing -> existing.getArn() == null- || !existing.getArn().startsWith(AwsManagedPolicies.ARN_PREFIX))+ || !AwsManagedPolicies.isManagedPolicyArn(existing.getArn())).map(IamPolicy::getPolicyName).anyMatch(existingName -> existingName != null && existingName.equalsIgnoreCase(policyName));if (nameTaken) {@@ -939,7 +959,7 @@ public class IamService implements SessionAccountLookup, ResourceProvider {public IamPolicy getPolicy(String policyArn) {IamPolicy policy = requirePolicy(policyArn);- if (policyArn.startsWith(AwsManagedPolicies.ARN_PREFIX)) {+ if (AwsManagedPolicies.isManagedPolicyArn(policyArn)) {return managedPolicySnapshot(policy, managedPolicyAttachmentCount(policyArn));}return policy;@@ -959,9 +979,9 @@ public class IamService implements SessionAccountLookup, ResourceProvider {* that account's {@link #policies} partition and would otherwise be silently dropped.*/private Optional<IamPolicy> resolvePolicy(String arn) {- if (arn != null && arn.startsWith(AwsManagedPolicies.ARN_PREFIX)) {+ if (AwsManagedPolicies.isManagedPolicyArn(arn)) {// Authorization and ListAttached* need policy documents or names, not attachment counts.- return Optional.ofNullable(awsManagedPolicies.get(arn));+ return Optional.ofNullable(awsManagedPoliciesFor(arn).get(arn));}return policies.get(arn);}@@ -980,7 +1000,7 @@ public class IamService implements SessionAccountLookup, ResourceProvider {private void tallyManagedPolicyAttachments(List<String> policyArns, Map<String, Integer> counts) {for (String policyArn : policyArns) {- if (policyArn.startsWith(AwsManagedPolicies.ARN_PREFIX)) {+ if (AwsManagedPolicies.isManagedPolicyArn(policyArn)) {counts.merge(policyArn, 1, Integer::sum);}}@@ -1012,7 +1032,7 @@ public class IamService implements SessionAccountLookup, ResourceProvider {}private void incrementCustomerManagedPolicyAttachmentCount(IamPolicy policy) {- if (policy.getArn().startsWith(AwsManagedPolicies.ARN_PREFIX)) {+ if (AwsManagedPolicies.isManagedPolicyArn(policy.getArn())) {return;}policy.setAttachmentCount(policy.getAttachmentCount() + 1);@@ -1020,7 +1040,7 @@ public class IamService implements SessionAccountLookup, ResourceProvider {}private void decrementCustomerManagedPolicyAttachmentCount(String policyArn) {- if (policyArn.startsWith(AwsManagedPolicies.ARN_PREFIX)) {+ if (AwsManagedPolicies.isManagedPolicyArn(policyArn)) {return;}policies.get(policyArn).ifPresent(policy -> {@@ -1030,7 +1050,7 @@ public class IamService implements SessionAccountLookup, ResourceProvider {}private void rejectIfAwsManaged(String policyArn) {- if (policyArn != null && policyArn.startsWith(AwsManagedPolicies.ARN_PREFIX)) {+ if (AwsManagedPolicies.isManagedPolicyArn(policyArn)) {throw new AwsException("AccessDenied","Cannot modify or delete AWS managed policy: " + policyArn, 403);}@@ -1089,7 +1109,7 @@ public class IamService implements SessionAccountLookup, ResourceProvider {// AWS-managed ARNs mirrored into the default account at seed time — those are// served from the global catalog below so the default account does not see them twice.policies.scan(k -> true).stream()- .filter(p -> !p.getArn().startsWith(AwsManagedPolicies.ARN_PREFIX))+ .filter(p -> !AwsManagedPolicies.isManagedPolicyArn(p.getArn())).filter(p -> p.getPath().startsWith(prefix)).forEach(result::add);}@@ -1098,7 +1118,7 @@ public class IamService implements SessionAccountLookup, ResourceProvider {// every caller sees the full set regardless of the request account — mirroring the// getPolicy fix, and keeping the ListPolicies and GetPolicy read paths consistent.Map<String, Integer> attachmentCounts = managedPolicyAttachmentCounts();- awsManagedPolicies.values().stream()+ awsManagedPolicies(regionResolver.getPartition()).values().stream().filter(p -> p.getPath().startsWith(prefix)).map(p -> managedPolicySnapshot(p, attachmentCounts.getOrDefault(p.getArn(), 0))).forEach(result::add);@@ -1119,7 +1139,7 @@ public class IamService implements SessionAccountLookup, ResourceProvider {long localPolicyCount = 0;long policyVersionsInUse = 0;for (IamPolicy policy : policies.scan(k -> true)) {- if (policy.getArn().startsWith(AwsManagedPolicies.ARN_PREFIX)) {+ if (AwsManagedPolicies.isManagedPolicyArn(policy.getArn())) {continue;}localPolicyCount++;@@ -2996,7 +3016,7 @@ public class IamService implements SessionAccountLookup, ResourceProvider {Set<String> referencedAwsManagedArns) {for (String arn : attachedPolicyArns) {attachmentCounts.merge(arn, 1, Integer::sum);- if (arn.startsWith(AwsManagedPolicies.ARN_PREFIX)) {+ if (AwsManagedPolicies.isManagedPolicyArn(arn)) {referencedAwsManagedArns.add(arn);}}@@ -3008,7 +3028,7 @@ public class IamService implements SessionAccountLookup, ResourceProvider {return;}boundaryUsageCounts.merge(permissionsBoundaryArn, 1, Integer::sum);- if (permissionsBoundaryArn.startsWith(AwsManagedPolicies.ARN_PREFIX)) {+ if (AwsManagedPolicies.isManagedPolicyArn(permissionsBoundaryArn)) {referencedAwsManagedArns.add(permissionsBoundaryArn);}}diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/AwsManagedPoliciesTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/AwsManagedPoliciesTest.javanew file mode 100644index 0000000000..134b331e5e--- /dev/null+++ b/src/test/java/io/github/hectorvent/floci/services/iam/AwsManagedPoliciesTest.java@@ -0,0 +1,132 @@+package io.github.hectorvent.floci.services.iam;++import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import io.github.hectorvent.floci.testing.PartitionMatrix;+import io.github.hectorvent.floci.testing.PartitionMatrix.PartitionCase;+import org.junit.jupiter.api.Test;+import org.junit.jupiter.params.ParameterizedTest;+import org.junit.jupiter.params.provider.MethodSource;++import java.util.List;+import java.util.regex.Matcher;+import java.util.regex.Pattern;++import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertSame;+import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;++/**+ * The per-partition managed policy catalogs are derived from the commercial data by exactly two+ * substitutions: {@code arn:aws:} takes the partition (what AWS's SAM translator does) and the+ * region-bearing {@code kms:ViaService} hosts take the partition's DNS suffix. Bare service+ * principals, service-linked role paths, the {@code ::aws:policy/} owner slot and the+ * pre-existing {@code .amazonaws.com.cn} entries must come through untouched.+ */+class AwsManagedPoliciesTest {++ private static final ObjectMapper MAPPER = new ObjectMapper();+ private static final Pattern BARE_PRINCIPAL =+ Pattern.compile("\"([a-z0-9-]+(?:\\.[a-z0-9-]+)?\\.amazonaws\\.com)\"");++ @Test+ void theCommercialCatalogIsTheBundledDataItself() {+ assertSame(AwsManagedPolicies.POLICIES, AwsManagedPolicies.forPartition("aws"));+ assertEquals("arn:aws:iam::aws:policy/AdministratorAccess", find("aws", "AdministratorAccess").arn());+ }++ @ParameterizedTest+ @MethodSource("io.github.hectorvent.floci.testing.PartitionMatrix#cases")+ void everyPartitionGetsTheFullCatalogUnderItsOwnArnPrefix(PartitionCase partition) {+ List<AwsManagedPolicies.ManagedPolicyDef> catalog = AwsManagedPolicies.forPartition(partition.partition());+ assertEquals(AwsManagedPolicies.POLICIES.size(), catalog.size());+ AwsManagedPolicies.ManagedPolicyDef admin = find(partition.partition(), "AdministratorAccess");+ assertEquals("arn:" + partition.partition() + ":iam::aws:policy/AdministratorAccess", admin.arn());+ assertTrue(AwsManagedPolicies.isManagedPolicyArn(admin.arn()));+ assertSame(catalog, AwsManagedPolicies.forPartition(partition.partition()), "built once per partition");+ }++ @Test+ void anUnpublishedPartitionIsRefusedNotInvented() {+ assertThrows(IllegalArgumentException.class, () -> AwsManagedPolicies.forPartition("aws-xyz"));+ assertFalse(AwsManagedPolicies.isManagedPolicyArn("arn:aws:iam::000000000000:policy/mine"));+ assertFalse(AwsManagedPolicies.isManagedPolicyArn(null));+ }++ @Test+ void documentArnsTakeThePartitionAndTheOwnerSlotStaysAws() throws Exception {+ String china = find("aws-cn", "AWSLambdaExecute").document();+ assertFalse(china.contains("arn:aws:"), "every commercial ARN in the document was rewritten");+ assertTrue(china.contains("arn:aws-cn:logs:"), china);+ // A document that references another managed policy keeps the owner slot literally aws.+ String batch = find("aws-cn", "AWSBatchServiceRole").document();+ assertFalse(batch.contains("arn:aws:"));+ MAPPER.readTree(china);+ MAPPER.readTree(batch);+ }++ @Test+ void bareServicePrincipalsAndPreExistingChinaPrincipalsAreLeftAlone() {+ String commercial = find("aws", "AWSBatchServiceRole").document();+ String china = find("aws-cn", "AWSBatchServiceRole").document();+ assertEquals(count(commercial, "ec2.amazonaws.com.cn"), count(china, "ec2.amazonaws.com.cn"),+ "the .cn principal AWS already spells out is neither doubled nor removed");+ Matcher bare = BARE_PRINCIPAL.matcher(commercial);+ int principals = 0;+ while (bare.find()) {+ principals++;+ assertTrue(china.contains("\"" + bare.group(1) + "\""), bare.group(1) + " must stay universal");+ }+ assertTrue(principals > 0, "the fixture has bare principals to check");+ }++ @Test+ void regionBearingViaServiceHostsTakeThePartitionSuffix() {+ String commercial = "{\"Condition\":{\"StringEquals\":{\"kms:ViaService\":[\"s3.*.amazonaws.com\","+ + "\"secretsmanager.us-east-1.amazonaws.com\",\"ec2.amazonaws.com\",\"ec2.amazonaws.com.cn\"]}},"+ + "\"Resource\":\"arn:aws:iam::aws:policy/X\","+ + "\"Principal\":\"arn:aws:iam::123456789012:role/aws-service-role/ecs.amazonaws.com/"+ + "AWSServiceRoleForECS\"}";+ String china = AwsManagedPolicies.rewriteDocument(commercial, "arn:aws-cn:", "amazonaws.com.cn");+ assertTrue(china.contains("\"s3.*.amazonaws.com.cn\""), china);+ assertTrue(china.contains("\"secretsmanager.us-east-1.amazonaws.com.cn\""), china);+ assertTrue(china.contains("\"ec2.amazonaws.com\""), "a bare principal is universal");+ assertTrue(china.contains("\"ec2.amazonaws.com.cn\"") && !china.contains(".cn.cn"), china);+ assertTrue(china.contains("arn:aws-cn:iam::aws:policy/X"), "owner slot stays aws");+ assertTrue(china.contains("role/aws-service-role/ecs.amazonaws.com/AWSServiceRoleForECS"),+ "SLR path untouched");++ String govcloud = AwsManagedPolicies.rewriteDocument(commercial, "arn:aws-us-gov:", "amazonaws.com");+ assertTrue(govcloud.contains("\"s3.*.amazonaws.com\"")+ && govcloud.contains("arn:aws-us-gov:iam::aws:policy/X"));+ }++ @Test+ void theWholeChinaCatalogStillParsesAndCarriesNoCommercialArn() throws Exception {+ int viaServiceHosts = 0;+ for (AwsManagedPolicies.ManagedPolicyDef def : AwsManagedPolicies.forPartition("aws-cn")) {+ JsonNode document = MAPPER.readTree(def.document());+ assertFalse(document.isNull(), def.name());+ assertFalse(def.document().contains("arn:aws:"), def.name());+ if (def.document().contains(".*.amazonaws.com.cn")) {+ viaServiceHosts++;+ }+ }+ assertTrue(viaServiceHosts > 100, "the kms:ViaService hosts were rewritten: " + viaServiceHosts);+ }++ private static AwsManagedPolicies.ManagedPolicyDef find(String partition, String name) {+ return AwsManagedPolicies.forPartition(partition).stream()+ .filter(def -> def.name().equals(name)).findFirst().orElseThrow();+ }++ private static int count(String text, String needle) {+ int count = 0;+ for (int i = text.indexOf(needle); i >= 0; i = text.indexOf(needle, i + needle.length())) {+ count++;+ }+ return count;+ }+}diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/IamCaseInsensitiveLegacyNamesTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/IamCaseInsensitiveLegacyNamesTest.javaindex b62c33466e..97490bf8b9 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/IamCaseInsensitiveLegacyNamesTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/IamCaseInsensitiveLegacyNamesTest.java@@ -98,7 +98,7 @@ class IamCaseInsensitiveLegacyNamesTest {@ParameterizedTest@ValueSource(booleans = {false, true})void awsManagedPolicyMirrorsDoNotReserveCustomerPolicyNames(boolean accountPrefixed) {- String managedArn = AwsManagedPolicies.ARN_PREFIX + "/AdministratorAccess";+ String managedArn = AwsManagedPolicies.arnPrefix("aws") + "/AdministratorAccess";String mirrorKey = accountPrefixed ? DEFAULT_ACCOUNT + "/" + managedArn : managedArn;IamPolicy mirror = new IamPolicy("ANPALEGACYAWS", "AdministratorAccess", "/", managedArn,null, "{}");diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyAccountScopeTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyAccountScopeTest.javaindex a30f07ebd8..f0f8651f25 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyAccountScopeTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyAccountScopeTest.java@@ -86,7 +86,7 @@ class IamManagedPolicyAccountScopeTest {// A managed policy resolves from any account context (served from the global catalog,// not the account-partitioned store) — the request runs as account 111...- String managedArn = AwsManagedPolicies.ARN_PREFIX + "/service-role/AWSLambdaBasicExecutionRole";+ String managedArn = AwsManagedPolicies.arnPrefix("aws") + "/service-role/AWSLambdaBasicExecutionRole";IamPolicy managed = service.getPolicy(managedArn);assertEquals(managedArn, managed.getArn());// GetPolicyVersion routes through getPolicy, so the document is reachable too.@@ -102,11 +102,11 @@ class IamManagedPolicyAccountScopeTest {List<String> arns = AwsManagedPolicies.POLICIES.stream().map(AwsManagedPolicies.ManagedPolicyDef::arn).toList();- assertTrue(arns.contains(AwsManagedPolicies.ARN_PREFIX + "/AWSXRayDaemonWriteAccess"));- assertTrue(arns.contains(AwsManagedPolicies.ARN_PREFIX + "/AWSCloudFormationReadOnlyAccess"));- assertTrue(arns.contains(AwsManagedPolicies.ARN_PREFIX + "/AWSCloudFormationFullAccess"));- assertTrue(arns.contains(AwsManagedPolicies.ARN_PREFIX + "/AWSServiceCatalogEndUserFullAccess"));- assertTrue(arns.contains(AwsManagedPolicies.ARN_PREFIX + "/AmazonElasticFileSystemClientFullAccess"));+ assertTrue(arns.contains(AwsManagedPolicies.arnPrefix("aws") + "/AWSXRayDaemonWriteAccess"));+ assertTrue(arns.contains(AwsManagedPolicies.arnPrefix("aws") + "/AWSCloudFormationReadOnlyAccess"));+ assertTrue(arns.contains(AwsManagedPolicies.arnPrefix("aws") + "/AWSCloudFormationFullAccess"));+ assertTrue(arns.contains(AwsManagedPolicies.arnPrefix("aws") + "/AWSServiceCatalogEndUserFullAccess"));+ assertTrue(arns.contains(AwsManagedPolicies.arnPrefix("aws") + "/AmazonElasticFileSystemClientFullAccess"));}@Test@@ -123,7 +123,7 @@ class IamManagedPolicyAccountScopeTest {new RegionResolver("us-east-1", DEFAULT_ACCT));int catalogSize = AwsManagedPolicies.POLICIES.size();- String lambdaBasicArn = AwsManagedPolicies.ARN_PREFIX + "/service-role/AWSLambdaBasicExecutionRole";+ String lambdaBasicArn = AwsManagedPolicies.arnPrefix("aws") + "/service-role/AWSLambdaBasicExecutionRole";// Scope=AWS now serves the full global catalog from a non-default account.List<IamPolicy> aws = service.listPolicies("AWS", null);@@ -152,7 +152,7 @@ class IamManagedPolicyAccountScopeTest {"app", CUSTOMER_DOCUMENT));// Simulate the seed-time mirror: a managed policy copied into the default account store.- String mirroredManagedArn = AwsManagedPolicies.ARN_PREFIX + "/AdministratorAccess";+ String mirroredManagedArn = AwsManagedPolicies.arnPrefix("aws") + "/AdministratorAccess";reqPolicies.putForAccount(DEFAULT_ACCT, mirroredManagedArn,new IamPolicy("ANPAADMIN0000001", "AdministratorAccess", "/", mirroredManagedArn,"admin", CUSTOMER_DOCUMENT));@@ -195,7 +195,7 @@ class IamManagedPolicyAccountScopeTest {AccountAwareStorageBackend<IamPolicy> policies =new AccountAwareStorageBackend<>(rawPolicies, ctx, DEFAULT_ACCT);- String managedArn = AwsManagedPolicies.ARN_PREFIX + "/service-role/AWSLambdaBasicExecutionRole";+ String managedArn = AwsManagedPolicies.arnPrefix("aws") + "/service-role/AWSLambdaBasicExecutionRole";// A customer policy attached to the same user — must stay account-scoped (control).String customerArn = "arn:aws:iam::" + REQUEST_ACCT + ":policy/app-policy";policies.putForAccount(REQUEST_ACCT, customerArn,@@ -254,7 +254,7 @@ class IamManagedPolicyAccountScopeTest {AccountAwareStorageBackend<IamPolicy> policies =new AccountAwareStorageBackend<>(rawPolicies, ctx, DEFAULT_ACCT);- String managedArn = AwsManagedPolicies.ARN_PREFIX + "/service-role/AWSLambdaBasicExecutionRole";+ String managedArn = AwsManagedPolicies.arnPrefix("aws") + "/service-role/AWSLambdaBasicExecutionRole";String customerArn = "arn:aws:iam::" + REQUEST_ACCT + ":policy/group-policy";policies.putForAccount(REQUEST_ACCT, customerArn,new IamPolicy("ANPAGRP000000001", "group-policy", "/", customerArn,@@ -287,8 +287,8 @@ class IamManagedPolicyAccountScopeTest {AccountAwareStorageBackend<IamPolicy> policies =new AccountAwareStorageBackend<>(new InMemoryStorage<>(), ctx, DEFAULT_ACCT);- String managedArn = AwsManagedPolicies.ARN_PREFIX + "/service-role/AWSLambdaBasicExecutionRole";- String boundaryArn = AwsManagedPolicies.ARN_PREFIX + "/PowerUserAccess";+ String managedArn = AwsManagedPolicies.arnPrefix("aws") + "/service-role/AWSLambdaBasicExecutionRole";+ String boundaryArn = AwsManagedPolicies.arnPrefix("aws") + "/PowerUserAccess";IamRole role = new IamRole("AROLE00000000001", "task-role", "/","arn:aws:iam::" + REQUEST_ACCT + ":role/task-role", "{}");@@ -333,8 +333,8 @@ class IamManagedPolicyAccountScopeTest {users, groups, roles, new InMemoryStorage<>(),new InMemoryStorage<>(), new InMemoryStorage<>(), new InMemoryStorage<>(),new RegionResolver("us-east-1", DEFAULT_ACCT));- String managedArn = AwsManagedPolicies.ARN_PREFIX + "/service-role/AWSLambdaBasicExecutionRole";- String boundaryArn = AwsManagedPolicies.ARN_PREFIX + "/PowerUserAccess";+ String managedArn = AwsManagedPolicies.arnPrefix("aws") + "/service-role/AWSLambdaBasicExecutionRole";+ String boundaryArn = AwsManagedPolicies.arnPrefix("aws") + "/PowerUserAccess";service.createUser("auth-user", "/");service.createGroup("auth-group", "/");@@ -380,7 +380,7 @@ class IamManagedPolicyAccountScopeTest {users, groups, roles, policies,new InMemoryStorage<>(), new InMemoryStorage<>(), new InMemoryStorage<>(),new RegionResolver("us-east-1", DEFAULT_ACCT));- String managedArn = AwsManagedPolicies.ARN_PREFIX + "/AdministratorAccess";+ String managedArn = AwsManagedPolicies.arnPrefix("aws") + "/AdministratorAccess";service.createUser("account-a-user", "/");service.createGroup("account-a-group", "/");diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyCatalogTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyCatalogTest.javaindex 1f5b4d41ac..7efc309027 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyCatalogTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyCatalogTest.java@@ -44,6 +44,38 @@ class IamManagedPolicyCatalogTest {new RegionResolver("us-east-1", "000000000000"));}+ @Test+ void aManagedPolicyResolvesUnderThePartitionItsArnNames() {+ IamPolicy china = iamService.getPolicy("arn:aws-cn:iam::aws:policy/AdministratorAccess");+ assertEquals("arn:aws-cn:iam::aws:policy/AdministratorAccess", china.getArn());+ assertEquals("AdministratorAccess", china.getPolicyName());+ IamPolicy govcloud = iamService.getPolicy("arn:aws-us-gov:iam::aws:policy/AWSLambdaExecute");+ assertTrue(govcloud.getVersions().get(govcloud.getDefaultVersionId()).getDocument()+ .contains("arn:aws-us-gov:logs:"));++ AwsException unknown = assertThrows(AwsException.class,+ () -> iamService.getPolicy("arn:aws-xyz:iam::aws:policy/AdministratorAccess"));+ assertEquals("NoSuchEntity", unknown.getErrorCode());+ AwsException denied = assertThrows(AwsException.class,+ () -> iamService.deletePolicy("arn:aws-cn:iam::aws:policy/AdministratorAccess"));+ assertEquals("AccessDenied", denied.getErrorCode());+ }++ @Test+ void aChinaDeploymentListsTheChinaCatalog() {+ IamService china = new IamService(+ new InMemoryStorage<>(), new InMemoryStorage<>(), new InMemoryStorage<>(),+ new InMemoryStorage<>(), new InMemoryStorage<>(), new InMemoryStorage<>(),+ new InMemoryStorage<>(),+ new RegionResolver("cn-north-1", "000000000000"));+ List<IamPolicy> listed = china.listPolicies("AWS", "/");+ assertEquals(AwsManagedPolicies.POLICIES.size(), listed.size());+ assertTrue(listed.stream().allMatch(p -> p.getArn().startsWith("arn:aws-cn:iam::aws:policy/")),+ "every listed ARN carries the deployment's partition");+ assertTrue(iamService.listPolicies("AWS", "/").stream()+ .allMatch(p -> p.getArn().startsWith("arn:aws:iam::aws:policy/")));+ }+@Testvoid catalogCarriesTheFullPublishedListNotAHandfulOfEntries() {assertTrue(AwsManagedPolicies.POLICIES.size() > 1000,diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyPartitionIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyPartitionIntegrationTest.javanew file mode 100644index 0000000000..ecaa48f70d--- /dev/null+++ b/src/test/java/io/github/hectorvent/floci/services/iam/IamManagedPolicyPartitionIntegrationTest.java@@ -0,0 +1,51 @@+package io.github.hectorvent.floci.services.iam;++import io.github.hectorvent.floci.testing.PartitionMatrix;+import io.quarkus.test.junit.QuarkusTest;+import org.junit.jupiter.api.Test;++import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.not;++/**+ * The managed policy catalog under a China signing scope: GetPolicy resolves the China ARN and+ * ListPolicies lists the China catalog, both read-only so the shared emulator needs no cleanup.+ */+@QuarkusTest+class IamManagedPolicyPartitionIntegrationTest {++ private static final String CHINA_IAM = PartitionMatrix.sigV4Auth("cn-north-1", "iam");++ @Test+ void getPolicyResolvesTheChinaManagedPolicyArn() {+ given()+ .header("Authorization", CHINA_IAM)+ .formParam("Action", "GetPolicy")+ .formParam("PolicyArn", "arn:aws-cn:iam::aws:policy/AdministratorAccess")+ .when().post("/").then().statusCode(200)+ .body(containsString("<Arn>arn:aws-cn:iam::aws:policy/AdministratorAccess</Arn>"))+ .body(containsString("<PolicyName>AdministratorAccess</PolicyName>"));++ given()+ .header("Authorization", CHINA_IAM)+ .formParam("Action", "GetPolicyVersion")+ .formParam("PolicyArn", "arn:aws-cn:iam::aws:policy/AWSLambdaExecute")+ .formParam("VersionId", "v1")+ .when().post("/").then().statusCode(200)+ .body(containsString("arn:aws-cn:logs:"))+ .body(not(containsString("arn:aws:")));+ }++ @Test+ void listPoliciesUnderChinaScopeListsTheChinaCatalog() {+ given()+ .header("Authorization", CHINA_IAM)+ .formParam("Action", "ListPolicies")+ .formParam("Scope", "AWS")+ .formParam("MaxItems", "5")+ .when().post("/").then().statusCode(200)+ .body(containsString("<Arn>arn:aws-cn:iam::aws:policy/"))+ .body(not(containsString("<Arn>arn:aws:iam::aws:policy/")));+ }+}diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/IamServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/IamServiceTest.javaindex 2200b936ea..23eea28be4 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/IamServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/IamServiceTest.java@@ -769,7 +769,7 @@ class IamServiceTest {@Testvoid awsManagedReadOnlyPolicyAllowsReadsButDeniesWrites() {- String arn = AwsManagedPolicies.ARN_PREFIX + "/AmazonS3ReadOnlyAccess";+ String arn = AwsManagedPolicies.arnPrefix("aws") + "/AmazonS3ReadOnlyAccess";IamPolicy policy = iamService.getPolicy(arn);assertEquals("AmazonS3ReadOnlyAccess", policy.getPolicyName());@@ -785,9 +785,9 @@ class IamServiceTest {@Testvoid serviceScopedAndAdministratorManagedPoliciesUseTheirDocumentedScopes() {IamPolicy s3ReadOnly = iamService.getPolicy(- AwsManagedPolicies.ARN_PREFIX + "/AmazonS3ReadOnlyAccess");+ AwsManagedPolicies.arnPrefix("aws") + "/AmazonS3ReadOnlyAccess");IamPolicy administrator = iamService.getPolicy(- AwsManagedPolicies.ARN_PREFIX + "/AdministratorAccess");+ AwsManagedPolicies.arnPrefix("aws") + "/AdministratorAccess");IamPolicyEvaluator evaluator = new IamPolicyEvaluator(new ObjectMapper());assertEquals(IamPolicyEvaluator.Decision.DENY,@@ -804,8 +804,8 @@ class IamServiceTest {@Testvoid managedPolicyActsAsPermissionsBoundary() {IamUser user = iamService.createUser("boundary-user", "/");- String adminArn = AwsManagedPolicies.ARN_PREFIX + "/AdministratorAccess";- String boundaryArn = AwsManagedPolicies.ARN_PREFIX + "/AmazonS3ReadOnlyAccess";+ String adminArn = AwsManagedPolicies.arnPrefix("aws") + "/AdministratorAccess";+ String boundaryArn = AwsManagedPolicies.arnPrefix("aws") + "/AmazonS3ReadOnlyAccess";iamService.attachUserPolicy(user.getUserName(), adminArn);iamService.putUserPermissionsBoundary(user.getUserName(), boundaryArn);@@ -822,7 +822,7 @@ class IamServiceTest {@Testvoid managedPolicyRetrievalPreservesFieldsAndUnavailableVersionFailsWithNoSuchEntity() {- String arn = AwsManagedPolicies.ARN_PREFIX + "/AmazonS3ReadOnlyAccess";+ String arn = AwsManagedPolicies.arnPrefix("aws") + "/AmazonS3ReadOnlyAccess";IamPolicy policy = iamService.getPolicy(arn);assertEquals("AmazonS3ReadOnlyAccess", policy.getPolicyName());assertEquals(arn, policy.getArn());diff --git a/tools/partition/baseline.tsv b/tools/partition/baseline.tsvindex 80405f3a44..d4b4b64802 100644--- a/tools/partition/baseline.tsv+++ b/tools/partition/baseline.tsv@@ -1,6 +1,5 @@# category path count# Generated by tools/partition/partition_literals.py --write-baseline; do not hand-edit.-arn-literal src/main/java/io/github/hectorvent/floci/services/iam/AwsManagedPolicies.java 1arn-literal src/main/java/io/github/hectorvent/floci/services/kinesisanalytics/container/FlinkContainerManager.java 1arn-literal src/main/java/io/github/hectorvent/floci/services/rds/proxy/RdsSigV4Validator.java 1dns-suffix src/main/java/io/github/hectorvent/floci/services/cloudformation/CloudFormationService.java 1