7158329: NPE in sun.security.krb5.Credentials.acquireDefaultCreds()
Reviewed-by: valeriep, jjg
This commit is contained in:
parent
79f8fba3f9
commit
9c8af427e8
@ -330,12 +330,17 @@ public class Credentials {
|
|||||||
CredentialsCache ccache =
|
CredentialsCache ccache =
|
||||||
CredentialsCache.getInstance(princ, ticketCache);
|
CredentialsCache.getInstance(princ, ticketCache);
|
||||||
|
|
||||||
if (ccache == null)
|
if (ccache == null) {
|
||||||
return null;
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
sun.security.krb5.internal.ccache.Credentials tgtCred =
|
sun.security.krb5.internal.ccache.Credentials tgtCred =
|
||||||
ccache.getDefaultCreds();
|
ccache.getDefaultCreds();
|
||||||
|
|
||||||
|
if (tgtCred == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
if (EType.isSupported(tgtCred.getEType())) {
|
if (EType.isSupported(tgtCred.getEType())) {
|
||||||
return tgtCred.setKrbCreds();
|
return tgtCred.setKrbCreds();
|
||||||
} else {
|
} else {
|
||||||
@ -375,12 +380,13 @@ public class Credentials {
|
|||||||
cache = CredentialsCache.getInstance();
|
cache = CredentialsCache.getInstance();
|
||||||
}
|
}
|
||||||
if (cache != null) {
|
if (cache != null) {
|
||||||
if (DEBUG) {
|
|
||||||
System.out.println(">>> KrbCreds found the default ticket " +
|
|
||||||
"granting ticket in credential cache.");
|
|
||||||
}
|
|
||||||
sun.security.krb5.internal.ccache.Credentials temp =
|
sun.security.krb5.internal.ccache.Credentials temp =
|
||||||
cache.getDefaultCreds();
|
cache.getDefaultCreds();
|
||||||
|
if (temp != null) {
|
||||||
|
if (DEBUG) {
|
||||||
|
System.out.println(">>> KrbCreds found the default ticket"
|
||||||
|
+ " granting ticket in credential cache.");
|
||||||
|
}
|
||||||
if (EType.isSupported(temp.getEType())) {
|
if (EType.isSupported(temp.getEType())) {
|
||||||
result = temp.setKrbCreds();
|
result = temp.setKrbCreds();
|
||||||
} else {
|
} else {
|
||||||
@ -391,6 +397,7 @@ public class Credentials {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (result == null) {
|
if (result == null) {
|
||||||
// Doesn't seem to be a default cache on this system or
|
// Doesn't seem to be a default cache on this system or
|
||||||
// TGT has unsupported encryption type
|
// TGT has unsupported encryption type
|
||||||
|
83
jdk/test/sun/security/krb5/ccache/EmptyCC.java
Normal file
83
jdk/test/sun/security/krb5/ccache/EmptyCC.java
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
|
||||||
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
|
*
|
||||||
|
* This code is free software; you can redistribute it and/or modify it
|
||||||
|
* under the terms of the GNU General Public License version 2 only, as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* version 2 for more details (a copy is included in the LICENSE file that
|
||||||
|
* accompanied this code).
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License version
|
||||||
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*
|
||||||
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
|
* or visit www.oracle.com if you need additional information or have any
|
||||||
|
* questions.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @test
|
||||||
|
* @bug 7158329
|
||||||
|
* @summary NPE in sun.security.krb5.Credentials.acquireDefaultCreds()
|
||||||
|
* @compile -XDignore.symbol.file EmptyCC.java
|
||||||
|
* @run main EmptyCC
|
||||||
|
*/
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
|
import sun.security.krb5.Credentials;
|
||||||
|
import sun.security.krb5.PrincipalName;
|
||||||
|
import sun.security.krb5.internal.ccache.CredentialsCache;
|
||||||
|
|
||||||
|
public class EmptyCC {
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
final PrincipalName pn = new PrincipalName("dummy@FOO.COM");
|
||||||
|
final String ccache = "tmpcc";
|
||||||
|
|
||||||
|
if (args.length == 0) {
|
||||||
|
// Main process, write the ccache and launch sub process
|
||||||
|
CredentialsCache cache = CredentialsCache.create(pn, ccache);
|
||||||
|
cache.save();
|
||||||
|
|
||||||
|
// java -cp $test.classes EmptyCC readcc
|
||||||
|
ProcessBuilder pb = new ProcessBuilder(
|
||||||
|
new File(new File(System.getProperty("java.home"), "bin"),
|
||||||
|
"java").getPath(),
|
||||||
|
"-cp",
|
||||||
|
System.getProperty("test.classes"),
|
||||||
|
"EmptyCC",
|
||||||
|
"readcc"
|
||||||
|
);
|
||||||
|
|
||||||
|
pb.environment().put("KRB5CCNAME", ccache);
|
||||||
|
pb.redirectErrorStream(true);
|
||||||
|
|
||||||
|
Process p = pb.start();
|
||||||
|
try (InputStream ins = p.getInputStream()) {
|
||||||
|
byte[] buf = new byte[8192];
|
||||||
|
int n;
|
||||||
|
while ((n = ins.read(buf)) > 0) {
|
||||||
|
System.out.write(buf, 0, n);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (p.waitFor() != 0) {
|
||||||
|
throw new Exception("Test failed");
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Sub process, read the ccache
|
||||||
|
String cc = System.getenv("KRB5CCNAME");
|
||||||
|
if (!cc.equals(ccache)) {
|
||||||
|
throw new Exception("env not set correctly");
|
||||||
|
}
|
||||||
|
Credentials.acquireTGTFromCache(pn, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user