Repository: cxf Updated Branches: refs/heads/3.0.x-fixes bf03cdc51 -> 41b67a545
[CXF-6558] Wrapping SecurityException in OAuthServiceException in DefaultEncryptingOAuthDataProvider Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/41b67a54 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/41b67a54 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/41b67a54 Branch: refs/heads/3.0.x-fixes Commit: 41b67a5457701028872f4d6f67a7445bc7af0685 Parents: bf03cdc Author: Sergey Beryozkin <[email protected]> Authored: Wed Aug 26 11:29:49 2015 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Wed Aug 26 11:31:14 2015 +0100 ---------------------------------------------------------------------- .../oauth2/provider/DefaultEncryptingOAuthDataProvider.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/41b67a54/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEncryptingOAuthDataProvider.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEncryptingOAuthDataProvider.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEncryptingOAuthDataProvider.java index 5750a3e..5c00892 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEncryptingOAuthDataProvider.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/DefaultEncryptingOAuthDataProvider.java @@ -77,7 +77,11 @@ public class DefaultEncryptingOAuthDataProvider extends AbstractOAuthDataProvide @Override public ServerAccessToken getAccessToken(String accessToken) throws OAuthServiceException { - return ModelEncryptionSupport.decryptAccessToken(this, accessToken, key); + try { + return ModelEncryptionSupport.decryptAccessToken(this, accessToken, key); + } catch (SecurityException ex) { + throw new OAuthServiceException(ex); + } } @Override
