big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[HADOOP-19010] - NullPointerException in Hadoop Credential Check CLI (#6351)

Browse Source
This commit is contained in:
Anika Kelhanka 2023-12-16 12:23:52 +05:30 committed by GitHub
parent 3caabb2957
commit 62cc673d00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/alias/CredentialShell.java
View File

@ -25,6 +25,7 @@
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import org.apache.hadoop.security.alias.CredentialProvider.CredentialEntry;
import org.apache.hadoop.classification.VisibleForTesting; import org.apache.hadoop.classification.VisibleForTesting;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -365,12 +366,17 @@ public void execute() throws IOException, NoSuchAlgorithmException {
} else { } else {
password = c.readPassword("Enter alias password: "); password = c.readPassword("Enter alias password: ");
} }
char[] storePassword = CredentialEntry credentialEntry = provider.getCredentialEntry(alias);
provider.getCredentialEntry(alias).getCredential(); if(credentialEntry == null) {
String beMatch = // Fail the password match when alias not found
Arrays.equals(storePassword, password) ? "success" : "failed"; getOut().println("Password match failed for " + alias + ".");
} else {
char[] storePassword = credentialEntry.getCredential();
String beMatch =
Arrays.equals(storePassword, password) ? "success" : "failed";
getOut().println("Password match " + beMatch + " for " + alias + "."); getOut().println("Password match " + beMatch + " for " + alias + ".");
}
} catch (IOException e) { } catch (IOException e) {
getOut().println("Cannot check aliases for CredentialProvider: " + getOut().println("Cannot check aliases for CredentialProvider: " +
provider.toString() provider.toString()

15
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/alias/TestCredShell.java
View File

@ -165,6 +165,21 @@ public void testPromptForCredentialWithEmptyPasswd() throws Exception {
assertTrue(outContent.toString().contains("Passwords don't match")); assertTrue(outContent.toString().contains("Passwords don't match"));
} }
@Test
public void testPromptForCredentialNotFound() throws Exception {
String[] args1 = {"check", "credential1", "-provider",
jceksProvider};
ArrayList<String> password = new ArrayList<String>();
password.add("p@ssw0rd");
int rc = 0;
CredentialShell shell = new CredentialShell();
shell.setConf(new Configuration());
shell.setPasswordReader(new MockPasswordReader(password));
rc = shell.run(args1);
assertEquals(0, rc);
assertOutputContains("Password match failed for credential1.");
}
@Test @Test
public void testPromptForCredential() throws Exception { public void testPromptForCredential() throws Exception {
String[] args1 = {"create", "credential1", "-provider", String[] args1 = {"create", "credential1", "-provider",