- * [RFC2459] When the subjectAltName extension contains a domain name service - * label, the domain name MUST be stored in the dNSName (an IA5String). - * The name MUST be in the "preferred name syntax," as specified by RFC - * 1034 [RFC 1034]. Note that while upper and lower case letters are - * allowed in domain names, no signifigance is attached to the case. In - * addition, while the string " " is a legal domain name, subjectAltName - * extensions with a dNSName " " are not permitted. Finally, the use of - * the DNS representation for Internet mail addresses (wpolk.nist.gov - * instead of wpolk@nist.gov) is not permitted; such identities are to - * be encoded as rfc822Name. - * - * This class has been copied from OpenJDK8u repository and modified - * in order to fix Java bug 8016345: - * https://bugs.openjdk.java.net/browse/JDK-8016345 - * - * It can be deleted after a migration to a Java release fixing this bug: - * https://bugs.openjdk.java.net/browse/JDK-8054380 - *
- * @author Amit Kapoor - * @author Hemma Prafullchandra - * @author JOSM developers - * @since 7347 - */ -public final class DNSNameFix extends sun.security.x509.DNSName { - - private static final String alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - private static final String digitsAndHyphen = "0123456789-"; - private static final String alphaDigitsAndHyphen = alpha + digitsAndHyphen; - - /** - * Create the DNSName object with the specified name. - * - * @param name the DNSName. - * @throws IOException if the name is not a valid DNSName subjectAltName - */ - public DNSNameFix(String name) throws IOException { - super("fake"); - if (name == null || name.isEmpty()) - throw new IOException("DNS name must not be null"); - if (name.indexOf(' ') != -1) - throw new IOException("DNS names or NameConstraints with blank components are not permitted"); - if (name.charAt(0) == '.' || name.charAt(name.length() -1) == '.') - throw new IOException("DNS names or NameConstraints may not begin or end with a ."); - //Name will consist of label components separated by "." - //startIndex is the index of the first character of a component - //endIndex is the index of the last character of a component plus 1 - for (int endIndex, startIndex = 0; startIndex < name.length(); startIndex = endIndex+1) { - endIndex = name.indexOf('.', startIndex); - if (endIndex < 0) { - endIndex = name.length(); - } - if ((endIndex-startIndex) < 1) - throw new IOException("DNSName SubjectAltNames with empty components are not permitted"); - - //nonStartIndex: index for characters in the component beyond the first one - for (int nonStartIndex = startIndex+1; nonStartIndex < endIndex; nonStartIndex++) { - char x = name.charAt(nonStartIndex); - if ((alphaDigitsAndHyphen).indexOf(x) < 0) - throw new IOException("DNSName components must consist of letters, digits, and hyphens"); - } - } - try { - Field fName = getClass().getSuperclass().getDeclaredField("name"); - Utils.setObjectsAccessible(fName); - fName.set(this, name); - } catch (ReflectiveOperationException | SecurityException e) { - throw new IOException(e); - } - } -} Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (revision 12457) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java (revision 12458) @@ -51,4 +51,5 @@ import sun.security.x509.CertificateVersion; import sun.security.x509.CertificateX509Key; +import sun.security.x509.DNSName; import sun.security.x509.ExtendedKeyUsageExtension; import sun.security.x509.GeneralName; @@ -109,5 +110,5 @@ /** - * Creates a GeneralName object from known types. + * Creates a GeneralNameInterface object from known types. * @param t one of 4 known types * @param v value @@ -115,13 +116,11 @@ * @throws IOException if any I/O error occurs */ - private static GeneralName createGeneralName(String t, String v) throws IOException { - GeneralNameInterface gn; + private static GeneralNameInterface createGeneralNameInterface(String t, String v) throws IOException { switch (t.toLowerCase(Locale.ENGLISH)) { - case "uri": gn = new URIName(v); break; - case "dns": gn = new DNSNameFix(v); break; - case "ip": gn = new IPAddressName(v); break; - default: gn = new OIDName(v); - } - return new GeneralName(gn); + case "uri": return new URIName(v); + case "dns": return new DNSName(v); + case "ip": return new IPAddressName(v); + default: return new OIDName(v); + } } @@ -174,5 +173,5 @@ String t = item.substring(0, colonpos); String v = item.substring(colonpos+1); - gnames.add(createGeneralName(t, v)); + gnames.add(new GeneralName(createGeneralNameInterface(t, v))); } // Non critical @@ -220,9 +219,5 @@ X509Certificate cert = generateCertificate("CN=localhost, OU=JOSM, O=OpenStreetMap", pair, 1825, "SHA256withRSA", - // see #10033#comment:20: All browsers respect "ip" in SAN, except IE which only understands DNS entries: - // CHECKSTYLE.OFF: LineLength - // https://connect.microsoft.com/IE/feedback/details/814744/the-ie-doesnt-trust-a-san-certificate-when-connecting-to-ip-address - // CHECKSTYLE.ON: LineLength - "dns:localhost,ip:127.0.0.1,dns:127.0.0.1,ip:::1,uri:https://127.0.0.1:"+HTTPS_PORT+",uri:https://::1:"+HTTPS_PORT); + "dns:localhost,ip:127.0.0.1,ip:::1,uri:https://127.0.0.1:"+HTTPS_PORT+",uri:https://::1:"+HTTPS_PORT); KeyStore ks = KeyStore.getInstance("JKS"); Index: unk/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameFixTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameFixTest.java (revision 12457) +++ (revision ) @@ -1,33 +1,0 @@ -// License: GPL. For details, see LICENSE file. -package org.openstreetmap.josm.io.remotecontrol; - -import static org.junit.Assert.assertEquals; - -import java.io.IOException; - -import org.junit.Test; - -/** - * Unit tests of {@link DNSNameFix} class. - */ -public class DNSNameFixTest { - - /** - * Unit test of {@link DNSNameFix#DNSNameFix} - null check. - * @throws IOException always (expected with null name) - */ - @Test(expected = IOException.class) - public void testDNSNameNull() throws IOException { - new DNSNameFix(null); - } - - /** - * Unit test of {@link DNSNameFix#DNSNameFix} - nominal cases. - * @throws IOException never - */ - @Test - public void testDNSNameNominal() throws IOException { - assertEquals("localhost", new DNSNameFix("localhost").getName()); - assertEquals("127.0.0.1", new DNSNameFix("127.0.0.1").getName()); - } -}