Skip to content

armgit / floci

Public Imported from GitHub
0

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

feat(cognito): implement user MFA preferences (#2896)

Abarnaa Sree N82ee3605c87e
diff --git a/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoJsonHandler.java b/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoJsonHandler.java
index e4bc12d140..8a4b4af260 100644
--- a/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoJsonHandler.java
+++ b/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoJsonHandler.java
@@ -119,6 +119,8 @@ public class CognitoJsonHandler {
case "ListUserPoolClientSecrets" -> handleListUserPoolClientSecrets(request);
case "AddUserPoolClientSecret" -> handleAddUserPoolClientSecret(request);
case "DeleteUserPoolClientSecret" -> handleDeleteUserPoolClientSecret(request);
+ case "AdminSetUserMFAPreference" -> handleAdminSetUserMFAPreference(request);
+ case "SetUserMFAPreference" -> handleSetUserMFAPreference(request);
default -> Response.status(400)
.entity(new AwsErrorResponse("UnsupportedOperation", "Operation " + action + " is not supported."))
.build();
@@ -1371,5 +1373,48 @@ public class CognitoJsonHandler {
node.put("ClientSecretCreateDate", cs.getClientSecretCreateDate());
return node;
}
+ private Response handleAdminSetUserMFAPreference(JsonNode request) {
+ String userPoolId = request.path("UserPoolId").asText();
+ String username = request.path("Username").asText();
+
+ JsonNode emailSettings = request.path("EmailMfaSettings");
+
+ Boolean enabled = emailSettings.has("Enabled")
+ ? emailSettings.path("Enabled").asBoolean()
+ : null;
+
+ Boolean preferredMfa = emailSettings.has("PreferredMfa")
+ ? emailSettings.path("PreferredMfa").asBoolean()
+ : null;
+
+ service.adminSetUserMFAPreference(
+ userPoolId,
+ username,
+ enabled,
+ preferredMfa
+ );
+
+ return Response.ok(objectMapper.createObjectNode()).build();
+ }
+
+ private Response handleSetUserMFAPreference(JsonNode request) {
+ JsonNode emailSettings = request.path("EmailMfaSettings");
+
+ Boolean enabled = emailSettings.has("Enabled")
+ ? emailSettings.path("Enabled").asBoolean()
+ : null;
+
+ Boolean preferredMfa = emailSettings.has("PreferredMfa")
+ ? emailSettings.path("PreferredMfa").asBoolean()
+ : null;
+
+ service.setUserMFAPreference(
+ request.path("AccessToken").asText(),
+ enabled,
+ preferredMfa
+ );
+
+ return Response.ok(objectMapper.createObjectNode()).build();
+ }
}
diff --git a/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoService.java b/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoService.java
index 6a5b2169e2..d632795b0e 100644
--- a/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/cognito/CognitoService.java
@@ -5,6 +5,7 @@ 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.ArrayNode;
+import io.github.hectorvent.floci.services.cognito.model.EmailMfaSettings;
import io.github.hectorvent.floci.config.EmulatorConfig;
import io.github.hectorvent.floci.core.common.AwsArnUtils;
import io.github.hectorvent.floci.core.common.AwsException;
@@ -3774,7 +3775,98 @@ public class CognitoService implements ResourceProvider {
}
return value;
}
+ public void adminSetUserMFAPreference(
+ String userPoolId,
+ String username,
+ Boolean emailEnabled,
+ Boolean emailPreferred) {
+ CognitoUser user = adminGetUser(userPoolId, username);
+
+ updateEmailMfaPreference(user, emailEnabled, emailPreferred);
+
+ user.setLastModifiedDate(System.currentTimeMillis() / 1000L);
+
+ userStore.put(userKey(userPoolId, user.getUsername()), user);
+ }
+
+ public void setUserMFAPreference(
+ String accessToken,
+ Boolean emailEnabled,
+ Boolean emailPreferred) {
+
+ String username = extractUsernameFromToken(accessToken);
+ String poolId = extractPoolIdFromToken(accessToken);
+ String jti = extractJtiFromToken(accessToken);
+
+ if (username == null || poolId == null || jti == null) {
+ throw new AwsException(
+ "NotAuthorizedException",
+ "Invalid access token",
+ 400
+ );
+ }
+
+ validateTokenNotRevoked(jti, poolId, "access");
+ validateOriginJtiNotRevoked(accessToken, poolId);
+
+ Long iat = extractIatFromToken(accessToken);
+
+ validateUserNotGloballySignedOut(
+ username,
+ poolId,
+ "access",
+ iat != null ? iat : 0L
+ );
+
+ CognitoUser user = adminGetUser(poolId, username);
+
+ updateEmailMfaPreference(user, emailEnabled, emailPreferred);
+
+ user.setLastModifiedDate(System.currentTimeMillis() / 1000L);
+
+ userStore.put(userKey(poolId, user.getUsername()), user);
+ }
+
+ private void updateEmailMfaPreference(
+ CognitoUser user,
+ Boolean enabled,
+ Boolean preferredMfa) {
+
+ if (enabled == null && preferredMfa == null) {
+ return;
+ }
+
+ EmailMfaSettings current = user.getEmailMfaSettings();
+
+ boolean newEnabled = enabled != null
+ ? enabled
+ : current != null && current.isEnabled();
+
+ boolean newPreferredMfa = preferredMfa != null
+ ? preferredMfa
+ : current != null && current.isPreferredMfa();
+ if (!newEnabled && Boolean.TRUE.equals(preferredMfa)) {
+ throw new AwsException(
+ "InvalidParameterException",
+ "Preferred MFA setting cannot be enabled when the MFA method is disabled.",
+ 400
+ );
+ }
+
+ if (!newEnabled) {
+ newPreferredMfa = false;
+ }
+
+ EmailMfaSettings settings = current != null
+ ? current
+ : new EmailMfaSettings();
+
+ settings.setEnabled(newEnabled);
+ settings.setPreferredMfa(newPreferredMfa);
+
+ user.setEmailMfaSettings(settings);
+ }
private record DeliveryTarget(String attributeName, String deliveryMedium, String destination) {
}
}
diff --git a/src/main/java/io/github/hectorvent/floci/services/cognito/model/CognitoUser.java b/src/main/java/io/github/hectorvent/floci/services/cognito/model/CognitoUser.java
index 91360ba691..43e59fd4a7 100644
--- a/src/main/java/io/github/hectorvent/floci/services/cognito/model/CognitoUser.java
+++ b/src/main/java/io/github/hectorvent/floci/services/cognito/model/CognitoUser.java
@@ -24,6 +24,7 @@ public class CognitoUser {
private List<String> groupNames = new ArrayList<>();
private String srpSalt;
private String srpVerifier;
+ private EmailMfaSettings emailMfaSettings;
public CognitoUser() {
long now = System.currentTimeMillis() / 1000L;
@@ -73,4 +74,11 @@ public class CognitoUser {
public String getSrpVerifier() { return srpVerifier; }
public void setSrpVerifier(String srpVerifier) { this.srpVerifier = srpVerifier; }
+ public EmailMfaSettings getEmailMfaSettings() {
+ return emailMfaSettings;
+ }
+
+ public void setEmailMfaSettings(EmailMfaSettings emailMfaSettings) {
+ this.emailMfaSettings = emailMfaSettings;
+ }
}
diff --git a/src/main/java/io/github/hectorvent/floci/services/cognito/model/EmailMfaSettings.java b/src/main/java/io/github/hectorvent/floci/services/cognito/model/EmailMfaSettings.java
new file mode 100644
index 0000000000..135de737a4
--- /dev/null
+++ b/src/main/java/io/github/hectorvent/floci/services/cognito/model/EmailMfaSettings.java
@@ -0,0 +1,28 @@
+package io.github.hectorvent.floci.services.cognito.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+@RegisterForReflection
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class EmailMfaSettings {
+
+ private boolean enabled;
+ private boolean preferredMfa;
+
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ public boolean isPreferredMfa() {
+ return preferredMfa;
+ }
+
+ public void setPreferredMfa(boolean preferredMfa) {
+ this.preferredMfa = preferredMfa;
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoServiceTest.java
index 7725526421..64ca113f08 100644
--- a/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/cognito/CognitoServiceTest.java
@@ -3161,7 +3161,46 @@ class CognitoServiceTest {
assertTrue(id.contains("\"email\":\"[email protected]\""), "readable attribute present: " + id);
assertFalse(id.contains("\"name\""), "non-readable attribute must be filtered out: " + id);
}
+ @Test
+ void adminSetUserMFAPreferenceUpdatesEmailMfaSettings() {
+ UserPool pool = createPoolAndUser();
+
+ service.adminSetUserMFAPreference(pool.getId(), "alice", true, true);
+
+ CognitoUser user = service.adminGetUser(pool.getId(), "alice");
+
+ assertNotNull(user.getEmailMfaSettings());
+ assertTrue(user.getEmailMfaSettings().isEnabled());
+ assertTrue(user.getEmailMfaSettings().isPreferredMfa());
+ }
+
+ @Test
+ void adminSetUserMFAPreferenceDoesNotMutateOnInvalidUpdate() {
+ UserPool pool = createPoolAndUser();
+
+ service.adminSetUserMFAPreference(pool.getId(), "alice", true, true);
+
+ assertThrows(AwsException.class, () ->
+ service.adminSetUserMFAPreference(pool.getId(), "alice", false, true));
+
+ CognitoUser user = service.adminGetUser(pool.getId(), "alice");
+
+ assertTrue(user.getEmailMfaSettings().isEnabled());
+ assertTrue(user.getEmailMfaSettings().isPreferredMfa());
+ }
+ @Test
+ void adminSetUserMFAPreferenceDisablingEmailMfaClearsPreferredMfa() {
+ UserPool pool = createPoolAndUser();
+
+ service.adminSetUserMFAPreference(pool.getId(), "alice", true, true);
+
+ service.adminSetUserMFAPreference(pool.getId(), "alice", false, null);
+
+ CognitoUser user = service.adminGetUser(pool.getId(), "alice");
+ assertFalse(user.getEmailMfaSettings().isEnabled());
+ assertFalse(user.getEmailMfaSettings().isPreferredMfa());
+ }
private static String jwtPayload(String token) {
String segment = token.split("\\.")[1];
int pad = (4 - segment.length() % 4) % 4;