Ensure whole string is valid email

siemensikkema · siemensikkema · commit 1f07ec099360 · 2019-09-04T15:08:26.000+02:00
diff --git a/Sources/Validation/Convenience/Email.swift b/Sources/Validation/Convenience/Email.swift
@@ -3,11 +3,14 @@ import Foundation
 public struct EmailValidator: Validator {
 
     public init() {}
-	private let pattern = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}"
+	private let pattern = "[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,64}"
 
 
     public func validate(_ input: String) throws {
-    	guard input.range(of: pattern, options: [.regularExpression, .caseInsensitive]) != nil else {
+    	guard
+            let range = input.range(of: pattern, options: [.regularExpression, .caseInsensitive]),
+            range.lowerBound == input.startIndex, range.upperBound == input.endIndex
+        else {
 			throw error("\(input) is not a valid email address")
 		}
     }
diff --git a/Tests/ValidationTests/ValidationTests.swift b/Tests/ValidationTests/ValidationTests.swift
@@ -84,9 +84,11 @@ class ValidationTests: XCTestCase {
         XCTAssertTrue("f@b.co".passes(EmailValidator()))
         XCTAssertTrue("foo@bar.com".passes(EmailValidator()))
         XCTAssertTrue("SOMETHING@SOMETHING.SOMETHING".passes(EmailValidator()))
-        XCTAssertTrue("foo!-bar!-baz@foo.bar".passes(EmailValidator()))
+        XCTAssertTrue("foo-bar-baz@foo.bar".passes(EmailValidator()))
         XCTAssertFalse("f@b.".passes(EmailValidator()))
         XCTAssertFalse("æøå@gmail.com".passes(EmailValidator()))
+        XCTAssertFalse(">a@b.co".passes(EmailValidator()))
+        XCTAssertFalse("a@b.co<".passes(EmailValidator()))
     }
 
     func testValidHexadecimal() {

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,14 @@ import Foundation`
`3`	`3`	`public struct EmailValidator: Validator {`
`4`	`4`
`5`	`5`	`public init() {}`
`6`		`- private let pattern = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,64}"`
	`6`	`+ private let pattern = "[A-Z0-9._%+-]+@[A-Z0-9.-]+\\.[A-Z]{2,64}"`
`7`	`7`
`8`	`8`
`9`	`9`	`public func validate(_ input: String) throws {`
`10`		`- guard input.range(of: pattern, options: [.regularExpression, .caseInsensitive]) != nil else {`
	`10`	`+ guard`
	`11`	`+ let range = input.range(of: pattern, options: [.regularExpression, .caseInsensitive]),`
	`12`	`+ range.lowerBound == input.startIndex, range.upperBound == input.endIndex`
	`13`	`+ else {`
`11`	`14`	`throw error("\(input) is not a valid email address")`
`12`	`15`	`}`
`13`	`16`	`}`
-Original file line number
+Diff line change
         XCTAssertTrue("[email protected]".passes(EmailValidator()))
         XCTAssertTrue("[email protected]".passes(EmailValidator()))
         XCTAssertTrue("[email protected]".passes(EmailValidator()))
 -        XCTAssertTrue("foo!-bar![email protected]".passes(EmailValidator()))
 +        XCTAssertTrue("[email protected]".passes(EmailValidator()))
         XCTAssertFalse("f@b.".passes(EmailValidator()))
         XCTAssertFalse("æøå@gmail.com".passes(EmailValidator()))
 +        XCTAssertFalse(">[email protected]".passes(EmailValidator()))
 +        XCTAssertFalse("[email protected]<".passes(EmailValidator()))
+    }
     func testValidHexadecimal() {