Light, fluffy, and always free - The AWS Local Emulator alternative
fix(iam): return protocol-correct access-denied statuses (#4673)
Aniket Shukla970bdf2e5448
diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamEnforcementTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamEnforcementTest.javaindex 664bb3a79d..a08d7c45ae 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamEnforcementTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IamEnforcementTest.java@@ -1,13 +1,15 @@package com.floci.test;import org.junit.jupiter.api.*;-import software.amazon.awssdk.core.sync.RequestBody;import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;+import software.amazon.awssdk.core.sync.RequestBody;import software.amazon.awssdk.regions.Region;import software.amazon.awssdk.services.iam.IamClient;import software.amazon.awssdk.services.iam.model.*;+import software.amazon.awssdk.services.lambda.LambdaClient;+import software.amazon.awssdk.services.lambda.model.LambdaException;import software.amazon.awssdk.services.s3.S3Client;import software.amazon.awssdk.services.s3.model.CreateBucketRequest;import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;@@ -16,6 +18,10 @@ import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;import software.amazon.awssdk.services.s3.model.PutObjectRequest;import software.amazon.awssdk.services.s3.model.S3Exception;+import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;+import software.amazon.awssdk.services.secretsmanager.model.SecretsManagerException;+import software.amazon.awssdk.services.sqs.SqsClient;+import software.amazon.awssdk.services.sqs.model.SqsException;import software.amazon.awssdk.services.sts.StsClient;import software.amazon.awssdk.services.sts.model.*;@@ -427,6 +433,82 @@ class IamEnforcementTest {}}+ @Test+ @Order(9)+ @DisplayName("AWS JSON 1.0 SQS authorization denial returns HTTP 400")+ void json10AccessDeniedReturns400() {+ assumeEnforcementEnabled();+ try (SqsClient sqs = SqsClient.builder()+ .endpointOverride(TestFixtures.endpoint())+ .region(Region.US_EAST_1)+ .credentialsProvider(userCredentials())+ .build()) {+ assertThatThrownBy(sqs::listQueues)+ .isInstanceOfSatisfying(SqsException.class, error -> {+ assertThat(error.statusCode()).isEqualTo(400);+ assertThat(error.awsErrorDetails().errorCode()).isEqualTo("AccessDeniedException");+ });+ }+ }++ @Test+ @Order(10)+ @DisplayName("AWS JSON 1.1 Secrets Manager authorization denial returns HTTP 400")+ void json11AccessDeniedReturns400() {+ assumeEnforcementEnabled();+ try (SecretsManagerClient secrets = SecretsManagerClient.builder()+ .endpointOverride(TestFixtures.endpoint())+ .region(Region.US_EAST_1)+ .credentialsProvider(userCredentials())+ .build()) {+ assertThatThrownBy(secrets::listSecrets)+ .isInstanceOfSatisfying(SecretsManagerException.class, error -> {+ assertThat(error.statusCode()).isEqualTo(400);+ assertThat(error.awsErrorDetails().errorCode()).isEqualTo("AccessDeniedException");+ });+ }+ }++ @Test+ @Order(11)+ @DisplayName("REST-JSON Lambda authorization denial remains HTTP 403")+ void restJsonAccessDeniedRemains403() {+ assumeEnforcementEnabled();+ try (LambdaClient lambda = LambdaClient.builder()+ .endpointOverride(TestFixtures.endpoint())+ .region(Region.US_EAST_1)+ .credentialsProvider(userCredentials())+ .build()) {+ assertThatThrownBy(lambda::listFunctions)+ .isInstanceOfSatisfying(LambdaException.class, error -> {+ assertThat(error.statusCode()).isEqualTo(403);+ assertThat(error.awsErrorDetails().errorCode()).isEqualTo("AccessDeniedException");+ });+ }+ }++ @Test+ @Order(12)+ @DisplayName("AWS Query IAM authorization denial remains HTTP 403")+ void queryAccessDeniedRemains403() {+ assumeEnforcementEnabled();+ try (IamClient caller = IamClient.builder()+ .endpointOverride(TestFixtures.endpoint())+ .region(Region.US_EAST_1)+ .credentialsProvider(userCredentials())+ .build()) {+ assertThatThrownBy(caller::listUsers)+ .isInstanceOfSatisfying(IamException.class, error -> {+ assertThat(error.statusCode()).isEqualTo(403);+ assertThat(error.awsErrorDetails().errorCode()).isEqualTo("AccessDenied");+ });+ }+ }++ private static StaticCredentialsProvider userCredentials() {+ return StaticCredentialsProvider.create(AwsBasicCredentials.create(userAccessKeyId, userSecretKey));+ }+private static void cleanupResource(String description, CleanupAction action) {try {action.run();diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/OrganizationsTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/OrganizationsTest.javaindex 7c89977d5d..7c405fc9f8 100644--- a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/OrganizationsTest.java+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/OrganizationsTest.java@@ -236,7 +236,8 @@ public class OrganizationsTest {.isEqualTo(organization.id());assertThatThrownBy(() -> invitedClient.createOrganizationalUnit(r -> r.parentId(root.id()).name("Nope")))- .isInstanceOf(AccessDeniedException.class);+ .isInstanceOfSatisfying(AccessDeniedException.class,+ error -> assertThat(error.statusCode()).isEqualTo(400));assertThat(client.listHandshakesForOrganization().handshakes()).extracting(Handshake::id).contains(invitation.id());diff --git a/docs/services/iam.md b/docs/services/iam.mdindex 758adc8d94..5844e4fe3d 100644--- a/docs/services/iam.md+++ b/docs/services/iam.md@@ -550,11 +550,16 @@ environment:Policy evaluation follows the standard AWS precedence:1. If [SCP enforcement](#service-control-policies-scps) is active, the action must be allowed at **every** organization level (root, OUs on the path, account) and explicitly denied at none — otherwise the request is denied before identity policies are consulted-2. An explicit **Deny** in any identity, session, or boundary policy → request is denied (HTTP 403 `AccessDeniedException`)+2. An explicit **Deny** in any identity, session, or boundary policy denies the request3. An explicit **Allow** in an identity policy creates the base grant4. If a session policy is present, it must also explicitly allow the request5. If a permission boundary is present, it must also explicitly allow the request-6. No matching effective allow → implicit deny (HTTP 403)+6. No matching effective allow results in an implicit deny++IAM authorization denials return HTTP 400 `AccessDeniedException` for AWS JSON 1.0/1.1+requests. REST-JSON requests return HTTP 403 `AccessDeniedException`; AWS Query and S3+requests retain HTTP 403 XML `AccessDenied` responses. The routed protocol determines+the status, not just the request's content type.### Resource-based policiesdiff --git a/docs/services/organizations.md b/docs/services/organizations.mdindex 97a4551bcd..5f2ba689c6 100644--- a/docs/services/organizations.md+++ b/docs/services/organizations.md@@ -25,7 +25,7 @@ AWS_ACCESS_KEY_ID=<new-account-id> AWS_SECRET_ACCESS_KEY=x \## Management account vs member accountsAuthorization mirrors AWS. Every mutating action is restricted to the **management account**-— the account that called `CreateOrganization` — and returns `AccessDeniedException` otherwise.+that called `CreateOrganization`, and returns HTTP 400 `AccessDeniedException` otherwise.Member accounts can read the organization they belong to (`DescribeOrganization`, `ListRoots`,`ListParents`, `DescribeAccount`, `DescribePolicy`), act on handshakes addressed to them, andcall `LeaveOrganization`. An account in no organization getsdiff --git a/src/main/java/io/github/hectorvent/floci/core/common/IamEnforcementFilter.java b/src/main/java/io/github/hectorvent/floci/core/common/IamEnforcementFilter.javaindex 3e7d78787f..fec161005e 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/IamEnforcementFilter.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/IamEnforcementFilter.java@@ -281,7 +281,7 @@ public class IamEnforcementFilter implements ContainerRequestFilter {if (action == null) {if (!"OPTIONS".equalsIgnoreCase(ctx.getMethod())&& iamService.presignedScope(akid).isPresent()) {- ctx.abortWith(accessDeniedResponse("Unknown", credentialScope, ctx.getMediaType()));+ ctx.abortWith(accessDeniedForRequest("Unknown", credentialScope, ctx));}return; // unknown action → ALLOW for ordinary credentials (permissive)}@@ -349,14 +349,14 @@ public class IamEnforcementFilter implements ContainerRequestFilter {// absolute-form request target forwarded by a proxy.String rawPath = request == null ? null : request.path();if (rawPath == null || !rawPath.startsWith("/")) {- ctx.abortWith(accessDeniedResponse(action, credentialScope, ctx.getMediaType()));+ ctx.abortWith(accessDeniedForRequest(action, credentialScope, ctx));return;}String decodedPath;try {decodedPath = URLDecoder.decode(rawPath.replace("+", "%2B"), StandardCharsets.UTF_8);} catch (IllegalArgumentException invalidEncoding) {- ctx.abortWith(accessDeniedResponse(action, credentialScope, ctx.getMediaType()));+ ctx.abortWith(accessDeniedForRequest(action, credentialScope, ctx));return;}resources = List.of(AwsArnUtils.Arn.global(AwsRegions.partitionFor(region),@@ -366,7 +366,7 @@ public class IamEnforcementFilter implements ContainerRequestFilter {// credential is narrower: it may authorize only its literal object and action.if (!scope.action().equals(action) || resources.isEmpty()|| resources.stream().anyMatch(resource -> !scope.resourceArn().equals(resource))) {- ctx.abortWith(accessDeniedResponse(action, credentialScope, ctx.getMediaType()));+ ctx.abortWith(accessDeniedForRequest(action, credentialScope, ctx));return;}// A tagged PutObject additionally requires s3:PutObjectTagging. Generated URLs@@ -375,7 +375,7 @@ public class IamEnforcementFilter implements ContainerRequestFilter {if ("s3:PutObject".equals(action)&& (ctx.getHeaderString("x-amz-tagging") != null|| ctx.getUriInfo().getQueryParameters().containsKey("x-amz-tagging"))) {- ctx.abortWith(accessDeniedResponse("s3:PutObjectTagging", credentialScope, ctx.getMediaType()));+ ctx.abortWith(accessDeniedForRequest("s3:PutObjectTagging", credentialScope, ctx));return;}}@@ -514,7 +514,7 @@ public class IamEnforcementFilter implements ContainerRequestFilter {+ " on resource: \"" + resource + "\""+ " because no identity-based policy allows the " + action + " action";emitS3DenialIfApplicable(akid, action, resource, ctx, region, denyMessage);- ctx.abortWith(accessDeniedResponse(action, credentialScope, ctx.getMediaType(), resource));+ ctx.abortWith(accessDeniedForRequest(action, credentialScope, ctx, resource));return true;}}@@ -930,7 +930,7 @@ public class IamEnforcementFilter implements ContainerRequestFilter {* <li>S3 → S3-flavored XML {@code <Error>...</Error>}</li>* <li>{@code application/x-www-form-urlencoded} body → AWS Query* {@code <ErrorResponse>...</ErrorResponse>} (IAM/STS/EC2/SQS/SNS/...)</li>- * <li>everything else (JSON 1.x, REST-JSON) → keep the historical JSON shape</li>+ * <li>JSON 1.x: JSON with HTTP 400; REST-JSON: JSON with HTTP 403</li>* </ul>*/// Package-private for unit testing.@@ -939,15 +939,32 @@ public class IamEnforcementFilter implements ContainerRequestFilter {}static Response accessDeniedResponse(String action, String credentialScope, MediaType requestMediaType, String resourceArn) {+ return accessDeniedResponse(action, credentialScope, requestMediaType, resourceArn, WireProtocol.REST);+ }++ private static Response accessDeniedForRequest(String action, String credentialScope, ContainerRequestContext ctx) {+ return accessDeniedForRequest(action, credentialScope, ctx, null);+ }++ private static Response accessDeniedForRequest(String action, String credentialScope,+ ContainerRequestContext ctx, String resourceArn) {+ WireProtocol protocol = ctx.getProperty(AwsProtocolClaimFilter.CLAIM_PROPERTY) instanceof ProtocolClaim claim+ ? claim.protocol() : WireProtocol.REST;+ return accessDeniedResponse(action, credentialScope, ctx.getMediaType(), resourceArn, protocol);+ }++ static Response accessDeniedResponse(String action, String credentialScope, MediaType requestMediaType,+ String resourceArn, WireProtocol protocol) {String message = "User is not authorized to perform: " + action;if ("s3".equals(credentialScope)) {String resourcePath = formatS3ResourcePath(resourceArn);return s3XmlAccessDenied(message, resourcePath);}- if (isFormEncoded(requestMediaType)) {+ if (protocol == WireProtocol.AWS_QUERY || isFormEncoded(requestMediaType)) {return queryXmlAccessDenied(message);}- return jsonAccessDenied(message);+ int status = protocol == WireProtocol.AWS_JSON_1_0 || protocol == WireProtocol.AWS_JSON_1_1 ? 400 : 403;+ return jsonAccessDenied(message, status);}private static String formatS3ResourcePath(String resourceArn) {@@ -1104,8 +1121,8 @@ public class IamEnforcementFilter implements ContainerRequestFilter {return Response.status(403).type(MediaType.APPLICATION_JSON).entity(body).build();}- private static Response jsonAccessDenied(String message) {+ private static Response jsonAccessDenied(String message, int status) {String body = "{\"__type\":\"AccessDeniedException\",\"message\":\"" + message + "\"}";- return Response.status(403).type(MediaType.APPLICATION_JSON).entity(body).build();+ return Response.status(status).type(MediaType.APPLICATION_JSON).entity(body).build();}}diff --git a/src/main/java/io/github/hectorvent/floci/services/organizations/OrganizationsService.java b/src/main/java/io/github/hectorvent/floci/services/organizations/OrganizationsService.javaindex 066fcafdf2..ae00c55391 100644--- a/src/main/java/io/github/hectorvent/floci/services/organizations/OrganizationsService.java+++ b/src/main/java/io/github/hectorvent/floci/services/organizations/OrganizationsService.java@@ -1935,6 +1935,6 @@ public class OrganizationsService implements ScpProvider {}private static AwsException accessDenied(String message) {- return new AwsException("AccessDeniedException", message, 403);+ return new AwsException("AccessDeniedException", message, 400);}}diff --git a/src/test/java/io/github/hectorvent/floci/core/common/IamEnforcementFilterTest.java b/src/test/java/io/github/hectorvent/floci/core/common/IamEnforcementFilterTest.javaindex c4a6d101a8..8669562231 100644--- a/src/test/java/io/github/hectorvent/floci/core/common/IamEnforcementFilterTest.java+++ b/src/test/java/io/github/hectorvent/floci/core/common/IamEnforcementFilterTest.java@@ -26,6 +26,8 @@ import jakarta.ws.rs.core.Response;import jakarta.ws.rs.core.UriInfo;import org.junit.jupiter.api.BeforeEach;import org.junit.jupiter.api.Test;+import org.junit.jupiter.params.ParameterizedTest;+import org.junit.jupiter.params.provider.CsvSource;import org.mockito.ArgumentCaptor;import java.nio.charset.StandardCharsets;@@ -196,7 +198,38 @@ class IamEnforcementFilterTest {verify(actionRegistry).resolve(eq("dynamodb"), eq(containerRequest));ArgumentCaptor<Response> denied = ArgumentCaptor.captor();verify(containerRequest).abortWith(denied.capture());- assertEquals(403, denied.getValue().getStatus());+ assertEquals(400, denied.getValue().getStatus());+ }++ @ParameterizedTest+ @CsvSource({+ "AWS_JSON_1_0, application/json, 400",+ "AWS_JSON_1_1, application/json, 400",+ "REST, application/x-amz-json-1.1, 403"+ })+ void denialStatusUsesTheClaimedProtocolRatherThanContentType(WireProtocol protocol, String contentType,+ int expectedStatus) {+ ContainerRequestContext containerRequest = mock(ContainerRequestContext.class);+ String auth = "AWS4-HMAC-SHA256 Credential=AKIAUSER/20260629/us-east-1/dynamodb/aws4_request, "+ + "SignedHeaders=host, Signature=abc";+ requestContext.setAccountId("000000000000");+ when(accountResolver.extractAccessKeyId(auth)).thenReturn("AKIAUSER");+ when(containerRequest.getHeaderString("Authorization")).thenReturn(auth);+ when(containerRequest.getMediaType()).thenReturn(MediaType.valueOf(contentType));+ stubClaim(containerRequest, protocol, dynamoDbDescriptor());+ when(iamService.resolveCallerContext("AKIAUSER")).thenReturn(CallerContext.of(List.of()));+ when(actionRegistry.resolve("dynamodb", containerRequest)).thenReturn("dynamodb:PutItem");+ when(evaluator.evaluateResolvedResourcePolicy(any(), any(), any(), eq("dynamodb:PutItem"), any(), any()))+ .thenReturn(IamPolicyEvaluator.Decision.DENY);++ newFilter().filter(containerRequest);++ ArgumentCaptor<Response> denied = ArgumentCaptor.captor();+ verify(containerRequest).abortWith(denied.capture());+ assertEquals(expectedStatus, denied.getValue().getStatus());+ assertEquals(MediaType.APPLICATION_JSON_TYPE, denied.getValue().getMediaType());+ assertTrue(entityString(denied.getValue()).contains("\"__type\":\"AccessDeniedException\""));+ assertTrue(entityString(denied.getValue()).contains("User is not authorized to perform: dynamodb:PutItem"));}@Test@@ -1398,9 +1431,10 @@ class IamEnforcementFilterTest {void jsonProtocolGetsJsonErrorResponse() {// DynamoDB / Cognito / Kinesis / ... — JSON 1.0/1.1, JSON error response.Response r = IamEnforcementFilter.accessDeniedResponse(- "dynamodb:PutItem", "dynamodb", MediaType.valueOf("application/x-amz-json-1.0"));+ "dynamodb:PutItem", "dynamodb", MediaType.valueOf("application/x-amz-json-1.0"),+ null, WireProtocol.AWS_JSON_1_0);- assertEquals(403, r.getStatus());+ assertEquals(400, r.getStatus());assertEquals(MediaType.APPLICATION_JSON_TYPE, r.getMediaType());String body = entityString(r);assertTrue(body.contains("\"__type\":\"AccessDeniedException\""), body);diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/DynamoDbFgacEnforcementIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/DynamoDbFgacEnforcementIntegrationTest.javaindex 4a662bcfde..36f20e52e9 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/DynamoDbFgacEnforcementIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/DynamoDbFgacEnforcementIntegrationTest.java@@ -72,7 +72,7 @@ class DynamoDbFgacEnforcementIntegrationTest {.when().post("/").then()- .statusCode(403)+ .statusCode(400).body(containsString("AccessDeniedException"));}@@ -101,7 +101,7 @@ class DynamoDbFgacEnforcementIntegrationTest {.when().post("/").then()- .statusCode(403)+ .statusCode(400).body(containsString("AccessDeniedException"));}@@ -151,7 +151,7 @@ class DynamoDbFgacEnforcementIntegrationTest {.when().post("/").then()- .statusCode(403)+ .statusCode(400).body(containsString("AccessDeniedException"));}diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/LambdaScopedTablePermissionIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/LambdaScopedTablePermissionIntegrationTest.javaindex 163555e33b..bec742ce51 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/LambdaScopedTablePermissionIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/LambdaScopedTablePermissionIntegrationTest.java@@ -92,7 +92,7 @@ class LambdaScopedTablePermissionIntegrationTest {{"TableName":"not-granted-%s","Key":{"id":{"S":"record"}}}""".formatted(suffix)).when().post("/")- .then().statusCode(403).body(containsString("AccessDenied"));+ .then().statusCode(400).body(containsString("AccessDenied"));} finally {executionRoleCredentials.unregister(ACCOUNT_ID, credentials.accessKeyId());iamService.deleteRolePolicy(roleName, "TableAccess");diff --git a/src/test/java/io/github/hectorvent/floci/services/iam/ScpEnforcementLeaveOrganizationIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/iam/ScpEnforcementLeaveOrganizationIntegrationTest.javaindex 0f34767847..900eb1c7b2 100644--- a/src/test/java/io/github/hectorvent/floci/services/iam/ScpEnforcementLeaveOrganizationIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/iam/ScpEnforcementLeaveOrganizationIntegrationTest.java@@ -76,7 +76,7 @@ class ScpEnforcementLeaveOrganizationIntegrationTest {// --- the member is now bounded by the OU's deny SCP ------------------------------------org(memberId, "LeaveOrganization", "{}").then()- .statusCode(403)+ .statusCode(400).body(containsString("AccessDeniedException"));// An action the SCP does not deny must still succeed (FullAWSAccess baseline holds).diff --git a/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsCrossAccountIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsCrossAccountIntegrationTest.javaindex 7be2140803..1dcf35cca9 100644--- a/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsCrossAccountIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsCrossAccountIntegrationTest.java@@ -144,7 +144,7 @@ class OrganizationsCrossAccountIntegrationTest {.when().post("/").then()- .statusCode(403)+ .statusCode(400).body("__type", equalTo("AccessDeniedException"));}@@ -214,7 +214,7 @@ class OrganizationsCrossAccountIntegrationTest {.when().post("/").then()- .statusCode(403)+ .statusCode(400).body("__type", equalTo("AccessDeniedException"));organizations(INVITED_ACCOUNT, "CreateAccount",@@ -222,7 +222,7 @@ class OrganizationsCrossAccountIntegrationTest {.when().post("/").then()- .statusCode(403)+ .statusCode(400).body("__type", equalTo("AccessDeniedException"));}@@ -279,7 +279,7 @@ class OrganizationsCrossAccountIntegrationTest {.when().post("/").then()- .statusCode(403)+ .statusCode(400).body("__type", equalTo("AccessDeniedException"));organizations(MANAGEMENT_ACCOUNT, "CancelHandshake", "{\"HandshakeId\":\"" + canceledHandshakeId + "\"}")@@ -337,7 +337,7 @@ class OrganizationsCrossAccountIntegrationTest {.when().post("/").then()- .statusCode(403)+ .statusCode(400).body("__type", equalTo("AccessDeniedException"));}diff --git a/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsInvalidEffectivePolicyIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsInvalidEffectivePolicyIntegrationTest.javaindex 96937b7f9a..3bbf212f1c 100644--- a/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsInvalidEffectivePolicyIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsInvalidEffectivePolicyIntegrationTest.java@@ -157,7 +157,7 @@ class OrganizationsInvalidEffectivePolicyIntegrationTest {.when().post("/").then()- .statusCode(403)+ .statusCode(400).body("__type", equalTo("AccessDeniedException"));}@@ -185,7 +185,7 @@ class OrganizationsInvalidEffectivePolicyIntegrationTest {.when().post("/").then()- .statusCode(403)+ .statusCode(400).body("__type", equalTo("AccessDeniedException"));}}diff --git a/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsServiceTest.javaindex 55cae3703b..616308c234 100644--- a/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/organizations/OrganizationsServiceTest.java@@ -208,7 +208,7 @@ class OrganizationsServiceTest {AwsException error = assertThrows(AwsException.class, () -> service.createOrganizationalUnit(OUTSIDER_ACCOUNT, organization.getRoot().getId(), "Unit", null));assertEquals("AccessDeniedException", error.getErrorCode());- assertEquals(403, error.getHttpStatus());+ assertEquals(400, error.getHttpStatus());}@Test