cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6558] Wrapping SecurityException in OAuthServiceException in DefaultEncryptingOAuthDataProvider
Date Wed, 26 Aug 2015 10:30:08 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 2bbdbdab9 -> 53fdbb8bc


[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/53fdbb8b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/53fdbb8b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/53fdbb8b

Branch: refs/heads/master
Commit: 53fdbb8bcc2c2967271c30ff8edeaa6d0c8a0954
Parents: 2bbdbda
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Wed Aug 26 11:29:49 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Wed Aug 26 11:29:49 2015 +0100

----------------------------------------------------------------------
 .../oauth2/provider/DefaultEncryptingOAuthDataProvider.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/53fdbb8b/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


Mime
View raw message