version 0.3.0

README.md

@@ -118,5 +118,19 @@ const adjusted = adjuster.adjustData(inputData, adjusters);
 
 ## Release notes
 
+* 2018/04/22 *version 0.3.0*
+    * Bugfixes
+        * quoted-pair of email
+        * import error in `EmailAdjuster.es`
+    * Change Specifications
+        * limit the length of local/domain part of email
+
+* 2018/04/21 *version 0.2.0*
+    * Bugfixes
+        * test error on npm@5
+    * Change Specifications
+        * enable to specify value to `allowEmpty()`
+        * support IPv6 domain for `EmailAdjuster`
+
 * 2018/04/18 *version 0.1.0*
     * First release.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "adjuster",
   "description": "validate and adjust input values",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "author": "shimataro",
   "license": "MIT",
   "repository": {

src/libs/EmailAdjuster.es

@@ -1,8 +1,11 @@
 import {CAUSE} from "./constants";
 import AdjusterInterface from "./AdjusterInterface";
+import AdjusterError from "./AdjusterError";
 import StringAdjuster from "./StringAdjuster";
 
-const MAX_LENGTH = 254;
+const MAX_LENGTH_LOCAL = 64;
+const MAX_LENGTH_DOMAIN = 255;
+const MAX_LENGTH = MAX_LENGTH_LOCAL + 1 + MAX_LENGTH_DOMAIN; // local-part + "@" + domain-part
 
 // https://tools.ietf.org/html/rfc5321
 // https://tools.ietf.org/html/rfc5322
@@ -14,7 +17,7 @@ const REGEXP_CHARSET_IPV4 = "\\d";
 const REGEXP_CHARSET_IPV6 = "[\\da-fA-F]";
 
 const REGEXP_COMPONENT_DOT = `${REGEXP_CHARSET_DOT}+`;
-const REGEXP_COMPONENT_QUOTED = `(${REGEXP_CHARSET_QUOTED}|\\\\|\\")+`;
+const REGEXP_COMPONENT_QUOTED = `(${REGEXP_CHARSET_QUOTED}|\\\\[\\\\"])+`;
 const REGEXP_COMPONENT_TLD = `${REGEXP_CHARSET_TLD}+`;
 const REGEXP_COMPONENT_SLD = `${REGEXP_CHARSET_SLD}+`;
 const REGEXP_COMPONENT_IPV4 = `${REGEXP_CHARSET_IPV4}{1,3}`;
@@ -95,7 +98,21 @@ export default class EmailAdjuster extends AdjusterInterface
 	{
 		try
 		{
-			return this._objAdjuster.adjust(value);
+			const adjusted = this._objAdjuster.adjust(value);
+
+			const atPosition = adjusted.lastIndexOf("@");
+			if(atPosition > MAX_LENGTH_LOCAL)
+			{
+				// local-part length error
+				throw new AdjusterError(CAUSE.MAX_LENGTH, value);
+			}
+			if(adjusted.length - atPosition - 1 > MAX_LENGTH_DOMAIN)
+			{
+				// domain-part length error
+				throw new AdjusterError(CAUSE.MAX_LENGTH, value);
+			}
+
+			return adjusted;
 		}
 		catch(err)
 		{

test/libs/EmailAdjuster.test.es

@@ -6,6 +6,7 @@ import EmailAdjuster from "libs/EmailAdjuster";
 	describe("default", testDefault);
 	describe("empty", testEmpty);
 	describe("allowEmpty", testAllowEmpty);
+	describe("maxLength", testMaxLength);
 	describe("pattern", testPattern);
 	describe("email", testEmail);
 }
@@ -52,6 +53,39 @@ function testAllowEmpty()
 	});
 }
 
+function testMaxLength()
+{
+	const objEmailAdjuster = new EmailAdjuster();
+	it("should be OK", () =>
+	{
+		const values = [
+			"1234567890123456789012345678901234567890123456789012345678901234@example.com",
+			"user@12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901.com",
+			"1234567890123456789012345678901234567890123456789012345678901234@12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901.com",
+		];
+		for(const value of values)
+		{
+			expect(objEmailAdjuster.adjust(value)).toEqual(value);
+		}
+	});
+	it("should cause error(s)", () =>
+	{
+		const values = [
+			"12345678901234567890123456789012345678901234567890123456789012345@example.com",
+			"user@123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012.com",
+			"12345678901234567890123456789012345678901234567890123456789012345@12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901.com",
+			"1234567890123456789012345678901234567890123456789012345678901234@123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012.com",
+		];
+		for(const value of values)
+		{
+			expect(() =>
+			{
+				objEmailAdjuster.adjust(value);
+			}).toThrow(CAUSE.MAX_LENGTH);
+		}
+	});
+}
+
 function testPattern()
 {
 	const objEmailAdjuster = new EmailAdjuster().pattern(/^\w+@([\w-]+\.)+\w+$/);
@@ -81,9 +115,11 @@ function testEmail()
 			"user+mailbox/[email protected]",
 			"!#$%&'*+-/=?^_`.{|}[email protected]",
 
-			// quoted-pair
+			// quoted-string
 			"\"Fred\\\"Bloggs\"@example.com",
 			"\"Joe.\\\\Blow\"@example.com",
+			"\"...\"@example.com",
+			"\"(@_@) >_< ...(o;_;)o\"@example.com",
 
 			// domain
 			"[email protected]",