fromUrlEncoded to handle input not starting with ?

jalauros · jalauros · commit dd0e6ee6889f · 2018-10-23T15:19:26.000+03:00
diff --git a/src/main/java/org/oidc/msg/AbstractMessage.java b/src/main/java/org/oidc/msg/AbstractMessage.java
@@ -106,7 +106,8 @@ public void fromUrlEncoded(String input) throws MalformedURLException, Deseriali
       return;
     }
     StringBuilder jsonBuilder = new StringBuilder("{ ");
-    StringTokenizer paramTokenizer = new StringTokenizer(input.substring(1), "&");
+    StringTokenizer paramTokenizer = new StringTokenizer(
+        input.substring(input.startsWith("?") ? 1 : 0), "&");
     while (paramTokenizer.hasMoreTokens()) {
       String pair = paramTokenizer.nextToken();
       StringTokenizer pairTokenizer = new StringTokenizer(pair, "=");
diff --git a/src/test/java/org/oidc/msg/AbstractMessageTest.java b/src/test/java/org/oidc/msg/AbstractMessageTest.java
@@ -32,6 +32,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.io.IOException;
 import java.lang.reflect.Array;
+import java.net.MalformedURLException;
 import java.security.interfaces.RSAPublicKey;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -55,6 +56,17 @@ public void setUp() throws Exception {
     message = new MockMessage();
   }
 
+  @Test
+  public void fromUrlEncodedRemoveQuestionMark()
+      throws MalformedURLException, DeserializationException {
+    MockMessage pcr = new MockMessage();
+    pcr.fromUrlEncoded("?key1=value1&key2=value2");
+    Assert.assertEquals("value1", pcr.getClaims().get("key1"));
+    Assert.assertEquals("value2", pcr.getClaims().get("key2"));
+    pcr.fromUrlEncoded("key1=value1&key2=value2");
+    Assert.assertEquals("value1", pcr.getClaims().get("key1"));
+    Assert.assertEquals("value2", pcr.getClaims().get("key2"));
+  }
   
   @Test
   public void testToAndFromUrlEncoded() throws Exception {
