Skip to content

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

DEV: Simplify `Email::AuthenticationResults` and its specs

Régis Hanol31f5113e71a3
diff --git a/lib/email/authentication_results.rb b/lib/email/authentication_results.rb
index 8df6f06676c..0b80b66a3d1 100644
--- a/lib/email/authentication_results.rb
+++ b/lib/email/authentication_results.rb
@@ -2,12 +2,35 @@
module Email
class AuthenticationResults
- VERDICT = Enum.new(:gray, :pass, :fail, start: 0)
+ # ordered by severity
+ VERDICTS = %i[gray pass fail].freeze
+
+ # based on https://tools.ietf.org/html/rfc8601#section-2.2
+ CFWS = /\s*(?:\([^()]*\))?\s*/
+ VALUE = /(?:"([^"]*)")|(?:([^\s";]*))/
+ VERSION = /\d+#{CFWS}?/
+ KEYWORD = /([a-zA-Z0-9-]*[a-zA-Z0-9])/
+ NO_RESULT = /#{CFWS}?;#{CFWS}?none#{CFWS}?\z/i
+ PAYLOAD = /\A#{CFWS}?#{VALUE}(?:#{CFWS}#{VERSION})?(?:#{NO_RESULT}|([\S\s]*))/
+ METHODSPEC =
+ %r{#{CFWS}?#{KEYWORD}\s*(?:#{CFWS}?/#{CFWS}?#{VERSION})?#{CFWS}?=#{CFWS}?#{KEYWORD}}
+ REASONSPEC = /reason#{CFWS}?=#{CFWS}?#{VALUE}/
+ RESINFO = /#{CFWS}?;#{METHODSPEC}(?:#{CFWS}#{REASONSPEC})?(?:#{CFWS}([^;]*))?/
+ PROPSPEC = /#{KEYWORD}#{CFWS}?\.#{CFWS}?#{VALUE}#{CFWS}?=#{CFWS}?#{VALUE}#{CFWS}?/
+ private_constant :CFWS,
+ :VALUE,
+ :VERSION,
+ :KEYWORD,
+ :NO_RESULT,
+ :PAYLOAD,
+ :METHODSPEC,
+ :REASONSPEC,
+ :RESINFO,
+ :PROPSPEC
def initialize(headers)
@authserv_id = SiteSetting.email_in_authserv_id
@headers = headers
- @verdict = :gray if @authserv_id.blank?
end
def results
@@ -17,87 +40,58 @@ module Email
.filter { |result| @authserv_id.blank? || @authserv_id == result[:authserv_id] }
end
- def action
- @action ||= calc_action
- end
-
def verdict
@verdict ||= calc_verdict
end
- private
-
- def calc_action
- if verdict == :fail
- :enqueue
- else
- :accept
- end
+ def action
+ verdict == :fail ? :enqueue : :accept
end
+ private
+
def calc_verdict
- VERDICT[calc_dmarc]
- end
+ # without a trusted authserv-id, any MTA along the way could have forged the header
+ return :gray if @authserv_id.blank?
- def calc_dmarc
- verdict = VERDICT[:gray]
- results.each do |result|
- result[:resinfo].each do |resinfo|
- if resinfo[:method] == "dmarc"
- v = VERDICT[resinfo[:result].to_sym].to_i
- verdict = v if v > verdict
+ severity =
+ results
+ .flat_map { |result| result[:resinfo] }
+ .filter_map do |resinfo|
+ VERDICTS.index(resinfo[:result].downcase.to_sym) if resinfo[:method].casecmp?("dmarc")
end
- end
- end
- verdict = VERDICT[:gray] if SiteSetting.email_in_authserv_id.blank? &&
- verdict == VERDICT[:pass]
- verdict
+ .max
+
+ VERDICTS[severity || 0]
end
def parse_header(header)
- # based on https://tools.ietf.org/html/rfc8601#section-2.2
- cfws = /\s*(\([^()]*\))?\s*/
- value = /(?:"([^"]*)")|(?:([^\s";]*))/
- authserv_id = value
- authres_version = /\d+#{cfws}?/
- no_result = /#{cfws}?;#{cfws}?none#{cfws}?\z/i
- keyword = /([a-zA-Z0-9-]*[a-zA-Z0-9])/
- authres_payload =
- /\A#{cfws}?#{authserv_id}(?:#{cfws}#{authres_version})?(?:#{no_result}|([\S\s]*))/
-
- method_version = authres_version
- method = %r{#{keyword}\s*(?:#{cfws}?/#{cfws}?#{method_version})?}
- result = keyword
- methodspec = /#{cfws}?#{method}#{cfws}?=#{cfws}?#{result}/
- reasonspec = /reason#{cfws}?=#{cfws}?#{value}/
- resinfo = /#{cfws}?;#{methodspec}(?:#{cfws}#{reasonspec})?(?:#{cfws}([^;]*))?/
-
- ptype = keyword
- property = value
- pvalue = /#{cfws}?#{value}#{cfws}?/
- propspec = /#{ptype}#{cfws}?\.#{cfws}?#{property}#{cfws}?=#{pvalue}/
-
- authres_payload_match = authres_payload.match(header)
- parsed_authserv_id = authres_payload_match[2] || authres_payload_match[3]
- resinfo_val = authres_payload_match[-1]
-
- if resinfo_val
- resinfo_scan = resinfo_val.scan(resinfo)
- parsed_resinfo =
- resinfo_scan.map do |x|
- {
- method: x[2],
- result: x[8],
- reason: x[12] || x[13],
- props:
- x[-1]
- .scan(propspec)
- .map { |y| { ptype: y[0], property: y[4], pvalue: y[8] || y[9] } },
- }
- end
- end
+ authserv_id_quoted, authserv_id, resinfo = PAYLOAD.match(header).captures
- { authserv_id: parsed_authserv_id, resinfo: parsed_resinfo || [] }
+ {
+ authserv_id: authserv_id_quoted || authserv_id,
+ resinfo:
+ resinfo
+ .to_s
+ .scan(RESINFO)
+ .map do |method, result, reason_quoted, reason, props|
+ {
+ method:,
+ result:,
+ reason: reason_quoted || reason,
+ props:
+ props
+ .scan(PROPSPEC)
+ .map do |ptype, property_quoted, property, pvalue_quoted, pvalue|
+ {
+ ptype:,
+ property: property_quoted || property,
+ pvalue: pvalue_quoted || pvalue,
+ }
+ end,
+ }
+ end,
+ }
end
end
end
diff --git a/spec/lib/email/authentication_results_spec.rb b/spec/lib/email/authentication_results_spec.rb
index c53d591ccdb..374f54d2d1d 100644
--- a/spec/lib/email/authentication_results_spec.rb
+++ b/spec/lib/email/authentication_results_spec.rb
@@ -3,12 +3,24 @@
require "email/authentication_results"
RSpec.describe Email::AuthenticationResults do
+ def resinfo(method, result, *props, reason: nil)
+ {
+ method:,
+ result:,
+ reason:,
+ props:
+ props.map do |p|
+ p.split(/[.=]/, 3).then { |t, k, v| { ptype: t, property: k, pvalue: v } }
+ end,
+ }
+ end
+
describe "#results" do
it "parses 'Nearly Trivial Case: Service Provided, but No Authentication Done' correctly" do
# https://tools.ietf.org/html/rfc8601#appendix-B.2
- results = described_class.new(" example.org 1; none").results
- expect(results[0][:authserv_id]).to eq "example.org"
- expect(results[0][:resinfo]).to eq []
+ expect(described_class.new(" example.org 1; none").results).to eq(
+ [{ authserv_id: "example.org", resinfo: [] }],
+ )
end
it "parses 'Service Provided, Authentication Done' correctly" do
@@ -17,13 +29,15 @@ RSpec.describe Email::AuthenticationResults do
example.com;
spf=pass smtp.mailfrom=example.net
RAW
- expect(results[0][:authserv_id]).to eq "example.com"
- expect(results[0][:resinfo][0][:method]).to eq "spf"
- expect(results[0][:resinfo][0][:result]).to eq "pass"
- expect(results[0][:resinfo][0][:reason]).to be nil
- expect(results[0][:resinfo][0][:props][0][:ptype]).to eq "smtp"
- expect(results[0][:resinfo][0][:props][0][:property]).to eq "mailfrom"
- expect(results[0][:resinfo][0][:props][0][:pvalue]).to eq "example.net"
+
+ expect(results).to eq(
+ [
+ {
+ authserv_id: "example.com",
+ resinfo: [resinfo("spf", "pass", "smtp.mailfrom=example.net")],
+ },
+ ],
+ )
end
it "parses 'Service Provided, Several Authentications Done, Single MTA' correctly" do
@@ -37,26 +51,21 @@ RSpec.describe Email::AuthenticationResults do
policy.iprev=192.0.2.200
RAW
- expect(results[0][:authserv_id]).to eq "example.com"
- expect(results[0][:resinfo][0][:method]).to eq "auth"
- expect(results[0][:resinfo][0][:result]).to eq "pass"
- expect(results[0][:resinfo][0][:reason]).to be nil
- expect(results[0][:resinfo][0][:props][0][:ptype]).to eq "smtp"
- expect(results[0][:resinfo][0][:props][0][:property]).to eq "auth"
- expect(results[0][:resinfo][0][:props][0][:pvalue]).to eq "[email protected]"
- expect(results[0][:resinfo][1][:method]).to eq "spf"
- expect(results[0][:resinfo][1][:result]).to eq "pass"
- expect(results[0][:resinfo][1][:reason]).to be nil
- expect(results[0][:resinfo][1][:props][0][:ptype]).to eq "smtp"
- expect(results[0][:resinfo][1][:props][0][:property]).to eq "mailfrom"
- expect(results[0][:resinfo][1][:props][0][:pvalue]).to eq "example.net"
- expect(results[1][:authserv_id]).to eq "example.com"
- expect(results[1][:resinfo][0][:method]).to eq "iprev"
- expect(results[1][:resinfo][0][:result]).to eq "pass"
- expect(results[1][:resinfo][0][:reason]).to be nil
- expect(results[1][:resinfo][0][:props][0][:ptype]).to eq "policy"
- expect(results[1][:resinfo][0][:props][0][:property]).to eq "iprev"
- expect(results[1][:resinfo][0][:props][0][:pvalue]).to eq "192.0.2.200"
+ expect(results).to eq(
+ [
+ {
+ authserv_id: "example.com",
+ resinfo: [
+ resinfo("auth", "pass", "[email protected]"),
+ resinfo("spf", "pass", "smtp.mailfrom=example.net"),
+ ],
+ },
+ {
+ authserv_id: "example.com",
+ resinfo: [resinfo("iprev", "pass", "policy.iprev=192.0.2.200")],
+ },
+ ],
+ )
end
it "parses 'Service Provided, Several Authentications Done, Different MTAs' correctly" do
@@ -70,26 +79,21 @@ RSpec.describe Email::AuthenticationResults do
spf=fail smtp.mailfrom=example.com
RAW
- expect(results[0][:authserv_id]).to eq "example.com"
- expect(results[0][:resinfo][0][:method]).to eq "dkim"
- expect(results[0][:resinfo][0][:result]).to eq "pass"
- expect(results[0][:resinfo][0][:reason]).to be nil
- expect(results[0][:resinfo][0][:props][0][:ptype]).to eq "header"
- expect(results[0][:resinfo][0][:props][0][:property]).to eq "d"
- expect(results[0][:resinfo][0][:props][0][:pvalue]).to eq "example.com"
- expect(results[1][:authserv_id]).to eq "example.com"
- expect(results[1][:resinfo][0][:method]).to eq "auth"
- expect(results[1][:resinfo][0][:result]).to eq "pass"
- expect(results[1][:resinfo][0][:reason]).to be nil
- expect(results[1][:resinfo][0][:props][0][:ptype]).to eq "smtp"
- expect(results[1][:resinfo][0][:props][0][:property]).to eq "auth"
- expect(results[1][:resinfo][0][:props][0][:pvalue]).to eq "[email protected]"
- expect(results[1][:resinfo][1][:method]).to eq "spf"
- expect(results[1][:resinfo][1][:result]).to eq "fail"
- expect(results[1][:resinfo][1][:reason]).to be nil
- expect(results[1][:resinfo][1][:props][0][:ptype]).to eq "smtp"
- expect(results[1][:resinfo][1][:props][0][:property]).to eq "mailfrom"
- expect(results[1][:resinfo][1][:props][0][:pvalue]).to eq "example.com"
+ expect(results).to eq(
+ [
+ {
+ authserv_id: "example.com",
+ resinfo: [resinfo("dkim", "pass", "header.d=example.com")],
+ },
+ {
+ authserv_id: "example.com",
+ resinfo: [
+ resinfo("auth", "pass", "[email protected]"),
+ resinfo("spf", "fail", "smtp.mailfrom=example.com"),
+ ],
+ },
+ ],
+ )
end
it "parses 'Service Provided, Multi-tiered Authentication Done' correctly" do
@@ -105,26 +109,26 @@ RSpec.describe Email::AuthenticationResults do
dkim=pass (good signature) [email protected]
RAW
- expect(results[0][:authserv_id]).to eq "example.com"
- expect(results[0][:resinfo][0][:method]).to eq "dkim"
- expect(results[0][:resinfo][0][:result]).to eq "pass"
- expect(results[0][:resinfo][0][:reason]).to eq "good signature"
- expect(results[0][:resinfo][0][:props][0][:ptype]).to eq "header"
- expect(results[0][:resinfo][0][:props][0][:property]).to eq "i"
- expect(results[0][:resinfo][0][:props][0][:pvalue]).to eq "@mail-router.example.net"
- expect(results[0][:resinfo][1][:method]).to eq "dkim"
- expect(results[0][:resinfo][1][:result]).to eq "fail"
- expect(results[0][:resinfo][1][:reason]).to eq "bad signature"
- expect(results[0][:resinfo][1][:props][0][:ptype]).to eq "header"
- expect(results[0][:resinfo][1][:props][0][:property]).to eq "i"
- expect(results[0][:resinfo][1][:props][0][:pvalue]).to eq "@newyork.example.com"
- expect(results[1][:authserv_id]).to eq "example.net"
- expect(results[1][:resinfo][0][:method]).to eq "dkim"
- expect(results[1][:resinfo][0][:result]).to eq "pass"
- expect(results[1][:resinfo][0][:reason]).to be nil
- expect(results[1][:resinfo][0][:props][0][:ptype]).to eq "header"
- expect(results[1][:resinfo][0][:props][0][:property]).to eq "i"
- expect(results[1][:resinfo][0][:props][0][:pvalue]).to eq "@newyork.example.com"
+ expect(results).to eq(
+ [
+ {
+ authserv_id: "example.com",
+ resinfo: [
+ resinfo(
+ "dkim",
+ "pass",
+ reason: "good signature",
+ ),
+ resinfo("dkim", "fail", "[email protected]", reason: "bad signature"),
+ ],
+ },
+ {
+ authserv_id: "example.net",
+ resinfo: [resinfo("dkim", "pass", "[email protected]")],
+ },
+ ],
+ )
end
it "parses 'Comment-Heavy Example' correctly" do
@@ -136,189 +140,89 @@ RSpec.describe Email::AuthenticationResults do
(this surprised me) = (as I wasn't expecting it) 1362471462
RAW
- expect(results[0][:authserv_id]).to eq "foo.example.net"
- expect(results[0][:resinfo][0][:method]).to eq "dkim"
- expect(results[0][:resinfo][0][:result]).to eq "fail"
- expect(results[0][:resinfo][0][:reason]).to be nil
- expect(results[0][:resinfo][0][:props][0][:ptype]).to eq "policy"
- expect(results[0][:resinfo][0][:props][0][:property]).to eq "expired"
- expect(results[0][:resinfo][0][:props][0][:pvalue]).to eq "1362471462"
- end
-
- it "doesn't mistake a method starting with 'none' for a no-result" do
- results = described_class.new("example.com; nonexistent=pass").results
- expect(results[0][:resinfo][0][:method]).to eq "nonexistent"
- end
-
- it "parses header with no props correctly" do
- results = described_class.new(" example.com; dmarc=pass").results
- expect(results[0][:authserv_id]).to eq "example.com"
- expect(results[0][:resinfo][0][:method]).to eq "dmarc"
- expect(results[0][:resinfo][0][:result]).to eq "pass"
- expect(results[0][:resinfo][0][:reason]).to be nil
- expect(results[0][:resinfo][0][:props]).to eq []
+ expect(results).to eq(
+ [
+ {
+ authserv_id: "foo.example.net",
+ resinfo: [resinfo("dkim", "fail", "policy.expired=1362471462")],
+ },
+ ],
+ )
end
- it "parses header with multiple props correctly" do
+ it "parses header with multiple props and quoted values correctly" do
results = described_class.new(<<~RAW).results
- mx.google.com;
- dkim=pass [email protected] header.s=20111006 header.b=URn9MW+F;
+ "mx.google.com";
+ dkim=pass [email protected] header.s=20111006 header.b="URn9MW+F" (comment);
spf=pass (google.com: domain of [email protected] designates 1.2.3.4 as permitted sender) [email protected];
dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=email.example.com
RAW
- expect(results[0][:authserv_id]).to eq "mx.google.com"
- expect(results[0][:resinfo][0][:method]).to eq "dkim"
- expect(results[0][:resinfo][0][:result]).to eq "pass"
- expect(results[0][:resinfo][0][:reason]).to be nil
- expect(results[0][:resinfo][0][:props][0][:ptype]).to eq "header"
- expect(results[0][:resinfo][0][:props][0][:property]).to eq "i"
- expect(results[0][:resinfo][0][:props][0][:pvalue]).to eq "@email.example.com"
- expect(results[0][:resinfo][0][:props][1][:ptype]).to eq "header"
- expect(results[0][:resinfo][0][:props][1][:property]).to eq "s"
- expect(results[0][:resinfo][0][:props][1][:pvalue]).to eq "20111006"
- expect(results[0][:resinfo][0][:props][2][:ptype]).to eq "header"
- expect(results[0][:resinfo][0][:props][2][:property]).to eq "b"
- expect(results[0][:resinfo][0][:props][2][:pvalue]).to eq "URn9MW+F"
- expect(results[0][:resinfo][1][:method]).to eq "spf"
- expect(results[0][:resinfo][1][:result]).to eq "pass"
- expect(results[0][:resinfo][1][:reason]).to be nil
- expect(results[0][:resinfo][1][:props][0][:ptype]).to eq "smtp"
- expect(results[0][:resinfo][1][:props][0][:property]).to eq "mailfrom"
- expect(results[0][:resinfo][1][:props][0][:pvalue]).to eq "[email protected]"
- expect(results[0][:resinfo][2][:method]).to eq "dmarc"
- expect(results[0][:resinfo][2][:result]).to eq "pass"
- expect(results[0][:resinfo][2][:reason]).to be nil
- expect(results[0][:resinfo][2][:props][0][:ptype]).to eq "header"
- expect(results[0][:resinfo][2][:props][0][:property]).to eq "from"
- expect(results[0][:resinfo][2][:props][0][:pvalue]).to eq "email.example.com"
+ expect(results).to eq(
+ [
+ {
+ authserv_id: "mx.google.com",
+ resinfo: [
+ resinfo(
+ "dkim",
+ "pass",
+ "header.s=20111006",
+ "header.b=URn9MW+F",
+ ),
+ resinfo("spf", "pass", "[email protected]"),
+ resinfo("dmarc", "pass", "header.from=email.example.com"),
+ ],
+ },
+ ],
+ )
end
- end
-
- describe "#verdict" do
- before { SiteSetting.email_in_authserv_id = "valid.com" }
- shared_examples "is verdict" do |verdict|
- it "is #{verdict}" do
- expect(described_class.new(headers).verdict).to eq verdict
- end
+ it "doesn't mistake a method starting with 'none' for a no-result" do
+ expect(described_class.new("example.com; nonexistent=pass").results).to eq(
+ [{ authserv_id: "example.com", resinfo: [resinfo("nonexistent", "pass")] }],
+ )
end
- context "with no authentication-results headers" do
- let(:headers) { "" }
+ it "only keeps results from the configured authserv-id" do
+ SiteSetting.email_in_authserv_id = "valid.com"
- it "is gray" do
- expect(described_class.new(headers).verdict).to eq :gray
- end
+ expect(
+ described_class.new(["valid.com; dmarc=pass", "invalid.com; dmarc=fail"]).results,
+ ).to eq([{ authserv_id: "valid.com", resinfo: [resinfo("dmarc", "pass")] }])
end
+ end
- context "with a single authentication-results header" do
- context "with a valid fail" do
- let(:headers) { "valid.com; dmarc=fail" }
-
- include_examples "is verdict", :fail
- end
-
- context "with a valid pass" do
- let(:headers) { "valid.com; dmarc=pass" }
-
- include_examples "is verdict", :pass
- end
-
- context "with a valid error" do
- let(:headers) { "valid.com; dmarc=error" }
-
- include_examples "is verdict", :gray
- end
-
- context "with a valid no-result" do
- let(:headers) { "valid.com; none" }
-
- include_examples "is verdict", :gray
- end
-
- context "with a valid versioned no-result" do
- let(:headers) { "valid.com 1; NONE (no checks run)" }
-
- include_examples "is verdict", :gray
- end
-
- context "with a fail following a misplaced 'none'" do
- let(:headers) { "valid.com; none; dmarc=fail" }
-
- include_examples "is verdict", :fail
- end
-
- context "with no email_in_authserv_id set" do
- before { SiteSetting.email_in_authserv_id = "" }
-
- context "with a fail" do
- let(:headers) { "foobar.com; dmarc=fail" }
-
- include_examples "is verdict", :gray
- end
-
- context "with a pass" do
- let(:headers) { "foobar.com; dmarc=pass" }
-
- include_examples "is verdict", :gray
- end
- end
- end
-
- context "with multiple authentication-results headers" do
- context "with a valid fail, and an invalid pass" do
- let(:headers) { ["valid.com; dmarc=fail", "invalid.com; dmarc=pass"] }
-
- include_examples "is verdict", :fail
- end
-
- context "with a valid fail, and a valid pass" do
- let(:headers) { ["valid.com; dmarc=fail", "valid.com; dmarc=pass"] }
-
- include_examples "is verdict", :fail
- end
-
- context "with a valid fail, and a valid no-result" do
- let(:headers) { ["valid.com; dmarc=fail", "valid.com; none"] }
-
- include_examples "is verdict", :fail
- end
-
- context "with a valid error, and a valid pass" do
- let(:headers) { ["valid.com; dmarc=foobar", "valid.com; dmarc=pass"] }
-
- include_examples "is verdict", :pass
- end
-
- context "with no email_in_authserv_id set" do
- before { SiteSetting.email_in_authserv_id = "" }
-
- context "with an error, and a pass" do
- let(:headers) { ["foobar.com; dmarc=foobar", "foobar.com; dmarc=pass"] }
+ describe "#verdict and #action" do
+ before { SiteSetting.email_in_authserv_id = "valid.com" }
- include_examples "is verdict", :gray
- end
+ {
+ "" => %i[gray accept],
+ "valid.com; dmarc=pass" => %i[pass accept],
+ "valid.com; dmarc=fail" => %i[fail enqueue],
+ "valid.com; DMARC=Fail" => %i[fail enqueue],
+ "valid.com; dmarc=error" => %i[gray accept],
+ "valid.com; none" => %i[gray accept],
+ "valid.com 1; NONE (no checks run)" => %i[gray accept],
+ "valid.com; none (a=b; dmarc=fail)" => %i[gray accept],
+ "valid.com; none; dmarc=fail" => %i[fail enqueue],
+ ["valid.com; dmarc=pass", "invalid.com; dmarc=fail"] => %i[pass accept],
+ ["valid.com; dmarc=fail", "valid.com; dmarc=pass"] => %i[fail enqueue],
+ ["valid.com; dmarc=fail", "valid.com; none"] => %i[fail enqueue],
+ ["valid.com; dmarc=foobar", "valid.com; dmarc=pass"] => %i[pass accept],
+ }.each do |headers, (verdict, action)|
+ it "is #{verdict} and #{action}s #{headers.inspect}" do
+ results = described_class.new(headers)
+ expect(results.verdict).to eq(verdict)
+ expect(results.action).to eq(action)
end
end
- end
- describe "#action" do
- it "enqueues a fail verdict" do
- results = described_class.new("")
- results.expects(:verdict).returns(:fail)
- expect(results.action).to eq(:enqueue)
- end
-
- it "accepts a pass verdict" do
- results = described_class.new("")
- results.expects(:verdict).returns(:pass)
- expect(results.action).to eq(:accept)
- end
+ it "is gray without a configured authserv-id" do
+ SiteSetting.email_in_authserv_id = ""
- it "accepts a gray verdict" do
- results = described_class.new("")
- results.expects(:verdict).returns(:gray)
+ results = described_class.new("foobar.com; dmarc=fail")
+ expect(results.verdict).to eq(:gray)
expect(results.action).to eq(:accept)
end
end
diff --git a/spec/lib/email/receiver_spec.rb b/spec/lib/email/receiver_spec.rb
index f0cd64b6ba5..d0388eaa0ea 100644
--- a/spec/lib/email/receiver_spec.rb
+++ b/spec/lib/email/receiver_spec.rb
@@ -826,93 +826,51 @@ RSpec.describe Email::Receiver do
expect(handler_calls).to eq(1)
end
- it "creates visible topic for ham" do
- SiteSetting.email_in_spam_header = "none"
-
- Fabricate(
- :user,
- email: "[email protected]",
- trust_level: TrustLevel[2],
- refresh_auto_groups: true,
- )
- expect { process(:existing_user) }.to change { Topic.count }.by(1) # Topic created
-
- topic = Topic.last
- expect(topic.visible).to eq(true)
-
- post = Post.last
- expect(post.hidden).to eq(false)
- expect(post.hidden_at).to eq(nil)
- expect(post.hidden_reason_id).to eq(nil)
- end
-
- it "creates hidden topic for X-Spam-Flag" do
- SiteSetting.email_in_spam_header = "X-Spam-Flag"
-
- user =
+ context "with spam and Authentication-Results headers" do
+ fab!(:user) do
Fabricate(
:user,
trust_level: TrustLevel[2],
refresh_auto_groups: true,
)
- expect { process(:spam_x_spam_flag) }.to change { ReviewableQueuedPost.count }.by(1)
- expect(user.reload.silenced?).to be(true)
- end
+ end
- it "creates hidden topic for X-Spam-Status" do
- SiteSetting.email_in_spam_header = "X-Spam-Status"
+ it "creates visible topic for ham" do
+ SiteSetting.email_in_spam_header = "none"
- user =
- Fabricate(
- :user,
- email: "[email protected]",
- trust_level: TrustLevel[2],
- refresh_auto_groups: true,
- )
- expect { process(:spam_x_spam_status) }.to change { ReviewableQueuedPost.count }.by(1)
- expect(user.reload.silenced?).to be(true)
- end
+ expect { process(:existing_user) }.to change { Topic.count }.by(1)
+
+ expect(Topic.last.visible).to eq(true)
+ expect(Post.last).to have_attributes(hidden: false, hidden_at: nil, hidden_reason_id: nil)
+ end
- it "creates hidden topic for X-SES-Spam-Verdict" do
- SiteSetting.email_in_spam_header = "X-SES-Spam-Verdict"
+ {
+ "X-Spam-Flag" => :spam_x_spam_flag,
+ "X-Spam-Status" => :spam_x_spam_status,
+ "X-SES-Spam-Verdict" => :spam_x_ses_spam_verdict,
+ }.each do |header, fixture|
+ it "enqueues the post and silences the user for #{header}" do
+ SiteSetting.email_in_spam_header = header
- user =
- Fabricate(
- :user,
- email: "[email protected]",
- trust_level: TrustLevel[2],
- refresh_auto_groups: true,
- )
- expect { process(:spam_x_ses_spam_verdict) }.to change { ReviewableQueuedPost.count }.by(1)
- expect(user.reload.silenced?).to be(true)
- end
+ expect { process(fixture) }.to change { ReviewableQueuedPost.count }.by(1)
+ expect(user.reload.silenced?).to be(true)
+ end
+ end
- it "creates hidden topic for failed Authentication-Results header" do
- SiteSetting.email_in_authserv_id = "example.com"
+ it "enqueues the post for a failed Authentication-Results header" do
+ SiteSetting.email_in_authserv_id = "example.com"
- user =
- Fabricate(
- :user,
- email: "[email protected]",
- trust_level: TrustLevel[2],
- refresh_auto_groups: true,
- )
- expect { process(:dmarc_fail) }.to change { ReviewableQueuedPost.count }.by(1)
- expect(user.reload.silenced?).to be(false)
- end
+ expect { process(:dmarc_fail) }.to change { ReviewableQueuedPost.count }.by(1)
+ expect(user.reload.silenced?).to be(false)
+ end
- it "enqueues the post when evaluating the Authentication-Results header fails" do
- Email::AuthenticationResults.any_instance.stubs(:action).raises(StandardError)
- Discourse.expects(:warn_exception).once
+ it "enqueues the post when evaluating the Authentication-Results header fails" do
+ Email::AuthenticationResults.any_instance.stubs(:action).raises(StandardError)
+ Discourse.expects(:warn_exception).once
- Fabricate(
- :user,
- email: "[email protected]",
- trust_level: TrustLevel[2],
- refresh_auto_groups: true,
- )
- expect { process(:existing_user) }.to change { ReviewableQueuedPost.count }.by(1)
+ expect { process(:existing_user) }.to change { ReviewableQueuedPost.count }.by(1)
+ end
end
it "adds the 'elided' part of the original message when always_show_trimmed_content is enabled" do