A platform for community discussion. Free, open, simple.
SECURITY: Hidden post revisions leak through adjacent visible diffs
Renato Atilio1f26c1163ce8
diff --git a/app/serializers/post_revision_serializer.rb b/app/serializers/post_revision_serializer.rbindex c42e3a69342..8e208e864f5 100644--- a/app/serializers/post_revision_serializer.rb+++ b/app/serializers/post_revision_serializer.rb@@ -37,9 +37,15 @@ class PostRevisionSerializer < ApplicationSerializerchanges_name = :"#{field}_changes"attributes changes_name- define_method(changes_name) { { previous: previous[field], current: current[field] } }+ define_method(changes_name) do+ return if suppress_hidden_diffs?- define_method("include_#{changes_name}?") { previous[field] != current[field] }+ { previous: previous[field], current: current[field] }+ end++ define_method("include_#{changes_name}?") do+ !suppress_hidden_diffs? && previous[field] != current[field]+ endendadd_compared_field :wiki@@ -47,11 +53,13 @@ class PostRevisionSerializer < ApplicationSerializeradd_compared_field :localedef previous_hidden- previous["hidden"]+ return previous["hidden"] if scope.can_view_hidden_post_revisions?++ previous_side_hidden?enddef current_hidden- current["hidden"]+ !!(adjacent_current && adjacent_current["hidden"])enddef first_revision@@ -125,6 +133,8 @@ class PostRevisionSerializer < ApplicationSerializerenddef body_changes+ return if suppress_hidden_diffs?+cooked_diff = DiscourseDiff.new(previous["cooked"], current["cooked"])raw_diff = DiscourseDiff.new(previous["raw"], current["raw"])@@ -139,6 +149,8 @@ class PostRevisionSerializer < ApplicationSerializerenddef title_changes+ return if suppress_hidden_diffs?+prev = "<div>#{previous["title"] && CGI.escapeHTML(previous["title"])}</div>"cur = "<div>#{current["title"] && CGI.escapeHTML(current["title"])}</div>"@@ -162,10 +174,12 @@ class PostRevisionSerializer < ApplicationSerializerenddef include_title_changes?- object.post.post_number == 1+ object.post.post_number == 1 && !suppress_hidden_diffs?enddef user_changes+ return if suppress_hidden_diffs?+prev = previous["user_id"]cur = current["user_id"]@@ -188,10 +202,12 @@ class PostRevisionSerializer < ApplicationSerializerenddef include_user_changes?- previous["user_id"] != current["user_id"]+ !suppress_hidden_diffs? && previous["user_id"] != current["user_id"]enddef reply_to_post_number_changes+ return if suppress_hidden_diffs?+{previous: reply_to_info(previous["reply_to_post_number"]),current: reply_to_info(current["reply_to_post_number"]),@@ -199,10 +215,12 @@ class PostRevisionSerializer < ApplicationSerializerenddef include_reply_to_post_number_changes?- previous["reply_to_post_number"] != current["reply_to_post_number"]+ !suppress_hidden_diffs? && previous["reply_to_post_number"] != current["reply_to_post_number"]enddef tags_changes+ return if suppress_hidden_diffs?+pre = filter_tags previous["tags"]cur = filter_tags current["tags"]@@ -210,10 +228,12 @@ class PostRevisionSerializer < ApplicationSerializerenddef include_tags_changes?- previous["tags"] != current["tags"] && scope.can_see_tags?(topic)+ !suppress_hidden_diffs? && previous["tags"] != current["tags"] && scope.can_see_tags?(topic)enddef category_id_changes+ return if suppress_hidden_diffs?+pre = filter_category_id previous["category_id"]cur = filter_category_id current["category_id"]@@ -221,10 +241,12 @@ class PostRevisionSerializer < ApplicationSerializerenddef include_category_id_changes?- previous["category_id"] != current["category_id"]+ !suppress_hidden_diffs? && previous["category_id"] != current["category_id"]enddef locale_changes+ return if suppress_hidden_diffs?+prev = previous["locale"].presencecur = current["locale"].presence{ previous: prev, current: cur }@@ -311,6 +333,24 @@ class PostRevisionSerializer < ApplicationSerializer@all_revisionsend+ def adjacent_previous+ @adjacent_previous ||=+ all_revisions.select { |revision| revision["revision"] < current_revision }.last+ end++ def adjacent_current+ @adjacent_current ||=+ all_revisions.select { |revision| revision["revision"] > current_revision }.first+ end++ def previous_side_hidden?+ !!(previous["hidden"] || (adjacent_previous && adjacent_previous["hidden"]))+ end++ def suppress_hidden_diffs?+ !scope.can_view_hidden_post_revisions? && (previous_side_hidden? || current_hidden)+ end+def previous@previous ||= revisions.select { |r| r["revision"] <= current_revision }.lastenddiff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rbindex e943e96f0cb..470364ee630 100644--- a/spec/requests/posts_controller_spec.rb+++ b/spec/requests/posts_controller_spec.rb@@ -2674,6 +2674,104 @@ RSpec.describe PostsController doendend+ context "when a visible revision is adjacent to a hidden revision" do+ fab!(:post_owner, :user)+ fab!(:post_with_following_hidden_revision) do+ Fabricate(:post, user: post_owner, raw: "Initial public version")+ end+ fab!(:post_with_previous_hidden_revision) do+ Fabricate(:post, user: post_owner, raw: "Initial public version")+ end++ before do+ SiteSetting.edit_history_visible_to_public = true+ SiteSetting.editing_grace_period = 0+ end++ it "does not disclose a following hidden revision to non-staff" do+ post_with_following_hidden_revision.revise(post_owner, raw: "Visible version")+ post_with_following_hidden_revision.revise(post_owner, raw: "Following hidden secret")+ hidden_revision = post_with_following_hidden_revision.revisions.find_by(number: 3)+ hidden_revision.hide!++ get "/posts/#{post_with_following_hidden_revision.id}/revisions/2.json"++ expect(response.status).to eq(200)+ expect(response.parsed_body["current_hidden"]).to eq(true)+ expect(response.parsed_body["body_changes"]).to eq(nil)+ expect(response.body).not_to include(hidden_revision.modifications["raw"].last)+ end++ it "does not disclose a previous hidden revision to non-staff" do+ post_with_previous_hidden_revision.revise(post_owner, raw: "Previous hidden secret")+ hidden_revision = post_with_previous_hidden_revision.revisions.find_by(number: 2)+ hidden_revision.hide!+ post_with_previous_hidden_revision.revise(post_owner, raw: "Visible version")++ get "/posts/#{post_with_previous_hidden_revision.id}/revisions/3.json"++ expect(response.status).to eq(200)+ expect(response.parsed_body["previous_hidden"]).to eq(true)+ expect(response.parsed_body["body_changes"]).to eq(nil)+ expect(response.body).not_to include(hidden_revision.modifications["raw"].last)+ end++ it "does not disclose metadata changes from a previous hidden revision to non-staff" do+ topic = Fabricate(:topic, user: post_owner)+ op = Fabricate(:post, topic: topic, user: post_owner, post_number: 1)+ hidden_parent = Fabricate(:post, topic: topic, user: post_owner, post_number: 2)+ visible_parent = Fabricate(:post, topic: topic, user: post_owner, post_number: 3)+ post =+ Fabricate(+ :post,+ topic: topic,+ user: post_owner,+ post_number: 4,+ raw: "Initial public version",+ reply_to_post_number: op.post_number,+ locale: "en",+ wiki: false,+ post_type: Post.types[:regular],+ )++ post.revise(+ post_owner,+ {+ raw: "Hidden metadata version",+ reply_to_post_number: hidden_parent.post_number,+ wiki: true,+ post_type: Post.types[:whisper],+ locale: "ja",+ },+ skip_validations: true,+ )+ hidden_revision = post.revisions.find_by(number: 2)+ hidden_revision.hide!+ post.revise(+ post_owner,+ {+ raw: "Visible metadata version",+ reply_to_post_number: visible_parent.post_number,+ wiki: false,+ post_type: Post.types[:regular],+ locale: "fr",+ },+ skip_validations: true,+ )++ get "/posts/#{post.id}/revisions/3.json"++ expect(response.status).to eq(200)+ expect(response.parsed_body["previous_hidden"]).to eq(true)+ expect(response.parsed_body["body_changes"]).to eq(nil)+ expect(response.parsed_body).not_to have_key("reply_to_post_number_changes")+ expect(response.parsed_body).not_to have_key("wiki_changes")+ expect(response.parsed_body).not_to have_key("post_type_changes")+ expect(response.parsed_body).not_to have_key("locale_changes")+ expect(response.body).not_to include(hidden_revision.modifications["raw"].last)+ end+ end+context "when diff generation exceeds the comparison budget" dolet(:diff_error) doONPDiff::DiffLimitExceeded.new(