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: block all emails associated to a user when destroying their record

Browse Source
This commit is contained in:
Régis Hanol
2017-07-25 17:44:46 +02:00
parent 400a55eca3
commit d67fe4c674
3 changed files with 28 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/services/user_destroyer.rb
View File

@@ -31,18 +31,16 @@ class UserDestroyer
# block all external urls
if opts[:block_urls]
post.topic_links.each do |link|
unless link.internal ||
(Oneboxer.engine(link.url) != Onebox::Engine::WhitelistedGenericOnebox)
ScreenedUrl.watch(link.url, link.domain, ip_address: user.ip_address)&.record_match!
end
next if link.internal
next if Oneboxer.engine(link.url) != Onebox::Engine::WhitelistedGenericOnebox
ScreenedUrl.watch(link.url, link.domain, ip_address: user.ip_address)&.record_match!
end
end
PostDestroyer.new(@actor.staff? ? @actor : Discourse.system_user, post).destroy
if post.topic && post.is_first_post?
Topic.unscoped.where(id: post.topic.id).update_all(user_id: nil)
Topic.unscoped.where(id: post.topic_id).update_all(user_id: nil)
end
end
end
@@ -51,39 +49,39 @@ class UserDestroyer
post_action.remove_act!(Discourse.system_user)
end
# keep track of emails used
user_emails = user.user_emails.pluck(:email)
user.destroy.tap do |u|
if u
if opts[:block_email]
b = ScreenedEmail.block(u.email, ip_address: u.ip_address)
b.record_match! if b
end
if opts[:block_ip] && u.ip_address
b = ScreenedIpAddress.watch(u.ip_address)
b.record_match! if b
if u.registration_ip_address && u.ip_address != u.registration_ip_address
b = ScreenedIpAddress.watch(u.registration_ip_address)
b.record_match! if b
user_emails.each do |email|
ScreenedEmail.block(email, ip_address: u.ip_address)&.record_match!
end
end
Post.with_deleted.where(user_id: user.id).update_all("user_id = NULL")
if opts[:block_ip] && u.ip_address
ScreenedIpAddress.watch(u.ip_address)&.record_match!
if u.registration_ip_address && u.ip_address != u.registration_ip_address
ScreenedIpAddress.watch(u.registration_ip_address)&.record_match!
end
end
Post.unscoped.where(user_id: u.id).update_all(user_id: nil)
# If this user created categories, fix those up:
categories = Category.where(user_id: user.id)
categories.each do |c|
c.user_id = Discourse.system_user.id
Category.where(user_id: u.id).each do |c|
c.user_id = Discourse::SYSTEM_USER_ID
c.save!
if topic = Topic.with_deleted.find_by(id: c.topic_id)
topic.try(:recover!)
topic.user_id = Discourse.system_user.id
if topic = Topic.unscoped.find_by(id: c.topic_id)
topic.recover!
topic.user_id = Discourse::SYSTEM_USER_ID
topic.save!
end
end
StaffActionLogger.new(@actor == user ? Discourse.system_user : @actor).log_user_deletion(user, opts.slice(:context))
MessageBus.publish "/file-change", ["refresh"], user_ids: [user.id]
MessageBus.publish "/file-change", ["refresh"], user_ids: [u.id]
end
end
end