Cleanup job removes not expired tokens

[jensljungblad]

This is a follow-up to #1612 which was closed by #1625.

The PR fixed half of the problem. The issue is that the rake task doorkeeper:db:cleanup:expired_tokens will still delete tokens which haven't yet expired. The reason is that the expires_in column is not considered.

Compare the logic in

class StaleRecordsCleaner
  # This method compares against `created_at`
  def clean_expired(ttl)
    table = @base_scope.arel_table
  
    @base_scope
      .where.not(expires_in: nil)
      .where(table[:created_at].lt(Time.current - ttl))
      .in_batches(&:delete_all)
  end
end

With

module Expirable
  # This method compares against `expires_at`
  def expired?
    !!(expires_in && Time.now.utc > expires_at)
  end
end

[fredplante]

Hello @jensljungblad

I don't think there is an issue with this, could you provide a failing test that proves your point?

In Expirable, expires_at is computed as created_at + expires_in.
In StaleRecordsCleaner#clean_expired, ttl is basically the same as expires_in.

so we have:

created_at < (Time.current - expires_in)
VS
Time.now.utc > (created_at + expires_in)

And these 2 statements are equivalent. (I only have a doubt about Time.current vs Time.now.utc, I guess it's fine as long as you have UTC configured as a time zone)