cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change validation to accept only single email values

Browse source
This commit is contained in:
Boubacar 2020-02-19 23:44:40 -05:00
parent 2cfd5b97a8
commit 5d7b09e3bd
2 changed files with 51 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

38
app/helpers/browse_tags_helper.rb
View file

@ -21,12 +21,8 @@ module BrowseTagsHelper
link_to h(wmc[:title]), wmc[:url], :title => t("browse.tag_details.wikimedia_commons_link", :page => wmc[:title])
elsif url = wiki_link("tag", "#{key}=#{value}")
link_to h(value), url, :title => t("browse.tag_details.wiki_link.tag", :key => key, :value => value)
elsif emails = email_links(key, value)
# similarly, email_links() returns an array of emails
emails = emails.map do |e|
link_to(h(e[:email]), e[:url], :title => t("browse.tag_details.email_link", :email => e[:email]))
end
safe_join(emails, "; ")
elsif email = email_link(key, value)
link_to(h(email[:email]), email[:url], :title => t("browse.tag_details.email_link", :email => email[:email]))
elsif phones = telephone_links(key, value)
# similarly, telephone_links() returns an array of phone numbers
phones = phones.map do |p|
@ -129,26 +125,22 @@ module BrowseTagsHelper
nil
end
def email_links(_key, value)
# Does value look like an email? eg "someone@domain.tld"
# or a list of alternate emails separated by ;
def email_link(_key, value)
# Does the value look like an email? eg "someone@domain.tld"
# Uses WHATWG implementation of email validation, which follows RFC 1123
# but is a willful violation of RFC 5322.
# (see: https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address)
if value.match?(%r{^\s*[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+
@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*\s*
(;\s*[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+
@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*\s*)*$
}x)
return value.split(";").map do |email|
# remove any leading or trailing whitespace if present
email = email.strip
# Uses Ruby built-in regexp to validate email.
# This will not catch certain valid emails containing comments, whitespace characters,
# and quoted strings.
# (see: https://github.com/ruby/ruby/blob/master/lib/uri/mailto.rb)
# add 'mailto:'' prefix
{ :email => email, :url => "mailto:#{email}" }
end
# remove any leading and trailing whitespace
email = value.strip
if email.match?(URI::MailTo::EMAIL_REGEXP)
# add 'mailto:'' prefix
return { :email => email, :url => "mailto:#{email}" }
end
nil
end

93
test/helpers/browse_tags_helper_test.rb
View file

@ -221,76 +221,55 @@ class BrowseTagsHelperTest < ActionView::TestCase
assert_nil link
end
def test_email_links
links = email_links("foo", "Test")
assert_nil links
def test_email_link
email = email_link("foo", "Test")
assert_nil email
links = email_links("email", "123")
assert_nil links
email = email_link("email", "123")
assert_nil email
links = email_links("email", "Abc.example.com")
assert_nil links
email = email_link("email", "Abc.example.com")
assert_nil email
links = email_links("email", "a@b@c.com")
assert_nil links
email = email_link("email", "a@b@c.com")
assert_nil email
links = email_links("email", "123 abcdefg@space.com")
assert_nil links
email = email_link("email", "just\"not\"right@example.com")
assert_nil email
links = email_links("email", "test@ abc")
assert_nil links
email = email_link("email", "123 abcdefg@space.com")
assert_nil email
links = email_links("email", "just\"not\"right@example.com")
assert_nil links
email = email_link("email", "test@ abc")
assert_nil email
# If multiple emails are listed, all must be valid
links = email_links("email", "very.common@test.com; a@b@c.com")
assert_nil links
email = email_link("email", "using;semicolon@test.com")
assert_nil email
links = email_links("email", "x@example.com")
assert_equal 1, links.length
assert_equal "x@example.com", links[0][:email]
assert_equal "mailto:x@example.com", links[0][:url]
email = email_link("email", "x@example.com")
assert_equal "x@example.com", email[:email]
assert_equal "mailto:x@example.com", email[:url]
links = email_links("email", "other.email-with-hyphen@example.com")
assert_equal 1, links.length
assert_equal "other.email-with-hyphen@example.com", links[0][:email]
assert_equal "mailto:other.email-with-hyphen@example.com", links[0][:url]
email = email_link("email", "other.email-with-hyphen@example.com")
assert_equal "other.email-with-hyphen@example.com", email[:email]
assert_equal "mailto:other.email-with-hyphen@example.com", email[:url]
links = email_links("email", "user.name+tag+sorting@example.com")
assert_equal 1, links.length
assert_equal "user.name+tag+sorting@example.com", links[0][:email]
assert_equal "mailto:user.name+tag+sorting@example.com", links[0][:url]
email = email_link("email", "user.name+tag+sorting@example.com")
assert_equal "user.name+tag+sorting@example.com", email[:email]
assert_equal "mailto:user.name+tag+sorting@example.com", email[:url]
links = email_links("email", "dash-in@both-parts.com")
assert_equal 1, links.length
assert_equal "dash-in@both-parts.com", links[0][:email]
assert_equal "mailto:dash-in@both-parts.com", links[0][:url]
email = email_link("email", "dash-in@both-parts.com")
assert_equal "dash-in@both-parts.com", email[:email]
assert_equal "mailto:dash-in@both-parts.com", email[:url]
links = email_links("email", " test@email.com ")
assert_equal 1, links.length
assert_equal "test@email.com", links[0][:email]
assert_equal "mailto:test@email.com", links[0][:url]
email = email_link("email", "example@s.example")
assert_equal "example@s.example", email[:email]
assert_equal "mailto:example@s.example", email[:url]
links = email_links("email", "example@s.example")
assert_equal 1, links.length
assert_equal "example@s.example", links[0][:email]
assert_equal "mailto:example@s.example", links[0][:url]
# Multiple valid phone numbers separated by ;
links = email_links("email", "test@email.com; example@s.example")
assert_equal 2, links.length
assert_equal "test@email.com", links[0][:email]
assert_equal "mailto:test@email.com", links[0][:url]
assert_equal "example@s.example", links[1][:email]
assert_equal "mailto:example@s.example", links[1][:url]
links = email_links("email", "x@example.com ; dash-in@both-parts.com ")
assert_equal 2, links.length
assert_equal "x@example.com", links[0][:email]
assert_equal "mailto:x@example.com", links[0][:url]
assert_equal "dash-in@both-parts.com", links[1][:email]
assert_equal "mailto:dash-in@both-parts.com", links[1][:url]
# Strips whitespace at ends
email = email_link("email", " test@email.com ")
assert_equal "test@email.com", email[:email]
assert_equal "mailto:test@email.com", email[:url]
end
def test_telephone_links