fix: InactivitySessionTimeoutMiddleware: Check for last_login (allow Django admin login + access)
#7260
+29
−3
Conversation
This file contains 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
👷 Deploy request for heartex-docs pending review.Visit the deploys page to approve it
|
👷 Deploy request for label-studio-docs-new-theme pending review.Visit the deploys page to approve it
|
makseq
approved these changes
Mar 20, 2025
Only check for last_login when it is actually set in the session. Otherwise a user is immediately logged out when not logged in via the user_login view (for example via the Django admin)
maerteijn
force-pushed
the
fix/inactivity-session-timeout-middleware-last-login
branch
from
4546f40 to
38653b7
Compare
|
/git merge develop
|
|
@makseq Hi, could you merge the branch manually? All workflows fail because they require a token: As I'm an outside contributor, I don't have access to this token. And now I receive notifications the pipeline fails, each and every night ;) |
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
Reapply this PR: The original PR was closed due to inactivity,
Please reconsider and if you do not want to merge it a valid reason why not would be much appreciated.
PR fulfills these requirements
[fix|feat|ci|chore|doc]: TICKET-ID: Short description of change madeex.fix: DEV-XXXX: Removed inconsistent code usage causing intermittent errorss/features)
Note: I do not (yet) understand what should be the
TICKET-IDand how to decide the commit message with this prefixDEV-XXXX, therefore I left it empty for now and just added the commit message. (Suggestion: Add documentation for outside collaborators how they can determine this).Change has impacts in these area(s)
(check all that apply)
Not really sure which one to choose.
Describe the reason for change
Allows login into the Django admin "Out-of-the-box", and makes sure no
last_logincomparison is made when never logged in. See also the issue Admin Page - Not letting login #4083What does this fix?
Allow users to login via the Django admin login screen (
/admin/#)What is the new behavior?
The
InactivitySessionTimeoutMiddlewarewon't automatically logout a user whenlast_loginis not set in the user session.What is the current behavior?
The
InactivitySessionTimeoutMiddlewarelogs out all users which do not have thelast_loginvalue set > 0 in the user session.What libraries were added/updated?
N/A
Does this change affect performance?
No
Does this change affect security?
No
What alternative approaches were there?
I suggest to completely remove the
InactivitySessionTimeoutMiddlewarein a future release. Session expiration time can be set out of the box via the SESSION_COOKIE_AGE.If manual extension / adjustion of the session time is required, you can use the .set_expiry() method. (In the
/users/#view for example).What feature flags were used to cover this change?
N/A
Does this PR introduce a breaking change?
(check only one)
What level of testing was included in the change?
(check all that apply)
Which logical domain(s) does this change affect?
(for bug fixes/features, be as precise as possible. ex. Authentication, Annotation History, Review Stream etc.)
Authentication