Made change to each file to allow Validator.Email support emails with apostrophes included.

jtmelton · jtmelton · commit d8a3c2ee7c0f · 2010-11-04T02:46:54.000Z
diff --git a/configuration/.esapi/validation.properties b/configuration/.esapi/validation.properties
@@ -21,7 +21,7 @@
 #    someObject.setEmail(ESAPI.validator().getValidInput("User Email", input, "Email", maxLength, allowNull));
 #
 Validator.SafeString=^[.\\p{Alnum}\\p{Space}]{0,1024}$
-Validator.Email=^[A-Za-z0-9._%-]+@[A-Za-z0-9.-]+\\.[a-zA-Z]{2,4}$
+Validator.Email=^[A-Za-z0-9._%-']+@[A-Za-z0-9.-]+\\.[a-zA-Z]{2,4}$
 Validator.IPAddress=^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
 Validator.URL=^(ht|f)tp(s?)\\:\\/\\/[0-9a-zA-Z]([-.\\w]*[0-9a-zA-Z])*(:(0-9)*)*(\\/?)([a-zA-Z0-9\\-\\.\\?\\,\\:\\'\\/\\\\\\+=&amp;%\\$#_]*)?$
 Validator.CreditCard=^(\\d{4}[- ]?){3}\\d{4}$
diff --git a/src/test/resources/.esapi/validation.properties b/src/test/resources/.esapi/validation.properties
@@ -21,7 +21,7 @@
 #    someObject.setEmail(ESAPI.validator().getValidInput("User Email", input, "Email", maxLength, allowNull));
 #
 Validator.SafeString=^[.\\p{Alnum}\\p{Space}]{0,1024}$
-Validator.Email=^[A-Za-z0-9._%-]+@[A-Za-z0-9.-]+\\.[a-zA-Z]{2,4}$
+Validator.Email=^[A-Za-z0-9._%-']+@[A-Za-z0-9.-]+\\.[a-zA-Z]{2,4}$
 Validator.IPAddress=^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$
 Validator.URL=^(ht|f)tp(s?)\\:\\/\\/[0-9a-zA-Z]([-.\\w]*[0-9a-zA-Z])*(:(0-9)*)*(\\/?)([a-zA-Z0-9\\-\\.\\?\\,\\:\\'\\/\\\\\\+=&amp;%\\$#_]*)?$
 Validator.CreditCard=^(\\d{4}[- ]?){3}\\d{4}$

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`# someObject.setEmail(ESAPI.validator().getValidInput("User Email", input, "Email", maxLength, allowNull));`
`22`	`22`	`#`
`23`	`23`	`Validator.SafeString=^[.\\p{Alnum}\\p{Space}]{0,1024}$`
`24`		`-Validator.Email=^[A-Za-z0-9._%-]+@[A-Za-z0-9.-]+\\.[a-zA-Z]{2,4}$`
	`24`	`+Validator.Email=^[A-Za-z0-9._%-']+@[A-Za-z0-9.-]+\\.[a-zA-Z]{2,4}$`
`25`	`25`	`Validator.IPAddress=^(?:(?:25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]\|2[0-4][0-9]\|[01]?[0-9][0-9]?)$`
`26`	`26`	`Validator.URL=^(ht\|f)tp(s?)\\:\\/\\/[0-9a-zA-Z]([-.\\w][0-9a-zA-Z])(:(0-9))(\\/?)([a-zA-Z0-9\\-\\.\\?\\,\\:\\'\\/\\\\\\+=&%\\$#_]*)?$`
`27`	`27`	`Validator.CreditCard=^(\\d{4}[- ]?){3}\\d{4}$`