HADOOP-10774. Update KerberosTestUtils for hadoop-auth tests when using IBM Java (sangamesh via aw)
This commit is contained in:
parent
039366e3b4
commit
b01d3433ae
|
@ -32,12 +32,14 @@ import java.util.Map;
|
|||
import java.util.Set;
|
||||
import java.util.concurrent.Callable;
|
||||
|
||||
import static org.apache.hadoop.util.PlatformName.IBM_JAVA;
|
||||
|
||||
/**
|
||||
* Test helper class for Java Kerberos setup.
|
||||
*/
|
||||
public class KerberosTestUtils {
|
||||
private static String keytabFile = new File(System.getProperty("test.dir", "target"),
|
||||
UUID.randomUUID().toString()).toString();
|
||||
UUID.randomUUID().toString()).getAbsolutePath();
|
||||
|
||||
public static String getRealm() {
|
||||
return "EXAMPLE.COM";
|
||||
|
@ -65,18 +67,34 @@ public class KerberosTestUtils {
|
|||
@Override
|
||||
public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
|
||||
Map<String, String> options = new HashMap<String, String>();
|
||||
options.put("keyTab", KerberosTestUtils.getKeytabFile());
|
||||
options.put("principal", principal);
|
||||
options.put("useKeyTab", "true");
|
||||
options.put("storeKey", "true");
|
||||
options.put("doNotPrompt", "true");
|
||||
options.put("useTicketCache", "true");
|
||||
options.put("renewTGT", "true");
|
||||
options.put("refreshKrb5Config", "true");
|
||||
options.put("isInitiator", "true");
|
||||
if (IBM_JAVA) {
|
||||
options.put("useKeytab", KerberosTestUtils.getKeytabFile().startsWith("file://") ?
|
||||
KerberosTestUtils.getKeytabFile() : "file://" + KerberosTestUtils.getKeytabFile());
|
||||
options.put("principal", principal);
|
||||
options.put("refreshKrb5Config", "true");
|
||||
options.put("credsType", "both");
|
||||
} else {
|
||||
options.put("keyTab", KerberosTestUtils.getKeytabFile());
|
||||
options.put("principal", principal);
|
||||
options.put("useKeyTab", "true");
|
||||
options.put("storeKey", "true");
|
||||
options.put("doNotPrompt", "true");
|
||||
options.put("useTicketCache", "true");
|
||||
options.put("renewTGT", "true");
|
||||
options.put("refreshKrb5Config", "true");
|
||||
options.put("isInitiator", "true");
|
||||
}
|
||||
String ticketCache = System.getenv("KRB5CCNAME");
|
||||
if (ticketCache != null) {
|
||||
options.put("ticketCache", ticketCache);
|
||||
if (IBM_JAVA) {
|
||||
// IBM JAVA only respect system property and not env variable
|
||||
// The first value searched when "useDefaultCcache" is used.
|
||||
System.setProperty("KRB5CCNAME", ticketCache);
|
||||
options.put("useDefaultCcache", "true");
|
||||
options.put("renewTGT", "true");
|
||||
} else {
|
||||
options.put("ticketCache", ticketCache);
|
||||
}
|
||||
}
|
||||
options.put("debug", "true");
|
||||
|
||||
|
|
|
@ -403,6 +403,9 @@ Trunk (Unreleased)
|
|||
|
||||
HADOOP-11637. bash location hard-coded in shell scripts (aw)
|
||||
|
||||
HADOOP-10774. Update KerberosTestUtils for hadoop-auth tests when using
|
||||
IBM Java (sangamesh via aw)
|
||||
|
||||
OPTIMIZATIONS
|
||||
|
||||
HADOOP-7761. Improve the performance of raw comparisons. (todd)
|
||||
|
|
Loading…
Reference in New Issue