Skip to content

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

SECURITY: Restrict raw email in queued post payloads

Sérgio Saquetim08eacfdb8762
diff --git a/app/serializers/current_user_serializer.rb b/app/serializers/current_user_serializer.rb
index 5c90b0c59bd..d4c5877ee67 100644
--- a/app/serializers/current_user_serializer.rb
+++ b/app/serializers/current_user_serializer.rb
@@ -372,7 +372,7 @@ class CurrentUserSerializer < BasicUserSerializer
end
def can_view_raw_email
- scope.user.in_any_groups?(SiteSetting.view_raw_email_allowed_groups_map)
+ scope.can_view_raw_emails?
end
def do_not_disturb_channel_position
diff --git a/app/serializers/reviewable_queued_post_serializer.rb b/app/serializers/reviewable_queued_post_serializer.rb
index 8b5ba194dce..6c5ccc19317 100644
--- a/app/serializers/reviewable_queued_post_serializer.rb
+++ b/app/serializers/reviewable_queued_post_serializer.rb
@@ -20,6 +20,12 @@ class ReviewableQueuedPostSerializer < ReviewableSerializer
:raw_email,
)
+ def attributes
+ data = super
+ data[:payload]&.delete("raw_email") unless scope&.can_view_raw_emails?
+ data
+ end
+
def fancy_title
ERB::Util.html_escape(object.payload["title"]) if object.payload&.[]("title")
end
diff --git a/frontend/discourse/app/components/reviewable/queued-post.gjs b/frontend/discourse/app/components/reviewable/queued-post.gjs
index 31522ebedae..2c80d12a2e1 100644
--- a/frontend/discourse/app/components/reviewable/queued-post.gjs
+++ b/frontend/discourse/app/components/reviewable/queued-post.gjs
@@ -15,6 +15,11 @@ import { i18n } from "discourse-i18n";
export default class ReviewableQueuedPost extends Component {
@service modal;
+ @service currentUser;
+
+ get canViewRawEmail() {
+ return this.currentUser?.can_view_raw_email;
+ }
@action
showRawEmail(event) {
@@ -38,9 +43,13 @@ export default class ReviewableQueuedPost extends Component {
{{dCategoryBadge @reviewable.category}}
<ReviewableTags @tags={{@reviewable.payload.tags}} />
{{#if @reviewable.payload.via_email}}
- <a href {{on "click" this.showRawEmail}} class="show-raw-email">
+ {{#if this.canViewRawEmail}}
+ <a href {{on "click" this.showRawEmail}} class="show-raw-email">
+ {{dIcon "envelope" title="post.via_email"}}
+ </a>
+ {{else}}
{{dIcon "envelope" title="post.via_email"}}
- </a>
+ {{/if}}
{{/if}}
</ReviewableTopicLink>
</div>
diff --git a/lib/guardian/post_guardian.rb b/lib/guardian/post_guardian.rb
index be024b94865..8f0ffc6d4ec 100644
--- a/lib/guardian/post_guardian.rb
+++ b/lib/guardian/post_guardian.rb
@@ -394,8 +394,12 @@ module PostGuardian
is_staff?
end
+ def can_view_raw_emails?
+ @user.in_any_groups?(SiteSetting.view_raw_email_allowed_groups_map)
+ end
+
def can_view_raw_email?(post)
- post && @user.in_any_groups?(SiteSetting.view_raw_email_allowed_groups_map)
+ post && can_view_raw_emails?
end
def can_unhide?(post)
diff --git a/spec/lib/guardian/post_guardian_spec.rb b/spec/lib/guardian/post_guardian_spec.rb
index 28710d7f0cf..fba76001ab4 100644
--- a/spec/lib/guardian/post_guardian_spec.rb
+++ b/spec/lib/guardian/post_guardian_spec.rb
@@ -1293,6 +1293,26 @@ RSpec.describe PostGuardian do
expect(Guardian.new(trust_level_0).can_view_raw_email?(post)).to be_falsey
end
+
+ it "returns false when the post is nil even for an allowed user" do
+ SiteSetting.view_raw_email_allowed_groups = "1|2|14"
+
+ expect(Guardian.new(trust_level_4).can_view_raw_email?(nil)).to be_falsey
+ end
+ end
+
+ describe "#can_view_raw_emails?" do
+ it "returns true for a user in an allowed group" do
+ SiteSetting.view_raw_email_allowed_groups = "1|2|14"
+
+ expect(Guardian.new(trust_level_4).can_view_raw_emails?).to be_truthy
+ end
+
+ it "returns false for a user not in an allowed group" do
+ SiteSetting.view_raw_email_allowed_groups = "1|2|14"
+
+ expect(Guardian.new(trust_level_0).can_view_raw_emails?).to be_falsey
+ end
end
describe "#can_receive_post_notifications?" do
diff --git a/spec/serializers/reviewable_queued_post_serializer_spec.rb b/spec/serializers/reviewable_queued_post_serializer_spec.rb
index 489617062db..5b86a379404 100644
--- a/spec/serializers/reviewable_queued_post_serializer_spec.rb
+++ b/spec/serializers/reviewable_queued_post_serializer_spec.rb
@@ -74,4 +74,38 @@ RSpec.describe ReviewableQueuedPostSerializer do
expect(raw_field[:type]).to eq(:editor)
end
end
+
+ describe "raw email visibility" do
+ fab!(:reviewable, :reviewable_queued_post)
+ fab!(:user)
+ fab!(:group)
+ fab!(:group_user) { Fabricate(:group_user, group: group, user: user) }
+
+ def serialized_payload(scope_user)
+ ReviewableQueuedPostSerializer.new(
+ reviewable,
+ scope: Guardian.new(scope_user),
+ root: nil,
+ ).as_json[
+ :payload
+ ]
+ end
+
+ it "redacts raw_email when the user is not in view_raw_email_allowed_groups" do
+ SiteSetting.view_raw_email_allowed_groups = Group::AUTO_GROUPS[:admins].to_s
+
+ payload = serialized_payload(user)
+
+ expect(payload["via_email"]).to eq(true)
+ expect(payload).not_to have_key("raw_email")
+ end
+
+ it "exposes raw_email when the user is in view_raw_email_allowed_groups" do
+ SiteSetting.view_raw_email_allowed_groups = "#{Group::AUTO_GROUPS[:admins]}|#{group.id}"
+
+ payload = serialized_payload(user)
+
+ expect(payload["raw_email"]).to eq("store_me")
+ end
+ end
end