Read about our upcoming Code of Conduct on this issue

Commit f2e6dcd8 authored by Kamil Trzciński's avatar Kamil Trzciński
Browse files

Merge branch 'ccr/regexp_anchor' into 'master'

Add anchor for incoming email regex, closes 44989

See merge request gitlab-org/gitlab-ce!18917
title: Add anchor for incoming email regex
merge_request: !18917
type: added
......@@ -57,7 +57,7 @@ def address_regex
regex = Regexp.escape(wildcard_address)
regex = regex.sub(Regexp.escape(WILDCARD_PLACEHOLDER), '(.+)')
Regexp.new(regex).freeze
Regexp.new(/\A#{regex}\z/).freeze
end
end
end
......
......@@ -83,6 +83,10 @@
it "returns reply key" do
expect(described_class.key_from_address("replies+key@example.com")).to eq("key")
end
it 'does not match emails with extra bits' do
expect(described_class.key_from_address('somereplies+somekey@example.com.someotherdomain.com')).to be nil
end
end
context 'self.key_from_fallback_message_id' do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment