-
<% @new_topic_posts.keys.each do |topic| %>
-
- - <%= raw format_topic_title(topic.title) %> - <%= @new_topic_posts[topic].length %> - <%= category_badge(topic.category, inline_style: true, absolute_url: true) %> - + <%= mailing_list_topic(topic, @new_topic_posts[topic].length) %> <% end %>
<%= t('user_notifications.mailing_list.topic_updates') %>
<% @existing_topic_posts.keys.each do |topic| %>
- -
- <%= raw format_topic_title(topic.title) %>
- <%= @existing_topic_posts[topic].length %>
- <%= category_badge(topic.category, inline_style: true, absolute_url: true) %>
-
+ <%= mailing_list_topic(topic, @existing_topic_posts[topic].length) %>
<% end %>
@@ -46,40 +38,42 @@
- <%= raw format_topic_title(topic.title) %>
+ <%= email_topic_link(topic) %>
-
-
- <% @posts_by_topic[topic].each do |post| %>
-
- 
-
-
- <%- if show_username_on_post(post) %>
- <%= post.user.username %>
- <% end %>
+ <%- unless SiteSetting.private_email? %>
+
+
+ <% @posts_by_topic[topic].each do |post| %>
+
+
+
+
+ <%- if show_username_on_post(post) %>
+ <%= post.user.username %>
+ <% end %>
- <%- if show_name_on_post(post) %>
- - <%= post.user.name %>
- <% end %>
-
+ <%- if show_name_on_post(post) %>
+ - <%= post.user.name %>
+ <% end %>
+
- -
- <%= I18n.l(post.created_at, format: :long) %>
-
- <%= raw format_for_email(post, false) %>
-
-
- <% end %>
- <%= t('user_notifications.mailing_list.view_this_topic') %>
-
-
-
-
- <%= t('user_notifications.mailing_list.back_to_top') %>
-
-
+ -
+ <%= I18n.l(post.created_at, format: :long) %>
+
+ <%= raw format_for_email(post, false) %>
+
+
+ <% end %>
+ <%= t('user_notifications.mailing_list.view_this_topic') %>
+
+
+
+
+ <%= t('user_notifications.mailing_list.back_to_top') %>
+
+
+ <% end %>
<% end %>
diff --git a/app/views/user_notifications/mailing_list.text.erb b/app/views/user_notifications/mailing_list.text.erb
index 5208a9f085f..dfe0fe16831 100644
--- a/app/views/user_notifications/mailing_list.text.erb
+++ b/app/views/user_notifications/mailing_list.text.erb
@@ -4,28 +4,30 @@
<%- if @new_topic_posts.keys.present? -%>
### <%= t 'user_notifications.mailing_list.new_topics' %>
<%- @new_topic_posts.keys.each do |topic| %>
- <%= raw(@markdown_linker.create(topic.title, topic.relative_url)) %>
+ <%= mailing_list_topic_text(topic) %>
<%- end -%>
<%- end -%>
<%- if @existing_topic_posts.keys.present? -%>
### <%= t 'user_notifications.mailing_list.new_topics' %>
<%- @existing_topic_posts.keys.each do |topic| -%>
- <%= raw(@markdown_linker.create(topic.title, topic.relative_url)) %>
+ <%= mailing_list_topic_text(topic) %>
<%= @existing_topic_posts[topic].length %>
<%- end -%>
<%- end -%>
--------------------------------------------------------------------------------
-<%- @posts_by_topic.keys.each do |topic| %>
- ### <%= raw(@markdown_linker.create(topic.title, topic.relative_url)) %>
+<%- unless SiteSetting.private_email? %>
+ <%- @posts_by_topic.keys.each do |topic| %>
+ ### <%= raw(@markdown_linker.create(topic.title, topic.relative_url)) %>
- <%- @posts_by_topic[topic].each do |post| -%>
- <%= post.user.name || post.user.username %> - <%= post.created_at %>
---------------------------------------------------------------------------------
- <%= post.raw %>
+ <%- @posts_by_topic[topic].each do |post| -%>
+ <%= post.user.name || post.user.username %> - <%= post.created_at %>
+ --------------------------------------------------------------------------------
+ <%= post.raw %>
-
- <%- end -%>
+
+ <%- end -%>
+ <%- end %>
<%- end %>
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 19c7d0880c0..efa660128be 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1336,6 +1336,7 @@ en:
enable_forwarded_emails: "[BETA] Allow users to create a topic by forwarding an email in."
always_show_trimmed_content: "Always show trimmed part of incoming emails. WARNING: might reveal email addresses."
+ private_email: "Don't include content from posts or topics in emails for extra privacy."
manual_polling_enabled: "Push emails using the API for email replies."
pop3_polling_enabled: "Poll via POP3 for email replies."
@@ -1934,6 +1935,9 @@ en:
other: "This topic is temporarily closed for %{count} hours due to a large number of community flags."
system_messages:
+ secure_topic_title: "Topic #%{id}"
+ contents_hidden: "Please visit the post to see its contents."
+
post_hidden:
title: "Post Hidden"
subject_template: "Post hidden by community flags"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index c978dc48ec9..6c916061601 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -701,6 +701,7 @@ email:
default: "smime.p7s|signature.asc"
enable_forwarded_emails: false
always_show_trimmed_content: false
+ private_email: false
files:
max_image_size_kb:
diff --git a/lib/email/sender.rb b/lib/email/sender.rb
index cf9695583c3..db167a12dd7 100644
--- a/lib/email/sender.rb
+++ b/lib/email/sender.rb
@@ -130,7 +130,14 @@ module Email
# https://www.ietf.org/rfc/rfc3834.txt
@message.header['Precedence'] = 'list'
@message.header['List-ID'] = list_id
- @message.header['List-Archive'] = topic.url if topic
+
+ if topic
+ if SiteSetting.private_email?
+ @message.header['List-Archive'] = "#{Discourse.base_url}#{topic.slugless_url}"
+ else
+ @message.header['List-Archive'] = topic.url
+ end
+ end
end
if reply_key.present? && @message.header['Reply-To'] =~ /\<([^\>]+)\>/
diff --git a/spec/jobs/enqueue_digest_emails_spec.rb b/spec/jobs/enqueue_digest_emails_spec.rb
index 9d00e3dd4c5..acb3f16403d 100644
--- a/spec/jobs/enqueue_digest_emails_spec.rb
+++ b/spec/jobs/enqueue_digest_emails_spec.rb
@@ -6,7 +6,7 @@ describe Jobs::EnqueueDigestEmails do
describe '#target_users' do
context 'disabled digests' do
- before { SiteSetting.stubs(:default_email_digest_frequency).returns(0) }
+ before { SiteSetting.default_email_digest_frequency = 0 }
let!(:user_no_digests) { Fabricate(:active_user, last_emailed_at: 8.days.ago, last_seen_at: 10.days.ago) }
it "doesn't return users with email disabled" do
@@ -129,13 +129,24 @@ describe Jobs::EnqueueDigestEmails do
end
end
+ context "private email" do
+ before do
+ Jobs::EnqueueDigestEmails.any_instance.expects(:target_user_ids).never
+ SiteSetting.private_email = true
+ Jobs.expects(:enqueue).with(:user_email, type: :digest, user_id: user.id).never
+ end
+ it "doesn't return users with email disabled" do
+ Jobs::EnqueueDigestEmails.new.execute({})
+ end
+ end
+
context "digest emails are disabled" do
before do
Jobs::EnqueueDigestEmails.any_instance.expects(:target_user_ids).never
+ SiteSetting.disable_digest_emails = true
end
it "does not enqueue the digest email job" do
- SiteSetting.stubs(:disable_digest_emails?).returns(true)
Jobs.expects(:enqueue).with(:user_email, type: :digest, user_id: user.id).never
Jobs::EnqueueDigestEmails.new.execute({})
end
diff --git a/spec/mailers/invite_mailer_spec.rb b/spec/mailers/invite_mailer_spec.rb
index 3dc8a007f11..68ce2b4a4a9 100644
--- a/spec/mailers/invite_mailer_spec.rb
+++ b/spec/mailers/invite_mailer_spec.rb
@@ -67,6 +67,7 @@ describe InviteMailer do
it 'renders invite link' do
expect(custom_invite_mail.body.encoded).to match("#{Discourse.base_url}/invites/#{invite.invite_key}")
end
+
end
end
end
@@ -111,6 +112,14 @@ describe InviteMailer do
it 'renders topic title' do
expect(invite_mail.body.encoded).to match(topic.title)
end
+
+ it "respects the private_email setting" do
+ SiteSetting.private_email = true
+
+ message = invite_mail
+ expect(message.body.to_s).not_to include(topic.title)
+ expect(message.body.to_s).not_to include(topic.slug)
+ end
end
context "custom invite message" do
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index 3cd4ca74b4e..f37d78d78dd 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -47,7 +47,10 @@ describe UserNotifications do
user.user_option.update_columns(email_previous_replies: UserOption.previous_replies_type[:always])
expect(UserNotifications.get_context_posts(post3, topic_user, user).count).to eq(2)
+ SiteSetting.private_email = true
+ expect(UserNotifications.get_context_posts(post3, topic_user, user).count).to eq(0)
end
+
end
describe ".signup" do
@@ -152,6 +155,15 @@ describe UserNotifications do
expect(subject.html_part.body.to_s).to include old_topic.title
expect(subject.html_part.body.to_s).to include whisper.cooked
end
+
+ it "hides details for private email" do
+ SiteSetting.private_email = true
+
+ expect(subject.html_part.body.to_s).not_to include(topic.title)
+ expect(subject.html_part.body.to_s).not_to include(topic.slug)
+ expect(subject.text_part.body.to_s).not_to include(topic.title)
+ expect(subject.text_part.body.to_s).not_to include(topic.slug)
+ end
end
end
@@ -291,8 +303,6 @@ describe UserNotifications do
expect(mail.html_part.to_s.scan(/In Reply To/).count).to eq(0)
-
-
SiteSetting.enable_names = true
SiteSetting.display_name_on_posts = true
SiteSetting.prioritize_username_in_ux = false
@@ -324,6 +334,21 @@ describe UserNotifications do
expect(mail_html.scan(/>Bob Marley/).count).to eq(0)
expect(mail_html.scan(/>bobmarley/).count).to eq(1)
end
+
+ it "doesn't include details when private_email is enabled" do
+ SiteSetting.private_email = true
+ mail = UserNotifications.user_replied(
+ response.user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash
+ )
+
+ expect(mail.html_part.to_s).to_not include(response.raw)
+ expect(mail.html_part.to_s).to_not include(topic.url)
+ expect(mail.text_part.to_s).to_not include(response.raw)
+ expect(mail.text_part.to_s).to_not include(topic.url)
+ end
end
describe '.user_posted' do
@@ -360,6 +385,19 @@ describe UserNotifications do
tu = TopicUser.get(post.topic_id, response.user)
expect(tu.last_emailed_post_number).to eq(response.post_number)
end
+
+ it "doesn't include details when private_email is enabled" do
+ SiteSetting.private_email = true
+ mail = UserNotifications.user_posted(
+ response.user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash
+ )
+
+ expect(mail.html_part.to_s).to_not include(response.raw)
+ expect(mail.text_part.to_s).to_not include(response.raw)
+ end
end
describe '.user_private_message' do
@@ -397,6 +435,21 @@ describe UserNotifications do
tu = TopicUser.get(topic.id, response.user)
expect(tu.last_emailed_post_number).to eq(response.post_number)
end
+
+ it "doesn't include details when private_email is enabled" do
+ SiteSetting.private_email = true
+ mail = UserNotifications.user_private_message(
+ response.user,
+ post: response,
+ notification_type: notification.notification_type,
+ notification_data_hash: notification.data_hash
+ )
+
+ expect(mail.html_part.to_s).to_not include(response.raw)
+ expect(mail.html_part.to_s).to_not include(topic.url)
+ expect(mail.text_part.to_s).to_not include(response.raw)
+ expect(mail.text_part.to_s).to_not include(topic.url)
+ end
end
@@ -449,6 +502,28 @@ describe UserNotifications do
end
end
+ shared_examples "respect for private_email" do
+ context "private_email" do
+ it "doesn't support reply by email" do
+ SiteSetting.private_email = true
+ mailer = UserNotifications.send(
+ mail_type,
+ user,
+ notification_type: Notification.types[notification.notification_type],
+ notification_data_hash: notification.data_hash,
+ post: notification.post
+ )
+ message = mailer.message
+
+ topic = notification.post.topic
+ expect(message.html_part.body.to_s).not_to include(topic.title)
+ expect(message.html_part.body.to_s).not_to include(topic.slug)
+ expect(message.text_part.body.to_s).not_to include(topic.title)
+ expect(message.text_part.body.to_s).not_to include(topic.slug)
+ end
+ end
+ end
+
# The parts of emails that are derived from templates are translated
shared_examples "sets user locale" do
context "set locale for translating templates" do
@@ -546,6 +621,7 @@ describe UserNotifications do
describe "user mentioned email" do
include_examples "notification email building" do
let(:notification_type) { :mentioned }
+ include_examples "respect for private_email"
include_examples "supports reply by email"
include_examples "sets user locale"
end
@@ -554,6 +630,7 @@ describe UserNotifications do
describe "user replied" do
include_examples "notification email building" do
let(:notification_type) { :replied }
+ include_examples "respect for private_email"
include_examples "supports reply by email"
include_examples "sets user locale"
end
@@ -562,6 +639,7 @@ describe UserNotifications do
describe "user quoted" do
include_examples "notification email building" do
let(:notification_type) { :quoted }
+ include_examples "respect for private_email"
include_examples "supports reply by email"
include_examples "sets user locale"
end
@@ -570,6 +648,7 @@ describe UserNotifications do
describe "user posted" do
include_examples "notification email building" do
let(:notification_type) { :posted }
+ include_examples "respect for private_email"
include_examples "supports reply by email"
include_examples "sets user locale"
end
@@ -578,6 +657,7 @@ describe UserNotifications do
describe "user invited to a private message" do
include_examples "notification email building" do
let(:notification_type) { :invited_to_private_message }
+ include_examples "respect for private_email"
include_examples "no reply by email"
include_examples "sets user locale"
end
@@ -586,6 +666,7 @@ describe UserNotifications do
describe "user invited to a topic" do
include_examples "notification email building" do
let(:notification_type) { :invited_to_topic }
+ include_examples "respect for private_email"
include_examples "no reply by email"
include_examples "sets user locale"
end
@@ -594,6 +675,7 @@ describe UserNotifications do
describe "watching first post" do
include_examples "notification email building" do
let(:notification_type) { :invited_to_topic }
+ include_examples "respect for private_email"
include_examples "no reply by email"
include_examples "sets user locale"
end
- <%= raw format_topic_title(topic.title) %> + <%= email_topic_link(topic) %>
-
-
+
+ <% end %>
+ <%= t('user_notifications.mailing_list.view_this_topic') %>
+
-
- <%- if show_username_on_post(post) %>
- <%= post.user.username %>
- <% end %>
+ <%- unless SiteSetting.private_email? %>
+
+
+ <%- if show_username_on_post(post) %>
+ <%= post.user.username %>
+ <% end %>
- <%- if show_name_on_post(post) %>
- - <%= post.user.name %>
- <% end %>
-
+ <%- if show_name_on_post(post) %>
+ - <%= post.user.name %>
+ <% end %>
+
- -
- <%= I18n.l(post.created_at, format: :long) %>
-
+
-
+ <% @posts_by_topic[topic].each do |post| %>
+
-
+
- <% end %>
- <%= t('user_notifications.mailing_list.view_this_topic') %>
-
+
-
-
+ -
+ <%= I18n.l(post.created_at, format: :long) %>
+
- <%= t('user_notifications.mailing_list.back_to_top') %>
-
-
+