You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ve...@apache.org on 2016/06/07 19:57:07 UTC
[3/3] incubator-ranger git commit: RANGER-1015 : Ranger KMS changes
to cater to hadoop kms commits
RANGER-1015 : Ranger KMS changes to cater to hadoop kms commits
Signed-off-by: Velmurugan Periasamy <ve...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/724c83c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/724c83c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/724c83c9
Branch: refs/heads/master
Commit: 724c83c9e59a04a47928400e90e61429ee0e08bc
Parents: 759f52e
Author: Ankita Sinha <an...@freestoneinfotech.com>
Authored: Tue Jun 7 15:00:41 2016 +0530
Committer: Velmurugan Periasamy <ve...@apache.org>
Committed: Tue Jun 7 15:56:36 2016 -0400
----------------------------------------------------------------------
.../hadoop/crypto/key/kms/server/KMSExceptionsProvider.java | 2 ++
.../org/apache/hadoop/crypto/key/kms/server/KMSMDCFilter.java | 2 +-
.../crypto/key/kms/server/KeyAuthorizationKeyProvider.java | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/724c83c9/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java
index 5cb0885..aa9d299 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSExceptionsProvider.java
@@ -86,12 +86,14 @@ public class KMSExceptionsProvider implements ExceptionMapper<Exception> {
status = Response.Status.FORBIDDEN;
} else if (exception instanceof IOException) {
status = Response.Status.INTERNAL_SERVER_ERROR;
+ log(status, throwable);
} else if (exception instanceof UnsupportedOperationException) {
status = Response.Status.BAD_REQUEST;
} else if (exception instanceof IllegalArgumentException) {
status = Response.Status.BAD_REQUEST;
} else {
status = Response.Status.INTERNAL_SERVER_ERROR;
+ log(status, throwable);
}
if (doAudit) {
KMSWebApp.getKMSAudit().error(KMSMDCFilter.getUgi(),
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/724c83c9/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMDCFilter.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMDCFilter.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMDCFilter.java
index 6352fbc..da8f715 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMDCFilter.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSMDCFilter.java
@@ -49,7 +49,7 @@ public class KMSMDCFilter implements Filter {
}
}
- private static ThreadLocal<Data> DATA_TL = new ThreadLocal<Data>();
+ private static final ThreadLocal<Data> DATA_TL = new ThreadLocal<Data>();
public static UserGroupInformation getUgi() {
return DATA_TL.get().ugi;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/724c83c9/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
index fe2f175..23bf95c 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KeyAuthorizationKeyProvider.java
@@ -99,8 +99,8 @@ public class KeyAuthorizationKeyProvider extends KeyProviderCryptoExtension {
* The constructor takes a {@link KeyProviderCryptoExtension} and an
* implementation of <code>KeyACLs</code>. All calls are delegated to the
* provider keyProvider after authorization check (if required)
- * @param keyProvider
- * @param acls
+ * @param keyProvider the key provider
+ * @param acls the Key ACLs
*/
public KeyAuthorizationKeyProvider(KeyProviderCryptoExtension keyProvider,
KeyACLs acls) {