External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-09 23:12:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Do not send attributes when unlocking the user (#32993)

Browse Source 
Closes #31165

Signed-off-by: Pedro Igor <pigor.craveiro@gmail.com>
(cherry picked from commit 0410653e71aa474c7e39128ffcc89f54a6e49f21)

Co-authored-by: Pedro Igor <pigor.craveiro@gmail.com>
This commit is contained in:
Jon Koops 2024-09-17 08:49:02 +02:00 committed by GitHub
parent 9b1df077a0
commit f253f90610
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/apps/admin-ui/src/user/EditUser.tsx
View File

@ -318,6 +318,7 @@ export default function EditUser() {
user={user}
bruteForce={bruteForced}
userProfileMetadata={userProfileMetadata}
refresh={refresh}
save={save}
/>
</PageSection>

10
js/apps/admin-ui/src/user/UserForm.tsx
View File

@ -53,6 +53,7 @@ export type UserFormProps = {
bruteForce?: BruteForced;
userProfileMetadata?: UserProfileMetadata;
save: (user: UserFormFields) => void;
refresh?: () => void;
onGroupsUpdate?: (groups: GroupRepresentation[]) => void;
};
@ -66,6 +67,7 @@ export const UserForm = ({
},
userProfileMetadata,
save,
refresh,
onGroupsUpdate,
}: UserFormProps) => {
const { adminClient } = useAdminClient();
@ -95,8 +97,11 @@ export const UserForm = ({
const unLockUser = async () => {
try {
await adminClient.attackDetection.del({ id: user!.id! });
await adminClient.users.update({ id: user!.id! }, { enabled: true });
addAlert(t("unlockSuccess"), AlertVariant.success);
if (refresh) {
refresh();
}
} catch (error) {
addError("unlockError", error);
}
@ -272,9 +277,6 @@ export const UserForm = ({
onChange={(_event, value) => {
unLockUser();
setLocked(value);
save({
enabled: !value,
});
}}
isChecked={locked}
isDisabled={!locked}

12
services/src/main/java/org/keycloak/services/resources/admin/UserResource.java
View File

@ -184,9 +184,15 @@ public class UserResource {
boolean wasPermanentlyLockedOut = false;
if (rep.isEnabled() != null && rep.isEnabled()) {
UserLoginFailureModel failureModel = session.loginFailures().getUserLoginFailure(realm, user.getId());
if (failureModel != null) {
failureModel.clearFailures();
if (!user.isEnabled() || session.getProvider(BruteForceProtector.class).isTemporarilyDisabled(session, realm, user)) {
UserLoginFailureModel failureModel = session.loginFailures().getUserLoginFailure(realm, user.getId());
if (failureModel != null) {
session.loginFailures().removeUserLoginFailure(realm, user.getId());
adminEvent.clone(session).resource(ResourceType.USER_LOGIN_FAILURE)
.resourcePath(session.getContext().getUri())
.operation(OperationType.DELETE)
.success();
}
}
wasPermanentlyLockedOut = session.getProvider(BruteForceProtector.class).isPermanentlyLockedOut(session, realm, user);
}