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 2015/11/02 18:22:03 UTC
[1/2] cxf git commit: One more update to the oauth2 filter code
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes ea9f508c3 -> 5d4a4bc21
One more update to the oauth2 filter code
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5d4a4bc2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5d4a4bc2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5d4a4bc2
Branch: refs/heads/3.0.x-fixes
Commit: 5d4a4bc21bffae8b907492a23340013960908d8b
Parents: f12c540
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Nov 2 17:19:32 2015 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Nov 2 17:21:33 2015 +0000
----------------------------------------------------------------------
.../security/oauth2/services/AbstractAccessTokenValidator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5d4a4bc2/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java
index 4594e35..713318a 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AbstractAccessTokenValidator.java
@@ -106,8 +106,9 @@ public abstract class AbstractAccessTokenValidator {
accessTokenV = handler.validateAccessToken(getMessageContext(), authScheme, authSchemeData,
extraProps);
} catch (OAuthServiceException ex) {
- AuthorizationUtils.throwAuthorizationFailure(
- Collections.singleton(authScheme), realm);
+ AuthorizationUtils.throwAuthorizationFailure(Collections.singleton(authScheme), realm);
+ } catch (RuntimeException ex) {
+ AuthorizationUtils.throwAuthorizationFailure(Collections.singleton(authScheme), realm);
}
}
// Default processing if no registered providers available
[2/2] cxf git commit: Minor update to OAuth2 request filter
Posted by se...@apache.org.
Minor update to OAuth2 request filter
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f12c540d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f12c540d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f12c540d
Branch: refs/heads/3.0.x-fixes
Commit: f12c540db2066aa2992f2a77a3d4068c3f72b6b7
Parents: ea9f508
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Nov 2 17:15:07 2015 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Nov 2 17:21:33 2015 +0000
----------------------------------------------------------------------
.../security/oauth2/filters/AccessTokenValidatorClient.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f12c540d/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenValidatorClient.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenValidatorClient.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenValidatorClient.java
index 71bb021..7833f4e 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenValidatorClient.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/filters/AccessTokenValidatorClient.java
@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
+import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.MultivaluedMap;
import org.apache.cxf.jaxrs.client.WebClient;
@@ -54,7 +55,11 @@ public class AccessTokenValidatorClient implements AccessTokenValidator {
if (extraProps != null) {
props.putAll(extraProps);
}
- return client.post(props, AccessTokenValidation.class);
+ try {
+ return client.post(props, AccessTokenValidation.class);
+ } catch (WebApplicationException ex) {
+ throw new OAuthServiceException(ex);
+ }
}
public void setTokenValidatorClient(WebClient tokenValidatorClient) {