Light, fluffy, and always free - The AWS Local Emulator alternative
feat(iam): finish the SAML provider lifecycle (#4360)
Priamo Germosen3d35eabf51bb
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamTest.javaindex 2f51fb5a7f..a2fa3bde66 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamTest.java@@ -18,6 +18,8 @@ import software.amazon.awssdk.services.iam.model.CreatePolicyRequest;import software.amazon.awssdk.services.iam.model.CreatePolicyResponse;import software.amazon.awssdk.services.iam.model.CreateRoleRequest;import software.amazon.awssdk.services.iam.model.CreateRoleResponse;+import software.amazon.awssdk.services.iam.model.CreateSamlProviderRequest;+import software.amazon.awssdk.services.iam.model.CreateSamlProviderResponse;import software.amazon.awssdk.services.iam.model.CreateUserRequest;import software.amazon.awssdk.services.iam.model.CreateUserResponse;import software.amazon.awssdk.services.iam.model.DeleteAccessKeyRequest;@@ -25,13 +27,13 @@ import software.amazon.awssdk.services.iam.model.DeleteGroupRequest;import software.amazon.awssdk.services.iam.model.DeleteInstanceProfileRequest;import software.amazon.awssdk.services.iam.model.DeleteLoginProfileRequest;import software.amazon.awssdk.services.iam.model.DeletePolicyRequest;-import software.amazon.awssdk.services.iam.model.DeleteRoleRequest;import software.amazon.awssdk.services.iam.model.DeleteRolePolicyRequest;+import software.amazon.awssdk.services.iam.model.DeleteRoleRequest;+import software.amazon.awssdk.services.iam.model.DeleteSamlProviderRequest;import software.amazon.awssdk.services.iam.model.DeleteUserRequest;import software.amazon.awssdk.services.iam.model.DetachRolePolicyRequest;import software.amazon.awssdk.services.iam.model.DetachUserPolicyRequest;import software.amazon.awssdk.services.iam.model.GetAccountSummaryResponse;-import software.amazon.awssdk.services.iam.model.SummaryKeyType;import software.amazon.awssdk.services.iam.model.GetGroupRequest;import software.amazon.awssdk.services.iam.model.GetGroupResponse;import software.amazon.awssdk.services.iam.model.GetInstanceProfileRequest;@@ -42,10 +44,12 @@ import software.amazon.awssdk.services.iam.model.GetPolicyRequest;import software.amazon.awssdk.services.iam.model.GetPolicyResponse;import software.amazon.awssdk.services.iam.model.GetPolicyVersionRequest;import software.amazon.awssdk.services.iam.model.GetPolicyVersionResponse;-import software.amazon.awssdk.services.iam.model.GetRoleRequest;-import software.amazon.awssdk.services.iam.model.GetRoleResponse;import software.amazon.awssdk.services.iam.model.GetRolePolicyRequest;import software.amazon.awssdk.services.iam.model.GetRolePolicyResponse;+import software.amazon.awssdk.services.iam.model.GetRoleRequest;+import software.amazon.awssdk.services.iam.model.GetRoleResponse;+import software.amazon.awssdk.services.iam.model.GetSamlProviderRequest;+import software.amazon.awssdk.services.iam.model.GetSamlProviderResponse;import software.amazon.awssdk.services.iam.model.GetUserRequest;import software.amazon.awssdk.services.iam.model.GetUserResponse;import software.amazon.awssdk.services.iam.model.ListAccessKeysRequest;@@ -63,6 +67,9 @@ import software.amazon.awssdk.services.iam.model.ListInstanceProfilesResponse;import software.amazon.awssdk.services.iam.model.ListRolePoliciesRequest;import software.amazon.awssdk.services.iam.model.ListRolePoliciesResponse;import software.amazon.awssdk.services.iam.model.ListRolesResponse;+import software.amazon.awssdk.services.iam.model.ListSamlProviderTagsRequest;+import software.amazon.awssdk.services.iam.model.ListSamlProviderTagsResponse;+import software.amazon.awssdk.services.iam.model.ListSamlProvidersResponse;import software.amazon.awssdk.services.iam.model.ListUserTagsRequest;import software.amazon.awssdk.services.iam.model.ListUserTagsResponse;import software.amazon.awssdk.services.iam.model.ListUsersResponse;@@ -73,13 +80,17 @@ import software.amazon.awssdk.services.iam.model.RemoveRoleFromInstanceProfileReimport software.amazon.awssdk.services.iam.model.RemoveUserFromGroupRequest;import software.amazon.awssdk.services.iam.model.SimulatePrincipalPolicyRequest;import software.amazon.awssdk.services.iam.model.StatusType;+import software.amazon.awssdk.services.iam.model.SummaryKeyType;import software.amazon.awssdk.services.iam.model.Tag;import software.amazon.awssdk.services.iam.model.TagInstanceProfileRequest;+import software.amazon.awssdk.services.iam.model.TagSamlProviderRequest;import software.amazon.awssdk.services.iam.model.TagUserRequest;import software.amazon.awssdk.services.iam.model.UntagInstanceProfileRequest;+import software.amazon.awssdk.services.iam.model.UntagSamlProviderRequest;import software.amazon.awssdk.services.iam.model.UntagUserRequest;import software.amazon.awssdk.services.iam.model.UpdateAccessKeyRequest;import software.amazon.awssdk.services.iam.model.UpdateLoginProfileRequest;+import software.amazon.awssdk.services.iam.model.UpdateSamlProviderRequest;import java.net.URLDecoder;import java.nio.charset.StandardCharsets;@@ -107,8 +118,18 @@ class IamTest {private static final String POLICY_DOCUMENT = "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\","+ "\"Action\":\"s3:GetObject\",\"Resource\":\"*\"}]}";private static final String LOGIN_PROFILE_PASSWORD = "Sdk-Test-P4ssword!";+ private static final String SAML_PROVIDER_NAME = "sdk-test-saml-provider";+ private static final String SAML_METADATA_DOCUMENT = "<md:EntityDescriptor "+ + "xmlns:md=\"urn:oasis:names:tc:SAML:2.0:metadata\" entityID=\"https://idp.example.test/sdk-test\">"+ + "<md:IDPSSODescriptor><md:KeyDescriptor use=\"signing\"><ds:KeyInfo "+ + "xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\"><ds:X509Data><ds:X509Certificate>"+ + "c2RrLXRlc3QtY2VydGlmaWNhdGU=</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor>"+ + "</md:IDPSSODescriptor></md:EntityDescriptor>";+ private static final String SAML_METADATA_DOCUMENT_UPDATED = SAML_METADATA_DOCUMENT+ .replace("sdk-test", "sdk-test-updated").replace("c2RrLXRlc3QtY2VydGlmaWNhdGU=", "dXBkYXRlZC1jZXJ0");private static String policyArn;private static String accessKeyId;+ private static String samlProviderArn;@BeforeAllstatic void setup() {@@ -571,6 +592,80 @@ class IamTest {.instanceProfileName(INSTANCE_PROFILE_NAME).tagKeys("env").build());}+ // ── SAML Identity Provider ──────────────────────────────────────────++ @Test+ @Order(47)+ void createSamlProvider() {+ CreateSamlProviderResponse response = iam.createSAMLProvider(CreateSamlProviderRequest.builder()+ .name(SAML_PROVIDER_NAME).samlMetadataDocument(SAML_METADATA_DOCUMENT)+ .tags(Tag.builder().key("owner").value("sdk-test").build())+ .build());++ samlProviderArn = response.samlProviderArn();+ assertThat(samlProviderArn).contains(SAML_PROVIDER_NAME);+ assertThat(response.tags()).anyMatch(t -> "owner".equals(t.key()) && "sdk-test".equals(t.value()));+ }++ @Test+ @Order(48)+ void getSamlProvider() {+ GetSamlProviderResponse response = iam.getSAMLProvider(GetSamlProviderRequest.builder()+ .samlProviderArn(samlProviderArn).build());++ assertThat(response.samlMetadataDocument()).contains("sdk-test");+ }++ @Test+ @Order(49)+ void listSamlProviders() {+ ListSamlProvidersResponse response = iam.listSAMLProviders();++ assertThat(response.samlProviderList()).anyMatch(p -> samlProviderArn.equals(p.arn()));+ }++ @Test+ @Order(50)+ void tagSamlProvider() {+ iam.tagSAMLProvider(TagSamlProviderRequest.builder()+ .samlProviderArn(samlProviderArn)+ .tags(Tag.builder().key("env").value("sdk-test").build())+ .build());+ }++ @Test+ @Order(51)+ void listSamlProviderTags() {+ ListSamlProviderTagsResponse response = iam.listSAMLProviderTags(+ ListSamlProviderTagsRequest.builder().samlProviderArn(samlProviderArn).build());++ assertThat(response.tags()).anyMatch(t -> "env".equals(t.key()));+ }++ @Test+ @Order(52)+ void untagSamlProvider() {+ iam.untagSAMLProvider(UntagSamlProviderRequest.builder()+ .samlProviderArn(samlProviderArn).tagKeys("env").build());+ }++ @Test+ @Order(53)+ void updateSamlProvider() {+ iam.updateSAMLProvider(UpdateSamlProviderRequest.builder()+ .samlProviderArn(samlProviderArn).samlMetadataDocument(SAML_METADATA_DOCUMENT_UPDATED).build());++ GetSamlProviderResponse response = iam.getSAMLProvider(GetSamlProviderRequest.builder()+ .samlProviderArn(samlProviderArn).build());+ assertThat(response.samlMetadataDocument()).contains("sdk-test-updated");+ }++ @Test+ @Order(54)+ void deleteSamlProvider() {+ iam.deleteSAMLProvider(DeleteSamlProviderRequest.builder().samlProviderArn(samlProviderArn).build());+ }+// ── Login Profile ──────────────────────────────────────────────────@Testdiff --git a/docs/services/iam.md b/docs/services/iam.mdindex ebc2241fc0..8baab1aa44 100644--- a/docs/services/iam.md+++ b/docs/services/iam.md@@ -249,18 +249,35 @@ nothing here performs the TLS handshake they describe.| Action | Description ||--------|-------------|-| CreateSAMLProvider | Creates a SAML identity provider from a metadata document. |-| GetSAMLProvider | Returns a provider's creation date and a metadata document rebuilt from its stored entity ID and signing certificate. |+| CreateSAMLProvider | Creates a SAML identity provider from a metadata document, with optional tags echoed back in the response. |+| GetSAMLProvider | Returns a provider's creation date, tags, and a metadata document rebuilt from its stored entity ID and signing certificate. || ListSAMLProviders | Lists the stored SAML providers of the calling account. |+| UpdateSAMLProvider | Replaces a provider's metadata document. |+| DeleteSAMLProvider | Deletes a SAML identity provider. |+| TagSAMLProvider | Adds tags to a SAML identity provider. |+| UntagSAMLProvider | Removes tags from a SAML identity provider. |+| ListSAMLProviderTags | Lists tags stored for a SAML identity provider. |A provider is identified by name, giving an ARN of the form `arn:aws:iam::<account>:saml-provider/<name>`.The name must match `[A-Za-z0-9+=,.@_-]{1,128}`, and creating the same name twice returns-`EntityAlreadyExists`. An empty or unparseable metadata document returns `InvalidInput`.+`EntityAlreadyExists`. An empty or unparseable metadata document returns `InvalidInput`. `Tags` on the+create request are validated before anything is stored, so a request carrying more than 50 of them+fails without leaving a provider behind, as AWS documents.Floci stores only the entity ID and signing certificate parsed from the metadata, so `GetSAMLProvider`-returns a minimal rebuilt document rather than the one that was uploaded. `UpdateSAMLProvider`,-`DeleteSAMLProvider` and the SAML provider tag operations are not implemented. Providers created here-are used by `AssumeRoleWithSAML` for trust-policy and assertion validation.+returns a minimal rebuilt document rather than the one that was uploaded. `UpdateSAMLProvider` re-parses+a new `SAMLMetadataDocument` the same way and replaces the stored entity ID and certificate; omitting it+leaves the provider unchanged, since it is optional on the request. AWS's current `UpdateSAMLProvider`+and `GetSAMLProvider` also manage an `AssertionEncryptionMode` and a private-key list for decrypting+encrypted assertions; Floci's assertion verifier only checks signatures against a single certificate and+does not model encrypted assertions at all, so neither of those is modeled here either.+`DeleteSAMLProvider` does not check or update any role whose trust policy still references the provider's+ARN, matching AWS's own documented behavior: the delete succeeds regardless, and it is a later+`AssumeRoleWithSAML` against the now-dangling ARN that fails, not this call. `CreateSAMLProvider` and+`GetSAMLProvider` return their tags sorted by key, which is what AWS documents for those two responses;+`ListSAMLProviderTags` is sorted the same way here for consistency, though AWS does not document an+order for it. Providers created here are used by `AssumeRoleWithSAML` for trust-policy and assertion+validation.### Login Profilesdiff --git a/src/main/java/io/github/hectorvent/floci/core/common/AwsQueryController.java b/src/main/java/io/github/hectorvent/floci/core/common/AwsQueryController.javaindex 81fed7825a..09a548f200 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/AwsQueryController.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/AwsQueryController.java@@ -107,7 +107,10 @@ public class AwsQueryController {"GenerateCredentialReport", "GetCredentialReport","GetAccountSummary", "GetAccountAuthorizationDetails","SimulatePrincipalPolicy", "SimulateCustomPolicy",- "GetContextKeysForCustomPolicy", "GetContextKeysForPrincipalPolicy"+ "GetContextKeysForCustomPolicy", "GetContextKeysForPrincipalPolicy",+ "ListSAMLProviders", "CreateSAMLProvider", "GetSAMLProvider",+ "UpdateSAMLProvider", "DeleteSAMLProvider",+ "TagSAMLProvider", "UntagSAMLProvider", "ListSAMLProviderTags");private static final Set<String> AUTOSCALING_ACTIONS = Set.of(diff --git a/src/main/java/io/github/hectorvent/floci/services/iam/IamQueryHandler.java b/src/main/java/io/github/hectorvent/floci/services/iam/IamQueryHandler.javaindex 7c98accdec..f9a1dd35f6 100644--- a/src/main/java/io/github/hectorvent/floci/services/iam/IamQueryHandler.java+++ b/src/main/java/io/github/hectorvent/floci/services/iam/IamQueryHandler.java@@ -76,6 +76,11 @@ public class IamQueryHandler {case "ListSAMLProviders" -> handleListSAMLProviders(authorization);case "CreateSAMLProvider" -> handleCreateSAMLProvider(params, authorization);case "GetSAMLProvider" -> handleGetSAMLProvider(params, authorization);+ case "UpdateSAMLProvider" -> handleUpdateSAMLProvider(params, authorization);+ case "DeleteSAMLProvider" -> handleDeleteSAMLProvider(params, authorization);+ case "TagSAMLProvider" -> handleTagSAMLProvider(params, authorization);+ case "UntagSAMLProvider" -> handleUntagSAMLProvider(params, authorization);+ case "ListSAMLProviderTags" -> handleListSAMLProviderTags(params, authorization);case "ListOpenIDConnectProviders" -> handleListOpenIDConnectProviders(params);case "CreateOpenIDConnectProvider" -> handleCreateOpenIDConnectProvider(params);case "GetOpenIDConnectProvider" -> handleGetOpenIDConnectProvider(params);@@ -371,10 +376,12 @@ public class IamQueryHandler {}private Response handleCreateSAMLProvider(MultivaluedMap<String, String> params, String authorization) {+ checkSamlTagMembers(params);SAMLProvider provider = samlProviderService.create(accountResolver.resolve(authorization),- getParam(params, "Name"), getParam(params, "SAMLMetadataDocument"));+ getParam(params, "Name"), getParam(params, "SAMLMetadataDocument"), extractTags(params));return Response.ok(AwsQueryResponse.envelope("CreateSAMLProvider", AwsNamespaces.IAM,- new XmlBuilder().elem("SAMLProviderArn", provider.getArn()).build())).build();+ new XmlBuilder().elem("SAMLProviderArn", provider.getArn())+ .raw(tagsElement(new TreeMap<>(provider.getTags()))).build())).build();}private Response handleGetSAMLProvider(MultivaluedMap<String, String> params, String authorization) {@@ -385,7 +392,44 @@ public class IamQueryHandler {+ provider.getCertificate() + "</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor></md:EntityDescriptor>";return Response.ok(AwsQueryResponse.envelope("GetSAMLProvider", AwsNamespaces.IAM,new XmlBuilder().elem("SAMLProviderArn", provider.getArn()).elem("CreateDate", isoDate(provider.getCreateDate()))- .elem("ValidUntil", isoDate(provider.getCreateDate().plusSeconds(31536000))).elem("SAMLMetadataDocument", metadata).build())).build();+ .elem("ValidUntil", isoDate(provider.getCreateDate().plusSeconds(31536000))).elem("SAMLMetadataDocument", metadata)+ .raw(tagsElement(new TreeMap<>(provider.getTags()))).build())).build();+ }++ private Response handleUpdateSAMLProvider(MultivaluedMap<String, String> params, String authorization) {+ String accountId = accountResolver.resolve(authorization);+ SAMLProvider provider = samlProviderService.update(accountId,+ getParam(params, "SAMLProviderArn"), getParam(params, "SAMLMetadataDocument"));+ return Response.ok(AwsQueryResponse.envelope("UpdateSAMLProvider", AwsNamespaces.IAM,+ new XmlBuilder().elem("SAMLProviderArn", provider.getArn()).build())).build();+ }++ private Response handleDeleteSAMLProvider(MultivaluedMap<String, String> params, String authorization) {+ String accountId = accountResolver.resolve(authorization);+ samlProviderService.delete(accountId, getParam(params, "SAMLProviderArn"));+ return Response.ok(AwsQueryResponse.envelopeNoResult("DeleteSAMLProvider", AwsNamespaces.IAM)).build();+ }++ private Response handleTagSAMLProvider(MultivaluedMap<String, String> params, String authorization) {+ String accountId = accountResolver.resolve(authorization);+ checkSamlTagMembers(params);+ samlProviderService.tag(accountId, getParam(params, "SAMLProviderArn"), extractTags(params));+ return Response.ok(AwsQueryResponse.envelopeNoResult("TagSAMLProvider", AwsNamespaces.IAM)).build();+ }++ private Response handleUntagSAMLProvider(MultivaluedMap<String, String> params, String authorization) {+ String accountId = accountResolver.resolve(authorization);+ samlProviderService.untag(accountId, getParam(params, "SAMLProviderArn"), extractTagKeys(params));+ return Response.ok(AwsQueryResponse.envelopeNoResult("UntagSAMLProvider", AwsNamespaces.IAM)).build();+ }++ private Response handleListSAMLProviderTags(MultivaluedMap<String, String> params, String authorization) {+ String accountId = accountResolver.resolve(authorization);+ Map<String, String> tags = new TreeMap<>(+ samlProviderService.listTags(accountId, getParam(params, "SAMLProviderArn")));+ String result = new XmlBuilder().start("Tags").raw(tagsXml(tags)).end("Tags")+ .elem("IsTruncated", false).build();+ return Response.ok(AwsQueryResponse.envelope("ListSAMLProviderTags", AwsNamespaces.IAM, result)).build();}// ListOpenIDConnectProviders is not paginated and carries only ARNs — the client fetches@@ -1660,6 +1704,23 @@ public class IamQueryHandler {// Parameter parsing helpers// =========================================================================+ /**+ * Enforces {@code tagListType}'s {@code max: 50} on the members as sent. extractTags collapses+ * repeated keys into a map, and AWS resolves a repeated key by overwriting rather than+ * rejecting, so counting the map would let a 51-member list through whenever any key repeats.+ */+ private void checkSamlTagMembers(MultivaluedMap<String, String> params) {+ int members = 0;+ while (params.getFirst("Tags.member." + (members + 1) + ".Key") != null) {+ members++;+ }+ if (members > SAMLProviderService.MAX_TAGS_PER_SAML_PROVIDER) {+ throw new AwsException("ValidationError",+ "Value at 'tags' failed to satisfy constraint: Member must have length "+ + "less than or equal to " + SAMLProviderService.MAX_TAGS_PER_SAML_PROVIDER, 400);+ }+ }+private Map<String, String> extractTags(MultivaluedMap<String, String> params) {Map<String, String> tags = new HashMap<>();for (int i = 1; ; i++) {diff --git a/src/main/java/io/github/hectorvent/floci/services/iam/SAMLProviderService.java b/src/main/java/io/github/hectorvent/floci/services/iam/SAMLProviderService.javaindex 0114a0d536..80ced14aed 100644--- a/src/main/java/io/github/hectorvent/floci/services/iam/SAMLProviderService.java+++ b/src/main/java/io/github/hectorvent/floci/services/iam/SAMLProviderService.java@@ -11,7 +11,9 @@ import jakarta.enterprise.context.ApplicationScoped;import jakarta.inject.Inject;import java.util.Base64;+import java.util.LinkedHashMap;import java.util.List;+import java.util.Map;import java.util.Optional;import java.util.regex.Pattern;@@ -20,6 +22,8 @@ import java.util.regex.Pattern;public class SAMLProviderService {private static final Pattern ARN = Pattern.compile("^arn:" + AwsArnUtils.PARTITION_REGEX + ":iam::(\\d{12}):saml-provider/[A-Za-z0-9+=,.@_-]{1,128}$");+ /** {@code tagListType} / {@code tagKeyListType} are both {@code max: 50}, as elsewhere in IAM. */+ static final int MAX_TAGS_PER_SAML_PROVIDER = 50;private final StorageBackend<String, SAMLProvider> providers;private final Object providerLock = new Object();@@ -32,7 +36,7 @@ public class SAMLProviderService {this.providers = providers;}- public SAMLProvider create(String accountId, String name, String metadata) {+ public SAMLProvider create(String accountId, String name, String metadata, Map<String, String> tags) {String arn = "arn:aws:iam::" + accountId + ":saml-provider/" + name;if (!ARN.matcher(arn).matches()) {throw new AwsException("InvalidInput", "Invalid SAML provider name.", 400);@@ -40,6 +44,15 @@ public class SAMLProviderService {if (metadata == null || metadata.isBlank()) {throw new AwsException("InvalidInput", "SAML metadata document must not be empty.", 400);}+ // Checked before anything is stored: AWS documents that if any tag is invalid or the list+ // exceeds the maximum, "the entire request fails and the resource is not created". The+ // sent-list length is a wire-shape rule enforced in IamQueryHandler, which can still see+ // the members before duplicate keys collapse; what is left here is the quota on what the+ // provider would actually end up holding.+ if (tags != null && tags.size() > MAX_TAGS_PER_SAML_PROVIDER) {+ throw new AwsException("LimitExceeded",+ "Cannot exceed quota for TagsPerSAMLProvider: " + MAX_TAGS_PER_SAML_PROVIDER, 409);+ }SAMLMetadata.Parsed parsed;try {parsed = SAMLMetadata.parse(metadata);@@ -50,16 +63,13 @@ public class SAMLProviderService {provider.setArn(arn);provider.setEntityId(parsed.entityId());provider.setCertificate(parsed.certificateBase64());+ provider.setTags(tags);synchronized (providerLock) {if (findForAccount(accountId, arn).isPresent()) {throw new AwsException("EntityAlreadyExists","SAML provider " + arn + " already exists.", 409);}- if (providers instanceof AccountAwareStorageBackend<SAMLProvider> aware) {- aware.putForAccount(accountId, arn, provider);- } else {- providers.put(arn, provider);- }+ putBack(accountId, arn, provider);}return provider;}@@ -95,6 +105,111 @@ public class SAMLProviderService {"The SAML provider with ARN " + arn + " cannot be found.", 404));}+ /**+ * Replaces the provider's metadata document when one is given. AWS's current+ * UpdateSAMLProvider also manages an {@code AssertionEncryptionMode} and a private-key+ * list for decrypting encrypted assertions; Floci's assertion verifier only checks+ * signatures against a single certificate and does not model encrypted assertions at all,+ * so those inputs are not modeled here either.+ */+ public SAMLProvider update(String accountId, String arn, String metadata) {+ if (metadata == null) {+ return getForAccount(accountId, arn);+ }+ // Request shape (parsing) before the read-modify-write, matching tag/untag's order.+ // An explicitly empty document is invalid input, the same as CreateSAMLProvider already+ // rejects it as; only an omitted document (metadata == null, above) is a no-op.+ if (metadata.isBlank()) {+ throw new AwsException("InvalidInput", "SAML metadata document must not be empty.", 400);+ }+ SAMLMetadata.Parsed parsed;+ try {+ parsed = SAMLMetadata.parse(metadata);+ } catch (Exception e) {+ throw new AwsException("InvalidInput", "The SAML metadata document is invalid.", 400);+ }+ synchronized (providerLock) {+ SAMLProvider existing = getForAccount(accountId, arn);+ // A new object, not an in-place mutation of the existing one: assertion verification+ // (StsQueryHandler) reads a provider via find()/findForAccount() without taking this+ // lock, so setting entityId and certificate as two separate writes on the live,+ // already-published object could let it observe one field updated and the other not.+ // Publishing a fully-built replacement through the same ConcurrentHashMap-backed+ // store means any reader, synchronized or not, sees either the old provider intact+ // or the new one intact, never a mix.+ SAMLProvider updated = new SAMLProvider();+ updated.setArn(existing.getArn());+ updated.setCreateDate(existing.getCreateDate());+ updated.setTags(existing.getTags());+ updated.setEntityId(parsed.entityId());+ updated.setCertificate(parsed.certificateBase64());+ putBack(accountId, arn, updated);+ return updated;+ }+ }++ /**+ * Deleting the provider does not check or update any role that references its ARN in a+ * trust policy: AWS documents that deletion succeeds regardless, and that an AssumeRole+ * against the now-dangling ARN is what fails afterward, not this call.+ */+ public void delete(String accountId, String arn) {+ // Existence check under the same lock as the delete: two concurrent deletes must not+ // both pass the check before either removes the provider, and a delete racing a+ // recreate of the same ARN must not remove the newly created one.+ synchronized (providerLock) {+ getForAccount(accountId, arn);+ if (providers instanceof AccountAwareStorageBackend<SAMLProvider> aware) {+ aware.deleteForAccount(accountId, arn);+ } else {+ providers.delete(arn);+ }+ }+ }++ public void tag(String accountId, String arn, Map<String, String> newTags) {+ synchronized (providerLock) {+ SAMLProvider provider = getForAccount(accountId, arn);+ Map<String, String> merged = new LinkedHashMap<>(provider.getTags());+ merged.putAll(newTags == null ? Map.of() : newTags);+ if (merged.size() > MAX_TAGS_PER_SAML_PROVIDER) {+ throw new AwsException("LimitExceeded",+ "Cannot exceed quota for TagsPerSAMLProvider: " + MAX_TAGS_PER_SAML_PROVIDER, 409);+ }+ provider.setTags(merged);+ putBack(accountId, arn, provider);+ }+ }++ public void untag(String accountId, String arn, List<String> tagKeys) {+ if (tagKeys != null && tagKeys.size() > MAX_TAGS_PER_SAML_PROVIDER) {+ throw new AwsException("ValidationError",+ "Value at 'tagKeys' failed to satisfy constraint: Member must have length "+ + "less than or equal to " + MAX_TAGS_PER_SAML_PROVIDER, 400);+ }+ synchronized (providerLock) {+ SAMLProvider provider = getForAccount(accountId, arn);+ Map<String, String> remaining = new LinkedHashMap<>(provider.getTags());+ if (tagKeys != null) {+ tagKeys.forEach(remaining::remove);+ }+ provider.setTags(remaining);+ putBack(accountId, arn, provider);+ }+ }++ public Map<String, String> listTags(String accountId, String arn) {+ return getForAccount(accountId, arn).getTags();+ }++ private void putBack(String accountId, String arn, SAMLProvider provider) {+ if (providers instanceof AccountAwareStorageBackend<SAMLProvider> aware) {+ aware.putForAccount(accountId, arn, provider);+ } else {+ providers.put(arn, provider);+ }+ }+/** Metadata parser shared by provider registration and the assertion verifier. */static final class SAMLMetadata {private SAMLMetadata() {diff --git a/src/main/java/io/github/hectorvent/floci/services/iam/model/SAMLProvider.java b/src/main/java/io/github/hectorvent/floci/services/iam/model/SAMLProvider.javaindex 1320f5a915..0d01448058 100644--- a/src/main/java/io/github/hectorvent/floci/services/iam/model/SAMLProvider.java+++ b/src/main/java/io/github/hectorvent/floci/services/iam/model/SAMLProvider.java@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;import io.quarkus.runtime.annotations.RegisterForReflection;import java.time.Instant;+import java.util.Map;+import java.util.concurrent.ConcurrentHashMap;@RegisterForReflection@JsonIgnoreProperties(ignoreUnknown = true)@@ -12,6 +14,7 @@ public class SAMLProvider {private String entityId;private String certificate;private Instant createDate = Instant.now();+ private Map<String, String> tags = new ConcurrentHashMap<>();public SAMLProvider() {}@@ -23,4 +26,8 @@ public class SAMLProvider {public void setCertificate(String certificate) { this.certificate = certificate; }public Instant getCreateDate() { return createDate; }public void setCreateDate(Instant createDate) { this.createDate = createDate; }+ public Map<String, String> getTags() { return tags; }+ public void setTags(Map<String, String> tags) {+ this.tags = tags == null ? new ConcurrentHashMap<>() : new ConcurrentHashMap<>(tags);+ }}diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/SAMLProviderLifecycleIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/SAMLProviderLifecycleIntegrationTest.javanew file mode 100644index 0000000000..66c2d3a305--- /dev/null+++ b/src/test/java/io/github/hectorvent/floci/services/iam/SAMLProviderLifecycleIntegrationTest.java@@ -0,0 +1,391 @@+package io.github.hectorvent.floci.services.iam;++import io.quarkus.test.junit.QuarkusTest;+import io.restassured.specification.RequestSpecification;+import org.junit.jupiter.api.Test;++import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.containsString;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.Matchers.not;+import static org.junit.jupiter.api.Assertions.assertTrue;++/**+ * Verifies UpdateSAMLProvider, DeleteSAMLProvider, TagSAMLProvider, UntagSAMLProvider and+ * ListSAMLProviderTags against the real wire shape and AWS's documented behavior.+ */+@QuarkusTest+class SAMLProviderLifecycleIntegrationTest {++ private static final String IAM_AUTH =+ "AWS4-HMAC-SHA256 Credential=test/20260227/us-east-1/iam/aws4_request";++ private static String metadataFor(String entityId, String certBase64) {+ return "<md:EntityDescriptor xmlns:md=\"urn:oasis:names:tc:SAML:2.0:metadata\" entityID=\""+ + entityId + "\"><md:IDPSSODescriptor><md:KeyDescriptor use=\"signing\">"+ + "<ds:KeyInfo xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\"><ds:X509Data>"+ + "<ds:X509Certificate>" + certBase64 + "</ds:X509Certificate></ds:X509Data></ds:KeyInfo>"+ + "</md:KeyDescriptor></md:IDPSSODescriptor></md:EntityDescriptor>";+ }++ private static RequestSpecification iam(String action) {+ return given().header("Authorization", IAM_AUTH).formParam("Action", action);+ }++ private static String createProvider(String name, String entityId, String certBase64) {+ iam("CreateSAMLProvider")+ .formParam("Name", name)+ .formParam("SAMLMetadataDocument", metadataFor(entityId, certBase64))+ .when().post("/").then().statusCode(200);+ return "arn:aws:iam::000000000000:saml-provider/" + name;+ }++ @Test+ void updateSamlProviderReplacesTheMetadataDocument() {+ String name = "update-saml-" + System.nanoTime();+ String arn = createProvider(name, "https://idp.example.test/original", "b3JpZ2luYWw=");++ iam("UpdateSAMLProvider")+ .formParam("SAMLProviderArn", arn)+ .formParam("SAMLMetadataDocument", metadataFor("https://idp.example.test/updated", "dXBkYXRlZA=="))+ .when().post("/").then()+ .statusCode(200)+ .body("UpdateSAMLProviderResponse.UpdateSAMLProviderResult.SAMLProviderArn", equalTo(arn));++ iam("GetSAMLProvider").formParam("SAMLProviderArn", arn)+ .when().post("/").then()+ .statusCode(200)+ .body(containsString("https://idp.example.test/updated"))+ .body(containsString("dXBkYXRlZA=="))+ .body(not(containsString("https://idp.example.test/original")));+ }++ @Test+ void updateSamlProviderWithNoMetadataLeavesTheExistingDocumentUnchanged() {+ String name = "update-noop-saml-" + System.nanoTime();+ String arn = createProvider(name, "https://idp.example.test/kept", "a2VwdA==");++ iam("UpdateSAMLProvider").formParam("SAMLProviderArn", arn)+ .when().post("/").then().statusCode(200);++ iam("GetSAMLProvider").formParam("SAMLProviderArn", arn)+ .when().post("/").then()+ .statusCode(200)+ .body(containsString("https://idp.example.test/kept"));+ }++ /**+ * An omitted SAMLMetadataDocument is a no-op (above), but an explicitly empty one is+ * invalid input, the same as CreateSAMLProvider already rejects it as: the two are+ * distinguishable at the wire level (parameter absent vs. present with an empty value),+ * and only the former should be treated as "nothing to update."+ */+ @Test+ void updateSamlProviderWithAnExplicitlyEmptyMetadataDocumentReturnsInvalidInput() {+ String name = "update-empty-metadata-saml-" + System.nanoTime();+ String arn = createProvider(name, "https://idp.example.test/not-emptied", "bm90ZW1wdGllZA==");++ iam("UpdateSAMLProvider")+ .formParam("SAMLProviderArn", arn)+ .formParam("SAMLMetadataDocument", "")+ .when().post("/").then()+ .statusCode(400)+ .body("ErrorResponse.Error.Code", equalTo("InvalidInput"));++ iam("GetSAMLProvider").formParam("SAMLProviderArn", arn)+ .when().post("/").then()+ .statusCode(200)+ .body(containsString("https://idp.example.test/not-emptied"));+ }++ @Test+ void updateSamlProviderWithMalformedMetadataReturnsInvalidInput() {+ String name = "update-bad-metadata-saml-" + System.nanoTime();+ String arn = createProvider(name, "https://idp.example.test/ok", "b2s=");++ iam("UpdateSAMLProvider")+ .formParam("SAMLProviderArn", arn)+ .formParam("SAMLMetadataDocument", "<not-a-valid-saml-document/>")+ .when().post("/").then()+ .statusCode(400)+ .body("ErrorResponse.Error.Code", equalTo("InvalidInput"));+ }++ @Test+ void updateSamlProviderOfUnknownArnReturnsNoSuchEntity() {+ iam("UpdateSAMLProvider")+ .formParam("SAMLProviderArn", "arn:aws:iam::000000000000:saml-provider/no-such-saml-provider")+ .when().post("/").then()+ .statusCode(404)+ .body("ErrorResponse.Error.Code", equalTo("NoSuchEntity"));+ }++ @Test+ void deleteSamlProviderRemovesItFromListAndGet() {+ String name = "delete-saml-" + System.nanoTime();+ String arn = createProvider(name, "https://idp.example.test/deleted", "ZGVsZXRlZA==");++ iam("DeleteSAMLProvider").formParam("SAMLProviderArn", arn)+ .when().post("/").then().statusCode(200);++ iam("GetSAMLProvider").formParam("SAMLProviderArn", arn)+ .when().post("/").then()+ .statusCode(404)+ .body("ErrorResponse.Error.Code", equalTo("NoSuchEntity"));+ }++ /**+ * AWS documents that deleting a SAML provider does not check or update any role trust+ * policy that references it: "Any attempt to assume a role that references a non-existent+ * provider resource ARN fails" (later, on AssumeRoleWithSAML), not this call.+ */+ @Test+ void deleteSamlProviderSucceedsWhileARoleTrustPolicyStillReferencesIt() {+ String name = "referenced-saml-" + System.nanoTime();+ String arn = createProvider(name, "https://idp.example.test/referenced", "cmVmZXJlbmNlZA==");+ String roleName = "role-referencing-saml-" + System.nanoTime();+ String trustPolicy = "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\","+ + "\"Principal\":{\"Federated\":\"" + arn + "\"},\"Action\":\"sts:AssumeRoleWithSAML\","+ + "\"Condition\":{\"StringEquals\":{\"SAML:aud\":\"https://signin.aws.amazon.com/saml\"}}}]}";+ iam("CreateRole").formParam("RoleName", roleName).formParam("Path", "/")+ .formParam("AssumeRolePolicyDocument", trustPolicy)+ .when().post("/").then().statusCode(200);++ iam("DeleteSAMLProvider").formParam("SAMLProviderArn", arn)+ .when().post("/").then().statusCode(200);++ // The role itself is untouched by the provider's deletion.+ iam("GetRole").formParam("RoleName", roleName)+ .when().post("/").then()+ .statusCode(200)+ .body(containsString(arn));+ }++ @Test+ void deleteSamlProviderOfUnknownArnReturnsNoSuchEntity() {+ iam("DeleteSAMLProvider")+ .formParam("SAMLProviderArn", "arn:aws:iam::000000000000:saml-provider/no-such-saml-provider")+ .when().post("/").then()+ .statusCode(404)+ .body("ErrorResponse.Error.Code", equalTo("NoSuchEntity"));+ }++ @Test+ void tagAndListSamlProviderTagsReturnsThemSortedByKey() {+ String name = "tag-saml-" + System.nanoTime();+ String arn = createProvider(name, "https://idp.example.test/tagged", "dGFnZ2Vk");++ iam("TagSAMLProvider").formParam("SAMLProviderArn", arn)+ .formParam("Tags.member.1.Key", "zebra").formParam("Tags.member.1.Value", "1")+ .formParam("Tags.member.2.Key", "alpha").formParam("Tags.member.2.Value", "2")+ .when().post("/").then().statusCode(200);++ String body = iam("ListSAMLProviderTags").formParam("SAMLProviderArn", arn)+ .when().post("/").then().statusCode(200).extract().asString();++ int alphaIndex = body.indexOf("<Key>alpha</Key>");+ int zebraIndex = body.indexOf("<Key>zebra</Key>");+ assertTrue(alphaIndex >= 0 && zebraIndex >= 0 && alphaIndex < zebraIndex,+ "expected both alpha and zebra present, alpha first, in: " + body);+ }++ @Test+ void getSamlProviderIncludesSortedTagsInline() {+ String name = "get-tagged-saml-" + System.nanoTime();+ String arn = createProvider(name, "https://idp.example.test/get-tagged", "Z2V0dGFnZ2Vk");+ iam("TagSAMLProvider").formParam("SAMLProviderArn", arn)+ .formParam("Tags.member.1.Key", "Team").formParam("Tags.member.1.Value", "platform")+ .when().post("/").then().statusCode(200);++ iam("GetSAMLProvider").formParam("SAMLProviderArn", arn)+ .when().post("/").then()+ .statusCode(200)+ .body(containsString("<Key>Team</Key>"))+ .body(containsString("<Value>platform</Value>"));+ }++ @Test+ void untagSamlProviderRemovesTheTag() {+ String name = "untag-saml-" + System.nanoTime();+ String arn = createProvider(name, "https://idp.example.test/untagged", "dW50YWdnZWQ=");+ iam("TagSAMLProvider").formParam("SAMLProviderArn", arn)+ .formParam("Tags.member.1.Key", "team").formParam("Tags.member.1.Value", "platform")+ .when().post("/").then().statusCode(200);++ iam("UntagSAMLProvider").formParam("SAMLProviderArn", arn)+ .formParam("TagKeys.member.1", "team")+ .when().post("/").then().statusCode(200);++ iam("GetSAMLProvider").formParam("SAMLProviderArn", arn)+ .when().post("/").then()+ .statusCode(200)+ .body(not(containsString("<Tags>")));+ }++ @Test+ void tagSamlProviderOfUnknownArnReturnsNoSuchEntity() {+ iam("TagSAMLProvider")+ .formParam("SAMLProviderArn", "arn:aws:iam::000000000000:saml-provider/no-such-saml-provider")+ .formParam("Tags.member.1.Key", "team").formParam("Tags.member.1.Value", "platform")+ .when().post("/").then()+ .statusCode(404)+ .body("ErrorResponse.Error.Code", equalTo("NoSuchEntity"));+ }++ /** {@code tagListType} is {@code max: 50}, checked before the resource is even resolved. */+ @Test+ void tagSamlProviderBeyondFiftyTagsInOneRequestReturnsValidationError() {+ String name = "tag-limit-saml-" + System.nanoTime();+ String arn = createProvider(name, "https://idp.example.test/tag-limit", "dGFnbGltaXQ=");++ RequestSpecification request = iam("TagSAMLProvider").formParam("SAMLProviderArn", arn);+ for (int i = 1; i <= 51; i++) {+ request.formParam("Tags.member." + i + ".Key", "key" + i)+ .formParam("Tags.member." + i + ".Value", "value" + i);+ }+ request.when().post("/").then()+ .statusCode(400)+ .body(containsString("ValidationError"));+ }++ /** The 50-tag cap is a per-resource quota: two in-shape requests that exceed it cumulatively are rejected whole. */+ @Test+ void tagSamlProviderBeyondFiftyTagsAcrossRequestsReturnsLimitExceeded() {+ String name = "tag-quota-saml-" + System.nanoTime();+ String arn = createProvider(name, "https://idp.example.test/tag-quota", "dGFncXVvdGE=");++ RequestSpecification first = iam("TagSAMLProvider").formParam("SAMLProviderArn", arn);+ for (int i = 1; i <= 30; i++) {+ first.formParam("Tags.member." + i + ".Key", "key" + i).formParam("Tags.member." + i + ".Value", "v");+ }+ first.when().post("/").then().statusCode(200);++ RequestSpecification second = iam("TagSAMLProvider").formParam("SAMLProviderArn", arn);+ for (int i = 31; i <= 60; i++) {+ second.formParam("Tags.member." + (i - 30) + ".Key", "key" + i)+ .formParam("Tags.member." + (i - 30) + ".Value", "v");+ }+ second.when().post("/").then()+ .statusCode(409)+ .body(containsString("LimitExceeded"));+ }++ @Test+ void createSamlProviderStoresTagsFromTheRequestAndEchoesThemSorted() {+ String name = "create-tagged-saml-" + System.nanoTime();+ String body = iam("CreateSAMLProvider")+ .formParam("Name", name)+ .formParam("SAMLMetadataDocument", metadataFor("https://idp.example.test/created", "Y3JlYXRlZA=="))+ .formParam("Tags.member.1.Key", "zebra").formParam("Tags.member.1.Value", "1")+ .formParam("Tags.member.2.Key", "alpha").formParam("Tags.member.2.Value", "2")+ .when().post("/").then().statusCode(200).extract().asString();++ int alphaIndex = body.indexOf("<Key>alpha</Key>");+ int zebraIndex = body.indexOf("<Key>zebra</Key>");+ assertTrue(alphaIndex >= 0 && zebraIndex >= 0 && alphaIndex < zebraIndex,+ "expected both alpha and zebra echoed back, alpha first, in: " + body);++ // The tags are really stored, not just reflected back on the create response.+ iam("ListSAMLProviderTags")+ .formParam("SAMLProviderArn", "arn:aws:iam::000000000000:saml-provider/" + name)+ .when().post("/").then()+ .statusCode(200)+ .body(containsString("<Key>alpha</Key>"))+ .body(containsString("<Key>zebra</Key>"));+ }++ @Test+ void createSamlProviderWithoutTagsOmitsTheTagsElement() {+ String name = "create-untagged-saml-" + System.nanoTime();+ iam("CreateSAMLProvider")+ .formParam("Name", name)+ .formParam("SAMLMetadataDocument", metadataFor("https://idp.example.test/plain", "cGxhaW4="))+ .when().post("/").then()+ .statusCode(200)+ .body(not(containsString("<Tags>")));+ }++ /** AWS: if the tag list is invalid or too long, "the entire request fails and the resource is not created". */+ @Test+ void createSamlProviderBeyondFiftyTagsFailsWithoutCreatingTheProvider() {+ String name = "create-tag-limit-saml-" + System.nanoTime();+ RequestSpecification request = iam("CreateSAMLProvider")+ .formParam("Name", name)+ .formParam("SAMLMetadataDocument", metadataFor("https://idp.example.test/too-many", "dG9vbWFueQ=="));+ for (int i = 1; i <= 51; i++) {+ request.formParam("Tags.member." + i + ".Key", "key" + i)+ .formParam("Tags.member." + i + ".Value", "value" + i);+ }+ request.when().post("/").then()+ .statusCode(400)+ .body(containsString("ValidationError"));++ iam("GetSAMLProvider")+ .formParam("SAMLProviderArn", "arn:aws:iam::000000000000:saml-provider/" + name)+ .when().post("/").then()+ .statusCode(404)+ .body("ErrorResponse.Error.Code", equalTo("NoSuchEntity"));+ }++ /**+ * The 50-tag cap is on the members sent, not on the distinct keys they collapse to. Repeating a+ * key must not shrink a 51-member list into an accepted one, on either tagging path.+ */+ @Test+ void repeatedTagKeysDoNotSlipAnOversizedListPastTheLimit() {+ String name = "dup-key-create-saml-" + System.nanoTime();+ RequestSpecification create = iam("CreateSAMLProvider")+ .formParam("Name", name)+ .formParam("SAMLMetadataDocument", metadataFor("https://idp.example.test/dup", "ZHVw"));+ // 51 members, but only 50 distinct keys: key1 is sent twice.+ for (int i = 1; i <= 50; i++) {+ create.formParam("Tags.member." + i + ".Key", "key" + i)+ .formParam("Tags.member." + i + ".Value", "value" + i);+ }+ create.formParam("Tags.member.51.Key", "key1").formParam("Tags.member.51.Value", "again");+ create.when().post("/").then()+ .statusCode(400)+ .body(containsString("ValidationError"));++ iam("GetSAMLProvider")+ .formParam("SAMLProviderArn", "arn:aws:iam::000000000000:saml-provider/" + name)+ .when().post("/").then()+ .statusCode(404)+ .body("ErrorResponse.Error.Code", equalTo("NoSuchEntity"));++ String tagged = "dup-key-tag-saml-" + System.nanoTime();+ String arn = createProvider(tagged, "https://idp.example.test/dup-tag", "ZHVwdGFn");+ RequestSpecification tag = iam("TagSAMLProvider").formParam("SAMLProviderArn", arn);+ for (int i = 1; i <= 50; i++) {+ tag.formParam("Tags.member." + i + ".Key", "key" + i)+ .formParam("Tags.member." + i + ".Value", "value" + i);+ }+ tag.formParam("Tags.member.51.Key", "key1").formParam("Tags.member.51.Value", "again");+ tag.when().post("/").then()+ .statusCode(400)+ .body(containsString("ValidationError"));+ }++ /**+ * Without an Authorization header there is no credential scope to resolve, so the request only+ * reaches IAM through AwsQueryController's action-name fallback. This pins the SAML entries in+ * that set: drop them and this routes nowhere.+ */+ @Test+ void samlActionsRouteToIamWithoutACredentialScope() {+ String name = "unsigned-route-saml-" + System.nanoTime();+ String arn = createProvider(name, "https://idp.example.test/unsigned", "dW5zaWduZWQ=");++ given().formParam("Action", "UpdateSAMLProvider")+ .formParam("SAMLProviderArn", arn)+ .formParam("SAMLMetadataDocument", metadataFor("https://idp.example.test/unsigned-updated", "dXBkYXRlZA=="))+ .when().post("/").then()+ .statusCode(200)+ .body(containsString("UpdateSAMLProviderResponse"));++ iam("GetSAMLProvider").formParam("SAMLProviderArn", arn)+ .when().post("/").then()+ .statusCode(200)+ .body(containsString("https://idp.example.test/unsigned-updated"));+ }+}