supports now token with more than 3 parts (jwe)

jalauros · jalauros · commit 3004eaca1c02 · 2018-10-31T19:51:07.000+02:00
diff --git a/src/main/java/org/oidc/msg/MessageUtil.java b/src/main/java/org/oidc/msg/MessageUtil.java
@@ -22,7 +22,7 @@
  * Collection of utility methods related to messages.
  */
 public final class MessageUtil {
-  
+
   private MessageUtil() {
     // no op
   }
@@ -32,7 +32,7 @@ private MessageUtil() {
    *
    * @param token
    *          the string to split.
-   * @return the array representing the 3 parts of the token.
+   * @return the array representing the 3or more parts of the token.
    * @throws JWTDecodeException
    *           if the Token doesn't have 3 parts.
    */
@@ -42,10 +42,11 @@ public static String[] splitToken(String token) throws JWTDecodeException {
       // Tokens with alg='none' have empty String as Signature.
       parts = new String[] { parts[0], parts[1], "" };
     }
-    if (parts.length != 3) {
-      throw new JWTDecodeException(
-          String.format("The token was expected to have 3 parts, but got %s.", parts.length));
+    if (parts.length < 3) {
+      throw new JWTDecodeException(String
+          .format("The token was expected to have atleast 3 parts, but got %s.", parts.length));
     }
+
     return parts;
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`* Collection of utility methods related to messages.`
`23`	`23`	`*/`
`24`	`24`	`public final class MessageUtil {`
`25`		`-`
	`25`	`+`
`26`	`26`	`private MessageUtil() {`
`27`	`27`	`// no op`
`28`	`28`	`}`
`@@ -32,7 +32,7 @@ private MessageUtil() {`
`32`	`32`	`*`
`33`	`33`	`* @param token`
`34`	`34`	`* the string to split.`
`35`		`- * @return the array representing the 3 parts of the token.`
	`35`	`+ * @return the array representing the 3or more parts of the token.`
`36`	`36`	`* @throws JWTDecodeException`
`37`	`37`	`* if the Token doesn't have 3 parts.`
`38`	`38`	`*/`
`@@ -42,10 +42,11 @@ public static String[] splitToken(String token) throws JWTDecodeException {`
`42`	`42`	`// Tokens with alg='none' have empty String as Signature.`
`43`	`43`	`parts = new String[] { parts[0], parts[1], "" };`
`44`	`44`	`}`
`45`		`- if (parts.length != 3) {`
`46`		`- throw new JWTDecodeException(`
`47`		`- String.format("The token was expected to have 3 parts, but got %s.", parts.length));`
	`45`	`+ if (parts.length < 3) {`
	`46`	`+ throw new JWTDecodeException(String`
	`47`	`+ .format("The token was expected to have atleast 3 parts, but got %s.", parts.length));`
`48`	`48`	`}`
	`49`	`+`
`49`	`50`	`return parts;`
`50`	`51`	`}`
`51`	`52`	`}`