svn commit: r640653 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/ main/java/org/apache/shindig/gadgets/http/ test/java/org/apache/shindig/gadgets/ test/java/org/apache/shindig/gadgets/http/

[li...@apache.org]

Author: lindner
Date: Mon Mar 24 17:17:04 2008
New Revision: 640653

URL: http://svn.apache.org/viewvc?rev=640653&view=rev
Log:
Fix supplied by Brian Eaton that resolves SHINDIG-150

Modified:
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SignedFetchRequestSigner.java
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SignedFetchRequestSignerTest.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SignedFetchRequestSigner.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SignedFetchRequestSigner.java?rev=640653&r1=640652&r2=640653&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SignedFetchRequestSigner.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SignedFetchRequestSigner.java Mon Mar 24 17:17:04 2008
@@ -44,11 +44,11 @@
  */
 public class SignedFetchRequestSigner implements RequestSigner {
 
-  protected static final String OPENSOCIAL_OWNERID = "opensocial_ownerid";
+  protected static final String OPENSOCIAL_OWNERID = "opensocial_owner_id";
 
-  protected static final String OPENSOCIAL_VIEWERID = "opensocial_viewerid";
+  protected static final String OPENSOCIAL_VIEWERID = "opensocial_viewer_id";
 
-  protected static final String OPENSOCIAL_APPID = "opensocial_appid";
+  protected static final String OPENSOCIAL_APPID = "opensocial_app_id";
   
   protected static final String XOAUTH_PUBLIC_KEY =
     "xoauth_signature_publickey";

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java?rev=640653&r1=640652&r2=640653&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/ProxyHandler.java Mon Mar 24 17:17:04 2008
@@ -167,8 +167,7 @@
 
       if ("POST".equals(method)) {
         method = getParameter(request, METHOD_PARAM, "GET");
-        postBody = URLDecoder.decode(
-            getParameter(request, POST_DATA_PARAM, ""), encoding).getBytes();
+        postBody = getParameter(request, POST_DATA_PARAM, "").getBytes();
 
         String headerData = request.getParameter(HEADERS_PARAM);
         if (headerData == null || headerData.length() == 0) {

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SignedFetchRequestSignerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SignedFetchRequestSignerTest.java?rev=640653&r1=640652&r2=640653&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SignedFetchRequestSignerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SignedFetchRequestSignerTest.java Mon Mar 24 17:17:04 2008
@@ -79,16 +79,16 @@
     URL unsigned = new URL("http://test");
     URL out = signer.signRequest("GET", unsigned, null);
     List<OAuth.Parameter> queryParams = OAuth.decodeForm(out.getQuery());
-    Assert.assertTrue(contains(queryParams, "opensocial_ownerid", "o"));
-    Assert.assertTrue(contains(queryParams, "opensocial_viewerid", "v"));
-    Assert.assertTrue(contains(queryParams, "opensocial_appid", "a"));
+    Assert.assertTrue(contains(queryParams, "opensocial_owner_id", "o"));
+    Assert.assertTrue(contains(queryParams, "opensocial_viewer_id", "v"));
+    Assert.assertTrue(contains(queryParams, "opensocial_app_id", "a"));
     Assert.assertTrue(contains(queryParams, OAuth.OAUTH_CONSUMER_KEY, "d"));
     Assert.assertTrue(
         contains(queryParams, "xoauth_signature_publickey", "foo"));
   }
   
   public void testTrickyParametersInQuery() throws Exception {
-    String tricky = "%6fpensocial_ownerid=gotcha";
+    String tricky = "%6fpensocial_owner_id=gotcha";
     URL unsigned = new URL("http://test?" + tricky);
     URL out = signer.signRequest("GET", unsigned, null);
     Assert.assertFalse(out.getQuery().contains("gotcha"));
@@ -97,7 +97,7 @@
   
   public void testTrickyParametersInBody() throws Exception {
     URL unsigned = new URL("http://test");
-    String tricky = "%6fpensocial_ownerid=gotcha";
+    String tricky = "%6fpensocial_owner_id=gotcha";
     URL out = signer.signRequest("POST", unsigned, tricky);
     assertSignatureInvalid("POST", out.toString(), tricky);       
   }

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java?rev=640653&r1=640652&r2=640653&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java Mon Mar 24 17:17:04 2008
@@ -165,8 +165,9 @@
       RemoteContentRequest request = (RemoteContentRequest)arg0;
       String url = request.getUri().toASCIIString();
       return (url.startsWith(expectedUrl) &&
-          url.contains("opensocial_ownerid") && url.contains("opensocial_viewerid") &&
-          url.contains("opensocial_appid") && url.contains("opensocial_appid"));
+          url.contains("opensocial_owner_id") &&
+          url.contains("opensocial_viewer_id") &&
+          url.contains("opensocial_app_id"));
     }
 
   }