You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2009/08/03 08:41:15 UTC
svn commit: r800214 - in /incubator/shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
Author: lindner
Date: Mon Aug 3 06:41:15 2009
New Revision: 800214
URL: http://svn.apache.org/viewvc?rev=800214&view=rev
Log:
SHINDIG-609 | fix oauth parameters - add xoauth_public_key param, not using xoauth_app_url since that's not part of the spec
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java?rev=800214&r1=800213&r2=800214&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/oauth/OAuthRequest.java Mon Aug 3 06:41:15 2009
@@ -90,7 +90,10 @@
protected static final String OPENSOCIAL_PROXIED_CONTENT = "opensocial_proxied_content";
- protected static final String XOAUTH_PUBLIC_KEY = "xoauth_signature_publickey";
+ // old and new parameters for the public key
+ // TODO remove OLD in a far future release
+ protected static final String XOAUTH_PUBLIC_KEY_OLD = "xoauth_signature_publickey";
+ protected static final String XOAUTH_PUBLIC_KEY_NEW = "xoauth_public_key";
protected static final Pattern ALLOWED_PARAM_NAME = Pattern.compile("[-:\\w~!@$*()_\\[\\]:,./]+");
@@ -446,7 +449,8 @@
new Parameter(OAuth.OAUTH_CONSUMER_KEY, realRequest.getSecurityToken().getDomain()));
}
if (accessorInfo.getConsumer().getKeyName() != null) {
- params.add(new Parameter(XOAUTH_PUBLIC_KEY, accessorInfo.getConsumer().getKeyName()));
+ params.add(new Parameter(XOAUTH_PUBLIC_KEY_OLD, accessorInfo.getConsumer().getKeyName()));
+ params.add(new Parameter(XOAUTH_PUBLIC_KEY_NEW, accessorInfo.getConsumer().getKeyName()));
}
params.add(new Parameter(OAuth.OAUTH_VERSION, OAuth.VERSION_1_0));
params.add(new Parameter(OAuth.OAUTH_TIMESTAMP,
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java?rev=800214&r1=800213&r2=800214&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthRequestTest.java Mon Aug 3 06:41:15 2009
@@ -1096,6 +1096,7 @@
assertTrue(contains(queryParams, "opensocial_app_id", "app"));
assertTrue(contains(queryParams, OAuth.OAUTH_CONSUMER_KEY, "signedfetch"));
assertTrue(contains(queryParams, "xoauth_signature_publickey", "foo"));
+ assertTrue(contains(queryParams, "xoauth_public_key", "foo"));
assertFalse(contains(queryParams, "opensocial_proxied_content", "1"));
}
@@ -1124,6 +1125,7 @@
assertTrue(contains(queryParams, "opensocial_app_id", "app"));
assertTrue(contains(queryParams, OAuth.OAUTH_CONSUMER_KEY, "signedfetch"));
assertTrue(contains(queryParams, "xoauth_signature_publickey", "foo"));
+ assertTrue(contains(queryParams, "xoauth_public_key", "foo"));
assertTrue(contains(queryParams, "opensocial_proxied_content", "1"));
}
@@ -1320,6 +1322,7 @@
assertTrue(contains(queryParams, "opensocial_app_id", "app"));
assertTrue(contains(queryParams, OAuth.OAUTH_CONSUMER_KEY, "container.com"));
assertTrue(contains(queryParams, "xoauth_signature_publickey", "foo"));
+ assertTrue(contains(queryParams, "xoauth_public_key", "foo"));
}
@Test
@@ -1332,6 +1335,7 @@
assertTrue(contains(queryParams, "opensocial_app_id", "app"));
assertTrue(contains(queryParams, OAuth.OAUTH_CONSUMER_KEY, "signedfetch"));
assertTrue(contains(queryParams, "xoauth_signature_publickey", "foo"));
+ assertTrue(contains(queryParams, "xoauth_public_key", "foo"));
}
@Test