Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-10656. Merging change r1601985 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601986 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brandon Li 2014-06-11 18:58:44 +00:00
parent 279c5a3752
commit e5dadff1b7
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -192,6 +192,9 @@ Release 2.5.0 - UNRELEASED
HADOOP-10664. TestNetUtils.testNormalizeHostName fails. (atm)
HADOOP-10656. The password keystore file is not picked by LDAP group mapping
(brandonli)
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES

11
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/LdapGroupsMapping.java
View File

@ -40,6 +40,7 @@ import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configurable;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.IOUtils;
/**
* An implementation of {@link GroupMappingServiceProvider} which
@ -312,8 +313,8 @@ public class LdapGroupsMapping
keystorePass =
conf.get(LDAP_KEYSTORE_PASSWORD_KEY, LDAP_KEYSTORE_PASSWORD_DEFAULT);
if (keystorePass.isEmpty()) {
keystorePass = extractPassword(
conf.get(LDAP_KEYSTORE_PASSWORD_KEY, LDAP_KEYSTORE_PASSWORD_DEFAULT));
keystorePass = extractPassword(conf.get(LDAP_KEYSTORE_PASSWORD_FILE_KEY,
LDAP_KEYSTORE_PASSWORD_FILE_DEFAULT));
}
bindUser = conf.get(BIND_USER_KEY, BIND_USER_DEFAULT);
@ -346,18 +347,20 @@ public class LdapGroupsMapping
return "";
}
Reader reader = null;
try {
StringBuilder password = new StringBuilder();
Reader reader = new FileReader(pwFile);
reader = new FileReader(pwFile);
int c = reader.read();
while (c > -1) {
password.append((char)c);
c = reader.read();
}
reader.close();
return password.toString().trim();
} catch (IOException ioe) {
throw new RuntimeException("Could not read password file: " + pwFile, ioe);
} finally {
IOUtils.cleanup(LOG, reader);
}
}
}