You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2015/07/27 23:00:17 UTC
knox git commit: KNOX-576: CLI user-auth-test should print a message
when a user successfully authenticates.
Repository: knox
Updated Branches:
refs/heads/master be727f18c -> c414c58ad
KNOX-576: CLI user-auth-test should print a message when a user successfully authenticates.
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/c414c58a
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/c414c58a
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/c414c58a
Branch: refs/heads/master
Commit: c414c58ad541b2fd04a86c98bbfd730a2d6a1207
Parents: be727f1
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Mon Jul 27 17:00:11 2015 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Mon Jul 27 17:00:11 2015 -0400
----------------------------------------------------------------------
.../org/apache/hadoop/gateway/util/KnoxCLI.java | 2 +-
.../gateway/KnoxCliLdapFuncTestPositive.java | 22 ++++++++++++++++----
2 files changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/c414c58a/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java
index 497121e..b083fb3 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/util/KnoxCLI.java
@@ -1205,8 +1205,8 @@ public class KnoxCLI extends Configured implements Tool {
if(new File(config).exists()) {
if(testSysBind(topology, config)) {
if(authenticateUser(config, new UsernamePasswordToken(username, password))) {
+ out.println("LDAP authentication successful!");
if(groups) {
- out.println("LDAP authentication successful!");
groupSet = getGroups(topology, new UsernamePasswordToken(username, password));
if(groupSet == null || groupSet.isEmpty()) {
out.println(username + " does not belong to any groups");
http://git-wip-us.apache.org/repos/asf/knox/blob/c414c58a/gateway-test/src/test/java/org/apache/hadoop/gateway/KnoxCliLdapFuncTestPositive.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/KnoxCliLdapFuncTestPositive.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/KnoxCliLdapFuncTestPositive.java
index 72c2f60..afd2e8e 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/KnoxCliLdapFuncTestPositive.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/KnoxCliLdapFuncTestPositive.java
@@ -46,6 +46,7 @@ import java.util.Map;
import java.util.UUID;
import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
import static org.junit.Assert.assertThat;
public class KnoxCliLdapFuncTestPositive {
@@ -284,7 +285,7 @@ public class KnoxCliLdapFuncTestPositive {
username = "bad-name";
password = "bad-password";
String args2[] = {"user-auth-test", "--master", "knox", "--cluster", "test-cluster", "--u", username, "--p", password};
- cli.run( args2 );
+ cli.run(args2);
assertThat(outContent.toString(), containsString("LDAP authentication failed"));
// Test 3: Authenticate a user who belongs to no groups, but specify groups with --g
@@ -294,8 +295,8 @@ public class KnoxCliLdapFuncTestPositive {
username = "guest";
password = "guest-password";
String args3[] = {"user-auth-test", "--master", "knox", "--cluster", "test-cluster",
- "--u", username, "--p", password };
- cli.run( args3 );
+ "--u", username, "--p", password, "--g" };
+ cli.run(args3);
assertThat(outContent.toString(), containsString("LDAP authentication success"));
assertThat(outContent.toString(), containsString("does not belong to any groups"));
@@ -307,10 +308,23 @@ public class KnoxCliLdapFuncTestPositive {
password = "guest-password";
String args4[] = {"user-auth-test", "--master", "knox", "--cluster", "cluster-dne",
"--u", username, "--p", password };
- cli.run( args4 );
+ cli.run(args4);
assertThat(outContent.toString(), containsString("ERR: Topology"));
assertThat(outContent.toString(), containsString("does not exist"));
+
+ // Test 5: Authenticate a user who belongs to no groups, but specify groups with --g
+ outContent.reset();
+ cli = new KnoxCLI();
+ cli.setConf(config);
+ username = "guest";
+ password = "guest-password";
+ String args5[] = {"user-auth-test", "--master", "knox", "--cluster", "test-cluster",
+ "--u", username, "--p", password };
+ cli.run( args5 );
+ assertThat(outContent.toString(), containsString("LDAP authentication success"));
+ assertThat(outContent.toString(), not(containsString("does not belong to any groups")));
+
}