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/23 12:02:45 UTC
svn commit: r1234741 - in /cxf/branches/2.5.x-fixes: ./
distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/
rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/
rt/rs/se...
Author: sergeyb
Date: Mon Jan 23 11:02:44 2012
New Revision: 1234741
URL: http://svn.apache.org/viewvc?rev=1234741&view=rev
Log:
Merged revisions 1234739 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1234739 | sergeyb | 2012-01-23 10:59:44 +0000 (Mon, 23 Jan 2012) | 1 line
[CXF-4051] Removing redundant OAuthDataProvider.getPermissionsInfo
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/MemoryOAuthDataProvider.java
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Token.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/provider/OAuthDataProvider.java
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java
cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 23 11:02:44 2012
@@ -1 +1 @@
-/cxf/trunk:1234634
+/cxf/trunk:1234634,1234739
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java?rev=1234741&r1=1234740&r2=1234741&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java (original)
+++ cxf/branches/2.5.x-fixes/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java Mon Jan 23 11:02:44 2012
@@ -74,7 +74,7 @@ public class MemoryOAuthDataProvider imp
clientAuthInfo.put(CLIENT_ID, client);
}
- public List<OAuthPermission> getPermissionsInfo(List<String> requestPermissions) {
+ private List<OAuthPermission> getPermissionsInfo(List<String> requestPermissions) {
List<OAuthPermission> permissions = new ArrayList<OAuthPermission>();
for (String requestScope : requestPermissions) {
OAuthPermission oAuthPermission = AVAILABLE_PERMISSIONS.get(requestScope);
@@ -94,7 +94,7 @@ public class MemoryOAuthDataProvider imp
RequestToken reqToken = new RequestToken(reg.getClient(), token, tokenSecret,
reg.getLifetime(), reg.getIssuedAt());
- reqToken.setScopes(reg.getScopes());
+ reqToken.setScopes(getPermissionsInfo(reg.getScopes()));
reqToken.setUris(reg.getUris());
reqToken.setCallback(reg.getCallback());
oauthTokens.put(token, reqToken);
Modified: cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/MemoryOAuthDataProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/MemoryOAuthDataProvider.java?rev=1234741&r1=1234740&r2=1234741&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/MemoryOAuthDataProvider.java (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/MemoryOAuthDataProvider.java Mon Jan 23 11:02:44 2012
@@ -70,7 +70,7 @@ public class MemoryOAuthDataProvider imp
clientAuthInfo.put(OAuthTestUtils.CLIENT_ID, client);
}
- public List<OAuthPermission> getPermissionsInfo(List<String> requestPermissions) {
+ private List<OAuthPermission> getPermissionsInfo(List<String> requestPermissions) {
List<OAuthPermission> permissions = new ArrayList<OAuthPermission>();
for (String requestScope : requestPermissions) {
OAuthPermission oAuthPermission = AVAILABLE_PERMISSIONS.get(requestScope);
@@ -90,7 +90,7 @@ public class MemoryOAuthDataProvider imp
RequestToken reqToken = new RequestToken(reg.getClient(), token, tokenSecret,
reg.getLifetime(), reg.getIssuedAt());
- reqToken.setScopes(reg.getScopes());
+ reqToken.setScopes(getPermissionsInfo(reg.getScopes()));
reqToken.setUris(reg.getUris());
oauthTokens.put(token, reqToken);
Modified: cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.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/Client.java?rev=1234741&r1=1234740&r2=1234741&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java Mon Jan 23 11:02:44 2012
@@ -32,7 +32,7 @@ public class Client {
private String loginName;
private List<String> uris = Collections.emptyList();
- private List<String> scopes = Collections.emptyList();
+ private List<OAuthPermission> scopes = Collections.emptyList();
public Client(String consumerId,
String secretKey,
@@ -120,7 +120,7 @@ public class Client {
* Returns a list of opaque permissions/scopes
* @return the scopes
*/
- public List<String> getScopes() {
+ public List<OAuthPermission> getScopes() {
return scopes;
}
@@ -128,7 +128,7 @@ public class Client {
* Sets a list of opaque permissions/scopes
* @param scopes the scopes
*/
- public void setScopes(List<String> scopes) {
+ public void setScopes(List<OAuthPermission> 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/data/Token.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/Token.java?rev=1234741&r1=1234740&r2=1234741&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Token.java (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Token.java Mon Jan 23 11:02:44 2012
@@ -31,7 +31,7 @@ public abstract class Token {
private long issuedAt = -1;
private long lifetime = -1;
private Client client;
- private List<String> scopes = Collections.emptyList();
+ private List<OAuthPermission> scopes = Collections.emptyList();
private List<String> uris = Collections.emptyList();
private UserSubject subject;
@@ -88,7 +88,7 @@ public abstract class Token {
* Returns a list of opaque permissions/scopes
* @return the scopes
*/
- public List<String> getScopes() {
+ public List<OAuthPermission> getScopes() {
return scopes;
}
@@ -96,7 +96,7 @@ public abstract class Token {
* Sets a list of opaque permissions/scopes
* @param scopes the scopes
*/
- public void setScopes(List<String> scopes) {
+ public void setScopes(List<OAuthPermission> 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=1234741&r1=1234740&r2=1234741&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 23 11:02:44 2012
@@ -137,8 +137,7 @@ public class AbstractAuthFilter {
//check valid URI
checkRequestURI(req, OAuthUtils.getAllUris(client, accessToken));
- List<OAuthPermission> permissions = dataProvider.getPermissionsInfo(
- OAuthUtils.getAllScopes(client, accessToken));
+ List<OAuthPermission> permissions = OAuthUtils.getAllScopes(client, accessToken);
for (OAuthPermission perm : permissions) {
checkRequestURI(req, perm.getUris());
Modified: cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/OAuthDataProvider.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/provider/OAuthDataProvider.java?rev=1234741&r1=1234740&r2=1234741&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/OAuthDataProvider.java (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/OAuthDataProvider.java Mon Jan 23 11:02:44 2012
@@ -19,11 +19,8 @@
package org.apache.cxf.rs.security.oauth.provider;
-import java.util.List;
-
import org.apache.cxf.rs.security.oauth.data.AccessToken;
import org.apache.cxf.rs.security.oauth.data.Client;
-import org.apache.cxf.rs.security.oauth.data.OAuthPermission;
import org.apache.cxf.rs.security.oauth.data.RequestToken;
import org.apache.cxf.rs.security.oauth.data.RequestTokenRegistration;
import org.apache.cxf.rs.security.oauth.data.Token;
@@ -97,12 +94,4 @@ public interface OAuthDataProvider {
*/
void removeToken(Token token) throws OAuthServiceException;
- /**
- * Returns the list of {@link OAuthPermission} beans describing opaque
- * permissions (aka scopes) such as "read_data", etc
- * @param requestPermissions the list of opaque scopes/permissions
- * @see OAuthPermission
- * @return permissions
- */
- List<OAuthPermission> getPermissionsInfo(List<String> requestPermissions);
}
Modified: cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.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/AuthorizationRequestHandler.java?rev=1234741&r1=1234740&r2=1234741&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java Mon Jan 23 11:02:44 2012
@@ -156,8 +156,7 @@ public class AuthorizationRequestHandler
secData.setApplicationName(token.getClient().getApplicationName());
secData.setApplicationURI(token.getClient().getApplicationURI());
- secData.setPermissions(
- dataProvider.getPermissionsInfo(OAuthUtils.getAllScopes(token.getClient(), token)));
+ secData.setPermissions(OAuthUtils.getAllScopes(token.getClient(), token));
secData.setUris(OAuthUtils.getAllUris(token.getClient(), token));
return secData;
Modified: cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.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/OAuthUtils.java?rev=1234741&r1=1234740&r2=1234741&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java (original)
+++ cxf/branches/2.5.x-fixes/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java Mon Jan 23 11:02:44 2012
@@ -51,6 +51,7 @@ import org.apache.cxf.jaxrs.impl.Metadat
import org.apache.cxf.jaxrs.model.URITemplate;
import org.apache.cxf.jaxrs.utils.FormUtils;
import org.apache.cxf.rs.security.oauth.data.Client;
+import org.apache.cxf.rs.security.oauth.data.OAuthPermission;
import org.apache.cxf.rs.security.oauth.data.RequestToken;
import org.apache.cxf.rs.security.oauth.data.Token;
import org.apache.cxf.rs.security.oauth.provider.DefaultOAuthValidator;
@@ -82,8 +83,8 @@ public final class OAuthUtils {
return false;
}
- public static List<String> getAllScopes(Client client, Token token) {
- List<String> scopes = new LinkedList<String>();
+ public static List<OAuthPermission> getAllScopes(Client client, Token token) {
+ List<OAuthPermission> scopes = new LinkedList<OAuthPermission>();
if (token != null) {
scopes.addAll(token.getScopes());
}