You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sn...@apache.org on 2017/02/20 05:56:13 UTC
[1/2] ranger git commit: RANGER-1391:Error occurred when use EndDate
as Search Filter in Audit Access WebPage
Repository: ranger
Updated Branches:
refs/heads/ranger-0.7 869c723f1 -> 5eb030ada
RANGER-1391:Error occurred when use EndDate as Search Filter in Audit Access WebPage
Signed-off-by: Selvamohan Neethiraj <sn...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/06005ca3
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/06005ca3
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/06005ca3
Branch: refs/heads/ranger-0.7
Commit: 06005ca39b12bde4042804bf538ab855507c983f
Parents: 869c723
Author: zhangqiang2 <zh...@zte.com.cn>
Authored: Fri Feb 17 15:48:24 2017 +0800
Committer: Selvamohan Neethiraj <sn...@apache.org>
Committed: Mon Feb 20 00:33:47 2017 -0500
----------------------------------------------------------------------
security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/06005ca3/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
index e0ab372..a851c3e 100644
--- a/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
@@ -117,6 +117,7 @@ public class SolrUtil {
} else if (searchField.getSearchType() == SEARCH_TYPE.LESS_EQUAL_THAN
|| searchField.getSearchType() == SEARCH_TYPE.LESS_THAN) {
toDate = (Date) paramValue;
+ dateFieldName = fieldName;
}
}
} else if (searchField.getSearchType() == SEARCH_TYPE.GREATER_EQUAL_THAN
[2/2] ranger git commit: RANGER-1347 - The AtlasClient should fall
back to the plain password if the password decryption fails
Posted by sn...@apache.org.
RANGER-1347 - The AtlasClient should fall back to the plain password if the password decryption fails
Signed-off-by: Selvamohan Neethiraj <sn...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/5eb030ad
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/5eb030ad
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/5eb030ad
Branch: refs/heads/ranger-0.7
Commit: 5eb030ada419c4b1aaff4474ac98b6680667efb0
Parents: 06005ca
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Feb 3 15:50:13 2017 +0000
Committer: Selvamohan Neethiraj <sn...@apache.org>
Committed: Mon Feb 20 00:48:45 2017 -0500
----------------------------------------------------------------------
.../ranger/services/atlas/client/AtlasClient.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/5eb030ad/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
----------------------------------------------------------------------
diff --git a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
index 4f90469..b959f97 100644
--- a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
+++ b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java
@@ -112,7 +112,20 @@ public class AtlasClient extends BaseClient {
WebResource webResource = client.resource(statusUrl);
MultivaluedMap<String, String> formData = new MultivaluedMapImpl();
formData.add("j_username", userName);
- formData.add("j_password",PasswordUtils.decryptPassword(password));
+
+ String decryptedPwd = null;
+ try {
+ decryptedPwd = PasswordUtils.decryptPassword(password);
+ } catch (Exception ex) {
+ LOG.info("Password decryption failed; trying Atlas connection with received password string");
+ decryptedPwd = null;
+ } finally {
+ if (decryptedPwd == null) {
+ decryptedPwd = password;
+ }
+ }
+ formData.add("j_password", decryptedPwd);
+
try {
statusResponse = webResource.type("application/x-www-form-urlencoded").post(
ClientResponse.class, formData);