You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2016/08/02 16:29:07 UTC
incubator-ranger git commit: Some trivial fixes
Repository: incubator-ranger
Updated Branches:
refs/heads/master 24a100081 -> 17e37f0b6
Some trivial fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/17e37f0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/17e37f0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/17e37f0b
Branch: refs/heads/master
Commit: 17e37f0b68a5172c6c4b7c6d7c8a188ebc88f44a
Parents: 24a1000
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Aug 2 17:28:38 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Aug 2 17:28:38 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/hadoop/crypto/key/RangerKeyStore.java | 8 ++++----
.../java/org/apache/hadoop/crypto/key/RangerMasterKey.java | 6 +++---
.../org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/17e37f0b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
index f91fc50..6bd2954 100644
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStore.java
@@ -102,7 +102,7 @@ public class RangerKeyStore extends KeyStoreSpi {
{
Key key = null;
- Object entry = keyEntries.get(alias.toLowerCase());
+ Object entry = keyEntries.get(convertAlias(alias));
if (!(entry instanceof SecretKeyEntry)) {
return null;
@@ -166,7 +166,7 @@ public class RangerKeyStore extends KeyStoreSpi {
entry.description = description;
entry.version = version;
entry.attributes = attributes;
- deltaEntries.put(alias.toLowerCase(), entry);
+ deltaEntries.put(convertAlias(alias), entry);
} catch (Exception e) {
logger.error(e.getMessage());
throw new KeyStoreException(e.getMessage());
@@ -174,7 +174,7 @@ public class RangerKeyStore extends KeyStoreSpi {
}
synchronized(keyEntries) {
try {
- keyEntries.put(alias.toLowerCase(), entry);
+ keyEntries.put(convertAlias(alias), entry);
}catch (Exception e) {
logger.error(e.getMessage());
throw new KeyStoreException(e.getMessage());
@@ -586,4 +586,4 @@ public class RangerKeyStore extends KeyStoreSpi {
deltaEntries.clear();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/17e37f0b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
index d70ec4e..b701193 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerMasterKey.java
@@ -88,10 +88,10 @@ public class RangerMasterKey implements RangerKMSMKI{
}
/**
- * Generate the master key encrypt's it and save it in database
+ * Generate the master key, encrypt it and save it in the database
* @param password password to be used for encryption
- * @return true if successfully created the master key
- * false if master key generation was unsuccessful or already master key exists
+ * @return true if the master key was successfully created
+ * false if master key generation was unsuccessful or the master key already exists
* @throws Throwable
*/
@Override
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/17e37f0b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
index 65c80ad..b98b386 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
@@ -168,11 +168,11 @@ public class KMSWebApp implements ServletContextListener {
if (providerString == null) {
throw new IllegalStateException("No KeyProvider has been defined");
}
- Log.info("------------------ Ranger KMSWEbApp---------------------");
+ Log.info("------------------ Ranger KMSWebApp---------------------");
Log.info("provider string = "+providerString);
Log.info("URI = "+new URI(providerString).toString()+" scheme = "+new URI(providerString).getScheme());
Log.info("kmsconf size= "+kmsConf.size() + " kms classname="+kmsConf.getClass().getName());
- Log.info("----------------INstantiating key provider ---------------");
+ Log.info("----------------Instantiating key provider ---------------");
KeyProvider keyProvider =
KeyProviderFactory.get(new URI(providerString), kmsConf);
Log.info("keyProvider = "+keyProvider.toString());