Merge pull request #172 from nobu/more-checks-in-email_regexp

nobu · web-flow · commit 0abac721d8fe · 2025-07-12T16:07:00.000+09:00
More checks in `EMAIL_REGEXP`
diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb
@@ -52,7 +52,7 @@ class MailTo < Generic
     HEADER_REGEXP  = /\A(?<hfield>(?:%\h\h|[!$'-.0-;@-Z_a-z~])*=(?:%\h\h|[!$'-.0-;@-Z_a-z~])*)(?:&\g<hfield>)*\z/
     # practical regexp for email address
     # https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
-    EMAIL_REGEXP = /\A(?!\.)[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])?)*\z/
+    EMAIL_REGEXP = /\A(?!\.)(?!.*\.{2})[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])?)*\z/
     # :startdoc:
 
     #
diff --git a/test/uri/test_mailto.rb b/test/uri/test_mailto.rb
@@ -165,6 +165,49 @@ def test_check_to
     assert_raise(URI::InvalidComponentError) do
       u.to = 'n.@invalid.email'
     end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'n..t@invalid.email'
+    end
+
+    # Invalid host emails
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@.invalid.email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid.email.'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid..email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@-invalid.email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid-.email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid.-email'
+    end
+
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid.email-'
+    end
+
+    u.to = 'a@'+'invalid'.ljust(63, 'd')+'.email'
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@'+'invalid'.ljust(64, 'd')+'.email'
+    end
+
+    u.to = 'a@invalid.'+'email'.rjust(63, 'e')
+    assert_raise(URI::InvalidComponentError) do
+      u.to = 'a@invalid.'+'email'.rjust(64, 'e')
+    end
   end
 
   def test_to_s

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class MailTo < Generic`
`52`	`52`	`HEADER_REGEXP = /\A(?<hfield>(?:%\h\h\|[!$'-.0-;@-Z_a-z~])=(?:%\h\h\|[!$'-.0-;@-Z_a-z~]))(?:&\g<hfield>)*\z/`
`53`	`53`	`# practical regexp for email address`
`54`	`54`	`# https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address`
`55`		- EMAIL_REGEXP = /\A(?!\.)[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])?)\z/
	`55`	+ EMAIL_REGEXP = /\A(?!\.)(?!.\.{2})[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])?)*\z/
`56`	`56`	`# :startdoc:`
`57`	`57`
`58`	`58`	`#`