Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BF48D95E1 for ; Mon, 23 Jan 2012 11:00:12 +0000 (UTC) Received: (qmail 87427 invoked by uid 500); 23 Jan 2012 11:00:12 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 87314 invoked by uid 500); 23 Jan 2012 11:00:11 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 87302 invoked by uid 99); 23 Jan 2012 11:00:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jan 2012 11:00:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jan 2012 11:00:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D96E12388A66 for ; Mon, 23 Jan 2012 10:59:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1234739 - in /cxf/trunk: 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/security/oauth-paren... Date: Mon, 23 Jan 2012 10:59:45 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120123105945.D96E12388A66@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Mon Jan 23 10:59:44 2012 New Revision: 1234739 URL: http://svn.apache.org/viewvc?rev=1234739&view=rev Log: [CXF-4051] Removing redundant OAuthDataProvider.getPermissionsInfo Modified: cxf/trunk/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java cxf/trunk/rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/MemoryOAuthDataProvider.java cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Token.java cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/OAuthDataProvider.java cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java Modified: cxf/trunk/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java?rev=1234739&r1=1234738&r2=1234739&view=diff ============================================================================== --- cxf/trunk/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java (original) +++ cxf/trunk/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java Mon Jan 23 10:59:44 2012 @@ -74,7 +74,7 @@ public class MemoryOAuthDataProvider imp clientAuthInfo.put(CLIENT_ID, client); } - public List getPermissionsInfo(List requestPermissions) { + private List getPermissionsInfo(List requestPermissions) { List permissions = new ArrayList(); 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/trunk/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/trunk/rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/MemoryOAuthDataProvider.java?rev=1234739&r1=1234738&r2=1234739&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/MemoryOAuthDataProvider.java (original) +++ cxf/trunk/rt/rs/security/oauth-parent/oauth-test/src/main/java/org/apache/cxf/rs/security/oauth/test/MemoryOAuthDataProvider.java Mon Jan 23 10:59:44 2012 @@ -70,7 +70,7 @@ public class MemoryOAuthDataProvider imp clientAuthInfo.put(OAuthTestUtils.CLIENT_ID, client); } - public List getPermissionsInfo(List requestPermissions) { + private List getPermissionsInfo(List requestPermissions) { List permissions = new ArrayList(); 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/trunk/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/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java?rev=1234739&r1=1234738&r2=1234739&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java (original) +++ cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Client.java Mon Jan 23 10:59:44 2012 @@ -32,7 +32,7 @@ public class Client { private String loginName; private List uris = Collections.emptyList(); - private List scopes = Collections.emptyList(); + private List 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 getScopes() { + public List 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 scopes) { + public void setScopes(List scopes) { this.scopes = scopes; } Modified: cxf/trunk/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/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Token.java?rev=1234739&r1=1234738&r2=1234739&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Token.java (original) +++ cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/data/Token.java Mon Jan 23 10:59:44 2012 @@ -31,7 +31,7 @@ public abstract class Token { private long issuedAt = -1; private long lifetime = -1; private Client client; - private List scopes = Collections.emptyList(); + private List scopes = Collections.emptyList(); private List 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 getScopes() { + public List 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 scopes) { + public void setScopes(List scopes) { this.scopes = scopes; } Modified: cxf/trunk/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/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java?rev=1234739&r1=1234738&r2=1234739&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java (original) +++ cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/filters/AbstractAuthFilter.java Mon Jan 23 10:59:44 2012 @@ -137,8 +137,7 @@ public class AbstractAuthFilter { //check valid URI checkRequestURI(req, OAuthUtils.getAllUris(client, accessToken)); - List permissions = dataProvider.getPermissionsInfo( - OAuthUtils.getAllScopes(client, accessToken)); + List permissions = OAuthUtils.getAllScopes(client, accessToken); for (OAuthPermission perm : permissions) { checkRequestURI(req, perm.getUris()); Modified: cxf/trunk/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/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/OAuthDataProvider.java?rev=1234739&r1=1234738&r2=1234739&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/OAuthDataProvider.java (original) +++ cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/provider/OAuthDataProvider.java Mon Jan 23 10:59: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 getPermissionsInfo(List requestPermissions); } Modified: cxf/trunk/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/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java?rev=1234739&r1=1234738&r2=1234739&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java (original) +++ cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/services/AuthorizationRequestHandler.java Mon Jan 23 10:59: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/trunk/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/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java?rev=1234739&r1=1234738&r2=1234739&view=diff ============================================================================== --- cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java (original) +++ cxf/trunk/rt/rs/security/oauth-parent/oauth/src/main/java/org/apache/cxf/rs/security/oauth/utils/OAuthUtils.java Mon Jan 23 10:59: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 getAllScopes(Client client, Token token) { - List scopes = new LinkedList(); + public static List getAllScopes(Client client, Token token) { + List scopes = new LinkedList(); if (token != null) { scopes.addAll(token.getScopes()); }