8000 Ignore UpdateUserLocaleAction to force a result (26.4) by rmartinc · Pull Request #55003 · keycloak/keycloak · GitHub
[go: up one dir, main page]
Skip to content

Ignore UpdateUserLocaleAction to force a result (26.4) #55003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rmartinc wants to merge 1 commit into
base: release/26.4
Choose a base branch
from
+45 −14
Open

Ignore UpdateUserLocaleAction to force a result (26.4) #55003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions services/src/main/java/org/keycloak/authentication/requiredactions/UpdateEmail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ public void requiredActionChallenge(RequiredActionContext context) {
// skip and clear UPDATE_EMAIL required action if email is readonly
if (profile.getAttributes().isReadOnly(UserModel.EMAIL)) {
user.removeRequiredAction(UserModel.RequiredAction.UPDATE_EMAIL);
context.ignore();
return;
}

Expand All @@ -177,12 +178,15 @@ public void requiredActionChallenge(RequiredActionContext context) {
context.challenge(context.form().createResponse(UserModel.RequiredAction.UPDATE_EMAIL));
}
}
} else {
context.ignore();
}
}

@Override
public void processAction(RequiredActionContext context) {
if (!isEnabled(context.getRealm())) {
context.success();
return;
}
MultivaluedMap<String, String> formData = context.getHttpRequest().getDecodedFormParameters();
Expand Down
3 changes: 3 additions & 0 deletions ...ces/src/main/java/org/keycloak/authentication/requiredactions/UpdateUserLocaleAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,13 @@ public void evaluateTriggers(RequiredActionContext context) {

@Override
public void requiredActionChallenge(RequiredActionContext context) {
context.getUser().removeRequiredAction(getId());
context.ignore();
}

@Override
public void processAction(RequiredActionContext context) {
context.success();
}

@Override
Expand Down
24 changes: 11 additions & 13 deletions services/src/main/java/org/keycloak/services/managers/AuthenticationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,17 +1313,7 @@ private static Response executeAction(KeycloakSession session, AuthenticationSes

actionProvider.requiredActionChallenge(context);

if (context.getStatus() == RequiredActionContext.Status.FAILURE) {
LoginProtocol protocol = context.getSession().getProvider(LoginProtocol.class, context.getAuthenticationSession().getProtocol());
protocol.setRealm(context.getRealm())
.setHttpHeaders(context.getHttpRequest().getHttpHeaders())
.setUriInfo(context.getUriInfo())
.setEventBuilder(event);
Response response = protocol.sendError(context.getAuthenticationSession(), Error.CONSENT_DENIED, null);
event.error(Errors.REJECTED_BY_USER);
return response;
}
else if (context.getStatus() == RequiredActionContext.Status.CHALLENGE) {
if (context.getStatus() == RequiredActionContext.Status.CHALLENGE) {
authSession.setAuthNote(AuthenticationProcessor.CURRENT_AUTHENTICATION_EXECUTION, model.getProviderId());
return context.getChallenge();
}
Expand All @@ -1339,9 +1329,17 @@ else if (context.getStatus() == RequiredActionContext.Status.SUCCESS) {
authSession.removeRequiredAction(factory.getId());
setKcActionStatus(factory.getId(), RequiredActionContext.KcActionStatus.SUCCESS, authSession);
return nextActionAfterAuthentication(session, authSession, session.getContext().getConnection(), request, session.getContext().getUri(), event, ignoredActions);
} else {
// manage any other status as failure just in case
LoginProtocol protocol = context.getSession().getProvider(LoginProtocol.class, context.getAuthenticationSession().getProtocol());
protocol.setRealm(context.getRealm())
.setHttpHeaders(context.getHttpRequest().getHttpHeaders())
.setUriInfo(context.getUriInfo())
.setEventBuilder(event);
Response response = protocol.sendError(context.getAuthenticationSession(), Error.CONSENT_DENIED, null);
event.error(Errors.REJECTED_BY_USER);
return response;
}

return null;
}

private static RequiredActionProviderModel getFirstApplicableRequiredAction(final RealmModel realm,
Expand Down
28 changes: 27 additions & 1 deletion ...n/tests/base/src/test/java/org/keycloak/testsuite/actions/RequiredActionPriorityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.keycloak.models.UserModel.RequiredAction;
import org.keycloak.models.credential.OTPCredentialModel;
import org.keycloak.models.credential.PasswordCredentialModel;
import org.keycloak.models.utils.DefaultRequiredActions;
import org.keycloak.models.utils.TimeBasedOTP;
import org.keycloak.representations.idm.RealmRepresentation;
import org.keycloak.testsuite.AbstractTestRealmKeycloakTest;
Expand Down Expand Up @@ -96,6 +97,9 @@ public class RequiredActionPriorityTest extends AbstractTestRealmKeycloakTest {
@Page
protected LoginConfigTotpPage totpPage;

@Page
protected LoginConfigTotpPage configureTotpRequiredActionPage;

private String testUserId;

@Before
Expand Down Expand Up @@ -456,8 +460,30 @@ public void skipToNextRequiredActionWithCustomPriority() {
events.expect(EventType.UPDATE_CREDENTIAL).assertEvent();
}

@Test
public void setupTotpAfterUpdateUserLocale() throws Exception {
// change order to have update user locale before otp and assign them to the customer
final List<String> requiredActionsCustomOrdered = List.of(
DefaultRequiredActions.Action.UPDATE_USER_LOCALE.getAlias(),
DefaultRequiredActions.Action.CONFIGURE_TOTP.getAlias()
);
ApiUtil.updateRequiredActionsOrderByAlias(testRealm(), requiredActionsCustomOrdered);

enableRequiredActionForUser(DefaultRequiredActions.Action.UPDATE_USER_LOCALE.getAlias());
enableRequiredActionForUser(DefaultRequiredActions.Action.CONFIGURE_TOTP.getAlias());

// Login and check OTP is shown to be configured
oauth.openLoginForm();
loginPage.login(USERNAME, PASSWORD);
configureTotpRequiredActionPage.assertCurrent();
}

private void enableRequiredActionForUser(final RequiredAction requiredAction) {
setRequiredActionEnabled(TEST_REALM_NAME, testUserId, requiredAction.name(), true);
enableRequiredActionForUser(requiredAction.name());
}

private void enableRequiredActionForUser(final String requiredAction) {
setRequiredActionEnabled(TEST_REALM_NAME, testUserId, requiredAction, true);
}

}
Loading
0