Author: woonsan
Date: Fri Dec 11 11:22:34 2009
New Revision: 889578
URL: http://svn.apache.org/viewvc?rev=889578&view=rev
Log:
JS2-1087: Changes to read query parameter only for portal path param.
Added:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/HttpUtils.java
(with props)
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/util/TestHttpUtils.java
(with props)
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PortalURLValveImpl.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PortalURLValveImpl.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PortalURLValveImpl.java?rev=889578&r1=889577&r2=889578&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PortalURLValveImpl.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/container/url/impl/PortalURLValveImpl.java
Fri Dec 11 11:22:34 2009
@@ -17,6 +17,8 @@
package org.apache.jetspeed.container.url.impl;
+import java.util.Map;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
@@ -27,6 +29,7 @@
import org.apache.jetspeed.pipeline.valve.AbstractValve;
import org.apache.jetspeed.pipeline.valve.ValveContext;
import org.apache.jetspeed.request.RequestContext;
+import org.apache.jetspeed.util.HttpUtils;
/**
* Creates the PortalURL for the current Request
@@ -91,7 +94,15 @@
if (pathInfoParamAllowed)
{
- String param =
servletRequest.getParameter(PortalURL.PATH_INFO_QUERY);
+ String param = null;
+
+ Map<String, String []> queryParamMap =
HttpUtils.parseQueryString(servletRequest.getQueryString());
+ String [] pathInfoParams =
queryParamMap.get(PortalURL.PATH_INFO_QUERY);
+
+ if (pathInfoParams != null && pathInfoParams.length != 0)
+ {
+ param = pathInfoParams[0];
+ }
if (param == null)
{
Added:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/HttpUtils.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/HttpUtils.java?rev=889578&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/HttpUtils.java
(added)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/HttpUtils.java
Fri Dec 11 11:22:34 2009
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * HttpUtils
+ *
+ * @version $Id$
+ */
+public class HttpUtils
+{
+ private HttpUtils()
+ {
+ }
+
+ public static Map<String, String[]> parseQueryString(String queryString)
+ {
+ return parseQueryString(queryString, "ISO-8859-1");
+ }
+
+ public static Map<String, String[]> parseQueryString(String queryString,
String encoding)
+ {
+ if (StringUtils.isBlank(queryString))
+ {
+ return Collections.emptyMap();
+ }
+
+ Map<String, String[]> paramMap = new HashMap<String, String[]>();
+
+ for (String pair : StringUtils.split(queryString, "&"))
+ {
+ String [] nameAndValue = StringUtils.split(pair, "=", 2);
+
+ if (nameAndValue.length == 2)
+ {
+ String name = nameAndValue[0];
+ String value = nameAndValue[1];
+
+ if (encoding != null)
+ {
+ try
+ {
+ name = URLDecoder.decode(name, encoding);
+ value = URLDecoder.decode(value, encoding);
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ throw new IllegalArgumentException("Unsupported
encoding: " + encoding);
+ }
+ }
+
+ String [] values = paramMap.get(name);
+
+ if (values == null)
+ {
+ paramMap.put(name, new String [] { value });
+ }
+ else
+ {
+ String [] newValues = new String[values.length + 1];
+ System.arraycopy(values, 0, newValues, 0, values.length);
+ newValues[values.length] = value;
+ paramMap.put(name, newValues);
+ }
+ }
+ }
+
+ return paramMap;
+ }
+
+}
Propchange:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/HttpUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/HttpUtils.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/main/java/org/apache/jetspeed/util/HttpUtils.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/util/TestHttpUtils.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/util/TestHttpUtils.java?rev=889578&view=auto
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/util/TestHttpUtils.java
(added)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/util/TestHttpUtils.java
Fri Dec 11 11:22:34 2009
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.util;
+
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+/**
+ * TestHttpUtils
+ *
+ * @version $Id$
+ */
+public class TestHttpUtils extends TestCase
+{
+
+ public void testBasicParsing() throws Exception
+ {
+ String queryString = "a=1&b=2&c=3";
+ Map<String, String []> queryParamMap =
HttpUtils.parseQueryString(queryString);
+
+ assertNotNull(queryParamMap);
+
+ assertNotNull(queryParamMap.get("a"));
+ assertEquals(1, queryParamMap.get("a").length);
+ assertEquals("1", queryParamMap.get("a")[0]);
+
+ assertNotNull(queryParamMap.get("b"));
+ assertEquals(1, queryParamMap.get("b").length);
+ assertEquals("2", queryParamMap.get("b")[0]);
+
+ assertNotNull(queryParamMap.get("c"));
+ assertEquals(1, queryParamMap.get("c").length);
+ assertEquals("3", queryParamMap.get("c")[0]);
+ }
+
+ public void testMultiValueParsing() throws Exception
+ {
+ String queryString = "a=1&b=2&c=3&a=11&b=22&a=111";
+ Map<String, String []> queryParamMap =
HttpUtils.parseQueryString(queryString);
+
+ assertNotNull(queryParamMap);
+
+ assertNotNull(queryParamMap.get("a"));
+ assertEquals(3, queryParamMap.get("a").length);
+ assertEquals("1", queryParamMap.get("a")[0]);
+ assertEquals("11", queryParamMap.get("a")[1]);
+ assertEquals("111", queryParamMap.get("a")[2]);
+
+ assertNotNull(queryParamMap.get("b"));
+ assertEquals(2, queryParamMap.get("b").length);
+ assertEquals("2", queryParamMap.get("b")[0]);
+ assertEquals("22", queryParamMap.get("b")[1]);
+
+ assertNotNull(queryParamMap.get("c"));
+ assertEquals(1, queryParamMap.get("c").length);
+ assertEquals("3", queryParamMap.get("c")[0]);
+ }
+
+ public void testEncodedMultiValueParsing() throws Exception
+ {
+ String queryString = "param+1=value+1¶m%202=value%202";
+ Map<String, String []> queryParamMap =
HttpUtils.parseQueryString(queryString);
+
+ assertNotNull(queryParamMap);
+
+ assertNotNull(queryParamMap.get("param 1"));
+ assertEquals(1, queryParamMap.get("param 1").length);
+ assertEquals("value 1", queryParamMap.get("param 1")[0]);
+
+ assertNotNull(queryParamMap.get("param 2"));
+ assertEquals(1, queryParamMap.get("param 2").length);
+ assertEquals("value 2", queryParamMap.get("param 2")[0]);
+ }
+}
Propchange:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/util/TestHttpUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/util/TestHttpUtils.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange:
portals/jetspeed-2/portal/trunk/components/jetspeed-portal/src/test/java/org/apache/jetspeed/util/TestHttpUtils.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
