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 2017/09/26 11:01:23 UTC
[1/2] ranger git commit: RANGER-1804 The exception information is
error when judge password for RangerKeyStoreProvider class
Repository: ranger
Updated Branches:
refs/heads/master 1295e83bd -> 2e0691984
RANGER-1804 The exception information is error when judge password for RangerKeyStoreProvider class
Signed-off-by: Colm O hEigeartaigh <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/77be4025
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/77be4025
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/77be4025
Branch: refs/heads/master
Commit: 77be4025894e976c7d145382f6b43ad56186b046
Parents: 1295e83
Author: wangyuan <wa...@zte.com.cn>
Authored: Tue Sep 26 15:34:25 2017 +0800
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Sep 26 11:52:55 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/77be4025/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java
----------------------------------------------------------------------
diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java
index 267fcf0..b9d948f 100755
--- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java
+++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java
@@ -89,7 +89,7 @@ public class RangerKeyStoreProvider extends KeyProvider{
RangerKMSMKI rangerMasterKey = null;
String password = conf.get(ENCRYPTION_KEY);
if(password == null || password.trim().equals("") || password.trim().equals("_") || password.trim().equals("crypted")){
- throw new IOException("Master Key Jceks does not exists");
+ throw new IOException("The Ranger MasterKey Password is empty or not a valid Password");
}
if(StringUtils.isEmpty(conf.get(HSM_ENABLED)) || conf.get(HSM_ENABLED).equalsIgnoreCase("false")){
rangerMasterKey = new RangerMasterKey(daoManager);
[2/2] ranger git commit: RANGER-1803 Json may be analysis a null
value at tests[] for test_resourcematcher_default.json
Posted by co...@apache.org.
RANGER-1803 Json may be analysis a null value at tests[] for test_resourcematcher_default.json
Signed-off-by: Colm O hEigeartaigh <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/2e069198
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/2e069198
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/2e069198
Branch: refs/heads/master
Commit: 2e06919844f59904bcde423e02c59b66217dec6f
Parents: 77be402
Author: wangyuan <wa...@zte.com.cn>
Authored: Mon Sep 25 15:12:58 2017 +0800
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Sep 26 11:53:54 2017 +0100
----------------------------------------------------------------------
.../test_resourcematcher_default.json | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/2e069198/agents-common/src/test/resources/resourcematcher/test_resourcematcher_default.json
----------------------------------------------------------------------
diff --git a/agents-common/src/test/resources/resourcematcher/test_resourcematcher_default.json b/agents-common/src/test/resources/resourcematcher/test_resourcematcher_default.json
index 50b4cc3..779f57a 100644
--- a/agents-common/src/test/resources/resourcematcher/test_resourcematcher_default.json
+++ b/agents-common/src/test/resources/resourcematcher/test_resourcematcher_default.json
@@ -38,7 +38,7 @@
{ "name":"mixed-case","input":"SiMpLe", "result":true},
{ "name":"invalid-all-lower-wild","input":"other-simple", "result":false},
{ "name":"invalid-all-upper-wild","input":"OTHER-SIMPLE", "result":false},
- { "name":"invalid-mixed-case-wild","input":"OtHeR-SiMpLe", "result":false},
+ { "name":"invalid-mixed-case-wild","input":"OtHeR-SiMpLe", "result":false}
]
}
,
@@ -58,7 +58,7 @@
{ "name":"mixed-case","input":"SiMpLe", "result":false},
{ "name":"invalid-all-lower-wild","input":"other-simple", "result":true},
{ "name":"invalid-all-upper-wild","input":"OTHER-SIMPLE", "result":true},
- { "name":"invalid-mixed-case-wild","input":"OtHeR-SiMpLe", "result":true},
+ { "name":"invalid-mixed-case-wild","input":"OtHeR-SiMpLe", "result":true}
]
}
,
@@ -77,7 +77,7 @@
{ "name":"mixed-case","input":"SiMpLe", "result":false},
{ "name":"invalid-all-lower","input":"other-string", "result":false},
{ "name":"invalid-all-upper","input":"OTHER-STRING", "result":false},
- { "name":"invalid-mixed-case","input":"oThEr-StRiNg", "result":false},
+ { "name":"invalid-mixed-case","input":"oThEr-StRiNg", "result":false}
]
}
,
@@ -96,7 +96,7 @@
{ "name":"mixed-case","input":"SiMpLe", "result":true},
{ "name":"invalid-all-lower","input":"other-string", "result":false},
{ "name":"invalid-all-upper","input":"OTHER-STRING", "result":false},
- { "name":"invalid-mixed-case","input":"oThEr-StRiNg", "result":false},
+ { "name":"invalid-mixed-case","input":"oThEr-StRiNg", "result":false}
]
}
,
@@ -124,7 +124,7 @@
{ "name":"invalid-mixed-case","input":"oThEr-StRiNg", "result":false},
{ "name":"invalid-lower-wild","input":"simpele-test-string", "result":false},
{ "name":"invalid-upper-wild","input":"SIMPELE-TEST-STRING", "result":false},
- { "name":"invalid-mixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false},
+ { "name":"invalid-mixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false}
]
}
,
@@ -152,7 +152,7 @@
{ "name":"invalid-mixed-case","input":"oThEr-SiMpLe-StRiNg", "result":false},
{ "name":"invalid-lower-wild","input":"simpele-test-string", "result":false},
{ "name":"invalid-upper-wild","input":"SIMPELE-TEST-STRING", "result":false},
- { "name":"invalid-mixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false},
+ { "name":"invalid-mixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false}
]
}
,
@@ -183,7 +183,7 @@
{ "name":"invalid-mixed-case","input":"oThEr-SiMpLe-TeSt-StRiNg", "result":false},
{ "name":"invalid-lower-wild","input":"simpele-test-string", "result":false},
{ "name":"invalid-upper-wild","input":"SIMPELE-TEST-STRING", "result":false},
- { "name":"invalid-mixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false},
+ { "name":"invalid-mixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false}
]
}
,
@@ -217,7 +217,7 @@
{ "name":"invalid-mixed-case","input":"oThEr-SiMpLe-StRiNg", "result":false},
{ "name":"invalid-lower-wild","input":"simpele-test-string", "result":false},
{ "name":"invalid-upper-wild","input":"SIMPELE-TEST-STRING", "result":false},
- { "name":"invalid-mixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false},
+ { "name":"invalid-mixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false}
]
}
,
@@ -242,7 +242,7 @@
{ "name":"invalid-mixed-case","input":"oThEr-StRiNg", "result":false},
{ "name":"invalid-lower-wild","input":"simpele-test-string", "result":false},
{ "name":"invalid-upper-wild","input":"SIMPELE-TEST-STRING", "result":false},
- { "name":"invalidmixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false},
+ { "name":"invalidmixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false}
]
}
,
@@ -276,7 +276,7 @@
{ "name":"invalid-mixed-case","input":"oThEr-StRiNg", "result":false},
{ "name":"invalid-lower-wild","input":"simpele-test-string", "result":false},
{ "name":"invalid-upper-wild","input":"SIMPELE-TEST-STRING", "result":false},
- { "name":"invalid-mixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false},
+ { "name":"invalid-mixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false}
]
}
,
@@ -304,7 +304,7 @@
{ "name":"invalid-mixed-case","input":"oThEr-StRiNg-simple", "result":false},
{ "name":"invalid-lower-wild","input":"simpele-test-string", "result":false},
{ "name":"invalid-upper-wild","input":"SIMPELE-TEST-STRING", "result":false},
- { "name":"invalid-mixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false},
+ { "name":"invalid-mixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false}
]
}
,
@@ -335,7 +335,7 @@
{ "name":"invalid-mixed-case","input":"oThEr-StRiNg", "result":false},
{ "name":"invalid-lower-wild","input":"simpele-test-string", "result":false},
{ "name":"invalid-upper-wild","input":"SIMPELE-TEST-STRING", "result":false},
- { "name":"invalid-mixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false},
+ { "name":"invalid-mixed-case-wild","input":"SiMpeLe-TeSt-StRiNg", "result":false}
]
}
,
@@ -369,7 +369,7 @@
{ "name":"val3-extra-at-begin-wild","input":"mywildstring", "result":false},
{ "name":"val3-extra-at-begin-wild","input":"mywildstring", "result":false},
{ "name":"val4-all-lower","input":"onechar11", "result":false},
- { "name":"val5-all-lower","input":"star-studded-onechar11", "result":false},
+ { "name":"val5-all-lower","input":"star-studded-onechar11", "result":false}
]
}
]