You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by an...@apache.org on 2017/08/23 07:22:38 UTC
ranger git commit: RANGER-1705 : Good coding practice in Ranger
recommended by static code analysis
Repository: ranger
Updated Branches:
refs/heads/master a16889fbb -> 02c094393
RANGER-1705 : Good coding practice in Ranger recommended by static code analysis
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/02c09439
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/02c09439
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/02c09439
Branch: refs/heads/master
Commit: 02c094393f40b209800f740a1ca8eaa8f7f4e43a
Parents: a16889f
Author: Ankita Sinha <an...@apache.org>
Authored: Fri Jul 21 16:48:38 2017 +0530
Committer: Ankita Sinha <an...@apache.org>
Committed: Wed Aug 23 10:02:38 2017 +0530
----------------------------------------------------------------------
.../crypto/key/kms/TestRangerKeyStore.java | 36 +++++++++++++-------
.../filter/RangerSSOAuthenticationFilter.java | 10 +++---
.../org/apache/ranger/rest/TestServiceREST.java | 13 ++++---
3 files changed, 37 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/02c09439/kms/src/test/java/org/apache/hadoop/crypto/key/kms/TestRangerKeyStore.java
----------------------------------------------------------------------
diff --git a/kms/src/test/java/org/apache/hadoop/crypto/key/kms/TestRangerKeyStore.java b/kms/src/test/java/org/apache/hadoop/crypto/key/kms/TestRangerKeyStore.java
index c1925f8..bcdf2e3 100644
--- a/kms/src/test/java/org/apache/hadoop/crypto/key/kms/TestRangerKeyStore.java
+++ b/kms/src/test/java/org/apache/hadoop/crypto/key/kms/TestRangerKeyStore.java
@@ -35,9 +35,7 @@ import org.apache.ranger.kms.dao.DaoManager;
import org.junit.After;
import org.junit.Before;
import org.junit.FixMethodOrder;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
import org.mockito.Mockito;
@@ -53,9 +51,6 @@ public class TestRangerKeyStore {
char[] keyPass = "none".toCharArray();
char[] masterKey = "MasterPassword".toCharArray();
- @Rule
- public ExpectedException thrown = ExpectedException.none();
-
@Before
public void checkFileIfExists() {
deleteKeyStoreFile();
@@ -73,7 +68,9 @@ public class TestRangerKeyStore {
DaoManager daoManager = Mockito.mock(DaoManager.class);
RangerKeyStore rangerKeyStore = new RangerKeyStore(daoManager);
String keyValue = "enckey:1";
- rangerKeyStore.engineLoadKeyStoreFile(generateKeyStoreFile(keyValue),storePass, keyPass, masterKey, fileFormat);
+ InputStream inputStream = generateKeyStoreFile(keyValue);
+ rangerKeyStore.engineLoadKeyStoreFile(inputStream, storePass, keyPass, masterKey, fileFormat);
+ inputStream.close();
}
@Test(expected=IOException.class)
@@ -83,7 +80,9 @@ public class TestRangerKeyStore {
DaoManager daoManager = Mockito.mock(DaoManager.class);
RangerKeyStore rangerKeyStore = new RangerKeyStore(daoManager);
String keyValue = "1%enckey";
- rangerKeyStore.engineLoadKeyStoreFile(generateKeyStoreFile(keyValue),storePass, keyPass, masterKey, fileFormat);
+ InputStream inputStream = generateKeyStoreFile(keyValue);
+ rangerKeyStore.engineLoadKeyStoreFile(inputStream, storePass, keyPass, masterKey, fileFormat);
+ inputStream.close();
}
@Test(expected=IOException.class)
@@ -93,7 +92,9 @@ public class TestRangerKeyStore {
DaoManager daoManager = Mockito.mock(DaoManager.class);
RangerKeyStore rangerKeyStore = new RangerKeyStore(daoManager);
String keyValue = "1 enckey";
- rangerKeyStore.engineLoadKeyStoreFile(generateKeyStoreFile(keyValue),storePass, keyPass, masterKey, fileFormat);
+ InputStream inputStream = generateKeyStoreFile(keyValue);
+ rangerKeyStore.engineLoadKeyStoreFile(inputStream, storePass, keyPass, masterKey, fileFormat);
+ inputStream.close();
}
@Test(expected=IOException.class)
@@ -103,7 +104,9 @@ public class TestRangerKeyStore {
DaoManager daoManager = Mockito.mock(DaoManager.class);
RangerKeyStore rangerKeyStore = new RangerKeyStore(daoManager);
String keyValue = "_1-enckey";
- rangerKeyStore.engineLoadKeyStoreFile(generateKeyStoreFile(keyValue),storePass, keyPass, masterKey, fileFormat);
+ InputStream inputStream = generateKeyStoreFile(keyValue);
+ rangerKeyStore.engineLoadKeyStoreFile(inputStream, storePass, keyPass, masterKey, fileFormat);
+ inputStream.close();
}
@Test
@@ -113,7 +116,9 @@ public class TestRangerKeyStore {
DaoManager daoManager = Mockito.mock(DaoManager.class);
RangerKeyStore rangerKeyStore = new RangerKeyStore(daoManager);
String keyValue = "enckey_1-test";
- rangerKeyStore.engineLoadKeyStoreFile(generateKeyStoreFile(keyValue),storePass, keyPass, masterKey, fileFormat);
+ InputStream inputStream = generateKeyStoreFile(keyValue);
+ rangerKeyStore.engineLoadKeyStoreFile(inputStream, storePass, keyPass, masterKey, fileFormat);
+ inputStream.close();
}
@Test
@@ -123,7 +128,9 @@ public class TestRangerKeyStore {
DaoManager daoManager = Mockito.mock(DaoManager.class);
RangerKeyStore rangerKeyStore = new RangerKeyStore(daoManager);
String keyValue = "1-enckey_test";
- rangerKeyStore.engineLoadKeyStoreFile(generateKeyStoreFile(keyValue),storePass, keyPass, masterKey, fileFormat);
+ InputStream inputStream = generateKeyStoreFile(keyValue);
+ rangerKeyStore.engineLoadKeyStoreFile(inputStream, storePass, keyPass, masterKey, fileFormat);
+ inputStream.close();
}
private InputStream generateKeyStoreFile(String keyValue) throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
@@ -144,13 +151,18 @@ public class TestRangerKeyStore {
return new FileInputStream(new File(keyStoreFileName));
} catch (Throwable t) {
throw new IOException(t);
+ } finally {
+ stream.close();
}
}
private void deleteKeyStoreFile() {
File f = new File(keyStoreFileName);
if (f.exists()) {
- f.delete();
+ boolean bol = f.delete();
+ if(!bol){
+ System.out.println("Keystore File was not deleted successfully.");
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/02c09439/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java
index b912e7e..481fe8e 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSSOAuthenticationFilter.java
@@ -229,14 +229,14 @@ public class RangerSSOAuthenticationFilter implements Filter {
}
private String constructForwardableURL(HttpServletRequest httpRequest){
- String xForwardedProto = null;
- String xForwardedHost = null;
- String xForwardedContext = null;
+ String xForwardedProto = "";
+ String xForwardedHost = "";
+ String xForwardedContext = "";
Enumeration<String> names = httpRequest.getHeaderNames();
while (names.hasMoreElements()) {
String name = (String) names.nextElement();
Enumeration<String> values = httpRequest.getHeaders(name);
- String value = null;
+ String value = "";
if (values != null) {
while (values.hasMoreElements()) {
value = (String) values.nextElement();
@@ -253,7 +253,7 @@ public class RangerSSOAuthenticationFilter implements Filter {
}
}
}
- String xForwardedURL = null;
+ String xForwardedURL = "";
if (StringUtils.trimToNull(xForwardedProto) != null && StringUtils.trimToNull(xForwardedHost) != null && StringUtils.trimToNull(xForwardedContext) != null) {
xForwardedURL = xForwardedProto + "://" + xForwardedHost
+ xForwardedContext + PROXY_RANGER_URL_PATH
http://git-wip-us.apache.org/repos/asf/ranger/blob/02c09439/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
index 4bb0746..7c48d54 100644
--- a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
+++ b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java
@@ -1068,7 +1068,8 @@ public class TestServiceREST {
RangerPolicy existingPolicy = rangerPolicy();
RangerPolicy appliedPolicy = rangerPolicy();
- existingPolicy.setPolicyItems(null);
+ List<RangerPolicyItem> policyItem = new ArrayList<RangerPolicyItem>();
+ existingPolicy.setPolicyItems(policyItem );
appliedPolicy.setPolicyItems(null);
Map<String, RangerPolicyResource> policyResources = new HashMap<String, RangerPolicyResource>();
@@ -1117,7 +1118,8 @@ public class TestServiceREST {
RangerPolicy existingPolicy = rangerPolicy();
RangerPolicy appliedPolicy = rangerPolicy();
- existingPolicy.setPolicyItems(null);
+ List<RangerPolicyItem> policyItem = new ArrayList<RangerPolicyItem>();
+ existingPolicy.setPolicyItems(policyItem);
appliedPolicy.setPolicyItems(null);
Map<String, RangerPolicyResource> policyResources = new HashMap<String, RangerPolicyResource>();
@@ -1211,8 +1213,8 @@ public class TestServiceREST {
@Test
public void test42grant() {
RangerPolicy existingPolicy = rangerPolicy();
-
- existingPolicy.setPolicyItems(null);
+ List<RangerPolicyItem> policyItem = new ArrayList<RangerPolicyItem>();
+ existingPolicy.setPolicyItems(policyItem );
Map<String, RangerPolicyResource> policyResources = new HashMap<String, RangerPolicyResource>();
RangerPolicyResource rangerPolicyResource = new RangerPolicyResource("/tmp");
@@ -1306,7 +1308,8 @@ public class TestServiceREST {
public void test43revoke() {
RangerPolicy existingPolicy = rangerPolicy();
- existingPolicy.setPolicyItems(null);
+ List<RangerPolicyItem> policyItem = new ArrayList<RangerPolicyItem>();
+ existingPolicy.setPolicyItems(policyItem );
Map<String, RangerPolicyResource> policyResources = new HashMap<String, RangerPolicyResource>();
RangerPolicyResource rangerPolicyResource = new RangerPolicyResource("/tmp");