Merge pull request #648 from nielsavonds/master

jknack · web-flow · commit 07af5baa1e3b · 2017-02-19T19:20:26.000+02:00
Fixed #647 - Crash when using CookieSessionManager with invalid cookie
diff --git a/jooby/src/main/java/org/jooby/internal/CookieSessionManager.java b/jooby/src/main/java/org/jooby/internal/CookieSessionManager.java
@@ -100,6 +100,9 @@ public Definition cookie() {
 
   private Map<String, String> attributes(final String raw) {
     String unsigned = Cookie.Signature.unsign(raw, secret);
+    if (unsigned == null) {
+      return Collections.emptyMap();
+    }
     return Cookie.URL_DECODER.apply(unsigned);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,9 @@ public Definition cookie() {`
`100`	`100`
`101`	`101`	`private Map<String, String> attributes(final String raw) {`
`102`	`102`	`String unsigned = Cookie.Signature.unsign(raw, secret);`
	`103`	`+ if (unsigned == null) {`
	`104`	`+ return Collections.emptyMap();`
	`105`	`+ }`
`103`	`106`	`return Cookie.URL_DECODER.apply(unsigned);`
`104`	`107`	`}`
`105`	`108`