Light, fluffy, and always free - The AWS Local Emulator alternative
fix(iam): hold untag TagKeys to the tag key constraints (#4506)
Priamo Germosenc55ff5362b32
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 29b6fcfa3b..cb6260b3cc 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@@ -2182,16 +2182,9 @@ public class IamQueryHandler {String key = members.get(i).getKey();String value = members.get(i).getValue();String at = "tags." + (i + 1) + ".member";- if (key.isEmpty()) {- throw tagValidationError(key, at + ".key", "Member must have length greater than or equal to 1");- }- if (key.codePointCount(0, key.length()) > MAX_TAG_KEY_LENGTH) {- throw tagValidationError(key, at + ".key",- "Member must have length less than or equal to " + MAX_TAG_KEY_LENGTH);- }- if (!TAG_KEY_PATTERN.matcher(key).matches()) {- throw tagValidationError(key, at + ".key",- "Member must satisfy regular expression pattern: " + TAG_KEY_PATTERN.pattern());+ String keyViolation = tagKeyViolation(key);+ if (keyViolation != null) {+ throw tagValidationError(key, at + ".key", keyViolation);}if (value.codePointCount(0, value.length()) > MAX_TAG_VALUE_LENGTH) {throw tagValidationError(value, at + ".value",@@ -2227,6 +2220,20 @@ public class IamQueryHandler {}}+ /** Returns the {@code tagKeyType} constraint the key breaks, or null when it is valid. */+ private static String tagKeyViolation(String key) {+ if (key.isEmpty()) {+ return "Member must have length greater than or equal to 1";+ }+ if (key.codePointCount(0, key.length()) > MAX_TAG_KEY_LENGTH) {+ return "Member must have length less than or equal to " + MAX_TAG_KEY_LENGTH;+ }+ if (!TAG_KEY_PATTERN.matcher(key).matches()) {+ return "Member must satisfy regular expression pattern: " + TAG_KEY_PATTERN.pattern();+ }+ return null;+ }+private static AwsException tagValidationError(String value, String at, String constraint) {return new AwsException("ValidationError","1 validation error detected: Value '" + value + "' at '" + at + "' failed to satisfy constraint: "@@ -2251,6 +2258,13 @@ public class IamQueryHandler {keys.add(key);}checkListLength(keys.size(), "tagKeys");+ for (String key : keys) {+ String violation = tagKeyViolation(key);+ if (violation != null) {+ throw tagValidationError(keys.toString(), "tagKeys",+ "Member must satisfy constraint: [" + violation + "]");+ }+ }return keys;}diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/IamTagValidationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/IamTagValidationIntegrationTest.javaindex 35d5ababdc..d2154585eb 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/IamTagValidationIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/IamTagValidationIntegrationTest.java@@ -25,6 +25,11 @@ class IamTagValidationIntegrationTest {private static final String POLICY_DOCUMENT = "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\","+ "\"Action\":\"s3:GetObject\",\"Resource\":\"*\"}]}";private static final String THUMBPRINT = "9e99a48a9960b14926bb7f3b02e22da2b0ab7280";+ private static final String SAML_METADATA = "<md:EntityDescriptor xmlns:md=\"urn:oasis:names:tc:SAML:2.0:metadata\""+ + " entityID=\"https://idp.example.test/untag-key\"><md:IDPSSODescriptor><md:KeyDescriptor use=\"signing\">"+ + "<ds:KeyInfo xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\"><ds:X509Data>"+ + "<ds:X509Certificate>dW50YWc=</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);@@ -555,4 +560,84 @@ class IamTagValidationIntegrationTest {.formParam("Tags.member.2.Key", "\u0131").formParam("Tags.member.2.Value", "dotless");assertDuplicateTagKeys(request, true);}++ private static void assertInvalidTagKeys(RequestSpecification request, String constraint) {+ assertInvalidTag(request, "tagKeys", "Member must satisfy constraint: [" + constraint);+ }++ @Test+ void untagKeysAreHeldToTheTagKeyConstraintsOnEveryUntagAction() {+ String user = unique("untag-key-user");+ createUser(user);+ assertInvalidTagKeys(iam("UntagUser").formParam("UserName", user).formParam("TagKeys.member.1", ""),+ "Member must have length greater than or equal to 1");++ String role = unique("untag-key-role");+ iam("CreateRole").formParam("RoleName", role).formParam("AssumeRolePolicyDocument", TRUST_POLICY)+ .when().post("/").then().statusCode(200);+ assertInvalidTagKeys(iam("UntagRole").formParam("RoleName", role).formParam("TagKeys.member.1", "k".repeat(129)),+ "Member must have length less than or equal to 128");++ String policyArn = iam("CreatePolicy").formParam("PolicyName", unique("untag-key-policy"))+ .formParam("PolicyDocument", POLICY_DOCUMENT)+ .when().post("/").then().statusCode(200)+ .extract().xmlPath().getString("CreatePolicyResponse.CreatePolicyResult.Policy.Arn");+ assertInvalidTagKeys(iam("UntagPolicy").formParam("PolicyArn", policyArn).formParam("TagKeys.member.1", "cost#center"),+ "Member must satisfy regular expression pattern");++ String profile = unique("untag-key-profile");+ iam("CreateInstanceProfile").formParam("InstanceProfileName", profile)+ .when().post("/").then().statusCode(200);+ assertInvalidTagKeys(iam("UntagInstanceProfile").formParam("InstanceProfileName", profile)+ .formParam("TagKeys.member.1", "ok").formParam("TagKeys.member.2", "a,b"),+ "Member must satisfy regular expression pattern");++ String oidcArn = iam("CreateOpenIDConnectProvider")+ .formParam("Url", "https://oidc.tag-max.example.com/" + unique("untag-key"))+ .formParam("ThumbprintList.member.1", THUMBPRINT)+ .when().post("/").then().statusCode(200)+ .extract().xmlPath().getString(+ "CreateOpenIDConnectProviderResponse.CreateOpenIDConnectProviderResult.OpenIDConnectProviderArn");+ assertInvalidTagKeys(iam("UntagOpenIDConnectProvider").formParam("OpenIDConnectProviderArn", oidcArn)+ .formParam("TagKeys.member.1", ""),+ "Member must have length greater than or equal to 1");++ String samlArn = iam("CreateSAMLProvider")+ .formParam("Name", unique("untag-key-saml"))+ .formParam("SAMLMetadataDocument", SAML_METADATA)+ .when().post("/").then().statusCode(200)+ .extract().xmlPath().getString("CreateSAMLProviderResponse.CreateSAMLProviderResult.SAMLProviderArn");+ assertInvalidTagKeys(iam("UntagSAMLProvider").formParam("SAMLProviderArn", samlArn)+ .formParam("TagKeys.member.1", "k".repeat(129)),+ "Member must have length less than or equal to 128");+ }++ @Test+ void invalidUntagKeyRemovesNothing() {+ String name = unique("untag-key-atomic");+ createUser(name);+ singleTag(iam("TagUser").formParam("UserName", name), "team", "platform")+ .when().post("/").then().statusCode(200);++ assertInvalidTagKeys(iam("UntagUser").formParam("UserName", name)+ .formParam("TagKeys.member.1", "team").formParam("TagKeys.member.2", "bad#key"),+ "Member must satisfy regular expression pattern");++ iam("ListUserTags").formParam("UserName", name).when().post("/").then()+ .statusCode(200)+ .body("ListUserTagsResponse.ListUserTagsResult.Tags.member.Key", equalTo("team"));+ }++ @Test+ void untagKeyAtTheLengthLimitIsAccepted() {+ String name = unique("untag-key-limit");+ createUser(name);+ String scriptA = new String(Character.toChars(0x1D49C));+ iam("UntagUser").formParam("UserName", name)+ .contentType("application/x-www-form-urlencoded; charset=UTF-8")+ .formParam("TagKeys.member.1", "k".repeat(128))+ .formParam("TagKeys.member.2", scriptA.repeat(128))+ .formParam("TagKeys.member.3", "Cost Center_.:/=+-@")+ .when().post("/").then().statusCode(200);+ }}