[fix](password) password lock failed after invalid login#61592
Merged
morningman merged 1 commit intoapache:masterfrom Mar 24, 2026
Merged
[fix](password) password lock failed after invalid login#61592morningman merged 1 commit intoapache:masterfrom
morningman merged 1 commit intoapache:masterfrom
Conversation
Contributor
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
Contributor
Author
|
run buildall |
TPC-H: Total hot run time: 26713 ms |
TPC-DS: Total hot run time: 168545 ms |
Contributor
FE UT Coverage ReportIncrement line coverage |
CalvinKirs
approved these changes
Mar 24, 2026
github-actions
bot
added
the
approved
Contributor
|
PR approved by at least one committer and no changes requested. |
Contributor
|
PR approved by anyone and no changes requested. |
zhangstar333
approved these changes
Mar 24, 2026
github-actions bot
pushed a commit
that referenced
this pull request
Mar 24, 2026
### What problem does this PR solve? #### Problem Summary: When a user is created with `FAILED_LOGIN_ATTEMPTS N PASSWORD_LOCK_TIME T`, the account locks correctly after N consecutive wrong passwords. However, after the lock expires (or after admin `ACCOUNT_UNLOCK`), entering N wrong passwords again never triggers a lock again. Root cause: In `FailedLoginPolicy.onFailedLogin()`, when `failedLoginCounter` has reached [numFailedLogin](cci:1://file:///Users/morningman/workspace/git/doris/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PasswordPolicy.java:421:8-428:9) and the lock has expired, the method returned `true` without resetting the counter or updating `lockTime`. Since [isLocked()](cci:1://file:///Users/morningman/workspace/git/doris/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PasswordPolicy.java:373:8-375:9) correctly returned `false` (lock expired), the account could never be re-locked. Fix: When the counter has reached the limit but the lock has expired, call [unlock()](cci:1://file:///Users/morningman/workspace/git/doris/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PasswordPolicy.java:406:8-409:9) to reset both counter and lockTime, then continue counting new failed attempts from zero.
github-actions bot
pushed a commit
that referenced
this pull request
Mar 24, 2026
### What problem does this PR solve? #### Problem Summary: When a user is created with `FAILED_LOGIN_ATTEMPTS N PASSWORD_LOCK_TIME T`, the account locks correctly after N consecutive wrong passwords. However, after the lock expires (or after admin `ACCOUNT_UNLOCK`), entering N wrong passwords again never triggers a lock again. Root cause: In `FailedLoginPolicy.onFailedLogin()`, when `failedLoginCounter` has reached [numFailedLogin](cci:1://file:///Users/morningman/workspace/git/doris/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PasswordPolicy.java:421:8-428:9) and the lock has expired, the method returned `true` without resetting the counter or updating `lockTime`. Since [isLocked()](cci:1://file:///Users/morningman/workspace/git/doris/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PasswordPolicy.java:373:8-375:9) correctly returned `false` (lock expired), the account could never be re-locked. Fix: When the counter has reached the limit but the lock has expired, call [unlock()](cci:1://file:///Users/morningman/workspace/git/doris/fe/fe-core/src/main/java/org/apache/doris/mysql/privilege/PasswordPolicy.java:406:8-409:9) to reset both counter and lockTime, then continue counting new failed attempts from zero.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Problem Summary:
When a user is created with
FAILED_LOGIN_ATTEMPTS N PASSWORD_LOCK_TIME T,the account locks correctly after N consecutive wrong passwords. However,
after the lock expires (or after admin
ACCOUNT_UNLOCK), entering N wrongpasswords again never triggers a lock again.
Root cause: In
FailedLoginPolicy.onFailedLogin(), whenfailedLoginCounterhas reached numFailedLogin and the lock has expired, the method returned
truewithout resetting the counter or updatinglockTime. Since isLocked()correctly returned
false(lock expired), the account could never be re-locked.Fix: When the counter has reached the limit but the lock has expired, call
unlock() to reset both counter and lockTime, then continue counting new
failed attempts from zero.
Release note
None
Check List (For Author)
Test
Behavior changed:
Does this need documentation?
Check List (For Reviewer who merge this PR)