-
Notifications
You must be signed in to change notification settings - Fork 5.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8274205: Handle KDC_ERR_SVC_UNAVAILABLE error code from KDC
Co-authored-by: Weijun Wang <weijun@openjdk.org> Reviewed-by: weijun
- Loading branch information
1 parent
5a12af7
commit 5ba0d09
Showing
3 changed files
with
88 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/* | ||
* Copyright (c) 2021, 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 8274205 | ||
* @summary Handle KDC_ERR_SVC_UNAVAILABLE error code from KDC | ||
* @library /test/lib | ||
* @compile -XDignore.symbol.file Unavailable.java | ||
* @run main jdk.test.lib.FileInstaller TestHosts TestHosts | ||
* @run main/othervm -Djdk.net.hosts.file=TestHosts Unavailable | ||
*/ | ||
|
||
import sun.security.krb5.Config; | ||
import sun.security.krb5.PrincipalName; | ||
import sun.security.krb5.internal.KRBError; | ||
import sun.security.krb5.internal.KerberosTime; | ||
|
||
import java.nio.file.Files; | ||
import java.nio.file.Path; | ||
import java.util.Locale; | ||
|
||
public class Unavailable { | ||
|
||
public static void main(String[] args) throws Exception { | ||
|
||
// Good KDC | ||
KDC kdc1 = KDC.create(OneKDC.REALM); | ||
kdc1.addPrincipal(OneKDC.USER, OneKDC.PASS); | ||
kdc1.addPrincipalRandKey("krbtgt/" + OneKDC.REALM); | ||
|
||
// The "not available" KDC | ||
KDC kdc2 = new KDC(OneKDC.REALM, "kdc." + OneKDC.REALM.toLowerCase(Locale.US), 0, true) { | ||
@Override | ||
protected byte[] processAsReq(byte[] in) throws Exception { | ||
KRBError err = new KRBError(null, null, null, | ||
KerberosTime.now(), 0, | ||
29, // KDC_ERR_SVC_UNAVAILABLE | ||
null, new PrincipalName("krbtgt/" + OneKDC.REALM), | ||
null, null); | ||
return err.asn1Encode(); | ||
} | ||
}; | ||
|
||
Files.write(Path.of(OneKDC.KRB5_CONF), String.format(""" | ||
[libdefaults] | ||
default_realm = RABBIT.HOLE | ||
[realms] | ||
RABBIT.HOLE = { | ||
kdc = kdc.rabbit.hole:%d | ||
kdc = kdc.rabbit.hole:%d | ||
} | ||
""", kdc2.getPort(), kdc1.getPort()).getBytes()); | ||
System.setProperty("java.security.krb5.conf", OneKDC.KRB5_CONF); | ||
Config.refresh(); | ||
|
||
Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false); | ||
} | ||
} |
5ba0d09
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues
5ba0d09
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/backport jdk11u-dev
5ba0d09
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@GoeLin the backport was successfully created on the branch GoeLin-backport-5ba0d09f in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:
➡️ Create pull request
The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev: