github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 02:04:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

enqueue spam/dmarc failing emails instead of hiding (#8674)

Browse Source 
* enqueue spam/dmarc failing emails instead of hiding

* add translations for dmarc/spam enqueued reasons

* unescape quote

* if email_in_authserv_id is blank return gray for all emails
This commit is contained in:
Leo McArdle
2020-01-21 16:12:00 +00:00
committed by Robin Ward
parent 411512c0e3
commit 8883cca373
7 changed files with 142 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/email/authentication_results.rb
View File

@ -2,8 +2,6 @@
module Email
class AuthenticationResults
attr_reader :results
VERDICT = Enum.new(
:gray,
:pass,
@ -12,11 +10,16 @@ module Email
)
def initialize(headers)
authserv_id = SiteSetting.email_in_authserv_id
@results = Array(headers).map do |header|
@authserv_id = SiteSetting.email_in_authserv_id
@headers = headers
@verdict = :gray if @authserv_id.blank?
end
def results
@results ||= Array(@headers).map do |header|
parse_header(header.to_s)
end.filter do |result|
authserv_id.blank? || authserv_id == result[:authserv_id]
@authserv_id.blank? || @authserv_id == result[:authserv_id]
end
end
@ -32,7 +35,7 @@ module Email
def calc_action
if verdict == :fail
:hide
:enqueue
else
:accept
end
@ -44,7 +47,7 @@ module Email
def calc_dmarc
verdict = VERDICT[:gray]
@results.each do |result|
results.each do |result|
result[:resinfo].each do |resinfo|
if resinfo[:method] == "dmarc"
v = VERDICT[resinfo[:result].to_sym].to_i