stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6761072: new krb5 tests fail on multiple platforms

Browse Source 
Reviewed-by: xuelei
This commit is contained in:
Weijun Wang 2008-10-20 10:32:33 +08:00
parent b1e7b0352e
commit d9d3a81168
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jdk/test/sun/security/krb5/auto/BasicKrb5Test.java
View File

@ -49,14 +49,17 @@ public class BasicKrb5Test {
if (args.length > 0) { if (args.length > 0) {
etype = args[0]; etype = args[0];
} }
// Creates and starts the KDC. This line must be put ahead of etype check
// since the check needs a krb5.conf.
new OneKDC(etype).writeJAASConf();
System.out.println("Testing etype " + etype); System.out.println("Testing etype " + etype);
if (etype != null && !EType.isSupported(Config.getInstance().getType(etype))) { if (etype != null && !EType.isSupported(Config.getInstance().getType(etype))) {
System.out.println("Not supported."); System.out.println("Not supported.");
System.exit(0); System.exit(0);
} }
// Creates and starts the KDC
new OneKDC(etype).writeJAASConf();
new BasicKrb5Test().go(OneKDC.SERVER, OneKDC.BACKEND); new BasicKrb5Test().go(OneKDC.SERVER, OneKDC.BACKEND);
} }

11
jdk/test/sun/security/krb5/auto/KDC.java
View File

@ -152,12 +152,19 @@ public class KDC {
return; return;
} }
} }
String localhost = "localhost";
try {
localhost = InetAddress.getByName(localhost)
.getCanonicalHostName();
} catch (UnknownHostException uhe) {
; // Ignore, localhost is still "localhost"
}
KDC kdc = create("RABBIT.HOLE", 8888, false); KDC kdc = create("RABBIT.HOLE", 8888, false);
kdc.addPrincipal("dummy", "bogus".toCharArray()); kdc.addPrincipal("dummy", "bogus".toCharArray());
kdc.addPrincipal("foo", "bar".toCharArray()); kdc.addPrincipal("foo", "bar".toCharArray());
kdc.addPrincipalRandKey("krbtgt/" + kdc.realm); kdc.addPrincipalRandKey("krbtgt/" + kdc.realm);
kdc.addPrincipalRandKey("server/localhost"); kdc.addPrincipalRandKey("server/" + localhost);
kdc.addPrincipalRandKey("backend/localhost"); kdc.addPrincipalRandKey("backend/" + localhost);
} }
/** /**

19
jdk/test/sun/security/krb5/auto/OneKDC.java
View File

@ -24,6 +24,8 @@
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.security.Security; import java.security.Security;
import javax.security.auth.callback.Callback; import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.CallbackHandler;
@ -44,10 +46,23 @@ import sun.security.krb5.Config;
*/ */
public class OneKDC extends KDC { public class OneKDC extends KDC {
// The krb5 codes would try to canonicalize hostnames before creating
// a service principal name, so let's find out the canonicalized form
// of localhost first. The following codes mimic the process inside
// PrincipalName.java.
static String localhost = "localhost";
static {
try {
localhost = InetAddress.getByName(localhost)
.getCanonicalHostName();
} catch (UnknownHostException uhe) {
; // Ignore, localhost is still "localhost"
}
}
public static final String USER = "dummy"; public static final String USER = "dummy";
public static final char[] PASS = "bogus".toCharArray(); public static final char[] PASS = "bogus".toCharArray();
public static final String SERVER = "server/localhost"; public static String SERVER = "server/" + localhost;
public static final String BACKEND = "backend/localhost"; public static String BACKEND = "backend/" + localhost;
public static final String KRB5_CONF = "localkdc-krb5.conf"; public static final String KRB5_CONF = "localkdc-krb5.conf";
public static final String KTAB = "localkdc.ktab"; public static final String KTAB = "localkdc.ktab";
public static final String JAAS_CONF = "localkdc-jaas.conf"; public static final String JAAS_CONF = "localkdc-jaas.conf";