Skip to content

A platform for community discussion. Free, open, simple.

SECURITY: Filter restricted tags from post revision history (#43916)

Isaac Janzenbda7629ffc07
diff --git a/app/serializers/post_revision_serializer.rb b/app/serializers/post_revision_serializer.rb
index 2a7addf4869..e324c1dfddf 100644
--- a/app/serializers/post_revision_serializer.rb
+++ b/app/serializers/post_revision_serializer.rb
@@ -364,12 +364,10 @@ class PostRevisionSerializer < ApplicationSerializer
object.user || Discourse.system_user
end
- def hidden_tags
- @hidden_tags ||= DiscourseTagging.hidden_tag_names(scope)
- end
-
def filter_tags(tags)
- tags.is_a?(Array) && tags.any? ? tags - hidden_tags : tags
+ return tags unless tags.is_a?(Array) && tags.any?
+
+ tags & DiscourseTagging.filter_visible(Tag.where(name: tags), scope).pluck(:name)
end
def filter_category_id(category_id)
diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb
index 5ee64ff4ebe..1546a83357f 100644
--- a/spec/requests/posts_controller_spec.rb
+++ b/spec/requests/posts_controller_spec.rb
@@ -3479,6 +3479,90 @@ RSpec.describe PostsController do
expect(response.status).to eq(200)
end
+ it "does not expose tag names restricted to an inaccessible category" do
+ SiteSetting.tagging_enabled = true
+ public_tag = Fabricate(:tag, name: "public-revision-tag")
+ restricted_tag = Fabricate(:tag, name: "restricted-revision-tag")
+ revised_post = Fabricate(:post, version: 2)
+ revision =
+ Fabricate(
+ :post_revision,
+ post: revised_post,
+ modifications: {
+ "tags" => [[public_tag.name], [public_tag.name, restricted_tag.name]],
+ },
+ )
+
+ revised_post.topic.update!(tags: [public_tag, restricted_tag])
+ CategoryTag.create!(
+ category: Fabricate(:private_category, group: Group[:staff]),
+ tag: restricted_tag,
+ )
+
+ [
+ "/posts/#{revised_post.id}/revisions/#{revision.number}.json",
+ "/posts/#{revised_post.id}/revisions/latest.json",
+ ].each do |url|
+ get url
+
+ expect(response).to have_http_status(:ok)
+ expect(response.body).not_to include(restricted_tag.name)
+ end
+ end
+
+ it "does not disclose category-restricted tag names to anonymous users" do
+ SiteSetting.tagging_enabled = true
+
+ restricted_tag = Fabricate(:tag, name: "classified-tag")
+ revision =
+ Fabricate(
+ :post_revision,
+ post: post,
+ modifications: {
+ "tags" => [[restricted_tag.name], []],
+ },
+ )
+ private_category = Fabricate(:private_category, group: Group[:staff])
+ tag_group = Fabricate(:tag_group, tags: [restricted_tag])
+ CategoryTagGroup.create!(category: private_category, tag_group: tag_group)
+
+ get "/posts/#{post.id}/revisions/#{revision.number}.json"
+
+ expect(response.status).to eq(200)
+ expect(response.body).not_to include(restricted_tag.name)
+ end
+
+ it "does not disclose historical tags restricted to inaccessible categories" do
+ SiteSetting.tagging_enabled = true
+
+ restricted_tag = Fabricate(:tag, name: "restricted-historical-tag")
+ visible_previous_tag = Fabricate(:tag, name: "visible-previous-tag")
+ visible_current_tag = Fabricate(:tag, name: "visible-current-tag")
+ private_category = Fabricate(:private_category, group: Group[:staff])
+ CategoryTag.create!(category: private_category, tag: restricted_tag)
+ post.topic.update!(tags: [visible_current_tag])
+ revision =
+ Fabricate(
+ :post_revision,
+ post: post,
+ modifications: {
+ "tags" => [
+ [visible_previous_tag.name, restricted_tag.name],
+ [visible_current_tag.name],
+ ],
+ },
+ )
+
+ get "/posts/#{post.id}/revisions/#{revision.number}.json"
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["tags_changes"]).to eq(
+ "previous" => [visible_previous_tag.name],
+ "current" => [visible_current_tag.name],
+ )
+ expect(response.body).not_to include(restricted_tag.name)
+ end
+
it "omits unseen reply target post numbers" do
SiteSetting.editing_grace_period = 0
SiteSetting.whispers_allowed_groups = Group::AUTO_GROUPS[:staff]
diff --git a/spec/serializers/post_revision_serializer_spec.rb b/spec/serializers/post_revision_serializer_spec.rb
index e6ac4953625..5b7d582cf6a 100644
--- a/spec/serializers/post_revision_serializer_spec.rb
+++ b/spec/serializers/post_revision_serializer_spec.rb
@@ -51,6 +51,24 @@ RSpec.describe PostRevisionSerializer do
expect(json[:tags_changes][:current]).to eq([])
end
+ it "preserves the revision tag order when filtering visible tags" do
+ SiteSetting.tagging_enabled = true
+ tags = %w[alpha bravo charlie].map { |name| Fabricate(:tag, name: name) }
+ post.topic.tags = tags
+ revision =
+ Fabricate(
+ :post_revision,
+ post: post,
+ modifications: {
+ "tags" => [%w[charlie alpha], %w[alpha bravo charlie]],
+ },
+ )
+
+ json = described_class.new(revision, scope: Guardian.new, root: false).as_json
+
+ expect(json[:tags_changes]).to eq(previous: %w[charlie alpha], current: %w[alpha bravo charlie])
+ end
+
context "with hidden tags" do
fab!(:public_tag) { Fabricate(:tag, name: "public") }
fab!(:public_tag2) { Fabricate(:tag, name: "visible") }