[james-jdkim] branch master updated: Fix FWS is not trimmed correctly

[matthieu]

This is an automated email from the ASF dual-hosted git repository.

matthieu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-jdkim.git


The following commit(s) were added to refs/heads/master by this push:
     new 071ad1f  Fix FWS is not trimmed correctly
     new 008af18  Merge pull request #8 from Weiling-Liao/master
071ad1f is described below

commit 071ad1f266e95018aa38f933e0daa79e9c73ed6c
Author: Weiling Liao <weiling.l...@oath.com>
AuthorDate: Fri Jun 21 14:24:54 2019 -0700

    Fix FWS is not trimmed correctly
---
 main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java     | 2 +-
 main/src/test/java/org/apache/james/jdkim/tagvalue/TagValueTest.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java 
b/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
index 946c1d1..146dabb 100644
--- a/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
+++ b/main/src/main/java/org/apache/james/jdkim/tagvalue/TagValue.java
@@ -83,7 +83,7 @@ public class TagValue {
         while (tStart < tStop
                 && (data.charAt(tStop) == ' ' || data.charAt(tStop) == '\t')) {
             tStop--;
-            if ((tStart <= tStop - 1 && data.charAt(tStop) == '\n' && data
+            while ((tStart <= tStop - 1 && data.charAt(tStop) == '\n' && data
                     .charAt(tStop - 1) == '\r')
                     || (tStart < tStop && (data.charAt(tStop) == ' ' || data
                             .charAt(tStop) == '\t'))) {
diff --git 
a/main/src/test/java/org/apache/james/jdkim/tagvalue/TagValueTest.java 
b/main/src/test/java/org/apache/james/jdkim/tagvalue/TagValueTest.java
index 5b2e1a4..e0ccd7e 100644
--- a/main/src/test/java/org/apache/james/jdkim/tagvalue/TagValueTest.java
+++ b/main/src/test/java/org/apache/james/jdkim/tagvalue/TagValueTest.java
@@ -73,7 +73,7 @@ public class TagValueTest {
     @Test
     public void testInvalidFWSSyntax() {
         try {
-            new TagValue("p=test \r\n\r\n ");
+            new TagValue("p=test \r\n\r\n");
             Assert.fail("expecting WSP after CRLF to handle it as FWS");
         } catch (IllegalStateException e) {
         }
@@ -122,6 +122,8 @@ public class TagValueTest {
                 "p=ciao;s=cips;v=DKIM1;"));
         Assert.assertTrue(tagValuesEquals("p\r\n = ciao; s=cips\r\n\t; 
v=DKIM1;",
                 "p=ciao;s=cips;v=DKIM1;"));
+        Assert.assertTrue(tagValuesEquals("p=ciao\r\n\r\n  ; \r\n   
s=cips\r\n\t; v=DKIM1;",
+            "p=ciao;s=cips;v=DKIM1;"));
     }
 
     @Test


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org