Skip to content
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

Consider expires_in when clear expired tokens with StaleRecordsCleaner #1690

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Consider expires_in when clear expired tokens with StaleRecordsCleaner #1690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9dafe90
Consider expires_in when clear expired tokens with StaleRecordsCleaner
Paultdx Feb 10, 2024
99f8068
add pr to changelog
Paultdx Feb 10, 2024
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ User-visible changes worth mentioning.

## main

Add your entry here.

- [#1690] Consider expires_in when clear expired tokens with StaleRecordsCleaner.
- [#1747] Fix unknown pkce method error when configured

## 5.8.0
Expand Down
1 change: 1 addition & 0 deletions lib/doorkeeper/orm/active_record/stale_records_cleaner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def clean_expired(ttl)
@base_scope
.where.not(expires_in: nil)
.where(table[:created_at].lt(Time.current - ttl))
.where(table[:created_at] + table[:expires_in].lt(Time.current))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Won't we have an issues with timezones? I believe we're storing UTC and should use the same value regardless of configured application timezone, WDYT?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also I believe .where(table[:created_at].lt(Time.current - ttl)) does the same 🤔 By calculating ttl from configuration

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nbulaj it does the same only if you rely on the ttl from configuration. If in your app your are creating tokens with different expiration times you need to consider expires_in and perform calculations with it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @fredplante , you mean tokens created manually with some custom TTL, right?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nbulaj Yes, that's what I meant. For info, we had to create a custom task. Here is what we're doing (we use PG):

DoorkeeperExtensions::AccessToken
    .where(refresh_token: nil)
    .where.not(expires_in: nil)
    .where("? > (oauth_access_tokens.created_at + INTERVAL '1 second' * expires_in)", Time.current)
    .in_batches(&:delete_all)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting, we have some time SQL math as well https://github.com/doorkeeper-gem/doorkeeper/blob/a02cd99a304b01ca1bf529ca9d6bba5e7ff67f00/lib/doorkeeper/models/concerns/expiration_time_sql_math.rb

BTW MR sounds correct to me

.in_batches(&:delete_all)
end
end
Expand Down