Light, fluffy, and always free - The AWS Local Emulator alternative
feat(identitystore): add full service emulation (#3159)
Franklin G. Mendoza6264b09a28ba
diff --git a/README.md b/README.mdindex 5e6f9f2b73..17c4aefd79 100644--- a/README.md+++ b/README.md@@ -238,7 +238,7 @@ Floci supports local emulation for application services, data services, eventing| Data, analytics, and AI | Athena, Glue, Lake Formation, EMR, EMR Serverless, Redshift, Firehose, Managed Service for Apache Flink, OpenSearch, S3 Tables, S3 Vectors, Textract, Transcribe, Comprehend, Rekognition, Translate, Bedrock Runtime, Bedrock AgentCore || Databases and caching | RDS, RDS Data API, Neptune, DocumentDB, MemoryDB, ElastiCache || Messaging and transfer | SES, Kinesis, MSK, Amazon MQ, Transfer Family, IoT Core, Amazon Connect |-| Security and governance | AWS Network Firewall, AWS RAM, Service Quotas, WAF v2, GuardDuty, CloudTrail, CloudFront, Resource Groups Tagging API, Resource Explorer 2, CloudHSM v2, Organizations, AWS Account Management, IAM Access Analyzer, IAM Identity Center (SSO Admin), Amazon Macie, Control Tower, Service Catalog |+| Security and governance | AWS Network Firewall, AWS RAM, Service Quotas, WAF v2, GuardDuty, CloudTrail, CloudFront, Resource Groups Tagging API, Resource Explorer 2, CloudHSM v2, Organizations, AWS Account Management, IAM Access Analyzer, IAM Identity Center (SSO Admin), Identity Store, Amazon Macie, Control Tower, Service Catalog || Cost and billing | Pricing, Cost Explorer, Cost and Usage Reports, BCM Data Exports || Resilience, backup, and config | AWS FIS, AWS Backup, AWS Config, AppConfig, AppConfigData, CloudFormation, Cloud Control API |diff --git a/compatibility-tests/sdk-test-java/pom.xml b/compatibility-tests/sdk-test-java/pom.xmlindex 1c9be54002..a3b71d50b9 100644--- a/compatibility-tests/sdk-test-java/pom.xml+++ b/compatibility-tests/sdk-test-java/pom.xml@@ -239,6 +239,11 @@<groupId>software.amazon.awssdk</groupId><artifactId>ssoadmin</artifactId></dependency>+ <!-- Identity Store client -->+ <dependency>+ <groupId>software.amazon.awssdk</groupId>+ <artifactId>identitystore</artifactId>+ </dependency><!-- Amazon Macie client --><dependency><groupId>software.amazon.awssdk</groupId>diff --git a/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java b/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.javaindex 40928290af..7f3820d2f0 100644--- a/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java+++ b/compatibility-tests/sdk-test-java/src/main/java/com/floci/test/TestFixtures.java@@ -33,6 +33,7 @@ import software.amazon.awssdk.services.guardduty.GuardDutyClient;import software.amazon.awssdk.services.fis.FisClient;import software.amazon.awssdk.services.organizations.OrganizationsClient;import software.amazon.awssdk.services.ssoadmin.SsoAdminClient;+import software.amazon.awssdk.services.identitystore.IdentitystoreClient;import software.amazon.awssdk.services.macie2.Macie2Client;import software.amazon.awssdk.services.rum.RumClient;import software.amazon.awssdk.services.resourceexplorer2.ResourceExplorer2Client;@@ -303,6 +304,14 @@ public final class TestFixtures {.build();}+ public static IdentitystoreClient identityStoreClient() {+ return IdentitystoreClient.builder()+ .endpointOverride(ENDPOINT)+ .region(REGION)+ .credentialsProvider(CREDENTIALS)+ .build();+ }+public static Macie2Client macie2Client() {return macie2Client("test");}diff --git a/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IdentityStoreTest.java b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IdentityStoreTest.javanew file mode 100644index 0000000000..18e56995d3--- /dev/null+++ b/compatibility-tests/sdk-test-java/src/test/java/com/floci/test/IdentityStoreTest.java@@ -0,0 +1,154 @@+package com.floci.test;++import org.junit.jupiter.api.Test;+import software.amazon.awssdk.core.document.Document;+import software.amazon.awssdk.services.identitystore.IdentitystoreClient;+import software.amazon.awssdk.services.identitystore.model.AlternateIdentifier;+import software.amazon.awssdk.services.identitystore.model.AttributeOperation;+import software.amazon.awssdk.services.identitystore.model.CreateGroupMembershipRequest;+import software.amazon.awssdk.services.identitystore.model.CreateGroupRequest;+import software.amazon.awssdk.services.identitystore.model.CreateUserRequest;+import software.amazon.awssdk.services.identitystore.model.DeleteGroupMembershipRequest;+import software.amazon.awssdk.services.identitystore.model.DeleteGroupRequest;+import software.amazon.awssdk.services.identitystore.model.DeleteUserRequest;+import software.amazon.awssdk.services.identitystore.model.DescribeGroupMembershipRequest;+import software.amazon.awssdk.services.identitystore.model.DescribeGroupRequest;+import software.amazon.awssdk.services.identitystore.model.DescribeUserRequest;+import software.amazon.awssdk.services.identitystore.model.Email;+import software.amazon.awssdk.services.identitystore.model.Filter;+import software.amazon.awssdk.services.identitystore.model.GetGroupIdRequest;+import software.amazon.awssdk.services.identitystore.model.GetGroupMembershipIdRequest;+import software.amazon.awssdk.services.identitystore.model.GetUserIdRequest;+import software.amazon.awssdk.services.identitystore.model.IsMemberInGroupsRequest;+import software.amazon.awssdk.services.identitystore.model.ListGroupMembershipsForMemberRequest;+import software.amazon.awssdk.services.identitystore.model.ListGroupMembershipsRequest;+import software.amazon.awssdk.services.identitystore.model.ListGroupsRequest;+import software.amazon.awssdk.services.identitystore.model.ListUsersRequest;+import software.amazon.awssdk.services.identitystore.model.MemberId;+import software.amazon.awssdk.services.identitystore.model.UpdateGroupRequest;+import software.amazon.awssdk.services.identitystore.model.UpdateUserRequest;+import software.amazon.awssdk.services.identitystore.model.UniqueAttribute;++import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertFalse;+import static org.junit.jupiter.api.Assertions.assertNotNull;+import static org.junit.jupiter.api.Assertions.assertTrue;++class IdentityStoreTest {+ private static final String STORE = "d-1234567890";++ @Test+ void completeIdentityStoreApiUsesAwsSdk() {+ try (IdentitystoreClient client = TestFixtures.identityStoreClient()) {+ var group = client.createGroup(CreateGroupRequest.builder()+ .identityStoreId(STORE)+ .displayName("PlatformAdmins")+ .description("Platform administrators")+ .build());+ assertTrue(group.groupId().startsWith("1234567890-"));+ assertEquals(STORE, group.identityStoreId());++ var user = client.createUser(CreateUserRequest.builder()+ .identityStoreId(STORE)+ .userName("[email protected]")+ .displayName("Identity Store SDK")+ .emails(Email.builder().value("[email protected]").primary(true).build())+ .build());+ assertTrue(user.userId().startsWith("1234567890-"));+ assertEquals(STORE, user.identityStoreId());++ var describedGroup = client.describeGroup(DescribeGroupRequest.builder()+ .identityStoreId(STORE).groupId(group.groupId()).build());+ assertEquals("PlatformAdmins", describedGroup.displayName());+ assertNotNull(describedGroup.createdAt());++ var describedUser = client.describeUser(DescribeUserRequest.builder()+ .identityStoreId(STORE).userId(user.userId()).build());+ assertEquals("[email protected]", describedUser.userName());+ assertEquals("[email protected]", describedUser.emails().get(0).value());+ assertNotNull(describedUser.createdAt());++ assertEquals(group.groupId(), client.getGroupId(GetGroupIdRequest.builder()+ .identityStoreId(STORE)+ .alternateIdentifier(AlternateIdentifier.fromUniqueAttribute(UniqueAttribute.builder()+ .attributePath("displayName").attributeValue(Document.fromString("PlatformAdmins")).build()))+ .build()).groupId());+ assertEquals(user.userId(), client.getUserId(GetUserIdRequest.builder()+ .identityStoreId(STORE)+ .alternateIdentifier(AlternateIdentifier.fromUniqueAttribute(UniqueAttribute.builder()+ .attributePath("userName").attributeValue(Document.fromString("[email protected]")).build()))+ .build()).userId());++ assertEquals(1, client.listGroups(ListGroupsRequest.builder()+ .identityStoreId(STORE)+ .filters(Filter.builder().attributePath("DisplayName").attributeValue("PlatformAdmins").build())+ .maxResults(1)+ .build()).groups().size());+ assertEquals(1, client.listUsers(ListUsersRequest.builder()+ .identityStoreId(STORE)+ .filters(Filter.builder().attributePath("UserName").attributeValue("[email protected]").build())+ .maxResults(1)+ .build()).users().size());++ client.updateGroup(UpdateGroupRequest.builder()+ .identityStoreId(STORE)+ .groupId(group.groupId())+ .operations(AttributeOperation.builder()+ .attributePath("description")+ .attributeValue(Document.fromString("Updated platform administrators"))+ .build())+ .build());+ assertEquals("Updated platform administrators", client.describeGroup(DescribeGroupRequest.builder()+ .identityStoreId(STORE).groupId(group.groupId()).build()).description());++ client.updateUser(UpdateUserRequest.builder()+ .identityStoreId(STORE)+ .userId(user.userId())+ .operations(AttributeOperation.builder()+ .attributePath("displayName")+ .attributeValue(Document.fromString("Updated Identity Store SDK"))+ .build())+ .build());+ assertEquals("Updated Identity Store SDK", client.describeUser(DescribeUserRequest.builder()+ .identityStoreId(STORE).userId(user.userId()).build()).displayName());++ MemberId member = MemberId.builder().userId(user.userId()).build();+ assertFalse(client.isMemberInGroups(IsMemberInGroupsRequest.builder()+ .identityStoreId(STORE).memberId(member).groupIds(group.groupId()).build())+ .results().get(0).membershipExists());++ var membership = client.createGroupMembership(CreateGroupMembershipRequest.builder()+ .identityStoreId(STORE).groupId(group.groupId()).memberId(member).build());+ assertTrue(membership.membershipId().startsWith("1234567890-"));++ assertTrue(client.isMemberInGroups(IsMemberInGroupsRequest.builder()+ .identityStoreId(STORE).memberId(member).groupIds(group.groupId()).build())+ .results().get(0).membershipExists());++ var describedMembership = client.describeGroupMembership(DescribeGroupMembershipRequest.builder()+ .identityStoreId(STORE).membershipId(membership.membershipId()).build());+ assertEquals(group.groupId(), describedMembership.groupId());+ assertEquals(user.userId(), describedMembership.memberId().userId());+ assertNotNull(describedMembership.createdAt());++ assertEquals(membership.membershipId(), client.getGroupMembershipId(GetGroupMembershipIdRequest.builder()+ .identityStoreId(STORE).groupId(group.groupId()).memberId(member).build()).membershipId());+ assertEquals(1, client.listGroupMemberships(ListGroupMembershipsRequest.builder()+ .identityStoreId(STORE).groupId(group.groupId()).maxResults(1).build()).groupMemberships().size());+ assertEquals(1, client.listGroupMembershipsForMember(ListGroupMembershipsForMemberRequest.builder()+ .identityStoreId(STORE).memberId(member).maxResults(1).build()).groupMemberships().size());++ client.deleteGroupMembership(DeleteGroupMembershipRequest.builder()+ .identityStoreId(STORE).membershipId(membership.membershipId()).build());+ assertFalse(client.isMemberInGroups(IsMemberInGroupsRequest.builder()+ .identityStoreId(STORE).memberId(member).groupIds(group.groupId()).build())+ .results().get(0).membershipExists());++ client.deleteUser(DeleteUserRequest.builder().identityStoreId(STORE).userId(user.userId()).build());+ client.deleteGroup(DeleteGroupRequest.builder().identityStoreId(STORE).groupId(group.groupId()).build());++ assertTrue(client.listUsers(ListUsersRequest.builder().identityStoreId(STORE).build()).users().isEmpty());+ assertTrue(client.listGroups(ListGroupsRequest.builder().identityStoreId(STORE).build()).groups().isEmpty());+ }+ }+}diff --git a/docs/services/identitystore.md b/docs/services/identitystore.mdnew file mode 100644index 0000000000..bc30b9b69e--- /dev/null+++ b/docs/services/identitystore.md@@ -0,0 +1,57 @@+# Identity Store++**Protocol:** JSON 1.1 (`X-Amz-Target: AWSIdentityStore.*`)++**Signing name:** `identitystore`++Floci emulates the AWS Identity Store management API used by IAM Identity Center. Identity store resources are keyed by `IdentityStoreId` rather than the caller account, matching AWS behavior that allows authorized member accounts to access the same identity store.++## Supported Actions++<!-- floci:actions:start -->+| Action | Description |+| --- | --- |+| `CreateGroup` | - |+| `DeleteGroup` | - |+| `DescribeGroup` | - |+| `GetGroupId` | - |+| `ListGroups` | - |+| `UpdateGroup` | - |+| `CreateUser` | - |+| `DeleteUser` | - |+| `DescribeUser` | - |+| `GetUserId` | - |+| `ListUsers` | - |+| `UpdateUser` | - |+| `CreateGroupMembership` | - |+| `DeleteGroupMembership` | - |+| `DescribeGroupMembership` | - |+| `GetGroupMembershipId` | - |+| `IsMemberInGroups` | - |+| `ListGroupMemberships` | - |+| `ListGroupMembershipsForMember` | - |+<!-- floci:actions:end -->++## Behavior++Groups, users, and group memberships are persisted through `StorageFactory` and implement the complete AWS SDK Java v2 Identity Store operation surface. New resource identifiers use the normal `1234567890-UUID` format for `d-1234567890` identity stores, while legacy UUID-form identity store identifiers use UUID resource identifiers.++`ListGroups`, `ListUsers`, `ListGroupMemberships`, and `ListGroupMembershipsForMember` support AWS-style pagination with a maximum `MaxResults` of 100. The deprecated `ListGroups` and `ListUsers` filters remain supported for SDK compatibility. `GetGroupId` and `GetUserId` support alternate identifiers, including the documented unique attribute paths and external identifiers when those values are present in the stored resource.++`UpdateGroup` and `UpdateUser` apply `AttributeOperation` updates, including removals when `AttributeValue` is omitted. User updates support nested attributes and the `aws:identitystore:enterprise` extension. User extensions are returned by `DescribeUser` and `ListUsers` only when requested through `Extensions`, as in AWS.++Deleting a user or group removes its related local group memberships so subsequent membership queries do not retain dangling references.++## AWS-compatible failures++Floci validates identity store and resource identifier formats, filter shapes, pagination bounds, membership references, alternate-identifier unions, duplicate user/group names, duplicate memberships, reserved names, operation counts, and local user/group quotas. Deterministic failures use modeled AWS errors including `ValidationException`, `ConflictException`, `ResourceNotFoundException`, and `ServiceQuotaExceededException`.++AWS also models provider-side errors such as `AccessDeniedException`, `InternalServerException`, and `ThrottlingException`. Floci does not synthesize those failures without a request or emulator-state condition that causes them.++See the [AWS Identity Store API Reference](https://docs.aws.amazon.com/singlesignon/latest/IdentityStoreAPIReference/welcome.html).++## Configuration++| Variable | Default | Description |+|---|---|---|+| `FLOCI_SERVICES_IDENTITYSTORE_ENABLED` | `true` | Enable or disable Identity Store |diff --git a/docs/services/index.md b/docs/services/index.mdindex 7aaf8fb88d..3004a12e34 100644--- a/docs/services/index.md+++ b/docs/services/index.md@@ -47,6 +47,7 @@ Operation counts are exact. For dispatch-table services (Query and JSON 1.1) eac| [AWS Account Management](account.md) | `/putAlternateContact`, `/getAlternateContact` | REST JSON | 2 || [IAM Access Analyzer](access-analyzer.md) | `/analyzer`, `/analyzer/{name}` | REST JSON | 3 || [IAM Identity Center (SSO Admin)](ssoadmin.md) | `POST /` + `X-Amz-Target: SWBExternalService.*` | JSON 1.1 | 13 |+| [Identity Store](identitystore.md) | `POST /` + `X-Amz-Target: AWSIdentityStore.*` | JSON 1.1 | 19 || [Amazon Macie](macie2.md) | `/admin`, `/macie`, `/admin/configuration` | REST JSON | 6 || [Amazon Connect](connect.md) | `/instance`, `/instance/{instanceId}/*`, `/tags/*` | REST JSON | 15 || [ElastiCache](elasticache.md) | `POST /` with `Action=` param + TCP proxy | Query + RESP | 8 |diff --git a/mkdocs.yml b/mkdocs.ymlindex 5aed3823df..59358e157b 100644--- a/mkdocs.yml+++ b/mkdocs.yml@@ -122,6 +122,7 @@ nav:- AWS Account Management: services/account.md- IAM Access Analyzer: services/access-analyzer.md- IAM Identity Center (SSO Admin): services/ssoadmin.md+ - Identity Store: services/identitystore.md- Amazon Macie: services/macie2.md- Control Tower: services/controltower.md- AWS Service Catalog: services/service-catalog.mddiff --git a/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.java b/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.javaindex 57155332a3..fa837bcf8f 100644--- a/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.java+++ b/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.java@@ -713,6 +713,7 @@ public interface EmulatorConfig {Macie2ServiceConfig macie2();AccountServiceConfig account();AccessAnalyzerServiceConfig accessanalyzer();+ IdentityStoreServiceConfig identitystore();ServiceQuotasServiceConfig servicequotas();RamServiceConfig ram();ControlTowerServiceConfig controltower();@@ -756,6 +757,11 @@ public interface EmulatorConfig {boolean enabled();}+ interface IdentityStoreServiceConfig {+ @WithDefault("true")+ boolean enabled();+ }+interface ApsServiceConfig {@WithDefault("true")boolean enabled();diff --git a/src/main/java/io/github/hectorvent/floci/core/common/AwsJson11Controller.java b/src/main/java/io/github/hectorvent/floci/core/common/AwsJson11Controller.javaindex 1e065d3b49..c25a2abf75 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/AwsJson11Controller.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/AwsJson11Controller.java@@ -24,6 +24,7 @@ import io.github.hectorvent.floci.services.cloudtrail.CloudTrailJsonHandler;import io.github.hectorvent.floci.services.applicationautoscaling.ApplicationAutoScalingJsonHandler;import io.github.hectorvent.floci.services.cloudcontrol.CloudControlJsonHandler;import io.github.hectorvent.floci.services.ssoadmin.SsoAdminJsonHandler;+import io.github.hectorvent.floci.services.identitystore.IdentityStoreJsonHandler;import io.github.hectorvent.floci.services.configservice.ConfigServiceJsonHandler;import io.github.hectorvent.floci.services.cur.CurJsonHandler;import io.github.hectorvent.floci.services.pricing.PricingJsonHandler;@@ -124,6 +125,7 @@ public class AwsJson11Controller {private final CloudHsmV2JsonHandler cloudHsmV2JsonHandler;private final OrganizationsJsonHandler organizationsJsonHandler;private final SsoAdminJsonHandler ssoAdminJsonHandler;+ private final IdentityStoreJsonHandler identityStoreJsonHandler;private final ServiceQuotasJsonHandler serviceQuotasJsonHandler;@Inject@@ -171,6 +173,7 @@ public class AwsJson11Controller {CloudHsmV2JsonHandler cloudHsmV2JsonHandler,OrganizationsJsonHandler organizationsJsonHandler,SsoAdminJsonHandler ssoAdminJsonHandler,+ IdentityStoreJsonHandler identityStoreJsonHandler,ServiceQuotasJsonHandler serviceQuotasJsonHandler) {this.objectMapper = objectMapper;this.strictBodyReader = objectMapper.reader().with(DeserializationFeature.FAIL_ON_TRAILING_TOKENS);@@ -222,6 +225,7 @@ public class AwsJson11Controller {this.cloudHsmV2JsonHandler = cloudHsmV2JsonHandler;this.organizationsJsonHandler = organizationsJsonHandler;this.ssoAdminJsonHandler = ssoAdminJsonHandler;+ this.identityStoreJsonHandler = identityStoreJsonHandler;this.serviceQuotasJsonHandler = serviceQuotasJsonHandler;}@@ -309,6 +313,7 @@ public class AwsJson11Controller {case "organizations" ->organizationsJsonHandler.handle(action, request, regionResolver.getAccountId());case "sso" -> ssoAdminJsonHandler.handle(action, request, regionResolver.getAccountId());+ case "identitystore" -> identityStoreJsonHandler.handle(action, request);case "servicequotas" -> serviceQuotasJsonHandler.handle(action, request, region, regionResolver.getAccountId());default -> null;diff --git a/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.java b/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.javaindex b9e1121134..37b44de05e 100644--- a/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.java+++ b/src/main/java/io/github/hectorvent/floci/core/common/ResolvedServiceCatalog.java@@ -420,6 +420,9 @@ public class ResolvedServiceCatalog {descriptor("access-analyzer", "accessanalyzer", config.services().accessanalyzer().enabled(), true,"accessanalyzer", config.storage().mode(), 5000L, null, ServiceProtocol.REST_JSON,protocols(ServiceProtocol.REST_JSON), Set.of(), Set.of("access-analyzer"), Set.of(), Set.of(AccessAnalyzerController.class)),+ descriptor("identitystore", "identitystore", config.services().identitystore().enabled(), true,+ "identitystore", config.storage().mode(), 5000L, null, ServiceProtocol.JSON,+ protocols(ServiceProtocol.JSON), Set.of("AWSIdentityStore."), Set.of("identitystore"), Set.of(), Set.of()),descriptor("autoscaling", "autoscaling", config.services().autoscaling().enabled(), true,"autoscaling", config.storage().mode(), 5000L, AwsNamespaces.AUTOSCALING, ServiceProtocol.QUERY,protocols(ServiceProtocol.QUERY),diff --git a/src/main/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreJsonHandler.javanew file mode 100644index 0000000000..449bc0d620--- /dev/null+++ b/src/main/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreJsonHandler.java@@ -0,0 +1,255 @@+package io.github.hectorvent.floci.services.identitystore;++import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ArrayNode;+import com.fasterxml.jackson.databind.node.ObjectNode;+import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.services.identitystore.model.Group;+import io.github.hectorvent.floci.services.identitystore.model.Membership;+import io.github.hectorvent.floci.services.identitystore.model.User;+import jakarta.enterprise.context.ApplicationScoped;+import jakarta.inject.Inject;+import jakarta.ws.rs.core.Response;++@ApplicationScoped+public class IdentityStoreJsonHandler {+ private static final String ENTERPRISE_EXTENSION = "aws:identitystore:enterprise";++ private final IdentityStoreService service;+ private final ObjectMapper mapper;++ @Inject+ public IdentityStoreJsonHandler(IdentityStoreService service, ObjectMapper mapper) {+ this.service = service;+ this.mapper = mapper;+ }++ public Response handle(String action, JsonNode request) {+ return switch (action) {+ case "CreateGroup" -> createGroup(request);+ case "DeleteGroup" -> emptyAfter(() -> service.deleteGroup(request));+ case "DescribeGroup" -> Response.ok(groupDetails(service.describeGroup(request))).build();+ case "GetGroupId" -> getGroupId(request);+ case "ListGroups" -> listGroups(request);+ case "UpdateGroup" -> emptyAfter(() -> service.updateGroup(request));+ case "CreateUser" -> createUser(request);+ case "DeleteUser" -> emptyAfter(() -> service.deleteUser(request));+ case "DescribeUser" -> describeUser(request);+ case "GetUserId" -> getUserId(request);+ case "ListUsers" -> listUsers(request);+ case "UpdateUser" -> emptyAfter(() -> service.updateUser(request));+ case "CreateGroupMembership" -> createGroupMembership(request);+ case "DeleteGroupMembership" -> emptyAfter(() -> service.deleteMembership(request));+ case "DescribeGroupMembership" -> Response.ok(membershipDetails(service.describeMembership(request))).build();+ case "GetGroupMembershipId" -> getGroupMembershipId(request);+ case "IsMemberInGroups" -> isMemberInGroups(request);+ case "ListGroupMemberships" -> listGroupMemberships(request);+ case "ListGroupMembershipsForMember" -> listGroupMembershipsForMember(request);+ default -> throw new AwsException("UnknownOperationException",+ "Operation " + action + " is not supported.", 400);+ };+ }++ private Response createGroup(JsonNode request) {+ Group group = service.createGroup(request);+ ObjectNode out = mapper.createObjectNode();+ out.put("GroupId", group.groupId());+ out.put("IdentityStoreId", group.identityStoreId());+ return Response.ok(out).build();+ }++ private Response listGroups(JsonNode request) {+ var page = service.listGroups(request);+ ObjectNode out = mapper.createObjectNode();+ ArrayNode array = out.putArray("Groups");+ for (Group group : page.items()) {+ array.add(groupDetails(group));+ }+ if (page.nextToken() != null) {+ out.put("NextToken", page.nextToken());+ }+ return Response.ok(out).build();+ }++ private Response getGroupId(JsonNode request) {+ Group group = service.getGroupId(request);+ ObjectNode out = mapper.createObjectNode();+ out.put("GroupId", group.groupId());+ out.put("IdentityStoreId", group.identityStoreId());+ return Response.ok(out).build();+ }++ private Response createUser(JsonNode request) {+ User user = service.createUser(request);+ ObjectNode out = mapper.createObjectNode();+ out.put("UserId", user.userId());+ out.put("IdentityStoreId", user.identityStoreId());+ return Response.ok(out).build();+ }++ private Response describeUser(JsonNode request) {+ boolean includeExtensions = includeExtensions(request);+ return Response.ok(userDetails(service.describeUser(request), includeExtensions)).build();+ }++ private Response listUsers(JsonNode request) {+ boolean includeExtensions = includeExtensions(request);+ var page = service.listUsers(request);+ ObjectNode out = mapper.createObjectNode();+ ArrayNode array = out.putArray("Users");+ for (User user : page.items()) {+ array.add(userDetails(user, includeExtensions));+ }+ if (page.nextToken() != null) {+ out.put("NextToken", page.nextToken());+ }+ return Response.ok(out).build();+ }++ private Response getUserId(JsonNode request) {+ User user = service.getUserId(request);+ ObjectNode out = mapper.createObjectNode();+ out.put("UserId", user.userId());+ out.put("IdentityStoreId", user.identityStoreId());+ return Response.ok(out).build();+ }++ private Response createGroupMembership(JsonNode request) {+ Membership membership = service.createMembership(request);+ ObjectNode out = mapper.createObjectNode();+ out.put("MembershipId", membership.membershipId());+ out.put("IdentityStoreId", membership.identityStoreId());+ return Response.ok(out).build();+ }++ private Response getGroupMembershipId(JsonNode request) {+ Membership membership = service.getMembershipId(request);+ ObjectNode out = mapper.createObjectNode();+ out.put("MembershipId", membership.membershipId());+ out.put("IdentityStoreId", membership.identityStoreId());+ return Response.ok(out).build();+ }++ private Response listGroupMemberships(JsonNode request) {+ var page = service.listGroupMemberships(request);+ ObjectNode out = mapper.createObjectNode();+ ArrayNode result = out.putArray("GroupMemberships");+ for (Membership membership : page.items()) {+ result.add(membershipDetails(membership));+ }+ if (page.nextToken() != null) {+ out.put("NextToken", page.nextToken());+ }+ return Response.ok(out).build();+ }++ private Response listGroupMembershipsForMember(JsonNode request) {+ var page = service.listGroupMembershipsForMember(request);+ ObjectNode out = mapper.createObjectNode();+ ArrayNode result = out.putArray("GroupMemberships");+ for (Membership membership : page.items()) {+ result.add(membershipDetails(membership));+ }+ if (page.nextToken() != null) {+ out.put("NextToken", page.nextToken());+ }+ return Response.ok(out).build();+ }++ private Response isMemberInGroups(JsonNode request) {+ String storeId = IdentityStoreService.required(request, "IdentityStoreId");+ String userId = IdentityStoreService.memberUserId(request.get("MemberId"));+ var groupIds = service.validateGroupIds(request.get("GroupIds"));+ ObjectNode out = mapper.createObjectNode();+ ArrayNode results = out.putArray("Results");+ for (String groupId : groupIds) {+ ObjectNode result = results.addObject();+ result.put("GroupId", groupId);+ result.putObject("MemberId").put("UserId", userId);+ result.put("MembershipExists", service.isMember(storeId, userId, groupId));+ }+ return Response.ok(out).build();+ }++ private ObjectNode groupSummary(Group group) {+ ObjectNode out = mapper.createObjectNode();+ out.put("GroupId", group.groupId());+ out.put("IdentityStoreId", group.identityStoreId());+ copyIfPresent(group.attributes(), out, "DisplayName");+ copyIfPresent(group.attributes(), out, "Description");+ copyIfPresent(group.attributes(), out, "ExternalIds");+ return out;+ }++ private ObjectNode groupDetails(Group group) {+ ObjectNode out = groupSummary(group);+ putTimestamp(out, "CreatedAt", group.createdAt());+ putTimestamp(out, "UpdatedAt", group.updatedAt());+ return out;+ }++ private ObjectNode userDetails(User user, boolean includeExtensions) {+ ObjectNode out = mapper.createObjectNode();+ out.put("UserId", user.userId());+ out.put("IdentityStoreId", user.identityStoreId());+ user.attributes().fields().forEachRemaining(entry -> {+ if (!"Extensions".equals(entry.getKey()) || includeExtensions) {+ out.set(entry.getKey(), entry.getValue().deepCopy());+ }+ });+ putTimestamp(out, "CreatedAt", user.createdAt());+ putTimestamp(out, "UpdatedAt", user.updatedAt());+ return out;+ }++ private ObjectNode membershipDetails(Membership membership) {+ ObjectNode out = mapper.createObjectNode();+ out.put("IdentityStoreId", membership.identityStoreId());+ out.put("MembershipId", membership.membershipId());+ out.put("GroupId", membership.groupId());+ out.putObject("MemberId").put("UserId", membership.userId());+ putTimestamp(out, "CreatedAt", membership.createdAt());+ putTimestamp(out, "UpdatedAt", membership.updatedAt());+ return out;+ }++ private static boolean includeExtensions(JsonNode request) {+ JsonNode extensions = request == null ? null : request.get("Extensions");+ if (extensions == null || extensions.isNull()) {+ return false;+ }+ if (!extensions.isArray() || extensions.size() < 1 || extensions.size() > 10) {+ throw validation("Extensions must contain between 1 and 10 extension names.");+ }+ for (JsonNode extension : extensions) {+ if (!extension.isTextual() || !ENTERPRISE_EXTENSION.equals(extension.textValue())) {+ throw validation("Only aws:identitystore:enterprise is supported in Extensions.");+ }+ }+ return true;+ }++ private static void copyIfPresent(ObjectNode source, ObjectNode target, String field) {+ if (source != null && source.has(field) && !source.get(field).isNull()) {+ target.set(field, source.get(field).deepCopy());+ }+ }++ private static void putTimestamp(ObjectNode target, String field, String timestamp) {+ if (timestamp != null) {+ var instant = java.time.Instant.parse(timestamp);+ double unixTimestamp = instant.getEpochSecond() + instant.getNano() / 1_000_000_000.0;+ target.put(field, unixTimestamp);+ }+ }++ private Response emptyAfter(Runnable action) {+ action.run();+ return Response.ok(mapper.createObjectNode()).build();+ }++ private static AwsException validation(String message) {+ return new AwsException("ValidationException", message, 400);+ }+}diff --git a/src/main/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreService.java b/src/main/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreService.javanew file mode 100644index 0000000000..80102d5b04--- /dev/null+++ b/src/main/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreService.java@@ -0,0 +1,656 @@+package io.github.hectorvent.floci.services.identitystore;++import com.fasterxml.jackson.core.type.TypeReference;+import com.fasterxml.jackson.databind.JsonNode;+import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ObjectNode;+import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.core.common.PaginatedResult;+import io.github.hectorvent.floci.core.common.Pagination;+import io.github.hectorvent.floci.core.common.Resettable;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;+import io.github.hectorvent.floci.core.storage.StorageFactory;+import io.github.hectorvent.floci.services.identitystore.model.Group;+import io.github.hectorvent.floci.services.identitystore.model.Membership;+import io.github.hectorvent.floci.services.identitystore.model.User;+import jakarta.enterprise.context.ApplicationScoped;+import jakarta.inject.Inject;++import java.time.Instant;+import java.util.Comparator;+import java.util.List;+import java.util.Map;+import java.util.Set;+import java.util.UUID;+import java.util.regex.Pattern;++@ApplicationScoped+public class IdentityStoreService implements Resettable {+ private static final String GLOBAL_PARTITION = "000000000000";+ private static final Pattern STORE_ID = Pattern.compile(+ "d-[0-9a-f]{10}|[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}");+ private static final Pattern RESOURCE_ID = Pattern.compile(+ "([0-9a-f]{10}-|)[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}");+ private static final Set<String> RESERVED_NAMES = Set.of("Administrator", "AWSAdministrators");+ private static final Set<String> GROUP_WRITABLE_ATTRIBUTES = Set.of(+ "description", "displayName", "externalIds");+ private static final Set<String> USER_WRITABLE_ATTRIBUTES = Set.of(+ "addresses", "birthdate", "displayName", "emails", "externalIds", "locale", "name", "nickName",+ "phoneNumbers", "photos", "preferredLanguage", "profileUrl", "roles", "timezone", "title", "userName",+ "userStatus", "userType", "website");+ private static final String ENTERPRISE_EXTENSION = "aws:identitystore:enterprise";+ private static final Pattern ATTRIBUTE_PATH = Pattern.compile(+ "(?:\\p{L}+:\\p{L}+:\\p{L}+(?:\\.\\p{L}+){0,3}|\\p{L}+(?:\\.\\p{L}+){0,2})");+ private static final int MAX_GROUPS = 100_000;+ private static final int MAX_USERS = 200_000;++ private final AccountAwareStorageBackend<Group> groups;+ private final AccountAwareStorageBackend<User> users;+ private final AccountAwareStorageBackend<Membership> memberships;+ private final ObjectMapper mapper;++ @Inject+ public IdentityStoreService(StorageFactory storageFactory, ObjectMapper mapper) {+ this(+ storageFactory.create("identitystore", "identitystore-groups.json",+ new TypeReference<Map<String, Group>>() {}),+ storageFactory.create("identitystore", "identitystore-users.json",+ new TypeReference<Map<String, User>>() {}),+ storageFactory.create("identitystore", "identitystore-memberships.json",+ new TypeReference<Map<String, Membership>>() {}),+ mapper);+ }++ IdentityStoreService(AccountAwareStorageBackend<Group> groups,+ AccountAwareStorageBackend<User> users,+ AccountAwareStorageBackend<Membership> memberships,+ ObjectMapper mapper) {+ this.groups = groups;+ this.users = users;+ this.memberships = memberships;+ this.mapper = mapper;+ }++ public synchronized Group createGroup(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ ObjectNode attributes = copyAttributes(request, Set.of("IdentityStoreId"));+ String displayName = optionalTextLength(attributes, "DisplayName", 1, 1024);+ if (displayName != null) {+ requireNotReserved(displayName);+ if (!listGroupsAll(storeId, displayName).isEmpty()) {+ throw conflict("A group with DisplayName " + displayName + " already exists.");+ }+ }+ optionalTextLength(attributes, "Description", 1, 1024);+ if (scanGroups(storeId).size() >= MAX_GROUPS) {+ throw quota("The identity store group quota has been exceeded.");+ }+ String now = Instant.now().toString();+ Group group = new Group(resourceId(storeId), storeId, attributes, now, now);+ groups.putForAccount(GLOBAL_PARTITION, groupKey(storeId, group.groupId()), group);+ return group;+ }++ public PaginatedResult<Group> listGroups(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ String displayName = filterValue(request, "DisplayName");+ return Pagination.paginate(listGroupsAll(storeId, displayName), Group::groupId,+ optionalMaxResults(request), text(request, "NextToken"), 50, 100, "ValidationException");+ }++ public Group describeGroup(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ return requireGroup(storeId, requireResourceId(required(request, "GroupId"), "GroupId"));+ }++ public synchronized void updateGroup(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ String groupId = requireResourceId(required(request, "GroupId"), "GroupId");+ Group group = requireGroup(storeId, groupId);+ ObjectNode updated = group.attributes().deepCopy();+ applyOperations(updated, request.get("Operations"), false);+ String newDisplayName = optionalTextLength(updated, "DisplayName", 1, 1024);+ if (newDisplayName != null) {+ requireNotReserved(newDisplayName);+ boolean duplicate = listGroupsAll(storeId, newDisplayName).stream()+ .anyMatch(candidate -> !candidate.groupId().equals(groupId));+ if (duplicate) {+ throw conflict("A group with DisplayName " + newDisplayName + " already exists.");+ }+ }+ group.setAttributes(updated);+ group.setUpdatedAt(Instant.now().toString());+ groups.putForAccount(GLOBAL_PARTITION, groupKey(storeId, groupId), group);+ }++ public synchronized void deleteGroup(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ String groupId = requireResourceId(required(request, "GroupId"), "GroupId");+ requireGroup(storeId, groupId);+ listMembershipsAll(storeId).stream()+ .filter(membership -> groupId.equals(membership.groupId()))+ .forEach(membership -> memberships.deleteForAccount(GLOBAL_PARTITION,+ membershipKey(storeId, membership.membershipId())));+ groups.deleteForAccount(GLOBAL_PARTITION, groupKey(storeId, groupId));+ }++ public Group getGroupId(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ JsonNode alternate = requireObject(request, "AlternateIdentifier");+ return findGroupByAlternate(storeId, alternate);+ }++ public synchronized User createUser(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ ObjectNode attributes = copyAttributes(request, Set.of("IdentityStoreId"));+ String userName = optionalTextLength(attributes, "UserName", 1, 128);+ if (userName != null) {+ requireNotReserved(userName);+ if (!listUsersAll(storeId, userName).isEmpty()) {+ throw conflict("A user with UserName " + userName + " already exists.");+ }+ }+ optionalTextLength(attributes, "DisplayName", 1, 1024);+ if (scanUsers(storeId).size() >= MAX_USERS) {+ throw quota("The identity store user quota has been exceeded.");+ }+ String now = Instant.now().toString();+ User user = new User(resourceId(storeId), storeId, attributes, now, now);+ users.putForAccount(GLOBAL_PARTITION, userKey(storeId, user.userId()), user);+ return user;+ }++ public PaginatedResult<User> listUsers(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ String userName = filterValue(request, "UserName");+ return Pagination.paginate(listUsersAll(storeId, userName), User::userId,+ optionalMaxResults(request), text(request, "NextToken"), 50, 100, "ValidationException");+ }++ public User describeUser(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ return requireUser(storeId, requireResourceId(required(request, "UserId"), "UserId"));+ }++ public synchronized void updateUser(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ String userId = requireResourceId(required(request, "UserId"), "UserId");+ User user = requireUser(storeId, userId);+ ObjectNode updated = user.attributes().deepCopy();+ applyOperations(updated, request.get("Operations"), true);+ String newUserName = optionalTextLength(updated, "UserName", 1, 128);+ if (newUserName != null) {+ requireNotReserved(newUserName);+ boolean duplicate = listUsersAll(storeId, newUserName).stream()+ .anyMatch(candidate -> !candidate.userId().equals(userId));+ if (duplicate) {+ throw conflict("A user with UserName " + newUserName + " already exists.");+ }+ }+ user.setAttributes(updated);+ user.setUpdatedAt(Instant.now().toString());+ users.putForAccount(GLOBAL_PARTITION, userKey(storeId, userId), user);+ }++ public synchronized void deleteUser(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ String userId = requireResourceId(required(request, "UserId"), "UserId");+ requireUser(storeId, userId);+ listMembershipsAll(storeId).stream()+ .filter(membership -> userId.equals(membership.userId()))+ .forEach(membership -> memberships.deleteForAccount(GLOBAL_PARTITION,+ membershipKey(storeId, membership.membershipId())));+ users.deleteForAccount(GLOBAL_PARTITION, userKey(storeId, userId));+ }++ public User getUserId(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ JsonNode alternate = requireObject(request, "AlternateIdentifier");+ return findUserByAlternate(storeId, alternate);+ }++ public synchronized Membership createMembership(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ String groupId = requireResourceId(required(request, "GroupId"), "GroupId");+ String userId = memberUserId(request.get("MemberId"));+ requireGroup(storeId, groupId);+ requireUser(storeId, userId);+ boolean exists = listMembershipsAll(storeId).stream()+ .anyMatch(membership -> groupId.equals(membership.groupId()) && userId.equals(membership.userId()));+ if (exists) {+ throw conflict("The user is already a member of the group.");+ }+ String now = Instant.now().toString();+ Membership membership = new Membership(resourceId(storeId), storeId, groupId, userId, now, now);+ memberships.putForAccount(GLOBAL_PARTITION, membershipKey(storeId, membership.membershipId()), membership);+ return membership;+ }++ public Membership describeMembership(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ String membershipId = requireResourceId(required(request, "MembershipId"), "MembershipId");+ return requireMembership(storeId, membershipId);+ }++ public Membership getMembershipId(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ String groupId = requireResourceId(required(request, "GroupId"), "GroupId");+ String userId = memberUserId(request.get("MemberId"));+ requireGroup(storeId, groupId);+ requireUser(storeId, userId);+ return listMembershipsAll(storeId).stream()+ .filter(membership -> groupId.equals(membership.groupId()) && userId.equals(membership.userId()))+ .findFirst()+ .orElseThrow(() -> notFound("Group membership not found."));+ }++ public synchronized void deleteMembership(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ String membershipId = requireResourceId(required(request, "MembershipId"), "MembershipId");+ requireMembership(storeId, membershipId);+ memberships.deleteForAccount(GLOBAL_PARTITION, membershipKey(storeId, membershipId));+ }++ public PaginatedResult<Membership> listGroupMemberships(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ String groupId = requireResourceId(required(request, "GroupId"), "GroupId");+ requireGroup(storeId, groupId);+ List<Membership> matching = listMembershipsAll(storeId).stream()+ .filter(membership -> groupId.equals(membership.groupId()))+ .sorted(Comparator.comparing(Membership::membershipId))+ .toList();+ return paginateMemberships(matching, request);+ }++ public PaginatedResult<Membership> listGroupMembershipsForMember(JsonNode request) {+ String storeId = requireStore(required(request, "IdentityStoreId"));+ String userId = memberUserId(request.get("MemberId"));+ requireUser(storeId, userId);+ List<Membership> matching = listMembershipsAll(storeId).stream()+ .filter(membership -> userId.equals(membership.userId()))+ .sorted(Comparator.comparing(Membership::membershipId))+ .toList();+ return paginateMemberships(matching, request);+ }++ public boolean isMember(String storeId, String userId, String groupId) {+ storeId = requireStore(storeId);+ userId = requireResourceId(userId, "MemberId.UserId");+ groupId = requireResourceId(groupId, "GroupId");+ requireUser(storeId, userId);+ requireGroup(storeId, groupId);+ String finalStoreId = storeId;+ String finalUserId = userId;+ String finalGroupId = groupId;+ return listMembershipsAll(finalStoreId).stream()+ .anyMatch(membership -> finalUserId.equals(membership.userId())+ && finalGroupId.equals(membership.groupId()));+ }++ public List<String> validateGroupIds(JsonNode groupIds) {+ if (groupIds == null || !groupIds.isArray() || groupIds.size() < 1 || groupIds.size() > 100) {+ throw validation("GroupIds must contain between 1 and 100 identifiers.");+ }+ return java.util.stream.StreamSupport.stream(groupIds.spliterator(), false)+ .map(node -> {+ if (!node.isTextual()) {+ throw validation("GroupIds must contain strings.");+ }+ return requireResourceId(node.textValue(), "GroupId");+ })+ .toList();+ }++ @Override+ public void clear() {+ groups.clear();+ users.clear();+ memberships.clear();+ }++ private List<Group> listGroupsAll(String storeId, String displayName) {+ return scanGroups(storeId).stream()+ .filter(group -> displayName == null || displayName.equals(group.displayName()))+ .sorted(Comparator.comparing(Group::displayName, Comparator.nullsFirst(String::compareTo))+ .thenComparing(Group::groupId))+ .toList();+ }++ private List<User> listUsersAll(String storeId, String userName) {+ return scanUsers(storeId).stream()+ .filter(user -> userName == null || userName.equals(user.userName()))+ .sorted(Comparator.comparing(User::userName, Comparator.nullsFirst(String::compareTo))+ .thenComparing(User::userId))+ .toList();+ }++ private List<Group> scanGroups(String storeId) {+ return groups.scanForAccount(GLOBAL_PARTITION, key -> key.startsWith(storeId + "::"));+ }++ private List<User> scanUsers(String storeId) {+ return users.scanForAccount(GLOBAL_PARTITION, key -> key.startsWith(storeId + "::"));+ }++ private List<Membership> listMembershipsAll(String storeId) {+ return memberships.scanForAccount(GLOBAL_PARTITION, key -> key.startsWith(storeId + "::"));+ }++ private Group requireGroup(String storeId, String groupId) {+ return groups.getForAccount(GLOBAL_PARTITION, groupKey(storeId, groupId))+ .orElseThrow(() -> notFound("Group not found: " + groupId));+ }++ private User requireUser(String storeId, String userId) {+ return users.getForAccount(GLOBAL_PARTITION, userKey(storeId, userId))+ .orElseThrow(() -> notFound("User not found: " + userId));+ }++ private Membership requireMembership(String storeId, String membershipId) {+ return memberships.getForAccount(GLOBAL_PARTITION, membershipKey(storeId, membershipId))+ .orElseThrow(() -> notFound("Group membership not found: " + membershipId));+ }++ private Group findGroupByAlternate(String storeId, JsonNode alternate) {+ validateAlternateUnion(alternate);+ JsonNode unique = alternate.get("UniqueAttribute");+ if (unique != null) {+ if (!"displayName".equals(text(unique, "AttributePath"))) {+ throw validation("The only supported unique group attribute path is displayName.");+ }+ JsonNode value = unique.get("AttributeValue");+ if (value == null || !value.isTextual()) {+ throw validation("AlternateIdentifier.UniqueAttribute.AttributeValue must be a string.");+ }+ return listGroupsAll(storeId, value.textValue()).stream().findFirst()+ .orElseThrow(() -> notFound("Group not found."));+ }+ JsonNode external = alternate.get("ExternalId");+ return scanGroups(storeId).stream()+ .filter(group -> hasExternalId(group.attributes(), external))+ .findFirst()+ .orElseThrow(() -> notFound("Group not found."));+ }++ private User findUserByAlternate(String storeId, JsonNode alternate) {+ validateAlternateUnion(alternate);+ JsonNode unique = alternate.get("UniqueAttribute");+ if (unique != null) {+ String path = text(unique, "AttributePath");+ JsonNode value = unique.get("AttributeValue");+ if (value == null || !value.isTextual()) {+ throw validation("AlternateIdentifier.UniqueAttribute.AttributeValue must be a string.");+ }+ if ("userName".equals(path)) {+ return listUsersAll(storeId, value.textValue()).stream().findFirst()+ .orElseThrow(() -> notFound("User not found."));+ }+ if ("emails.value".equals(path)) {+ return scanUsers(storeId).stream()+ .filter(user -> arrayHasValue(user.attributes().get("Emails"), "Value", value.textValue()))+ .findFirst()+ .orElseThrow(() -> notFound("User not found."));+ }+ throw validation("The unique user attribute path must be userName or emails.value.");+ }+ JsonNode external = alternate.get("ExternalId");+ return scanUsers(storeId).stream()+ .filter(user -> hasExternalId(user.attributes(), external))+ .findFirst()+ .orElseThrow(() -> notFound("User not found."));+ }++ private static boolean hasExternalId(ObjectNode attributes, JsonNode requested) {+ if (requested == null || !requested.isObject()) {+ throw validation("ExternalId must be an object.");+ }+ String issuer = required(requested, "Issuer");+ String id = required(requested, "Id");+ JsonNode externalIds = attributes.get("ExternalIds");+ if (externalIds == null || !externalIds.isArray()) {+ return false;+ }+ for (JsonNode externalId : externalIds) {+ if (issuer.equals(text(externalId, "Issuer")) && id.equals(text(externalId, "Id"))) {+ return true;+ }+ }+ return false;+ }++ private static boolean arrayHasValue(JsonNode array, String field, String expected) {+ if (array == null || !array.isArray()) {+ return false;+ }+ for (JsonNode item : array) {+ if (expected.equals(text(item, field))) {+ return true;+ }+ }+ return false;+ }++ private static void validateAlternateUnion(JsonNode alternate) {+ boolean external = alternate.has("ExternalId") && !alternate.get("ExternalId").isNull();+ boolean unique = alternate.has("UniqueAttribute") && !alternate.get("UniqueAttribute").isNull();+ if (external == unique) {+ throw validation("AlternateIdentifier must contain exactly one union member.");+ }+ }++ private void applyOperations(ObjectNode attributes, JsonNode operations, boolean user) {+ if (operations == null || !operations.isArray() || operations.size() < 1 || operations.size() > 100) {+ throw validation("Operations must contain between 1 and 100 attribute operations.");+ }+ for (JsonNode operation : operations) {+ if (!operation.isObject()) {+ throw validation("Each operation must be an object.");+ }+ String path = required(operation, "AttributePath");+ JsonNode value = operation.get("AttributeValue");+ applyAttribute(attributes, path, value, user);+ }+ }++ private void applyAttribute(ObjectNode attributes, String path, JsonNode value, boolean user) {+ if (path.length() > 255 || !ATTRIBUTE_PATH.matcher(path).matches()) {+ throw validation("AttributePath is invalid.");+ }+ if (path.startsWith("aws:identitystore:")) {+ if (!user || !(path.equals(ENTERPRISE_EXTENSION) || path.startsWith(ENTERPRISE_EXTENSION + "."))) {+ throw validation("The attribute path is not supported for this resource.");+ }+ ObjectNode extensions = attributes.withObject("Extensions");+ int dot = path.indexOf('.');+ if (dot < 0) {+ setOrRemove(extensions, path, value);+ return;+ }+ String extensionName = path.substring(0, dot);+ String nestedPath = path.substring(dot + 1);+ ObjectNode extension = extensions.withObject(extensionName);+ setNested(extension, nestedPath, value);+ return;+ }+ String[] segments = path.split("\\.");+ Set<String> writableAttributes = user ? USER_WRITABLE_ATTRIBUTES : GROUP_WRITABLE_ATTRIBUTES;+ if (!writableAttributes.contains(segments[0])) {+ throw validation("The " + (user ? "user" : "group") + " attribute path is not supported.");+ }+ segments[0] = upperCamel(segments[0]);+ setNested(attributes, String.join(".", segments), value);+ }++ private void setNested(ObjectNode root, String path, JsonNode value) {+ String[] segments = path.split("\\.");+ ObjectNode current = root;+ for (int i = 0; i < segments.length - 1; i++) {+ String segment = i == 0 ? segments[i] : upperCamel(segments[i]);+ JsonNode child = current.get(segment);+ if (child == null || !child.isObject()) {+ child = mapper.createObjectNode();+ current.set(segment, child);+ }+ current = (ObjectNode) child;+ }+ String leaf = segments.length == 1 ? segments[0] : upperCamel(segments[segments.length - 1]);+ setOrRemove(current, leaf, value);+ }++ private static void setOrRemove(ObjectNode node, String field, JsonNode value) {+ if (value == null || value.isNull()) {+ node.remove(field);+ } else {+ node.set(field, value.deepCopy());+ }+ }++ private ObjectNode copyAttributes(JsonNode request, Set<String> excluded) {+ if (request == null || !request.isObject()) {+ throw validation("The request body must be a JSON object.");+ }+ ObjectNode copy = mapper.createObjectNode();+ request.fields().forEachRemaining(entry -> {+ if (!excluded.contains(entry.getKey())) {+ copy.set(entry.getKey(), entry.getValue().deepCopy());+ }+ });+ return copy;+ }++ private static PaginatedResult<Membership> paginateMemberships(List<Membership> memberships, JsonNode request) {+ return Pagination.paginate(memberships, Membership::membershipId,+ optionalMaxResults(request), text(request, "NextToken"), 50, 100, "ValidationException");+ }++ private static String filterValue(JsonNode request, String allowedPath) {+ JsonNode filters = request == null ? null : request.get("Filters");+ if (filters == null || filters.isNull() || (filters.isArray() && filters.isEmpty())) {+ return null;+ }+ if (!filters.isArray() || filters.size() > 1) {+ throw validation("Filters must contain at most one filter.");+ }+ JsonNode filter = filters.get(0);+ String path = text(filter, "AttributePath");+ String value = text(filter, "AttributeValue");+ if (!allowedPath.equals(path) || value == null || value.isBlank() || value.length() > 1024) {+ throw validation("The filter is invalid for this operation.");+ }+ return value;+ }++ static String memberUserId(JsonNode member) {+ if (member == null || !member.isObject() || member.size() != 1 || !member.path("UserId").isTextual()) {+ throw validation("MemberId must contain exactly one UserId string.");+ }+ return requireResourceId(member.path("UserId").textValue(), "MemberId.UserId");+ }++ static String required(JsonNode request, String field) {+ String value = text(request, field);+ if (value == null || value.isBlank()) {+ throw validation(field + " must be a non-empty string.");+ }+ return value;+ }++ private static JsonNode requireObject(JsonNode request, String field) {+ JsonNode value = request == null ? null : request.get(field);+ if (value == null || !value.isObject()) {+ throw validation(field + " must be an object.");+ }+ return value;+ }++ static String text(JsonNode request, String field) {+ JsonNode value = request == null ? null : request.get(field);+ return value != null && value.isTextual() ? value.textValue() : null;+ }++ private static String optionalTextLength(JsonNode request, String field, int min, int max) {+ if (request == null || !request.has(field) || request.get(field).isNull()) {+ return null;+ }+ String value = text(request, field);+ if (value == null || value.length() < min || value.length() > max) {+ throw validation(field + " length is invalid.");+ }+ return value;+ }++ private static Integer optionalMaxResults(JsonNode request) {+ JsonNode node = request == null ? null : request.get("MaxResults");+ if (node == null || node.isNull()) {+ return null;+ }+ if (!node.isIntegralNumber()) {+ throw validation("MaxResults must be an integer.");+ }+ int value = node.intValue();+ if (value < 1 || value > 100) {+ throw validation("MaxResults must be between 1 and 100.");+ }+ return value;+ }++ private static String requireStore(String storeId) {+ if (storeId == null || !STORE_ID.matcher(storeId).matches()) {+ throw validation("IdentityStoreId is invalid.");+ }+ return storeId;+ }++ private static String requireResourceId(String value, String field) {+ if (value == null || !RESOURCE_ID.matcher(value).matches()) {+ throw validation(field + " is invalid.");+ }+ return value;+ }++ private static void requireNotReserved(String value) {+ if (RESERVED_NAMES.contains(value)) {+ throw validation(value + " is a reserved identity name.");+ }+ }++ private static String resourceId(String storeId) {+ String uuid = UUID.randomUUID().toString();+ return storeId.startsWith("d-") ? storeId.substring(2) + "-" + uuid : uuid;+ }++ private static String groupKey(String store, String id) {+ return store + "::" + id;+ }++ private static String userKey(String store, String id) {+ return store + "::" + id;+ }++ private static String membershipKey(String store, String id) {+ return store + "::" + id;+ }++ private static String upperCamel(String value) {+ if (value == null || value.isEmpty()) {+ return value;+ }+ return Character.toUpperCase(value.charAt(0)) + value.substring(1);+ }++ private static AwsException conflict(String message) {+ return new AwsException("ConflictException", message, 400);+ }++ private static AwsException quota(String message) {+ return new AwsException("ServiceQuotaExceededException", message, 400);+ }++ private static AwsException notFound(String message) {+ return new AwsException("ResourceNotFoundException", message, 400);+ }++ private static AwsException validation(String message) {+ return new AwsException("ValidationException", message, 400);+ }+}diff --git a/src/main/java/io/github/hectorvent/floci/services/identitystore/model/Group.java b/src/main/java/io/github/hectorvent/floci/services/identitystore/model/Group.javanew file mode 100644index 0000000000..a3be019578--- /dev/null+++ b/src/main/java/io/github/hectorvent/floci/services/identitystore/model/Group.java@@ -0,0 +1,67 @@+package io.github.hectorvent.floci.services.identitystore.model;++import com.fasterxml.jackson.databind.node.ObjectNode;+import io.quarkus.runtime.annotations.RegisterForReflection;++@RegisterForReflection+public class Group {+ private String groupId;+ private String identityStoreId;+ private ObjectNode attributes;+ private String createdAt;+ private String updatedAt;++ public Group() {+ }++ public Group(String groupId, String identityStoreId, ObjectNode attributes, String createdAt, String updatedAt) {+ this.groupId = groupId;+ this.identityStoreId = identityStoreId;+ this.attributes = attributes;+ this.createdAt = createdAt;+ this.updatedAt = updatedAt;+ }++ public String groupId() {+ return groupId;+ }++ public String identityStoreId() {+ return identityStoreId;+ }++ public ObjectNode attributes() {+ return attributes;+ }++ public String createdAt() {+ return createdAt;+ }++ public String updatedAt() {+ return updatedAt;+ }++ public String displayName() {+ return textAttribute("DisplayName");+ }++ public String description() {+ return textAttribute("Description");+ }++ public void setAttributes(ObjectNode attributes) {+ this.attributes = attributes;+ }++ public void setUpdatedAt(String updatedAt) {+ this.updatedAt = updatedAt;+ }++ private String textAttribute(String name) {+ if (attributes == null || !attributes.path(name).isTextual()) {+ return null;+ }+ return attributes.path(name).textValue();+ }+}diff --git a/src/main/java/io/github/hectorvent/floci/services/identitystore/model/Membership.java b/src/main/java/io/github/hectorvent/floci/services/identitystore/model/Membership.javanew file mode 100644index 0000000000..5ed2316adf--- /dev/null+++ b/src/main/java/io/github/hectorvent/floci/services/identitystore/model/Membership.java@@ -0,0 +1,50 @@+package io.github.hectorvent.floci.services.identitystore.model;++import io.quarkus.runtime.annotations.RegisterForReflection;++@RegisterForReflection+public class Membership {+ private String membershipId;+ private String identityStoreId;+ private String groupId;+ private String userId;+ private String createdAt;+ private String updatedAt;++ public Membership() {+ }++ public Membership(String membershipId, String identityStoreId, String groupId, String userId,+ String createdAt, String updatedAt) {+ this.membershipId = membershipId;+ this.identityStoreId = identityStoreId;+ this.groupId = groupId;+ this.userId = userId;+ this.createdAt = createdAt;+ this.updatedAt = updatedAt;+ }++ public String membershipId() {+ return membershipId;+ }++ public String identityStoreId() {+ return identityStoreId;+ }++ public String groupId() {+ return groupId;+ }++ public String userId() {+ return userId;+ }++ public String createdAt() {+ return createdAt;+ }++ public String updatedAt() {+ return updatedAt;+ }+}diff --git a/src/main/java/io/github/hectorvent/floci/services/identitystore/model/User.java b/src/main/java/io/github/hectorvent/floci/services/identitystore/model/User.javanew file mode 100644index 0000000000..4417c93498--- /dev/null+++ b/src/main/java/io/github/hectorvent/floci/services/identitystore/model/User.java@@ -0,0 +1,67 @@+package io.github.hectorvent.floci.services.identitystore.model;++import com.fasterxml.jackson.databind.node.ObjectNode;+import io.quarkus.runtime.annotations.RegisterForReflection;++@RegisterForReflection+public class User {+ private String userId;+ private String identityStoreId;+ private ObjectNode attributes;+ private String createdAt;+ private String updatedAt;++ public User() {+ }++ public User(String userId, String identityStoreId, ObjectNode attributes, String createdAt, String updatedAt) {+ this.userId = userId;+ this.identityStoreId = identityStoreId;+ this.attributes = attributes;+ this.createdAt = createdAt;+ this.updatedAt = updatedAt;+ }++ public String userId() {+ return userId;+ }++ public String identityStoreId() {+ return identityStoreId;+ }++ public ObjectNode attributes() {+ return attributes;+ }++ public String createdAt() {+ return createdAt;+ }++ public String updatedAt() {+ return updatedAt;+ }++ public String userName() {+ return textAttribute("UserName");+ }++ public String displayName() {+ return textAttribute("DisplayName");+ }++ public void setAttributes(ObjectNode attributes) {+ this.attributes = attributes;+ }++ public void setUpdatedAt(String updatedAt) {+ this.updatedAt = updatedAt;+ }++ private String textAttribute(String name) {+ if (attributes == null || !attributes.path(name).isTextual()) {+ return null;+ }+ return attributes.path(name).textValue();+ }+}diff --git a/src/main/resources/application.yml b/src/main/resources/application.ymlindex ba66846041..d09352c188 100644--- a/src/main/resources/application.yml+++ b/src/main/resources/application.yml@@ -619,6 +619,8 @@ floci:enabled: trueaccessanalyzer:enabled: true+ identitystore:+ enabled: truecontroltower:enabled: trueseed-landing-zone: falsediff --git a/src/test/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreIntegrationTest.javanew file mode 100644index 0000000000..ad7584db9d--- /dev/null+++ b/src/test/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreIntegrationTest.java@@ -0,0 +1,159 @@+package io.github.hectorvent.floci.services.identitystore;++import io.github.hectorvent.floci.testing.RestAssuredJsonUtils;+import io.quarkus.test.junit.QuarkusTest;+import org.junit.jupiter.api.BeforeAll;+import org.junit.jupiter.api.Test;++import static io.restassured.RestAssured.given;+import static org.hamcrest.Matchers.equalTo;+import static org.hamcrest.Matchers.hasSize;+import static org.hamcrest.Matchers.notNullValue;+import static org.hamcrest.Matchers.nullValue;++@QuarkusTest+class IdentityStoreIntegrationTest {+ private static final String TYPE = "application/x-amz-json-1.1";+ private static final String AUTH = "AWS4-HMAC-SHA256 Credential=AKID/20260904/us-east-1/identitystore/aws4_request";+ private static final String STORE = "d-1234567890";++ @BeforeAll+ static void configureRestAssured() {+ RestAssuredJsonUtils.configureAwsContentTypes();+ }++ @Test+ void completeLifecycleUsesAwsJson11Shapes() {+ String group = json("AWSIdentityStore.CreateGroup",+ "{\"IdentityStoreId\":\"" + STORE + "\",\"DisplayName\":\"PlatformAdmins\",\"Description\":\"Initial\"}")+ .statusCode(200).body("IdentityStoreId", equalTo(STORE)).extract().path("GroupId");+ String user = json("AWSIdentityStore.CreateUser",+ "{\"IdentityStoreId\":\"" + STORE + "\",\"UserName\":\"[email protected]\",\"DisplayName\":\"Admin\"}")+ .statusCode(200).body("IdentityStoreId", equalTo(STORE)).extract().path("UserId");++ json("AWSIdentityStore.DescribeGroup",+ "{\"IdentityStoreId\":\"" + STORE + "\",\"GroupId\":\"" + group + "\"}")+ .statusCode(200)+ .body("DisplayName", equalTo("PlatformAdmins"))+ .body("CreatedAt", notNullValue());+ json("AWSIdentityStore.DescribeUser",+ "{\"IdentityStoreId\":\"" + STORE + "\",\"UserId\":\"" + user + "\"}")+ .statusCode(200)+ .body("UserName", equalTo("[email protected]"))+ .body("CreatedAt", notNullValue());++ json("AWSIdentityStore.GetGroupId",+ "{\"IdentityStoreId\":\"" + STORE + "\",\"AlternateIdentifier\":{\"UniqueAttribute\":{\"AttributePath\":\"displayName\",\"AttributeValue\":\"PlatformAdmins\"}}}")+ .statusCode(200).body("GroupId", equalTo(group));+ json("AWSIdentityStore.GetUserId",+ "{\"IdentityStoreId\":\"" + STORE + "\",\"AlternateIdentifier\":{\"UniqueAttribute\":{\"AttributePath\":\"userName\",\"AttributeValue\":\"[email protected]\"}}}")+ .statusCode(200).body("UserId", equalTo(user));++ json("AWSIdentityStore.UpdateGroup",+ "{\"IdentityStoreId\":\"" + STORE + "\",\"GroupId\":\"" + group + "\",\"Operations\":[{\"AttributePath\":\"description\",\"AttributeValue\":\"Updated\"}]}")+ .statusCode(200);+ json("AWSIdentityStore.UpdateUser",+ "{\"IdentityStoreId\":\"" + STORE + "\",\"UserId\":\"" + user + "\",\"Operations\":[{\"AttributePath\":\"displayName\",\"AttributeValue\":\"Updated Admin\"}]}")+ .statusCode(200);++ String membershipBody = "{\"IdentityStoreId\":\"" + STORE + "\",\"GroupId\":\"" + group+ + "\",\"MemberId\":{\"UserId\":\"" + user + "\"}}";+ String memberQuery = "{\"IdentityStoreId\":\"" + STORE + "\",\"GroupIds\":[\"" + group+ + "\"],\"MemberId\":{\"UserId\":\"" + user + "\"}}";+ json("AWSIdentityStore.IsMemberInGroups", memberQuery)+ .statusCode(200).body("Results[0].MembershipExists", equalTo(false));+ String membership = json("AWSIdentityStore.CreateGroupMembership", membershipBody)+ .statusCode(200).extract().path("MembershipId");+ json("AWSIdentityStore.DescribeGroupMembership",+ "{\"IdentityStoreId\":\"" + STORE + "\",\"MembershipId\":\"" + membership + "\"}")+ .statusCode(200).body("GroupId", equalTo(group)).body("CreatedAt", notNullValue());+ json("AWSIdentityStore.GetGroupMembershipId", membershipBody)+ .statusCode(200).body("MembershipId", equalTo(membership));+ json("AWSIdentityStore.ListGroupMemberships",+ "{\"IdentityStoreId\":\"" + STORE + "\",\"GroupId\":\"" + group + "\"}")+ .statusCode(200).body("GroupMemberships", hasSize(1));+ json("AWSIdentityStore.ListGroupMembershipsForMember",+ "{\"IdentityStoreId\":\"" + STORE + "\",\"MemberId\":{\"UserId\":\"" + user + "\"}}")+ .statusCode(200).body("GroupMemberships", hasSize(1));+ json("AWSIdentityStore.IsMemberInGroups", memberQuery)+ .statusCode(200).body("Results[0].MembershipExists", equalTo(true));++ json("AWSIdentityStore.DeleteGroupMembership",+ "{\"IdentityStoreId\":\"" + STORE + "\",\"MembershipId\":\"" + membership + "\"}")+ .statusCode(200);+ json("AWSIdentityStore.DeleteUser",+ "{\"IdentityStoreId\":\"" + STORE + "\",\"UserId\":\"" + user + "\"}")+ .statusCode(200);+ json("AWSIdentityStore.DeleteGroup",+ "{\"IdentityStoreId\":\"" + STORE + "\",\"GroupId\":\"" + group + "\"}")+ .statusCode(200);++ json("AWSIdentityStore.ListUsers", "{\"IdentityStoreId\":\"" + STORE + "\"}")+ .statusCode(200).body("Users", hasSize(0));+ json("AWSIdentityStore.ListGroups", "{\"IdentityStoreId\":\"" + STORE + "\"}")+ .statusCode(200).body("Groups", hasSize(0));+ }++ @Test+ void extensionsAreReturnedOnlyWhenRequested() {+ String store = "d-0987654321";+ String user = json("AWSIdentityStore.CreateUser",+ "{\"IdentityStoreId\":\"" + store + "\",\"UserName\":\"[email protected]\","+ + "\"Extensions\":{\"aws:identitystore:enterprise\":{\"department\":\"Platform\"}}}")+ .statusCode(200).extract().path("UserId");++ String describe = "{\"IdentityStoreId\":\"" + store + "\",\"UserId\":\"" + user + "\"}";+ json("AWSIdentityStore.DescribeUser", describe)+ .statusCode(200).body("Extensions", nullValue());+ json("AWSIdentityStore.DescribeUser",+ "{\"IdentityStoreId\":\"" + store + "\",\"UserId\":\"" + user+ + "\",\"Extensions\":[\"aws:identitystore:enterprise\"]}")+ .statusCode(200)+ .body("Extensions.'aws:identitystore:enterprise'.department", equalTo("Platform"));+ }++ @Test+ void duplicateUserReturnsConflict() {+ String body = "{\"IdentityStoreId\":\"d-1111111111\",\"UserName\":\"[email protected]\"}";+ json("AWSIdentityStore.CreateUser", body).statusCode(200);+ json("AWSIdentityStore.CreateUser", body)+ .statusCode(400).body("__type", equalTo("ConflictException"));+ }++ @Test+ void updatesRejectImmutableAndResourceSpecificAttributePaths() {+ String store = "d-2222222222";+ String user = json("AWSIdentityStore.CreateUser",+ "{\"IdentityStoreId\":\"" + store + "\",\"UserName\":\"[email protected]\"}")+ .statusCode(200).extract().path("UserId");+ String group = json("AWSIdentityStore.CreateGroup",+ "{\"IdentityStoreId\":\"" + store + "\",\"DisplayName\":\"ImmutableGroup\"}")+ .statusCode(200).extract().path("GroupId");++ json("AWSIdentityStore.UpdateUser",+ "{\"IdentityStoreId\":\"" + store + "\",\"UserId\":\"" + user+ + "\",\"Operations\":[{\"AttributePath\":\"UserId\",\"AttributeValue\":\"forbidden\"}]}")+ .statusCode(400).body("__type", equalTo("ValidationException"));+ json("AWSIdentityStore.UpdateGroup",+ "{\"IdentityStoreId\":\"" + store + "\",\"GroupId\":\"" + group+ + "\",\"Operations\":[{\"AttributePath\":\"aws:identitystore:enterprise.department\","+ + "\"AttributeValue\":\"forbidden\"}]}")+ .statusCode(400).body("__type", equalTo("ValidationException"));++ json("AWSIdentityStore.DescribeUser",+ "{\"IdentityStoreId\":\"" + store + "\",\"UserId\":\"" + user + "\"}")+ .statusCode(200)+ .body("UserId", equalTo(user))+ .body("UserName", equalTo("[email protected]"));+ }++ private static io.restassured.response.ValidatableResponse json(String target, String body) {+ return given()+ .contentType(TYPE)+ .header("Authorization", AUTH)+ .header("X-Amz-Target", target)+ .body(body)+ .post("/")+ .then();+ }+}diff --git a/src/test/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreServiceTest.javanew file mode 100644index 0000000000..43ec738b27--- /dev/null+++ b/src/test/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreServiceTest.java@@ -0,0 +1,187 @@+package io.github.hectorvent.floci.services.identitystore;++import com.fasterxml.jackson.databind.ObjectMapper;+import com.fasterxml.jackson.databind.node.ArrayNode;+import com.fasterxml.jackson.databind.node.ObjectNode;+import io.github.hectorvent.floci.core.common.AwsException;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;+import io.github.hectorvent.floci.services.identitystore.model.Group;+import io.github.hectorvent.floci.services.identitystore.model.Membership;+import io.github.hectorvent.floci.services.identitystore.model.User;+import org.junit.jupiter.api.BeforeEach;+import org.junit.jupiter.api.Test;++import java.time.Instant;++import static org.junit.jupiter.api.Assertions.assertEquals;+import static org.junit.jupiter.api.Assertions.assertThrows;+import static org.junit.jupiter.api.Assertions.assertTrue;++class IdentityStoreServiceTest {+ private static final String STORE = "d-1234567890";+ private static final String GLOBAL_PARTITION = "000000000000";++ private final ObjectMapper mapper = new ObjectMapper();+ private AccountAwareStorageBackend<Group> groups;+ private AccountAwareStorageBackend<User> users;+ private AccountAwareStorageBackend<Membership> memberships;+ private IdentityStoreService service;++ @BeforeEach+ void setUp() {+ groups = AccountAwareStorageBackend.inMemory(GLOBAL_PARTITION);+ users = AccountAwareStorageBackend.inMemory(GLOBAL_PARTITION);+ memberships = AccountAwareStorageBackend.inMemory(GLOBAL_PARTITION);+ service = new IdentityStoreService(groups, users, memberships, mapper);+ }++ @Test+ void generatedIdsUseIdentityStorePrefix() {+ Group group = service.createGroup(request("DisplayName", "PlatformAdmins"));+ User user = service.createUser(request("UserName", "[email protected]"));++ ObjectNode membershipRequest = mapper.createObjectNode();+ membershipRequest.put("IdentityStoreId", STORE);+ membershipRequest.put("GroupId", group.groupId());+ membershipRequest.putObject("MemberId").put("UserId", user.userId());+ Membership membership = service.createMembership(membershipRequest);++ assertTrue(group.groupId().startsWith("1234567890-"));+ assertTrue(user.userId().startsWith("1234567890-"));+ assertTrue(membership.membershipId().startsWith("1234567890-"));+ }++ @Test+ void optionalNamesRemainOptionalPerApiModel() {+ ObjectNode groupRequest = mapper.createObjectNode().put("IdentityStoreId", STORE);+ ObjectNode userRequest = mapper.createObjectNode().put("IdentityStoreId", STORE);++ Group group = service.createGroup(groupRequest);+ User user = service.createUser(userRequest);++ assertEquals(1, service.listGroups(groupRequest).items().size());+ assertEquals(1, service.listUsers(userRequest).items().size());+ assertEquals(null, group.displayName());+ assertEquals(null, user.userName());+ }++ @Test+ void alternateIdentifiersResolveExternalIds() {+ String now = Instant.now().toString();+ String groupId = "1234567890-11111111-1111-1111-1111-111111111111";+ String userId = "1234567890-22222222-2222-2222-2222-222222222222";++ ObjectNode groupAttributes = mapper.createObjectNode().put("DisplayName", "ExternalGroup");+ groupAttributes.putArray("ExternalIds").addObject().put("Issuer", "https://idp.example.com").put("Id", "group-42");+ groups.putForAccount(GLOBAL_PARTITION, STORE + "::" + groupId,+ new Group(groupId, STORE, groupAttributes, now, now));++ ObjectNode userAttributes = mapper.createObjectNode().put("UserName", "[email protected]");+ userAttributes.putArray("ExternalIds").addObject().put("Issuer", "https://idp.example.com").put("Id", "user-42");+ users.putForAccount(GLOBAL_PARTITION, STORE + "::" + userId,+ new User(userId, STORE, userAttributes, now, now));++ assertEquals(groupId, service.getGroupId(externalLookup("group-42")).groupId());+ assertEquals(userId, service.getUserId(externalLookup("user-42")).userId());+ }++ @Test+ void updateUserSupportsNestedAndEnterpriseAttributes() {+ User user = service.createUser(request("UserName", "[email protected]"));+ ObjectNode update = mapper.createObjectNode();+ update.put("IdentityStoreId", STORE);+ update.put("UserId", user.userId());+ ArrayNode operations = update.putArray("Operations");+ operations.addObject()+ .put("AttributePath", "name.familyName")+ .put("AttributeValue", "García");+ ObjectNode department = operations.addObject();+ department.put("AttributePath", "aws:identitystore:enterprise.department");+ department.put("AttributeValue", "Platform");++ service.updateUser(update);+ User updated = service.describeUser(describeUser(user.userId()));++ assertEquals("García", updated.attributes().path("Name").path("FamilyName").asText());+ assertEquals("Platform", updated.attributes().path("Extensions")+ .path("aws:identitystore:enterprise").path("department").asText());+ }++ @Test+ void updateUserRejectsImmutableAndUnsupportedAttributePaths() {+ User user = service.createUser(request("UserName", "[email protected]"));++ for (String path : new String[]{"UserId", "userId", "identityStoreId", "createdAt", "updatedBy"}) {+ ObjectNode update = updateRequest("UserId", user.userId(), path, "forbidden");+ AwsException error = assertThrows(AwsException.class, () -> service.updateUser(update));+ assertEquals("ValidationException", error.getErrorCode());+ }++ User unchanged = service.describeUser(describeUser(user.userId()));+ assertEquals(user.userId(), unchanged.userId());+ assertTrue(!unchanged.attributes().has("UserId"));+ }++ @Test+ void updateGroupRejectsUserExtensionsAndUnsupportedAttributes() {+ Group group = service.createGroup(request("DisplayName", "ImmutableGroup"));++ for (String path : new String[]{"GroupId", "groupId", "createdAt", "name", "aws:identitystore:enterprise.department"}) {+ ObjectNode update = updateRequest("GroupId", group.groupId(), path, "forbidden");+ AwsException error = assertThrows(AwsException.class, () -> service.updateGroup(update));+ assertEquals("ValidationException", error.getErrorCode());+ }++ Group unchanged = service.describeGroup(describeGroup(group.groupId()));+ assertEquals(group.groupId(), unchanged.groupId());+ assertEquals("ImmutableGroup", unchanged.displayName());+ }++ @Test+ void clearRemovesAllPersistedState() {+ service.createGroup(request("DisplayName", "PlatformAdmins"));+ service.createUser(request("UserName", "[email protected]"));++ service.clear();++ ObjectNode listRequest = mapper.createObjectNode().put("IdentityStoreId", STORE);+ assertTrue(service.listGroups(listRequest).items().isEmpty());+ assertTrue(service.listUsers(listRequest).items().isEmpty());+ }++ private ObjectNode request(String field, String value) {+ ObjectNode request = mapper.createObjectNode();+ request.put("IdentityStoreId", STORE);+ request.put(field, value);+ return request;+ }++ private ObjectNode externalLookup(String id) {+ ObjectNode request = mapper.createObjectNode().put("IdentityStoreId", STORE);+ request.putObject("AlternateIdentifier").putObject("ExternalId")+ .put("Issuer", "https://idp.example.com")+ .put("Id", id);+ return request;+ }++ private ObjectNode describeUser(String userId) {+ ObjectNode request = mapper.createObjectNode().put("IdentityStoreId", STORE);+ request.put("UserId", userId);+ return request;+ }++ private ObjectNode describeGroup(String groupId) {+ ObjectNode request = mapper.createObjectNode().put("IdentityStoreId", STORE);+ request.put("GroupId", groupId);+ return request;+ }++ private ObjectNode updateRequest(String idField, String id, String path, String value) {+ ObjectNode request = mapper.createObjectNode().put("IdentityStoreId", STORE);+ request.put(idField, id);+ request.putArray("Operations").addObject()+ .put("AttributePath", path)+ .put("AttributeValue", value);+ return request;+ }+}diff --git a/src/test/resources/application.yml b/src/test/resources/application.ymlindex d565899684..4fb11a1f26 100644--- a/src/test/resources/application.yml+++ b/src/test/resources/application.yml@@ -381,6 +381,8 @@ floci:enabled: trueaccessanalyzer:enabled: true+ identitystore:+ enabled: truecontroltower:enabled: trueseed-landing-zone: truediff --git a/tools/docs/services.yaml b/tools/docs/services.yamlindex d7aaaaef6c..82dd71fd4d 100644--- a/tools/docs/services.yaml+++ b/tools/docs/services.yaml@@ -218,6 +218,10 @@ services:doc: docs/services/ssoadmin.mdsources:- { path: src/main/java/io/github/hectorvent/floci/services/ssoadmin/SsoAdminJsonHandler.java, mode: switch }+ - service: identitystore+ doc: docs/services/identitystore.md+ sources:+ - { path: src/main/java/io/github/hectorvent/floci/services/identitystore/IdentityStoreJsonHandler.java, mode: switch }- service: sqsdoc: docs/services/sqs.mdsources: