Clean up unused application records (#24871)
This commit is contained in:
parent
5cbc402687
commit
144a406d33
|
@ -289,6 +289,7 @@ RSpec/LetSetup:
|
||||||
- 'spec/controllers/oauth/tokens_controller_spec.rb'
|
- 'spec/controllers/oauth/tokens_controller_spec.rb'
|
||||||
- 'spec/controllers/settings/imports_controller_spec.rb'
|
- 'spec/controllers/settings/imports_controller_spec.rb'
|
||||||
- 'spec/lib/activitypub/activity/delete_spec.rb'
|
- 'spec/lib/activitypub/activity/delete_spec.rb'
|
||||||
|
- 'spec/lib/vacuum/applications_vacuum_spec.rb'
|
||||||
- 'spec/lib/vacuum/preview_cards_vacuum_spec.rb'
|
- 'spec/lib/vacuum/preview_cards_vacuum_spec.rb'
|
||||||
- 'spec/models/account_spec.rb'
|
- 'spec/models/account_spec.rb'
|
||||||
- 'spec/models/account_statuses_cleanup_policy_spec.rb'
|
- 'spec/models/account_statuses_cleanup_policy_spec.rb'
|
||||||
|
|
|
@ -4,6 +4,8 @@ module ApplicationExtension
|
||||||
extend ActiveSupport::Concern
|
extend ActiveSupport::Concern
|
||||||
|
|
||||||
included do
|
included do
|
||||||
|
has_many :created_users, class_name: 'User', foreign_key: 'created_by_application_id', inverse_of: :created_by_application
|
||||||
|
|
||||||
validates :name, length: { maximum: 60 }
|
validates :name, length: { maximum: 60 }
|
||||||
validates :website, url: true, length: { maximum: 2_000 }, if: :website?
|
validates :website, url: true, length: { maximum: 2_000 }, if: :website?
|
||||||
validates :redirect_uri, length: { maximum: 2_000 }
|
validates :redirect_uri, length: { maximum: 2_000 }
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class Vacuum::ApplicationsVacuum
|
||||||
|
def perform
|
||||||
|
Doorkeeper::Application.where(owner_id: nil)
|
||||||
|
.where.missing(:created_users, :access_tokens, :access_grants)
|
||||||
|
.where(created_at: ...1.day.ago)
|
||||||
|
.in_batches.delete_all
|
||||||
|
end
|
||||||
|
end
|
|
@ -22,6 +22,7 @@ class Scheduler::VacuumScheduler
|
||||||
preview_cards_vacuum,
|
preview_cards_vacuum,
|
||||||
backups_vacuum,
|
backups_vacuum,
|
||||||
access_tokens_vacuum,
|
access_tokens_vacuum,
|
||||||
|
applications_vacuum,
|
||||||
feeds_vacuum,
|
feeds_vacuum,
|
||||||
imports_vacuum,
|
imports_vacuum,
|
||||||
]
|
]
|
||||||
|
@ -55,6 +56,10 @@ class Scheduler::VacuumScheduler
|
||||||
Vacuum::ImportsVacuum.new
|
Vacuum::ImportsVacuum.new
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def applications_vacuum
|
||||||
|
Vacuum::ApplicationsVacuum.new
|
||||||
|
end
|
||||||
|
|
||||||
def content_retention_policy
|
def content_retention_policy
|
||||||
ContentRetentionPolicy.current
|
ContentRetentionPolicy.current
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe Vacuum::ApplicationsVacuum do
|
||||||
|
subject { described_class.new }
|
||||||
|
|
||||||
|
describe '#perform' do
|
||||||
|
let!(:app1) { Fabricate(:application, created_at: 1.month.ago) }
|
||||||
|
let!(:app2) { Fabricate(:application, created_at: 1.month.ago) }
|
||||||
|
let!(:app3) { Fabricate(:application, created_at: 1.month.ago) }
|
||||||
|
let!(:app4) { Fabricate(:application, created_at: 1.month.ago, owner: Fabricate(:user)) }
|
||||||
|
let!(:app5) { Fabricate(:application, created_at: 1.month.ago) }
|
||||||
|
let!(:app6) { Fabricate(:application, created_at: 1.hour.ago) }
|
||||||
|
|
||||||
|
let!(:active_access_token) { Fabricate(:access_token, application: app1) }
|
||||||
|
let!(:active_access_grant) { Fabricate(:access_grant, application: app2) }
|
||||||
|
let!(:user) { Fabricate(:user, created_by_application: app3) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
subject.perform
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not delete applications with valid access tokens' do
|
||||||
|
expect { app1.reload }.to_not raise_error
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not delete applications with valid access grants' do
|
||||||
|
expect { app2.reload }.to_not raise_error
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not delete applications that were used to create users' do
|
||||||
|
expect { app3.reload }.to_not raise_error
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not delete owned applications' do
|
||||||
|
expect { app4.reload }.to_not raise_error
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'does not delete applications registered less than a day ago' do
|
||||||
|
expect { app6.reload }.to_not raise_error
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'deletes unused applications' do
|
||||||
|
expect { app5.reload }.to raise_error ActiveRecord::RecordNotFound
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Reference in New Issue