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/06/21 09:49:07 UTC
ranger git commit: RANGER-1635 - Stop writing keystore files to the
home directory
Repository: ranger
Updated Branches:
refs/heads/master e07556457 -> dbbc2eab1
RANGER-1635 - Stop writing keystore files to the home directory
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/dbbc2eab
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/dbbc2eab
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/dbbc2eab
Branch: refs/heads/master
Commit: dbbc2eab1c5400a20245f04672dc7b9932969d43
Parents: e075564
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Jun 9 10:40:32 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Jun 21 10:48:59 2017 +0100
----------------------------------------------------------------------
.../credentialapi/TestCredentialReader.java | 58 +++++++-----
.../ranger/credentialapi/Testbuildks.java | 94 +++++++++++---------
2 files changed, 87 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/dbbc2eab/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java
----------------------------------------------------------------------
diff --git a/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java b/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java
index 4c2e86e..006986c 100644
--- a/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java
+++ b/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/TestCredentialReader.java
@@ -18,36 +18,46 @@
package org.apache.ranger.credentialapi;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import java.io.File;
+import org.apache.commons.io.FileUtils;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
public class TestCredentialReader {
- private final String keystoreFile = new File(System.getProperty("user.home")+"/testkeystore.jceks").toURI().getPath();
- @Before
- public void setup() throws Exception {
- buildks buildksOBJ=new buildks();
- String[] argsCreateCommand = {"create", "TestCredential2", "-value", "PassworD123", "-provider", "jceks://file@/" + keystoreFile};
- int rc2=buildksOBJ.createCredential(argsCreateCommand);
- assertEquals( 0, rc2);
- assertTrue(rc2==0);
- }
-
- @Test
- public void testPassword() throws Exception {
- String password=CredentialReader.getDecryptedString(keystoreFile, "TestCredential2");
- assertEquals( "PassworD123", password);
- assertTrue(password,"PassworD123".equals(password));
- //delete after use
-
- String[] argsdeleteCommand = new String[] {"delete", "TestCredential2", "-provider", "jceks://file@/" + keystoreFile};
-
- buildks buildksOBJ=new buildks();
- buildksOBJ.deleteCredential(argsdeleteCommand, true);
-
- }
+ private String keystoreFile;
+
+ @Before
+ public void setup() throws Exception {
+ String basedir = System.getProperty("basedir");
+ if (basedir == null) {
+ basedir = new File(".").getCanonicalPath();
+ }
+ keystoreFile = basedir + File.separator + "target" + File.separator + "testkeystore.jceks";
+
+ buildks buildksOBJ = new buildks();
+ String[] argsCreateCommand = {"create", "TestCredential2", "-value", "PassworD123", "-provider", "jceks://file@/" + keystoreFile};
+ int rc2 = buildksOBJ.createCredential(argsCreateCommand);
+ assertEquals(0, rc2);
+ }
+
+ @After
+ public void cleanup() throws Exception {
+ FileUtils.deleteQuietly(new File(keystoreFile));
+ }
+
+ @Test
+ public void testPassword() throws Exception {
+ String password = CredentialReader.getDecryptedString(keystoreFile, "TestCredential2");
+ assertEquals("PassworD123", password);
+
+ String[] argsdeleteCommand = new String[] {"delete", "TestCredential2", "-provider", "jceks://file@/" + keystoreFile};
+
+ buildks buildksOBJ = new buildks();
+ buildksOBJ.deleteCredential(argsdeleteCommand, true);
+
+ }
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/dbbc2eab/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java
----------------------------------------------------------------------
diff --git a/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java b/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java
index ce93b65..87634d7 100644
--- a/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java
+++ b/credentialbuilder/src/test/java/org/apache/ranger/credentialapi/Testbuildks.java
@@ -21,56 +21,68 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.File;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
public class Testbuildks {
- private final String keystoreFile = new File(System.getProperty("user.home")+"/testkeystore.jceks").toURI().getPath();
- @Test
- public void testBuildKSsuccess() throws Exception {
- buildks buildksOBJ=new buildks();
- String[] argsCreateCommand = {"create", "TestCredential1", "-value", "PassworD123", "-provider", "jceks://file@/" + keystoreFile};
- int rc1=buildksOBJ.createCredential(argsCreateCommand);
- assertEquals( 0, rc1);
- assertTrue(rc1==0);
- String[] argsListCommand = {"list", "-provider","jceks://file@/" + keystoreFile};
- int rc2=buildksOBJ.listCredential(argsListCommand);
- assertEquals(0, rc2);
- assertTrue(rc2==0);
+ private String keystoreFile;
+
+ @Before
+ public void setup() throws Exception {
+ String basedir = System.getProperty("basedir");
+ if (basedir == null) {
+ basedir = new File(".").getCanonicalPath();
+ }
+ keystoreFile = basedir + File.separator + "target" + File.separator + "testkeystore.jceks";
+ }
+
+ @After
+ public void cleanup() throws Exception {
+ FileUtils.deleteQuietly(new File(keystoreFile));
+ }
+
+ @Test
+ public void testBuildKSsuccess() throws Exception {
+ buildks buildksOBJ = new buildks();
+ String[] argsCreateCommand = {"create", "TestCredential1", "-value", "PassworD123", "-provider", "jceks://file@/" + keystoreFile};
+ int rc1 = buildksOBJ.createCredential(argsCreateCommand);
+ assertEquals(0, rc1);
- String[] argsGetCommand = {"get", "TestCredential1", "-provider", "jceks://file@/" +keystoreFile };
- String pw=buildksOBJ.getCredential(argsGetCommand);
- assertEquals("PassworD123", pw);
- assertTrue(pw.equals("PassworD123"));
- boolean getCredentialPassed = pw.equals("PassworD123");
+ String[] argsListCommand = {"list", "-provider","jceks://file@/" + keystoreFile};
+ int rc2=buildksOBJ.listCredential(argsListCommand);
+ assertEquals(0, rc2);
- String[] argsDeleteCommand = new String[] {"delete", "TestCredential1", "-provider", "jceks://file@/" +keystoreFile };
- boolean isSilentMode = true;
+ String[] argsGetCommand = {"get", "TestCredential1", "-provider", "jceks://file@/" +keystoreFile };
+ String pw = buildksOBJ.getCredential(argsGetCommand);
+ assertEquals("PassworD123", pw);
+ assertTrue(pw.equals("PassworD123"));
+ boolean getCredentialPassed = pw.equals("PassworD123");
+ assertTrue(getCredentialPassed);
- int rc3=buildksOBJ.deleteCredential(argsDeleteCommand, isSilentMode);
- assertEquals(0, rc3);
- assertTrue(rc3==0);
+ String[] argsDeleteCommand = new String[] {"delete", "TestCredential1", "-provider", "jceks://file@/" +keystoreFile };
+ boolean isSilentMode = true;
- if(rc1==rc2 && rc2==rc3 && rc3==0 && getCredentialPassed){
- System.out.println("Test Case has been completed successfully..");
+ int rc3 = buildksOBJ.deleteCredential(argsDeleteCommand, isSilentMode);
+ assertEquals(0, rc3);
}
- }
- @Test
- public void testInvalidProvider() throws Exception {
- buildks buildksOBJ=new buildks();
- String[] argsCreateCommand = {"create", "TestCredential1", "-value", "PassworD123", "-provider", "jksp://file@/"+keystoreFile};
- int rc1=buildksOBJ.createCredential(argsCreateCommand);
- assertEquals(-1, rc1);
- assertTrue(rc1==-1);
- }
+ @Test
+ public void testInvalidProvider() throws Exception {
+ buildks buildksOBJ = new buildks();
+ String[] argsCreateCommand = {"create", "TestCredential1", "-value", "PassworD123", "-provider", "jksp://file@/"+keystoreFile};
+ int rc1 = buildksOBJ.createCredential(argsCreateCommand);
+ assertEquals(-1, rc1);
+ }
- @Test
- public void testInvalidCommand() throws Exception {
- buildks buildksOBJ=new buildks();
- String[] argsCreateCommand = {"creat", "TestCredential1", "-value", "PassworD123", "-provider", "jksp://file@/"+keystoreFile};
- int rc1=buildksOBJ.createCredential(argsCreateCommand);
- assertEquals(-1, rc1);
- assertTrue(rc1==-1);
- }
+ @Test
+ public void testInvalidCommand() throws Exception {
+ buildks buildksOBJ = new buildks();
+ String[] argsCreateCommand = {"creat", "TestCredential1", "-value", "PassworD123", "-provider", "jksp://file@/"+keystoreFile};
+ int rc1 = buildksOBJ.createCredential(argsCreateCommand);
+ assertEquals(-1, rc1);
+ }
}