Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

feat(organizations): add management account email configuration and tests (#2749)

Matheus André89fd37a5c43f
diff --git a/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.java b/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.java
index 2e8cc5a99e..302a4d49de 100644
--- a/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.java
+++ b/src/main/java/io/github/hectorvent/floci/config/EmulatorConfig.java
@@ -1402,6 +1402,8 @@ public interface EmulatorConfig {
@WithDefault("false")
boolean scpEnforcementEnabled();
+
+ Optional<String> managementAccountEmail();
}
interface AthenaServiceConfig {
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.java
index 1244322931..bf47793626 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
@@ -151,11 +151,16 @@ public class OrganizationsService implements ScpProvider {
private final AccountAwareStorageBackend<CreateAccountStatus> createAccountStatuses;
private final AccountAwareStorageBackend<Handshake> handshakes;
private final boolean scpEnforcementEnabled;
+ private final String managementAccountEmail;
@Inject
public OrganizationsService(StorageFactory storageFactory, ObjectMapper objectMapper,
EmulatorConfig config) {
- this.scpEnforcementEnabled = config.services().organizations().scpEnforcementEnabled();
+ EmulatorConfig.OrganizationsServiceConfig organizationsConfig = config.services().organizations();
+ this.scpEnforcementEnabled = organizationsConfig.scpEnforcementEnabled();
+ this.managementAccountEmail = organizationsConfig.managementAccountEmail()
+ .map(OrganizationsService::requireValidConfiguredEmail)
+ .orElse(null);
this.objectMapper = objectMapper;
this.organizations = storageFactory.create("organizations", "organizations-organizations.json",
new TypeReference<Map<String, Organization>>() {});
@@ -190,6 +195,19 @@ public class OrganizationsService implements ScpProvider {
AccountAwareStorageBackend<CreateAccountStatus> createAccountStatuses,
AccountAwareStorageBackend<Handshake> handshakes,
boolean scpEnforcementEnabled) {
+ this(objectMapper, organizations, accounts, organizationalUnits, policies,
+ createAccountStatuses, handshakes, scpEnforcementEnabled, null);
+ }
+
+ OrganizationsService(ObjectMapper objectMapper,
+ AccountAwareStorageBackend<Organization> organizations,
+ AccountAwareStorageBackend<OrganizationAccount> accounts,
+ AccountAwareStorageBackend<OrganizationalUnit> organizationalUnits,
+ AccountAwareStorageBackend<OrganizationPolicy> policies,
+ AccountAwareStorageBackend<CreateAccountStatus> createAccountStatuses,
+ AccountAwareStorageBackend<Handshake> handshakes,
+ boolean scpEnforcementEnabled,
+ String managementAccountEmail) {
this.objectMapper = objectMapper;
this.organizations = organizations;
this.accounts = accounts;
@@ -198,6 +216,9 @@ public class OrganizationsService implements ScpProvider {
this.createAccountStatuses = createAccountStatuses;
this.handshakes = handshakes;
this.scpEnforcementEnabled = scpEnforcementEnabled;
+ this.managementAccountEmail = managementAccountEmail == null
+ ? null
+ : requireValidConfiguredEmail(managementAccountEmail);
}
/** A parent reference as returned by {@code ListParents}. */
@@ -244,7 +265,9 @@ public class OrganizationsService implements ScpProvider {
organization.setFeatureSet(resolvedFeatureSet);
organization.setMasterAccountId(callerAccountId);
organization.setMasterAccountArn(arn(callerAccountId, "account/" + organizationId + "/" + callerAccountId));
- organization.setMasterAccountEmail("master@" + callerAccountId + ".example.com");
+ organization.setMasterAccountEmail(managementAccountEmail != null
+ ? managementAccountEmail
+ : "master@" + callerAccountId + ".example.com");
organization.setCreatedTimestamp(Instant.now());
Root root = new Root();
@@ -1848,11 +1871,30 @@ public class OrganizationsService implements ScpProvider {
if (email == null || email.isEmpty()) {
throw invalidInput("Email is required.");
}
- if (email.length() < 6 || email.length() > 64 || !EMAIL_PATTERN.matcher(email).matches()) {
+ if (!isValidEmail(email)) {
throw invalidInput("Email must be a valid address between 6 and 64 characters.");
}
}
+ private static boolean isValidEmail(String email) {
+ return email.length() >= 6 && email.length() <= 64 && EMAIL_PATTERN.matcher(email).matches();
+ }
+
+ /**
+ * Applies the same rules as {@link #validateEmail} to the configured management-account
+ * email, but fails at startup rather than surfacing an operator misconfiguration to an
+ * API caller as {@code InvalidInputException}.
+ */
+ private static String requireValidConfiguredEmail(String email) {
+ if (!isValidEmail(email)) {
+ throw new IllegalArgumentException(
+ "floci.services.organizations.management-account-email"
+ + " (FLOCI_SERVICES_ORGANIZATIONS_MANAGEMENT_ACCOUNT_EMAIL) must be a valid"
+ + " email address between 6 and 64 characters, got \"" + email + "\"");
+ }
+ return email;
+ }
+
private void validateServicePrincipal(String servicePrincipal) {
if (servicePrincipal == null || !SERVICE_PRINCIPAL_PATTERN.matcher(servicePrincipal).matches()) {
throw invalidInput("ServicePrincipal must match [\\w+=,.@-]{1,128}.");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 059686497b..251b646399 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -562,6 +562,7 @@ floci:
enabled: true
organizations:
enabled: true
+ # management-account-email: "" # When set, overrides the management-account email reported by DescribeOrganization and account listings.
rum:
enabled: true
networkfirewall:
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.java
index c1edd900f1..55cae3703b 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
@@ -352,4 +352,46 @@ class OrganizationsServiceTest {
.getAccountId();
assertNull(disabled.effectiveScpLevels(member));
}
+
+ @Test
+ void managementAccountEmailDefaultsToSynthesizedAddress() {
+ Organization organization = service.createOrganization(MANAGEMENT_ACCOUNT, "ALL");
+
+ assertEquals("master@" + MANAGEMENT_ACCOUNT + ".example.com", organization.getMasterAccountEmail());
+ }
+
+ @Test
+ void managementAccountEmailOverrideIsUsedForOrganizationAndAccount() {
+ OrganizationsService configured = new OrganizationsService(
+ new ObjectMapper(),
+ AccountAwareStorageBackend.inMemory(MANAGEMENT_ACCOUNT),
+ AccountAwareStorageBackend.inMemory(MANAGEMENT_ACCOUNT),
+ AccountAwareStorageBackend.inMemory(MANAGEMENT_ACCOUNT),
+ AccountAwareStorageBackend.inMemory(MANAGEMENT_ACCOUNT),
+ AccountAwareStorageBackend.inMemory(MANAGEMENT_ACCOUNT),
+ AccountAwareStorageBackend.inMemory(MANAGEMENT_ACCOUNT),
+ true,
+ Organization organization = configured.createOrganization(MANAGEMENT_ACCOUNT, "ALL");
+
+ assertEquals("[email protected]", organization.getMasterAccountEmail());
+ assertEquals("[email protected]",
+ configured.describeAccount(MANAGEMENT_ACCOUNT, MANAGEMENT_ACCOUNT).getEmail());
+ assertEquals("[email protected]",
+ configured.describeOrganization(MANAGEMENT_ACCOUNT).getMasterAccountEmail());
+ }
+
+ @Test
+ void malformedManagementAccountEmailOverrideIsRejected() {
+ assertThrows(IllegalArgumentException.class, () -> new OrganizationsService(
+ new ObjectMapper(),
+ AccountAwareStorageBackend.inMemory(MANAGEMENT_ACCOUNT),
+ AccountAwareStorageBackend.inMemory(MANAGEMENT_ACCOUNT),
+ AccountAwareStorageBackend.inMemory(MANAGEMENT_ACCOUNT),
+ AccountAwareStorageBackend.inMemory(MANAGEMENT_ACCOUNT),
+ AccountAwareStorageBackend.inMemory(MANAGEMENT_ACCOUNT),
+ AccountAwareStorageBackend.inMemory(MANAGEMENT_ACCOUNT),
+ true,
+ "not-an-email"));
+ }
}