This is an automated email from the ASF dual-hosted git repository.
zsombor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new 4eb557a RANGER-2386: Code duplication due to
RangerCredentialProvider.getCredentialString returns char[]
4eb557a is described below
commit 4eb557a8d9c15015042765235980678ae8d15fd3
Author: Zsombor Gegesy <[email protected]>
AuthorDate: Thu Mar 28 20:22:23 2019 +0100
RANGER-2386: Code duplication due to
RangerCredentialProvider.getCredentialString returns char[]
---
.../org/apache/ranger/audit/provider/DbAuditProvider.java | 11 ++---------
.../main/java/org/apache/ranger/audit/provider/MiscUtil.java | 11 ++---------
.../java/org/apache/ranger/plugin/util/RangerRESTClient.java | 4 +---
.../java/org/apache/ranger/plugin/util/RangerSslHelper.java | 4 +---
.../authorization/hadoop/utils/RangerCredentialProvider.java | 6 +++---
.../hadoop/utils/RangerCredentialProviderTest.java | 2 +-
6 files changed, 10 insertions(+), 28 deletions(-)
diff --git
a/agents-audit/src/main/java/org/apache/ranger/audit/provider/DbAuditProvider.java
b/agents-audit/src/main/java/org/apache/ranger/audit/provider/DbAuditProvider.java
index 1490c27..95909a9 100644
---
a/agents-audit/src/main/java/org/apache/ranger/audit/provider/DbAuditProvider.java
+++
b/agents-audit/src/main/java/org/apache/ranger/audit/provider/DbAuditProvider.java
@@ -362,16 +362,9 @@ public class DbAuditProvider extends AuditDestination {
}
private String getCredentialString(String url,String alias) {
- String ret = null;
-
if(url != null && alias != null) {
- char[] cred =
RangerCredentialProvider.getInstance().getCredentialString(url,alias);
-
- if ( cred != null ) {
- ret = new String(cred);
- }
+ return
RangerCredentialProvider.getInstance().getCredentialString(url,alias);
}
-
- return ret;
+ return null;
}
}
diff --git
a/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
b/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
index eff3824..b7315a9 100644
--- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
+++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/MiscUtil.java
@@ -423,18 +423,11 @@ public class MiscUtil {
}
public static String getCredentialString(String url, String alias) {
- String ret = null;
-
if (url != null && alias != null) {
- char[] cred = RangerCredentialProvider.getInstance()
+ return RangerCredentialProvider.getInstance()
.getCredentialString(url, alias);
-
- if (cred != null) {
- ret = new String(cred);
- }
}
-
- return ret;
+ return null;
}
public static UserGroupInformation createUGIFromSubject(Subject subject)
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
index 2a4b9c9..0075b36 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
@@ -383,9 +383,7 @@ public class RangerRESTClient {
}
private String getCredential(String url, String alias) {
- char[] credStr =
RangerCredentialProvider.getInstance().getCredentialString(url, alias);
-
- return credStr == null ? null : new String(credStr);
+ return
RangerCredentialProvider.getInstance().getCredentialString(url, alias);
}
private InputStream getFileInputStream(String fileName) throws
IOException {
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
index 2036661..5fc3358 100644
---
a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
+++
b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
@@ -255,9 +255,7 @@ public class RangerSslHelper {
}
private String getCredential(String url, String alias) {
- char[] credStr =
RangerCredentialProvider.getInstance().getCredentialString(url, alias);
-
- return credStr == null ? null : new String(credStr);
+ return
RangerCredentialProvider.getInstance().getCredentialString(url, alias);
}
private InputStream getFileInputStream(String fileName) throws
IOException {
diff --git
a/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java
b/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java
index 44cadfb..61d0f21 100644
---
a/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java
+++
b/agents-cred/src/main/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProvider.java
@@ -42,7 +42,7 @@ public final class RangerCredentialProvider {
return CRED_PROVIDER;
}
- public char[] getCredentialString(String url, String alias) {
+ public String getCredentialString(String url, String alias) {
List<CredentialProvider> providers =
getCredentialProviders(url);
if (providers != null) {
@@ -50,8 +50,8 @@ public final class RangerCredentialProvider {
try {
CredentialProvider.CredentialEntry
credEntry = provider.getCredentialEntry(alias);
- if (credEntry != null) {
- return
credEntry.getCredential();
+ if (credEntry != null &&
credEntry.getCredential() != null) {
+ return new
String(credEntry.getCredential());
}
} catch(Exception ie) {
LOG.error("Unable to get the Credential
Provider from the Configuration", ie);
diff --git
a/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java
b/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java
index 971ee68..a3b8397 100644
---
a/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java
+++
b/agents-cred/src/test/java/org/apache/ranger/authorization/hadoop/utils/RangerCredentialProviderTest.java
@@ -119,7 +119,7 @@ public class RangerCredentialProviderTest {
cp = new RangerCredentialProvider();
providers = cp.getCredentialProviders(url);
if (providers != null) {
- assertTrue("PassworD123".equals(new
String(cp.getCredentialString(url, "TestCredential001"))));
+
assertTrue("PassworD123".equals(cp.getCredentialString(url,
"TestCredential001")));
}
System.out.println("(3) Number of active Threads : " +
Thread.activeCount());
listThreads();
