Author: lindner
Date: Wed May 12 00:00:09 2010
New Revision: 943342
URL: http://svn.apache.org/viewvc?rev=943342&view=rev
Log:
add oauth_token parameters, first step towards oauth bearer token support
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.java
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java?rev=943342&r1=943341&r2=943342&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/UrlParameterAuthenticationHandler.java
Wed May 12 00:00:09 2010
@@ -28,8 +28,8 @@ import javax.servlet.http.HttpServletReq
* Produces security tokens by extracting the "st" parameter from the request
url or post body.
*/
public class UrlParameterAuthenticationHandler implements
AuthenticationHandler {
- private static final String TOKEN_PARAM = "st";
-
+ private static final String SECURITY_TOKEN_PARAM = "st";
+ private static final String OAUTH2_TOKEN_PARAM = "oauth_token";
private final SecurityTokenDecoder securityTokenDecoder;
@Inject
@@ -63,10 +63,16 @@ public class UrlParameterAuthenticationH
return this.securityTokenDecoder;
}
- protected Map<String, String> getMappedParameters(
- final HttpServletRequest request) {
+ protected Map<String, String> getMappedParameters(final HttpServletRequest
request) {
Map<String, String> params = Maps.newHashMap();
- params.put(SecurityTokenDecoder.SECURITY_TOKEN_NAME,
request.getParameter(TOKEN_PARAM));
+
+ String oauth_token_value = request.getParameter(OAUTH2_TOKEN_PARAM);
+
+ if (request.isSecure() && oauth_token_value != null) {
+ params.put(SecurityTokenDecoder.SECURITY_TOKEN_NAME, oauth_token_value);
+ } else {
+ params.put(SecurityTokenDecoder.SECURITY_TOKEN_NAME,
request.getParameter(SECURITY_TOKEN_PARAM));
+ }
params.put(SecurityTokenDecoder.ACTIVE_URL_NAME, getActiveUrl(request));
return params;
}
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java?rev=943342&r1=943341&r2=943342&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/util/JsonConversionUtil.java
Wed May 12 00:00:09 2010
@@ -39,7 +39,7 @@ public class JsonConversionUtil {
private static final Pattern ARRAY_MATCH =
Pattern.compile("(\\w+)\\((\\d+)\\)");
- private static final Set<String> RESERVED_PARAMS = ImmutableSet.of("method",
"id", "st");
+ private static final Set<String> RESERVED_PARAMS = ImmutableSet.of("method",
"id", "st", "oauth_token");
@SuppressWarnings("unchecked")
public static JSONObject fromRequest(HttpServletRequest request) throws
JSONException {
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.java?rev=943342&r1=943341&r2=943342&view=diff
==============================================================================
---
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.java
(original)
+++
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/UriCommon.java
Wed May 12 00:00:09 2010
@@ -31,6 +31,7 @@ public interface UriCommon {
NO_CACHE("nocache"),
VERSION("v"),
SECURITY_TOKEN("st"),
+ OAUTH2_TOKEN("oauth_token"),
MODULE_ID("mid"),
REFRESH("refresh"),
LIBS("libs"),
