fixing inconsistent behaviour of opengrok cookie

Author: tulinkry

src/org/opensolaris/opengrok/web/PageConfig.java

@@ -28,8 +28,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.URLDecoder;
 import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -742,7 +744,12 @@ public List<String> getCookieVals(String cookieName) {
         if (cookies != null) {
             for (int i = cookies.length - 1; i >= 0; i--) {
                 if (cookies[i].getName().equals(cookieName)) {
-                    splitByComma(cookies[i].getValue(), res);
+                    try {
+                        String value = URLDecoder.decode(cookies[i].getValue(), "utf-8");
+                        splitByComma(value, res);
+                    } catch (UnsupportedEncodingException ex) {
+                        log.log(Level.INFO, "decoding cookie failed", ex);
+                    }
                 }
             }
         }

web/list.jsp

@@ -21,14 +21,16 @@ CDDL HEADER END
 Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright 2011 Jens Elkner.
 
---%><%@page import="
+--%>
+<%@page import="
 java.io.BufferedInputStream,
 java.io.BufferedReader,
 java.io.FileInputStream,
 java.io.FileReader,
 java.io.InputStream,
 java.io.InputStreamReader,
 java.io.Reader,
+java.net.URLEncoder,
 java.util.ArrayList,
 java.util.Arrays,
 java.util.List,
@@ -92,8 +94,8 @@ document.pageReady.push(function() { pageReadyList();});
                 // update cookie
                 cookieValue = cookieValue.length() == 0
                     ? activeProject.getDescription()
-                    : activeProject.getDescription() + '/' + cookieValue;
-                Cookie cookie = new Cookie("OpenGrokProject", cookieValue);
+                    : activeProject.getDescription() + ',' + cookieValue;
+                Cookie cookie = new Cookie("OpenGrokProject", URLEncoder.encode(cookieValue, "utf-8"));
                 // TODO hmmm, projects.jspf doesn't set a path
                 cookie.setPath(request.getContextPath() + '/');
                 response.addCookie(cookie);

web/projects.jspf

@@ -18,10 +18,12 @@ information: Portions Copyright [yyyy] [name of copyright owner]
 
 CDDL HEADER END
 
-Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright 2011 Jens Elkner.
 
---%><%@page import="
+--%>
+<%@page import="
+java.net.URLEncoder,
 java.util.TreeSet,
 
 org.opensolaris.opengrok.web.Prefix,
@@ -40,7 +42,7 @@ org.opensolaris.opengrok.configuration.Project
 
     String projects = cfg.getRequestedProjectsAsString();
     if (projects.length() != 0) {
-        Cookie cookie = new Cookie("OpenGrokProject", projects);
+        Cookie cookie = new Cookie("OpenGrokProject", URLEncoder.encode(projects, "utf-8"));
         response.addCookie(cookie);
     }
 }

web/search.jsp

@@ -18,7 +18,7 @@ information: Portions Copyright [yyyy] [name of copyright owner]
 
 CDDL HEADER END
 
-Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright 2011 Jens Elkner.
 
 --%><%@page session="false" errorPage="error.jsp" import="
@@ -69,7 +69,7 @@ include file="projects.jspf"
     } else {
         cfg.setTitle("Search");
     }
-    response.addCookie(new Cookie("OpenGrokSorting", searchHelper.order.toString()));
+    response.addCookie(new Cookie("OpenGrokSorting", URLEncoder.encode(searchHelper.order.toString(), "utf-8")));
 %><%@
 
 include file="httpheader.jspf"