IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Do not deactivate admin accounts with recent posts or api keys (#8342)

Browse Source 
This prevents 'bot' users being deactivated
This commit is contained in:
David Taylor 2019-11-12 16:56:01 +00:00 committed by GitHub
parent 213ebc3b32
commit 836b3f4d82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/jobs/scheduled/invalidate_inactive_admins.rb
View File

@ -8,10 +8,14 @@ module Jobs
def execute(_) def execute(_)
return if SiteSetting.invalidate_inactive_admin_email_after_days == 0 return if SiteSetting.invalidate_inactive_admin_email_after_days == 0
timestamp = SiteSetting.invalidate_inactive_admin_email_after_days.days.ago
User.human_users User.human_users
.where(admin: true) .where(admin: true)
.where(active: true) .where(active: true)
.where('last_seen_at < ?', SiteSetting.invalidate_inactive_admin_email_after_days.days.ago) .where('last_seen_at < ?', timestamp)
.where("NOT EXISTS ( SELECT 1 from api_keys WHERE api_keys.user_id = users.id AND COALESCE(last_used_at, updated_at) > ? )", timestamp)
.where("NOT EXISTS ( SELECT 1 from posts WHERE posts.user_id = users.id AND created_at > ?)", timestamp)
.each do |user| .each do |user|
User.transaction do User.transaction do

12
spec/jobs/invalidate_inactive_admins_spec.rb
View File

@ -46,6 +46,18 @@ describe Jobs::InvalidateInactiveAdmins do
expect(UserAssociatedAccount.where(user_id: not_seen_admin.id).exists?).to eq(false) expect(UserAssociatedAccount.where(user_id: not_seen_admin.id).exists?).to eq(false)
end end
end end
it "doesn't deactivate admins with recent posts" do
Fabricate(:post, user: not_seen_admin)
subject
expect(not_seen_admin.reload.active).to eq(true)
end
it "doesn't deactivate admins with recently used api keys" do
Fabricate(:api_key, user: not_seen_admin, last_used_at: 1.day.ago)
subject
expect(not_seen_admin.reload.active).to eq(true)
end
end end
context 'invalidate_inactive_admin_email_after_days = 0 to disable this feature' do context 'invalidate_inactive_admin_email_after_days = 0 to disable this feature' do