* @author Amit Kapoor @@ -57,6 +57,5 @@ * @since 7347 */ -public final class DNSName implements GeneralNameInterface { - private final String name; +public final class DNSName extends sun.security.x509.DNSName { private static final String alpha = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; @@ -71,4 +70,5 @@ */ public DNSName(String name) throws IOException { + super("fake"); if (name == null || name.isEmpty()) throw new IOException("DNS name must not be null"); @@ -95,158 +95,11 @@ } } - this.name = name; - } - - /** - * Return the type of the GeneralName. - * @return the type of the GeneralName - */ - @Override - public int getType() { - return GeneralNameInterface.NAME_DNS; - } - - /** - * Return the actual name value of the GeneralName. - * @return the actual name value of the GeneralName - */ - public String getName() { - return name; - } - - /** - * Encode the DNS name into the DerOutputStream. - * - * @param out the DER stream to encode the DNSName to. - * @throws IOException on encoding errors. - */ - @Override - public void encode(DerOutputStream out) throws IOException { - out.putIA5String(name); - } - - /** - * Convert the name into user readable string. - */ - @Override - public String toString() { - return "DNSName: " + name; - } - - /** - * Compares this name with another, for equality. - * - * @return true iff the names are equivalent - * according to RFC2459. - */ - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - - if (!(obj instanceof DNSName)) - return false; - - DNSName other = (DNSName) obj; - - // RFC2459 mandates that these names are - // not case-sensitive - return name.equalsIgnoreCase(other.name); - } - - /** - * Returns the hash code value for this object. - * - * @return a hash code value for this object. - */ - @Override - public int hashCode() { - return name.toUpperCase(Locale.ENGLISH).hashCode(); - } - - /** - * Return type of constraint inputName places on this name:
- * RFC2459: DNS name restrictions are expressed as foo.bar.com. Any subdomain - * satisfies the name constraint. For example, www.foo.bar.com would - * satisfy the constraint but bigfoo.bar.com would not. - *
- * draft-ietf-pkix-new-part1-00.txt: DNS name restrictions are expressed as foo.bar.com. - * Any DNS name that - * can be constructed by simply adding to the left hand side of the name - * satisfies the name constraint. For example, www.foo.bar.com would - * satisfy the constraint but foo1.bar.com would not. - *
- * RFC1034: By convention, domain names can be stored with arbitrary case, but - * domain name comparisons for all present domain functions are done in a - * case-insensitive manner, assuming an ASCII character set, and a high - * order zero bit. - *
- * @param inputName to be checked for being constrained - * @return constraint type above - * @throws UnsupportedOperationException if name is not exact match, but narrowing and widening are - * not supported for this name type. - */ - @Override - public int constrains(GeneralNameInterface inputName) { - int constraintType; - if (inputName == null) - constraintType = NAME_DIFF_TYPE; - else if (inputName.getType() != NAME_DNS) - constraintType = NAME_DIFF_TYPE; - else { - if (!(inputName instanceof DNSName)) { - throw new IllegalArgumentException("inputName: " + inputName); - } - String inName = - (((DNSName) inputName).getName()).toLowerCase(Locale.ENGLISH); - String thisName = name.toLowerCase(Locale.ENGLISH); - if (inName.equals(thisName)) - constraintType = NAME_MATCH; - else if (thisName.endsWith(inName)) { - int inNdx = thisName.lastIndexOf(inName); - if (thisName.charAt(inNdx-1) == '.') - constraintType = NAME_WIDENS; - else - constraintType = NAME_SAME_TYPE; - } else if (inName.endsWith(thisName)) { - int ndx = inName.lastIndexOf(thisName); - if (inName.charAt(ndx-1) == '.') - constraintType = NAME_NARROWS; - else - constraintType = NAME_SAME_TYPE; - } else { - constraintType = NAME_SAME_TYPE; - } + try { + Field fName = getClass().getSuperclass().getDeclaredField("name"); + Utils.setObjectsAccessible(fName); + fName.set(this, name); + } catch (ReflectiveOperationException | SecurityException e) { + throw new IOException(e); } - return constraintType; - } - - /** - * Return subtree depth of this name for purposes of determining - * NameConstraints minimum and maximum bounds and for calculating - * path lengths in name subtrees. - * - * @return distance of name from root - * @throws UnsupportedOperationException if not supported for this name type - */ - @Override - public int subtreeDepth() { - String subtree = name; - int i = 1; - - /* count dots */ - for (; subtree.lastIndexOf('.') >= 0; i++) { - subtree = subtree.substring(0, subtree.lastIndexOf('.')); - } - - return i; } } Index: /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameTest.java (revision 12243) +++ /trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/DNSNameTest.java (revision 12244) @@ -7,7 +7,4 @@ import org.junit.Test; - -import nl.jqno.equalsverifier.EqualsVerifier; -import nl.jqno.equalsverifier.Warning; /** @@ -34,11 +31,3 @@ assertEquals("127.0.0.1", new DNSName("127.0.0.1").getName()); } - - /** - * Unit test of methods {@link DNSName#equals} and {@link DNSName#hashCode}. - */ - @Test - public void testEqualsContract() { - EqualsVerifier.forClass(DNSName.class).suppress(Warning.NULL_FIELDS).verify(); - } }