You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/12/04 17:38:33 UTC
[1/3] cxf git commit: Add equals/hashCode methods for OAuthPermission
so that the containsAll call in
AbstractOAuthDataProvider.doRefreshAccessToken works
Repository: cxf
Updated Branches:
refs/heads/master 0b9ce1c16 -> aaabd57fb
Add equals/hashCode methods for OAuthPermission so that the containsAll call in AbstractOAuthDataProvider.doRefreshAccessToken works
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8583a24a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8583a24a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8583a24a
Branch: refs/heads/master
Commit: 8583a24ac541dc373503d7a6c59cd90890acdae3
Parents: 796fda4
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Dec 4 16:34:03 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Dec 4 16:35:04 2015 +0000
----------------------------------------------------------------------
.../security/oauth2/common/OAuthPermission.java | 58 ++++++++++++++++++++
.../services/AbstractImplicitGrantService.java | 2 +-
2 files changed, 59 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/8583a24a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
index 1be8106..2b31fa8 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
@@ -146,4 +146,62 @@ public class OAuthPermission implements Serializable {
public void setInvisibleToClient(boolean invisibleToClient) {
this.invisibleToClient = invisibleToClient;
}
+
+ @Override
+ public boolean equals(Object object) {
+ if (!(object instanceof OAuthPermission)) {
+ return false;
+ }
+
+ OAuthPermission that = (OAuthPermission)object;
+ if (this.httpVerbs != null && that.httpVerbs == null
+ || this.httpVerbs == null && that.httpVerbs != null
+ || this.httpVerbs != null && !this.httpVerbs.equals(that.httpVerbs)) {
+ return false;
+ }
+ if (this.uris != null && that.uris == null
+ || this.uris == null && that.uris != null
+ || this.uris != null && !this.uris.equals(that.uris)) {
+ return false;
+ }
+ if (this.permission != null && that.permission == null
+ || this.permission == null && that.permission != null
+ || this.permission != null && !this.permission.equals(that.permission)) {
+ return false;
+ }
+ if (this.description != null && that.description == null
+ || this.description == null && that.description != null
+ || this.description != null && !this.description.equals(that.description)) {
+ return false;
+ }
+ if (this.invisibleToClient != that.invisibleToClient) {
+ return false;
+ }
+ if (this.isDefault != that.isDefault) {
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int hashCode = 17;
+ if (httpVerbs != null) {
+ hashCode = 31 * hashCode + httpVerbs.hashCode();
+ }
+ if (uris != null) {
+ hashCode = 31 * hashCode + uris.hashCode();
+ }
+ if (permission != null) {
+ hashCode = 31 * hashCode + permission.hashCode();
+ }
+ if (description != null) {
+ hashCode = 31 * hashCode + description.hashCode();
+ }
+ hashCode = 31 * hashCode + Boolean.hashCode(invisibleToClient);
+ hashCode = 31 * hashCode + Boolean.hashCode(isDefault);
+
+ return hashCode;
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8583a24a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
index 139c05b..cee77da 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractImplicitGrantService.java
@@ -71,7 +71,7 @@ public abstract class AbstractImplicitGrantService extends RedirectionBasedGrant
reg.setGrantType(super.getSupportedGrantType());
reg.setSubject(userSubject);
reg.setRequestedScope(requestedScope);
- if (approvedScope != null && approvedScope.isEmpty()) {
+ if (approvedScope == null || approvedScope.isEmpty()) {
// no down-scoping done by a user, all of the requested scopes have been authorized
reg.setApprovedScope(requestedScope);
} else {
[3/3] cxf git commit: PMD fix
Posted by co...@apache.org.
PMD fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aaabd57f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aaabd57f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aaabd57f
Branch: refs/heads/master
Commit: aaabd57fb537feda5c5243168734fe331c995926
Parents: 8583a24
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Dec 4 16:38:21 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Dec 4 16:38:21 2015 +0000
----------------------------------------------------------------------
.../apache/cxf/rs/security/oauth2/common/OAuthPermission.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/aaabd57f/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
index 2b31fa8..43aeb64 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/OAuthPermission.java
@@ -174,10 +174,7 @@ public class OAuthPermission implements Serializable {
|| this.description != null && !this.description.equals(that.description)) {
return false;
}
- if (this.invisibleToClient != that.invisibleToClient) {
- return false;
- }
- if (this.isDefault != that.isDefault) {
+ if (this.invisibleToClient != that.invisibleToClient || this.isDefault != that.isDefault) { //NOPMD
return false;
}
[2/3] cxf git commit: Make sure the default scopes are returned to
the user
Posted by co...@apache.org.
Make sure the default scopes are returned to the user
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/796fda4c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/796fda4c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/796fda4c
Branch: refs/heads/master
Commit: 796fda4c78788994686f2cad961b5bbdf8bcb4ef
Parents: 0b9ce1c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Dec 4 16:13:13 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Dec 4 16:35:04 2015 +0000
----------------------------------------------------------------------
.../oauth2/services/AuthorizationCodeGrantService.java | 6 ++++--
.../security/oauth2/services/ImplicitGrantService.java | 4 +++-
.../oauth2/services/RedirectionBasedGrantService.java | 13 ++++++++++---
3 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/796fda4c/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
index b95eae7..36615e7 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationCodeGrantService.java
@@ -68,10 +68,12 @@ public class AuthorizationCodeGrantService extends RedirectionBasedGrantService
MultivaluedMap<String, String> params,
String redirectUri,
UserSubject subject,
+ List<String> requestedScopes,
List<OAuthPermission> perms,
boolean authorizationCanBeSkipped) {
OAuthAuthorizationData data =
- super.createAuthorizationData(client, params, redirectUri, subject, perms, authorizationCanBeSkipped);
+ super.createAuthorizationData(client, params, redirectUri, subject,
+ requestedScopes, perms, authorizationCanBeSkipped);
setCodeQualifier(data, params);
return data;
}
@@ -105,7 +107,7 @@ public class AuthorizationCodeGrantService extends RedirectionBasedGrantService
codeReg.setClient(client);
codeReg.setRedirectUri(state.getRedirectUri());
codeReg.setRequestedScope(requestedScope);
- if (approvedScope != null && approvedScope.isEmpty()) {
+ if (approvedScope == null || approvedScope.isEmpty()) {
// no down-scoping done by a user, all of the requested scopes have been authorized
codeReg.setApprovedScope(requestedScope);
} else {
http://git-wip-us.apache.org/repos/asf/cxf/blob/796fda4c/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/ImplicitGrantService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/ImplicitGrantService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/ImplicitGrantService.java
index 057c59d..bec3714 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/ImplicitGrantService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/ImplicitGrantService.java
@@ -55,10 +55,12 @@ public class ImplicitGrantService extends AbstractImplicitGrantService {
MultivaluedMap<String, String> params,
String redirectUri,
UserSubject subject,
+ List<String> requestedScopes,
List<OAuthPermission> perms,
boolean authorizationCanBeSkipped) {
OAuthAuthorizationData data =
- super.createAuthorizationData(client, params, redirectUri, subject, perms, authorizationCanBeSkipped);
+ super.createAuthorizationData(client, params, redirectUri, subject,
+ requestedScopes, perms, authorizationCanBeSkipped);
data.setImplicitFlow(true);
return data;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/796fda4c/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
index cc9baba..53cedaf 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/RedirectionBasedGrantService.java
@@ -172,8 +172,8 @@ public abstract class RedirectionBasedGrantService extends AbstractOAuthService
// Populate the authorization challenge data
OAuthAuthorizationData data =
- createAuthorizationData(client, params, redirectUri, userSubject, requestedPermissions,
- authorizationCanBeSkipped);
+ createAuthorizationData(client, params, redirectUri, userSubject, requestedScope,
+ requestedPermissions, authorizationCanBeSkipped);
if (authorizationCanBeSkipped) {
List<OAuthPermission> approvedScopes =
@@ -203,6 +203,7 @@ public abstract class RedirectionBasedGrantService extends AbstractOAuthService
MultivaluedMap<String, String> params,
String redirectUri,
UserSubject subject,
+ List<String> requestedScope,
List<OAuthPermission> perms,
boolean authorizationCanBeSkipped) {
@@ -213,7 +214,13 @@ public abstract class RedirectionBasedGrantService extends AbstractOAuthService
secData.setAudience(params.getFirst(OAuthConstants.CLIENT_AUDIENCE));
secData.setNonce(params.getFirst(OAuthConstants.NONCE));
secData.setClientId(client.getClientId());
- secData.setProposedScope(params.getFirst(OAuthConstants.SCOPE));
+ if (requestedScope != null && !requestedScope.isEmpty()) {
+ StringBuilder builder = new StringBuilder();
+ for (String scope : requestedScope) {
+ builder.append(scope + " ");
+ }
+ secData.setProposedScope(builder.toString().trim());
+ }
if (!authorizationCanBeSkipped) {
secData.setPermissions(perms);
secData.setApplicationName(client.getApplicationName());