infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8349890: Option -Djava.security.debug=x509,ava breaks special chars

Browse Source 
Reviewed-by: mullan
This commit is contained in:
Koushik Thirupattur 2025-04-07 17:29:13 +00:00 committed by Sean Mullan
parent e08441c033
commit 0d4d155816
2 changed files with 65 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java.base/share/classes/sun/security/x509/AVA.java
View File

@ -640,7 +640,7 @@ public class AVA implements DerEncoder {
*/
public String toString() {
return toKeywordValueString
(toKeyword(DEFAULT, Collections.emptyMap()));
(toKeyword(DEFAULT, Collections.emptyMap()), true);
}
/**
@ -659,7 +659,7 @@ public class AVA implements DerEncoder {
* OID/keyword map.
*/
public String toRFC1779String(Map<String, String> oidMap) {
return toKeywordValueString(toKeyword(RFC1779, oidMap));
return toKeywordValueString(toKeyword(RFC1779, oidMap), false);
}
/**
@ -758,12 +758,6 @@ public class AVA implements DerEncoder {
// escape null character
sbuffer.append("\\00");
} else if (debug != null && Debug.isOn("ava")) {
// embed non-printable/non-escaped char
// as escaped hex pairs for debugging
byte[] valueBytes = Character.toString(c).getBytes(UTF_8);
HexFormat.of().withPrefix("\\").withUpperCase().formatHex(sbuffer, valueBytes);
} else {
// append non-printable/non-escaped char
@ -888,14 +882,6 @@ public class AVA implements DerEncoder {
}
}
} else if (debug != null && Debug.isOn("ava")) {
// embed non-printable/non-escaped char
// as escaped hex pairs for debugging
previousWhite = false;
byte[] valueBytes = Character.toString(c).getBytes(UTF_8);
HexFormat.of().withPrefix("\\").withUpperCase().formatHex(sbuffer, valueBytes);
} else {
// append non-printable/non-escaped char
@ -945,7 +931,7 @@ public class AVA implements DerEncoder {
return AVAKeyword.hasKeyword(oid, RFC2253);
}
private String toKeywordValueString(String keyword) {
private String toKeywordValueString(String keyword, Boolean isFromToString) {
/*
* Construct the value with as little copying and garbage
* production as practical. First the keyword (mandatory),
@ -1019,7 +1005,7 @@ public class AVA implements DerEncoder {
sbuffer.append(c);
} else if (debug != null && Debug.isOn("ava")) {
} else if (debug != null && isFromToString && Debug.isOn("ava")) {
// embed non-printable/non-escaped char
// as escaped hex pairs for debugging

61
test/jdk/sun/security/x509/X500Name/PrintX500PrincipalInDebugModeWithAvaOption.java Normal file
View File

@ -0,0 +1,61 @@
/*
* Copyright (c) 2025, 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 8349890
* @summary Make sure debug with AVA option does not interfere with parsing special characters.
* @library /test/lib
* @run main/othervm -Djava.security.debug=x509:ava PrintX500PrincipalInDebugModeWithAvaOption
*/
import jdk.test.lib.Asserts;
import javax.security.auth.x500.X500Principal;
public class PrintX500PrincipalInDebugModeWithAvaOption {
public static void main(String[] args) throws Exception {
X500Principal name = new X500Principal("cn=john doe + l=ca\\+lifornia + l =sf, O=Ñ");
//Test the name in default String format. This will perform the hex conversion to
//"\\C3\\91" for special character "Ñ"
Asserts.assertTrue(name.toString().contains("\\C3\\91"),
"String does not contain expected value");
//Test the name in RFC2253 format. This should skip the hex conversion to return
//"\u00d1" for special character "Ñ"
Asserts.assertTrue(name.getName().contains("\u00d1"),
"String does not contain expected value");
//Test the name in canonical name in RFC2253 format. This should skip the hex conversion to return
//"n\u0303" for special character "Ñ"
Asserts.assertTrue(name.getName(X500Principal.CANONICAL).contains("n\u0303"),
"String does not contain expected value");
//Test to print name in RFC1779 format. This should skip the hex conversion to print
//"\u00d1" for special character "Ñ"
Asserts.assertTrue(name.getName(X500Principal.RFC1779).contains("\u00d1"),
"String does not contain expected value");
}
}