Skip to content

Commit

Permalink
Clean up unused application records (mastodon#24871)
Browse files Browse the repository at this point in the history
  • Loading branch information
ClearlyClaire authored Jul 21, 2023
1 parent 5cbc402 commit 144a406
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 0 deletions.
1 change: 1 addition & 0 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,7 @@ RSpec/LetSetup:
- 'spec/controllers/oauth/tokens_controller_spec.rb'
- 'spec/controllers/settings/imports_controller_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/models/account_spec.rb'
- 'spec/models/account_statuses_cleanup_policy_spec.rb'
Expand Down
2 changes: 2 additions & 0 deletions app/lib/application_extension.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ module ApplicationExtension
extend ActiveSupport::Concern

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 :website, url: true, length: { maximum: 2_000 }, if: :website?
validates :redirect_uri, length: { maximum: 2_000 }
Expand Down
10 changes: 10 additions & 0 deletions app/lib/vacuum/applications_vacuum.rb
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions app/workers/scheduler/vacuum_scheduler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def vacuum_operations
preview_cards_vacuum,
backups_vacuum,
access_tokens_vacuum,
applications_vacuum,
feeds_vacuum,
imports_vacuum,
]
Expand Down Expand Up @@ -55,6 +56,10 @@ def imports_vacuum
Vacuum::ImportsVacuum.new
end

def applications_vacuum
Vacuum::ApplicationsVacuum.new
end

def content_retention_policy
ContentRetentionPolicy.current
end
Expand Down
48 changes: 48 additions & 0 deletions spec/lib/vacuum/applications_vacuum_spec.rb
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 144a406

Please sign in to comment.