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

HADOOP-11111 MiniKDC to use locale EN_US for case conversions

Browse Source
This commit is contained in:
Steve Loughran 2014-09-23 10:54:06 +01:00
parent f5578207d2
commit df52fec21d
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hadoop-common-project/hadoop-minikdc/src/main/java/org/apache/hadoop/minikdc/MiniKdc.java
View File

@ -70,6 +70,7 @@
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
@ -109,6 +110,11 @@
*/ */
public class MiniKdc { public class MiniKdc {
public static final String JAVA_SECURITY_KRB5_CONF =
"java.security.krb5.conf";
public static final String SUN_SECURITY_KRB5_DEBUG =
"sun.security.krb5.debug";
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
if (args.length < 4) { if (args.length < 4) {
System.out.println("Arguments: <WORKDIR> <MINIKDCPROPERTIES> " + System.out.println("Arguments: <WORKDIR> <MINIKDCPROPERTIES> " +
@ -266,7 +272,8 @@ public MiniKdc(Properties conf, File workDir) throws Exception {
} }
String orgName= conf.getProperty(ORG_NAME); String orgName= conf.getProperty(ORG_NAME);
String orgDomain = conf.getProperty(ORG_DOMAIN); String orgDomain = conf.getProperty(ORG_DOMAIN);
realm = orgName.toUpperCase() + "." + orgDomain.toUpperCase(); realm = orgName.toUpperCase(Locale.ENGLISH) + "."
+ orgDomain.toUpperCase(Locale.ENGLISH);
} }
/** /**
@ -355,8 +362,8 @@ private void initDirectoryService() throws Exception {
ds.addLast(new KeyDerivationInterceptor()); ds.addLast(new KeyDerivationInterceptor());
// create one partition // create one partition
String orgName= conf.getProperty(ORG_NAME).toLowerCase(); String orgName= conf.getProperty(ORG_NAME).toLowerCase(Locale.ENGLISH);
String orgDomain = conf.getProperty(ORG_DOMAIN).toLowerCase(); String orgDomain = conf.getProperty(ORG_DOMAIN).toLowerCase(Locale.ENGLISH);
JdbmPartition partition = new JdbmPartition(ds.getSchemaManager()); JdbmPartition partition = new JdbmPartition(ds.getSchemaManager());
partition.setId(orgName); partition.setId(orgName);
@ -387,10 +394,10 @@ private void initKDCServer() throws Exception {
String orgDomain = conf.getProperty(ORG_DOMAIN); String orgDomain = conf.getProperty(ORG_DOMAIN);
String bindAddress = conf.getProperty(KDC_BIND_ADDRESS); String bindAddress = conf.getProperty(KDC_BIND_ADDRESS);
final Map<String, String> map = new HashMap<String, String>(); final Map<String, String> map = new HashMap<String, String>();
map.put("0", orgName.toLowerCase()); map.put("0", orgName.toLowerCase(Locale.ENGLISH));
map.put("1", orgDomain.toLowerCase()); map.put("1", orgDomain.toLowerCase(Locale.ENGLISH));
map.put("2", orgName.toUpperCase()); map.put("2", orgName.toUpperCase(Locale.ENGLISH));
map.put("3", orgDomain.toUpperCase()); map.put("3", orgDomain.toUpperCase(Locale.ENGLISH));
map.put("4", bindAddress); map.put("4", bindAddress);
ClassLoader cl = Thread.currentThread().getContextClassLoader(); ClassLoader cl = Thread.currentThread().getContextClassLoader();
@ -455,9 +462,9 @@ private void initKDCServer() throws Exception {
FileUtils.writeStringToFile(krb5conf, FileUtils.writeStringToFile(krb5conf,
MessageFormat.format(sb.toString(), getRealm(), getHost(), MessageFormat.format(sb.toString(), getRealm(), getHost(),
Integer.toString(getPort()), System.getProperty("line.separator"))); Integer.toString(getPort()), System.getProperty("line.separator")));
System.setProperty("java.security.krb5.conf", krb5conf.getAbsolutePath()); System.setProperty(JAVA_SECURITY_KRB5_CONF, krb5conf.getAbsolutePath());
System.setProperty("sun.security.krb5.debug", conf.getProperty(DEBUG, System.setProperty(SUN_SECURITY_KRB5_DEBUG, conf.getProperty(DEBUG,
"false")); "false"));
// refresh the config // refresh the config
@ -481,8 +488,8 @@ private void initKDCServer() throws Exception {
*/ */
public synchronized void stop() { public synchronized void stop() {
if (kdc != null) { if (kdc != null) {
System.getProperties().remove("java.security.krb5.conf"); System.getProperties().remove(JAVA_SECURITY_KRB5_CONF);
System.getProperties().remove("sun.security.krb5.debug"); System.getProperties().remove(SUN_SECURITY_KRB5_DEBUG);
kdc.stop(); kdc.stop();
try { try {
ds.shutdown(); ds.shutdown();
@ -520,8 +527,8 @@ public synchronized void createPrincipal(String principal, String password)
throws Exception { throws Exception {
String orgName= conf.getProperty(ORG_NAME); String orgName= conf.getProperty(ORG_NAME);
String orgDomain = conf.getProperty(ORG_DOMAIN); String orgDomain = conf.getProperty(ORG_DOMAIN);
String baseDn = "ou=users,dc=" + orgName.toLowerCase() + ",dc=" + String baseDn = "ou=users,dc=" + orgName.toLowerCase(Locale.ENGLISH)
orgDomain.toLowerCase(); + ",dc=" + orgDomain.toLowerCase(Locale.ENGLISH);
String content = "dn: uid=" + principal + "," + baseDn + "\n" + String content = "dn: uid=" + principal + "," + baseDn + "\n" +
"objectClass: top\n" + "objectClass: top\n" +
"objectClass: person\n" + "objectClass: person\n" +