summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2023-07-21 13:13:16 +0200
committerGitHub <noreply@github.com>2023-07-21 13:13:16 +0200
commit144a406d332b034caa812ade2629df03ed4898d7 (patch)
treec8b7269de379b6b9a9ad569ecba7ce89ce67c82f
parent5cbc402687a99511b8fa20b1541a774c0428be16 (diff)
Clean up unused application records (#24871)
-rw-r--r--.rubocop_todo.yml1
-rw-r--r--app/lib/application_extension.rb2
-rw-r--r--app/lib/vacuum/applications_vacuum.rb10
-rw-r--r--app/workers/scheduler/vacuum_scheduler.rb5
-rw-r--r--spec/lib/vacuum/applications_vacuum_spec.rb48
5 files changed, 66 insertions, 0 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 32fb99b7722..71e8623ec5c 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -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'
diff --git a/app/lib/application_extension.rb b/app/lib/application_extension.rb
index 4de69c1eadd..fb442e2c2d2 100644
--- a/app/lib/application_extension.rb
+++ b/app/lib/application_extension.rb
@@ -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 }
diff --git a/app/lib/vacuum/applications_vacuum.rb b/app/lib/vacuum/applications_vacuum.rb
new file mode 100644
index 00000000000..ba88655f167
--- /dev/null
+++ b/app/lib/vacuum/applications_vacuum.rb
@@ -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
diff --git a/app/workers/scheduler/vacuum_scheduler.rb b/app/workers/scheduler/vacuum_scheduler.rb
index 9e884caefdb..9c040f6e474 100644
--- a/app/workers/scheduler/vacuum_scheduler.rb
+++ b/app/workers/scheduler/vacuum_scheduler.rb
@@ -22,6 +22,7 @@ class Scheduler::VacuumScheduler
preview_cards_vacuum,
backups_vacuum,
access_tokens_vacuum,
+ applications_vacuum,
feeds_vacuum,
imports_vacuum,
]
@@ -55,6 +56,10 @@ class Scheduler::VacuumScheduler
Vacuum::ImportsVacuum.new
end
+ def applications_vacuum
+ Vacuum::ApplicationsVacuum.new
+ end
+
def content_retention_policy
ContentRetentionPolicy.current
end
diff --git a/spec/lib/vacuum/applications_vacuum_spec.rb b/spec/lib/vacuum/applications_vacuum_spec.rb
new file mode 100644
index 00000000000..d30311ab134
--- /dev/null
+++ b/spec/lib/vacuum/applications_vacuum_spec.rb
@@ -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