parenthesis control

Author: Eduardo Gulias Davis

src/main/java/emailvalidator4j/parser/DomainPart.java

@@ -52,6 +52,7 @@ public void parse(String domainPart) throws InvalidEmail {
     }
 
     private void doParseDomainPart() throws InvalidEmail {
+        int domainPartOpenedParenthesis = 0;
         do {
             if (this.lexer.getCurrent().equals(Tokens.SEMICOLON)) {
                 throw new ExpectedATEXT("Expected ATEXT");
@@ -65,7 +66,19 @@ private void doParseDomainPart() throws InvalidEmail {
                 }
 
                 this.parseComment();
+                domainPartOpenedParenthesis += getOpenedParenthesis();
                 this.lexer.next();
+                if (this.lexer.getPrevious().equals(Tokens.CLOSEPARENTHESIS)) {
+                    domainPartOpenedParenthesis--;
+                }
+
+            }
+
+            if (this.lexer.getCurrent().equals(Tokens.CLOSEPARENTHESIS)) {
+                if (domainPartOpenedParenthesis <= 0) {
+                    throw new UnclosedComment("Missing closing parenthesis");
+                }
+                domainPartOpenedParenthesis--;
             }
 
             this.checkConsecutiveDots();

src/main/java/emailvalidator4j/parser/LocalPart.java

@@ -22,6 +22,7 @@ final class LocalPart extends Parser {
     @Override
     public void parse(String localpart) throws InvalidEmail {
         lexer.lex(localpart);
+        int localPartOpenedParenthesis = 0;
         if (this.lexer.getCurrent().equals(Tokens.DOT)) {
             throw new DotAtStart("Found DOT at start");
         }
@@ -35,6 +36,14 @@ public void parse(String localpart) throws InvalidEmail {
 
             if (this.lexer.getCurrent().equals(Tokens.OPENPARETHESIS)) {
                 this.parseComment();
+                localPartOpenedParenthesis += getOpenedParenthesis();
+            }
+
+            if (this.lexer.getCurrent().equals(Tokens.CLOSEPARENTHESIS)) {
+                if(localPartOpenedParenthesis == 0) {
+                    throw new UnclosedComment("Missing closing parenthesis");
+                }
+                localPartOpenedParenthesis--;
             }
 
             this.checkConsecutiveDots();

src/main/java/emailvalidator4j/parser/Parser.java

@@ -12,6 +12,7 @@
 abstract class Parser {
     protected List<Warnings> warnings = new ArrayList<Warnings>();
     protected EmailLexer lexer;
+    protected int openedParenthesis = 0;
 
     public Parser(EmailLexer lexer) {
         this.lexer = lexer;
@@ -32,11 +33,19 @@ protected boolean escaped() {
         return this.lexer.getPrevious().equals(Tokens.BACKSLASH) && !this.lexer.getCurrent().equals(Tokens.get("GENERIC"));
     }
 
+    protected int getOpenedParenthesis() {
+        return this.openedParenthesis;
+    }
+
     protected void parseComment() throws InvalidEmail {
+        this.openedParenthesis = 1;
         this.checkUnclosedComment();
         this.warnings.add(Warnings.COMMENT);
 
         while (!this.lexer.getCurrent().equals(Tokens.CLOSEPARENTHESIS)) {
+            if (this.lexer.isNextToken(Tokens.OPENPARETHESIS)) {
+                this.openedParenthesis++;
+            }
             this.lexer.next();
         }
 

src/test/java/emailvalidator4j/EmailValidatorTest.java

@@ -52,7 +52,13 @@ public static Object[][] invalidEmailProvider() {
                 {"[email protected]  \r\n\r\n "},
                 {"test@iana/icann.org"},
                 {"test@foo;bar.com"},
-                {(char) 1 + "[email protected]"}
+                {(char) 1 + "[email protected]"},
+                {"comment)[email protected]"},
+                {"comment(example))@example.com"},
+                {"example@example)comment.com"},
+                {"example@example(comment)).com"},
+                {"example@(example))comment.com"}
+
         };
     }