You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/01/30 23:24:10 UTC
svn commit: r1238048 - in /cxf/branches/2.5.x-fixes: ./
rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/
rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/
rt/rs/security/oaut...
Author: sergeyb
Date: Mon Jan 30 22:24:09 2012
New Revision: 1238048
URL: http://svn.apache.org/viewvc?rev=1238048&view=rev
Log:
Merged revisions 1238046 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1238046 | sergeyb | 2012-01-30 22:20:02 +0000 (Mon, 30 Jan 2012) | 1 line
Minor cleanup in the OAuth code
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/RequestTokenRegistration.java
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthConstants.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 30 22:24:09 2012
@@ -1 +1 @@
-/cxf/trunk:1236624,1236769,1236849,1237715
+/cxf/trunk:1236624,1236769,1236849,1237715,1238046
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/RequestTokenRegistration.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/RequestTokenRegistration.java?rev=1238048&r1=1238047&r2=1238048&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/RequestTokenRegistration.java (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/RequestTokenRegistration.java Mon Jan 30 22:24:09 2012
@@ -28,7 +28,6 @@ public class RequestTokenRegistration {
private Client client;
private String state;
private String callback;
- private List<String> uris;
private List<String> scopes;
private long lifetime;
private long issuedAt;
@@ -54,12 +53,6 @@ public class RequestTokenRegistration {
public String getState() {
return state;
}
- public void setUris(List<String> uris) {
- this.uris = uris;
- }
- public List<String> getUris() {
- return uris;
- }
public void setScopes(List<String> scopes) {
this.scopes = scopes;
}
Modified: cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java?rev=1238048&r1=1238047&r2=1238048&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java Mon Jan 30 22:24:09 2012
@@ -56,7 +56,6 @@ import org.apache.cxf.security.SecurityC
* Base OAuth filter which can be used to protect end-user endpoints
*/
public class AbstractAuthFilter {
- protected static final String USE_USER_SUBJECT = "org.apache.cxf.rs.security.oauth.use_user_subject";
private static final Logger LOG = LogUtils.getL7dLogger(AbstractAuthFilter.class);
private static final String[] REQUIRED_PARAMETERS =
new String[] {
@@ -74,7 +73,6 @@ public class AbstractAuthFilter {
ALLOWED_OAUTH_PARAMETERS.addAll(Arrays.asList(REQUIRED_PARAMETERS));
ALLOWED_OAUTH_PARAMETERS.add(OAuth.OAUTH_VERSION);
ALLOWED_OAUTH_PARAMETERS.add(OAuthConstants.X_OAUTH_SCOPE);
- ALLOWED_OAUTH_PARAMETERS.add(OAuthConstants.X_OAUTH_URI);
ALLOWED_OAUTH_PARAMETERS.add(OAuthConstants.OAUTH_CONSUMER_SECRET);
}
Modified: cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java?rev=1238048&r1=1238047&r2=1238048&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/OAuthServletFilter.java Mon Jan 30 22:24:09 2012
@@ -43,6 +43,8 @@ import org.apache.cxf.security.SecurityC
* HTTP Servlet filter which can be used to protect end user endpoints
*/
public class OAuthServletFilter extends AbstractAuthFilter implements javax.servlet.Filter {
+ protected static final String USE_USER_SUBJECT = "org.apache.cxf.rs.security.oauth.use_user_subject";
+
public void init(FilterConfig filterConfig) throws ServletException {
ServletContext servletContext = filterConfig.getServletContext();
super.setDataProvider(OAuthUtils.getOAuthDataProvider(servletContext));
Modified: cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java?rev=1238048&r1=1238047&r2=1238048&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/RequestTokenHandler.java Mon Jan 30 22:24:09 2012
@@ -56,7 +56,6 @@ public class RequestTokenHandler {
private long tokenLifetime = 3600L;
private String defaultScope;
- private String defaultURI;
public Response handle(MessageContext mc, OAuthDataProvider dataProvider) {
try {
@@ -77,14 +76,11 @@ public class RequestTokenHandler {
List<String> scopes = OAuthUtils.parseParamValue(
oAuthMessage.getParameter(OAuthConstants.X_OAUTH_SCOPE), defaultScope);
- List<String> uris = OAuthUtils.parseParamValue(
- oAuthMessage.getParameter(OAuthConstants.X_OAUTH_URI), defaultURI);
RequestTokenRegistration reg = new RequestTokenRegistration();
reg.setClient(client);
reg.setCallback(callback);
reg.setState(oAuthMessage.getParameter("state"));
- reg.setUris(uris);
reg.setScopes(scopes);
reg.setLifetime(tokenLifetime);
reg.setIssuedAt(System.currentTimeMillis() / 1000);
@@ -144,9 +140,5 @@ public class RequestTokenHandler {
public void setDefaultScope(String defaultScope) {
this.defaultScope = defaultScope;
}
-
- public void setDefaultURI(String defaultURI) {
- this.defaultURI = defaultURI;
- }
}
Modified: cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthConstants.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthConstants.java?rev=1238048&r1=1238047&r2=1238048&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthConstants.java (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthConstants.java Mon Jan 30 22:24:09 2012
@@ -36,7 +36,6 @@ public final class OAuthConstants {
public static final String AUTHORIZATION_DECISION_ALLOW = "allow";
public static final String AUTHORIZATION_DECISION_DENY = "deny";
- public static final String X_OAUTH_URI = "x_oauth_uri";
public static final String X_OAUTH_SCOPE = "x_oauth_scope";
public static final String OAUTH_CONSUMER_SECRET = "oauth_consumer_secret";