Light, fluffy, and always free - The AWS Local Emulator alternative
fix(iam): correct GetAccountSummary provider and access-key counts (#2426)
Alex Banna17e77ba9d31e
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 7b11a8c243..4e10d34337 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@@ -27,6 +27,8 @@ import software.amazon.awssdk.services.iam.model.DeleteRolePolicyRequest;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;@@ -410,6 +412,20 @@ class IamTest {assertThat(response.isTruncated()).isFalse();}+ @Test+ @Order(101)+ void getAccountSummary() {+ GetAccountSummaryResponse response = iam.getAccountSummary();+ assertThat(response.summaryMap()).hasSize(34);+ assertThat(response.summaryMap().get(SummaryKeyType.USERS_QUOTA)).isEqualTo(5000);+ assertThat(response.summaryMap().get(SummaryKeyType.GROUPS_QUOTA)).isEqualTo(300);+ assertThat(response.summaryMap().get(SummaryKeyType.ROLES_QUOTA)).isEqualTo(1000);+ assertThat(response.summaryMap().get(SummaryKeyType.POLICIES_QUOTA)).isEqualTo(1500);+ assertThat(response.summaryMap().get(SummaryKeyType.INSTANCE_PROFILES_QUOTA)).isEqualTo(1000);+ assertThat(response.summaryMap().get(SummaryKeyType.ATTACHED_POLICIES_PER_ROLE_QUOTA)).isEqualTo(20);+ assertThat(response.summaryMap().get(SummaryKeyType.POLICY_SIZE_QUOTA)).isEqualTo(6144);+ }+@Test@Order(24)void simulatePrincipalPolicy() {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 d88bbe3378..efd0212528 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@@ -793,9 +793,9 @@ public class IamService implements SessionAccountLookup, ResourceProvider {* keys; quota values are cross-checked against AWS's published IAM service quotas* (docs.aws.amazon.com/general/latest/gr/iam-service.html), though floci itself enforces* only the 5-versions-per-policy cap in {@link #createPolicyVersion}. Resources floci does- * not track at all (MFA devices, SAML/OIDC providers, server certificates, account password -- * all stub-empty elsewhere in this handler) are reported as zero rather than omitted, so- * callers indexing into the full AWS field set don't hit a missing-key error.+ * not track at all (MFA devices, SAML providers, server certificates, account password - all+ * stub-empty elsewhere in this handler) are reported as zero rather than omitted, so callers+ * indexing into the full AWS field set don't hit a missing-key error.*/public Map<String, Long> getAccountSummary() {long localPolicyCount = 0;@@ -827,7 +827,7 @@ public class IamService implements SessionAccountLookup, ResourceProvider {summary.put("InstanceProfilesQuota", 1000L);summary.put("AttachedPoliciesPerUserQuota", 10L);summary.put("AttachedPoliciesPerGroupQuota", 10L);- summary.put("AttachedPoliciesPerRoleQuota", 10L);+ summary.put("AttachedPoliciesPerRoleQuota", 20L);summary.put("GroupPolicySizeQuota", 5120L);summary.put("UserPolicySizeQuota", 2048L);summary.put("RolePolicySizeQuota", 10240L);@@ -835,10 +835,12 @@ public class IamService implements SessionAccountLookup, ResourceProvider {summary.put("SigningCertificatesPerUserQuota", 2L);summary.put("ServerCertificates", 0L);summary.put("ServerCertificatesQuota", 20L);- summary.put("Providers", 0L);+ summary.put("Providers", (long) oidcProviders.scan(k -> true).size());summary.put("MFADevices", 0L);summary.put("MFADevicesInUse", 0L);summary.put("AccountMFAEnabled", 0L);+ // AWS reports whether the root account has access keys, not whether IAM users do.+ // Floci does not model root access keys, so this remains false even when user keys exist.summary.put("AccountAccessKeysPresent", 0L);summary.put("AccountSigningCertificatesPresent", 0L);summary.put("AccountPasswordPresent", 0L);diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/IamGetAccountSummaryIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/IamGetAccountSummaryIntegrationTest.javaindex b6d4f19b71..6b7afe7bc8 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/IamGetAccountSummaryIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/IamGetAccountSummaryIntegrationTest.java@@ -109,6 +109,22 @@ class IamGetAccountSummaryIntegrationTest {+ ".find { it.key == 'VersionsPerPolicyQuota' }.value", equalTo("5")).body("GetAccountSummaryResponse.GetAccountSummaryResult.SummaryMap.entry"+ ".find { it.key == 'UsersQuota' }.value", equalTo("5000"))+ .body("GetAccountSummaryResponse.GetAccountSummaryResult.SummaryMap.entry"+ + ".find { it.key == 'GroupsQuota' }.value", equalTo("300"))+ .body("GetAccountSummaryResponse.GetAccountSummaryResult.SummaryMap.entry"+ + ".find { it.key == 'RolesQuota' }.value", equalTo("1000"))+ .body("GetAccountSummaryResponse.GetAccountSummaryResult.SummaryMap.entry"+ + ".find { it.key == 'PoliciesQuota' }.value", equalTo("1500"))+ .body("GetAccountSummaryResponse.GetAccountSummaryResult.SummaryMap.entry"+ + ".find { it.key == 'InstanceProfilesQuota' }.value", equalTo("1000"))+ .body("GetAccountSummaryResponse.GetAccountSummaryResult.SummaryMap.entry"+ + ".find { it.key == 'AttachedPoliciesPerUserQuota' }.value", equalTo("10"))+ .body("GetAccountSummaryResponse.GetAccountSummaryResult.SummaryMap.entry"+ + ".find { it.key == 'AttachedPoliciesPerGroupQuota' }.value", equalTo("10"))+ .body("GetAccountSummaryResponse.GetAccountSummaryResult.SummaryMap.entry"+ + ".find { it.key == 'AttachedPoliciesPerRoleQuota' }.value", equalTo("20"))+ .body("GetAccountSummaryResponse.GetAccountSummaryResult.SummaryMap.entry"+ + ".find { it.key == 'PolicySizeQuota' }.value", equalTo("6144")).body("GetAccountSummaryResponse.GetAccountSummaryResult.SummaryMap.entry"+ ".find { it.key == 'AssumeRolePolicySizeQuota' }.value", equalTo("2048")).body("GetAccountSummaryResponse.GetAccountSummaryResult.SummaryMap.entry"@@ -116,4 +132,29 @@ class IamGetAccountSummaryIntegrationTest {.body("GetAccountSummaryResponse.GetAccountSummaryResult.SummaryMap.entry"+ ".find { it.key == 'MFADevices' }.value", equalTo("0"));}++ @Test+ void userAccessKeysDoNotSetRootAccountAccessKeySignal() {+ String userName = "gas-key-user-" + Long.toString(System.nanoTime(), 36);++ given()+ .formParam("Action", "CreateUser")+ .formParam("UserName", userName)+ .header("Authorization", IAM_AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200);++ given()+ .formParam("Action", "CreateAccessKey")+ .formParam("UserName", userName)+ .header("Authorization", IAM_AUTH)+ .when()+ .post("/")+ .then()+ .statusCode(200);++ assertSummaryValue("AccountAccessKeysPresent", 0);+ }}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 eb7198cb1a..0ec9381605 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@@ -71,6 +71,30 @@ class IamServiceTest {assertNotNull(user.getCreateDate());}+ @Test+ void accountSummaryUsesAwsDefaultQuotasAndTracksProviders() {+ Map<String, Long> empty = iamService.getAccountSummary();++ assertEquals(300L, empty.get("GroupsQuota"));+ assertEquals(1000L, empty.get("RolesQuota"));+ assertEquals(1500L, empty.get("PoliciesQuota"));+ assertEquals(1000L, empty.get("InstanceProfilesQuota"));+ assertEquals(10L, empty.get("AttachedPoliciesPerUserQuota"));+ assertEquals(10L, empty.get("AttachedPoliciesPerGroupQuota"));+ assertEquals(20L, empty.get("AttachedPoliciesPerRoleQuota"));+ assertEquals(6144L, empty.get("PolicySizeQuota"));+ assertEquals(0L, empty.get("Providers"));+ assertEquals(0L, empty.get("AccountAccessKeysPresent"));++ iamService.createUser("summary-user", "/");+ iamService.createAccessKey("summary-user");+ iamService.createOpenIDConnectProvider(+ "https://oidc.example.com/id/SUMMARY", List.of(), List.of("thumbprint"), Map.of());++ assertEquals(1L, iamService.getAccountSummary().get("Providers"));+ assertEquals(0L, iamService.getAccountSummary().get("AccountAccessKeysPresent"));+ }+@Testvoid createUserDuplicateFails() {iamService.createUser("alice", "/");