Fix #5237: Deleted comments can be viewed by other users
* Fix it so non-moderators can't search deleted comments using the `updater`, `body`, `score`, `do_not_bump_post`, or `is_sticky` fields. Searching for these fields will exclude deleted comments. * Fix it so non-moderators can search for their own deleted comments using the `creator` field, but not for deleted comments belonging to other users. * Fix it so that if a regular user searches `commenter:<username>`, they can only see posts with undeleted comments by that user. If a moderator or the commenter themselves searches `commenter:<username>`, they can see all posts the user has commented on, including posts with deleted comments. * Fix it so the comment count on user profiles only counts visible comments. Regular users can only see the number of undeleted comments a user has, while moderators and the commenter themselves can see the total number of comments. Known issue: * It's still possible to order deleted comments by score, which can let you infer the score of deleted comments.
This commit is contained in:
@@ -44,6 +44,10 @@ class ApplicationRecord < ActiveRecord::Base
|
||||
all
|
||||
end
|
||||
|
||||
def visible_for_search(attribute, current_user)
|
||||
policy(current_user).visible_for_search(all, attribute)
|
||||
end
|
||||
|
||||
def policy(current_user)
|
||||
Pundit.policy(current_user, self)
|
||||
end
|
||||
|
||||
@@ -1359,7 +1359,7 @@ class Post < ApplicationRecord
|
||||
end
|
||||
end
|
||||
|
||||
def user_subquery_matches(subquery, username, field: :creator, &block)
|
||||
def user_subquery_matches(subquery, username, current_user, field: :creator, &block)
|
||||
subquery = subquery.where("post_id = posts.id").select(1)
|
||||
|
||||
if username.downcase == "any"
|
||||
@@ -1369,7 +1369,7 @@ class Post < ApplicationRecord
|
||||
elsif block.nil?
|
||||
user = User.find_by_name(username)
|
||||
return none if user.nil?
|
||||
subquery = subquery.where(field => user)
|
||||
subquery = subquery.visible_for_search(field, current_user).where(field => user)
|
||||
where("EXISTS (#{subquery.to_sql})")
|
||||
else
|
||||
subquery = subquery.merge(block.call(username))
|
||||
|
||||
@@ -561,7 +561,7 @@ class User < ApplicationRecord
|
||||
end
|
||||
|
||||
def comment_count
|
||||
comments.count
|
||||
comments.visible_for_search(:creator, CurrentUser.user).count
|
||||
end
|
||||
|
||||
def favorite_group_count
|
||||
|
||||
Reference in New Issue
Block a user