Add new Tests and Test Vectors

* Fixes test vectors to accomadate (rfcs/crypto-conditions#4)
* Adds improved test coverage for RFC test vectors.

Author: sappenin

build.gradle

@@ -1,6 +1,6 @@
 group = 'org.interledger'
 description = 'Java implementation of the Crypto-Conditions RFC found at https://datatracker.ietf.org/doc/draft-thomas-crypto-conditions/.'
-version = '0.2.1-SNAPSHOT'
+version = '0.3.0-SNAPSHOT'
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
@@ -56,7 +56,7 @@ dependencies {
     testCompile 'com.fasterxml.jackson.core:jackson-databind:2.7.0'
     testCompile 'org.mockito:mockito-core:2.7.22'
     testCompile 'org.hamcrest:hamcrest-all:1.3'
-    testCompile 'com.google.guava:guava:21.0'
+    compile 'com.google.guava:guava:21.0'
 }
 
 if (project.hasProperty('sign')) {

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.interledger</groupId>
   <artifactId>java-crypto-conditions</artifactId>
-  <version>0.2.1-SNAPSHOT</version>
+  <version>0.3.0-SNAPSHOT</version>
   <name>Crypto Conditions (Java)</name>
   <description>Java implementation of the Crypto-Conditions RFC.</description>
   <url>http://github.com/interledger/java-crypto-conditions</url>
@@ -89,6 +89,11 @@
       <version>21.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>21.0</version>
+    </dependency>
   </dependencies>
   <reporting>
     <plugins>

src/main/java/org/interledger/cryptoconditions/Sha256Condition.java

@@ -66,4 +66,11 @@ private byte[] getDigest(byte[] input) {
     return messageDigest.digest(input);
   }
 
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder("Sha256Condition{");
+    sb.append("uri=").append(getUri());
+    sb.append('}');
+    return sb.toString();
+  }
 }

src/main/java/org/interledger/cryptoconditions/der/CryptoConditionReader.java

@@ -43,7 +43,7 @@ public class CryptoConditionReader {
 
   /**
    * Reads a DER encoded condition from the buffer.
-   * 
+   *
    * @param buffer contains the raw DER encoded condition.
    * @return The condition read from the buffer.
    */
@@ -53,7 +53,7 @@ public static Condition readCondition(byte[] buffer) throws DerEncodingException
 
   /**
    * Reads a DER encoded condition from the buffer.
-   * 
+   *
    * @param buffer contains the raw DER encoded condition.
    * @param offset the position within the buffer to begin reading the condition.
    * @param length the number of bytes to read.
@@ -80,7 +80,7 @@ public static Condition readCondition(byte[] buffer, int offset, int length)
 
   /**
    * Reads a DER encoded condition from the input stream.
-   * 
+   *
    * @param in The input stream containing the DER encoded condition.
    * @return The condition read from the stream.
    */
@@ -108,7 +108,7 @@ public static Condition readCondition(DerInputStream in, AtomicInteger bytesRead
         in.readTaggedObject(0, length - innerBytesRead.get(), innerBytesRead).getValue();
     long cost = new BigInteger(
         in.readTaggedObject(1, length - innerBytesRead.get(), innerBytesRead).getValue())
-            .longValue();
+        .longValue();
     EnumSet<ConditionType> subtypes = null;
     if (type == ConditionType.PREFIX_SHA256 || type == ConditionType.THRESHOLD_SHA256) {
       subtypes = ConditionType.getEnumOfTypesFromBitString(
@@ -268,27 +268,30 @@ public static Fulfillment readFulfillment(DerInputStream in, AtomicInteger bytes
 
       case RSA_SHA256:
 
-        BigInteger modulus = UnsignedBigInteger.fromUnsignedByteArray(
-            in.readTaggedObject(0, length - innerBytesRead.get(), innerBytesRead).getValue());
-        byte[] rsaSignature =
-            in.readTaggedObject(1, length - innerBytesRead.get(), innerBytesRead).getValue();
+        final BigInteger modulus = UnsignedBigInteger.fromUnsignedByteArray(
+            in.readTaggedObject(0, length - innerBytesRead.get(), innerBytesRead).getValue()
+        );
+
+        final byte[] rsaSignature = in.readTaggedObject(
+            1, length - innerBytesRead.get(), innerBytesRead
+        ).getValue();
 
         bytesRead.addAndGet(innerBytesRead.get());
 
-        RSAPublicKeySpec rsaSpec =
-            new RSAPublicKeySpec(modulus, RsaSha256Fulfillment.PUBLIC_EXPONENT);
+        final RSAPublicKeySpec rsaSpec = new RSAPublicKeySpec(
+            modulus, RsaSha256Fulfillment.PUBLIC_EXPONENT
+        );
 
         try {
-          KeyFactory rsaKeyFactory = KeyFactory.getInstance("RSA");
-          PublicKey publicKey = rsaKeyFactory.generatePublic(rsaSpec);
+          final KeyFactory rsaKeyFactory = KeyFactory.getInstance("RSA");
+          final PublicKey publicKey = rsaKeyFactory.generatePublic(rsaSpec);
 
           return new RsaSha256Fulfillment((RSAPublicKey) publicKey, rsaSignature);
 
         } catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
           throw new RuntimeException("Error creating RSA key.", e);
         }
 
-
       case ED25519_SHA256:
         byte[] ed25519key =
             in.readTaggedObject(0, length - innerBytesRead.get(), innerBytesRead).getValue();

src/main/java/org/interledger/cryptoconditions/types/Ed25519Sha256Fulfillment.java

@@ -1,13 +1,5 @@
 package org.interledger.cryptoconditions.types;
 
-import net.i2p.crypto.eddsa.EdDSAEngine;
-import net.i2p.crypto.eddsa.EdDSAPublicKey;
-
-import org.interledger.cryptoconditions.Condition;
-import org.interledger.cryptoconditions.ConditionType;
-import org.interledger.cryptoconditions.Fulfillment;
-import org.interledger.cryptoconditions.der.DerOutputStream;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -16,6 +8,13 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.Signature;
 import java.security.SignatureException;
+import java.util.Arrays;
+import net.i2p.crypto.eddsa.EdDSAEngine;
+import net.i2p.crypto.eddsa.EdDSAPublicKey;
+import org.interledger.cryptoconditions.Condition;
+import org.interledger.cryptoconditions.ConditionType;
+import org.interledger.cryptoconditions.Fulfillment;
+import org.interledger.cryptoconditions.der.DerOutputStream;
 
 
 /**
@@ -29,9 +28,9 @@ public class Ed25519Sha256Fulfillment implements Fulfillment {
 
   /**
    * Constructs an instance of the fulfillment.
-   * 
-   * @param publicKey   The public key associated with the condition and fulfillment.
-   * @param signature   The signature associated with the fulfillment.
+   *
+   * @param publicKey The public key associated with the condition and fulfillment.
+   * @param signature The signature associated with the fulfillment.
    */
   public Ed25519Sha256Fulfillment(EdDSAPublicKey publicKey, byte[] signature) {
     this.signature = new byte[signature.length];
@@ -138,4 +137,51 @@ private static MessageDigest getSha512Digest() {
 
     return _DIGEST;
   }
+
+  /**
+   * The {@link #condition} field in this class is not part of this equals method because it is a
+   * value derived from this fulfillment, and is lazily initialized (so it's occasionally null until
+   * {@link #getCondition()} is called.
+   */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+
+    Ed25519Sha256Fulfillment that = (Ed25519Sha256Fulfillment) o;
+
+    if (!publicKey.equals(that.publicKey)) {
+      return false;
+    }
+    return Arrays.equals(signature, that.signature);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = publicKey.hashCode();
+    result = 31 * result + Arrays.hashCode(signature);
+    return result;
+  }
+
+//  @Override
+//  public String toString() {
+//    final StringBuilder sb = new StringBuilder("Ed25519Sha256Fulfillment{");
+//    sb.append("type=").append(getType());
+//    sb.append('}');
+//    return sb.toString();
+//  }
+
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder("Ed25519Sha256Fulfillment{");
+    sb.append("publicKey=").append(publicKey);
+    sb.append(", signature=").append(Arrays.toString(signature));
+    sb.append(", type=").append(getType());
+    sb.append('}');
+    return sb.toString();
+  }
 }

src/main/java/org/interledger/cryptoconditions/types/PrefixSha256Fulfillment.java

@@ -1,15 +1,15 @@
 package org.interledger.cryptoconditions.types;
 
-import org.interledger.cryptoconditions.Condition;
-import org.interledger.cryptoconditions.ConditionType;
-import org.interledger.cryptoconditions.Fulfillment;
-import org.interledger.cryptoconditions.der.DerOutputStream;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.math.BigInteger;
 import java.util.Arrays;
+import java.util.Objects;
+import org.interledger.cryptoconditions.Condition;
+import org.interledger.cryptoconditions.ConditionType;
+import org.interledger.cryptoconditions.Fulfillment;
+import org.interledger.cryptoconditions.der.DerOutputStream;
 
 /**
  * Implementation of a fulfillment based on a prefix, a sub fulfillment, and the SHA-256 function.
@@ -24,10 +24,10 @@ public class PrefixSha256Fulfillment implements Fulfillment {
 
   /**
    * Constructs an instance of the fulfillment.
-   * 
-   * @param prefix The prefix associated with the condition and fulfillment
+   *
+   * @param prefix           The prefix associated with the condition and fulfillment
    * @param maxMessageLength The maximum length of a message.
-   * @param subfulfillment The sub fulfillments that this fulfillment depends on.
+   * @param subfulfillment   The sub fulfillments that this fulfillment depends on.
    */
   public PrefixSha256Fulfillment(byte[] prefix, long maxMessageLength, Fulfillment subfulfillment) {
     this.prefix = new byte[prefix.length];
@@ -102,12 +102,9 @@ public PrefixSha256Condition getCondition() {
   }
 
   @Override
-  public boolean verify(Condition condition, byte[] message) {
-
-    if (condition == null) {
-      throw new IllegalArgumentException(
-          "Can't verify a PrefixSha256Fulfillment against an null condition.");
-    }
+  public boolean verify(final Condition condition, final byte[] message) {
+    Objects.requireNonNull(condition,
+        "Can't verify a PrefixSha256Fulfillment against a null condition!");
 
     if (!(condition instanceof PrefixSha256Condition)) {
       throw new IllegalArgumentException(
@@ -116,7 +113,9 @@ public boolean verify(Condition condition, byte[] message) {
 
     if (message.length > maxMessageLength) {
       throw new IllegalArgumentException(
-          "Message length exceeds maximum message length of " + maxMessageLength + ".");
+          String
+              .format("Message length (%s) exceeds maximum message length of (%s).", message.length,
+                  maxMessageLength));
     }
 
     if (!getCondition().equals(condition)) {
@@ -130,4 +129,47 @@ public boolean verify(Condition condition, byte[] message) {
     return subfulfillment.verify(subcondition, prefixedMessage);
   }
 
+  /**
+   * The {@link #condition} field in this class is not part of this equals method because it is a
+   * value derived from this fulfillment, and is lazily initialized (so it's occasionally null until
+   * {@link #getCondition()} is called.
+   */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+
+    PrefixSha256Fulfillment that = (PrefixSha256Fulfillment) o;
+
+    if (maxMessageLength != that.maxMessageLength) {
+      return false;
+    }
+    if (subfulfillment != null ? !subfulfillment.equals(that.subfulfillment)
+        : that.subfulfillment != null) {
+      return false;
+    }
+    return Arrays.equals(prefix, that.prefix);
+  }
+
+  @Override
+  public int hashCode() {
+    int result = subfulfillment != null ? subfulfillment.hashCode() : 0;
+    result = 31 * result + (int) (maxMessageLength ^ (maxMessageLength >>> 32));
+    result = 31 * result + Arrays.hashCode(prefix);
+    return result;
+  }
+
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder("PrefixSha256Fulfillment{");
+    sb.append("maxMessageLength=").append(maxMessageLength);
+    sb.append(", prefix=").append(Arrays.toString(prefix));
+    sb.append(", type=").append(getType());
+    sb.append('}');
+    return sb.toString();
+  }
 }

src/main/java/org/interledger/cryptoconditions/types/PreimageSha256Fulfillment.java

@@ -1,5 +1,6 @@
 package org.interledger.cryptoconditions.types;
 
+import java.util.Arrays;
 import org.interledger.cryptoconditions.Condition;
 import org.interledger.cryptoconditions.ConditionType;
 import org.interledger.cryptoconditions.Fulfillment;
@@ -23,8 +24,10 @@ public class PreimageSha256Fulfillment implements Fulfillment {
    * @param preimage The preimage associated with the fulfillment.
    */
   public PreimageSha256Fulfillment(byte[] preimage) {
-    this.preimage = new byte[preimage.length];
-    System.arraycopy(preimage, 0, this.preimage, 0, preimage.length);
+
+    this.preimage = Arrays.copyOf(preimage, preimage.length);
+//    this.preimage = new byte[preimage.length];
+//    System.arraycopy(preimage, 0, this.preimage, 0, preimage.length);
   }
 
   @Override
@@ -88,4 +91,35 @@ public boolean verify(Condition condition, byte[] message) {
     return getCondition().equals(condition);
   }
 
+  /**
+   * The {@link #condition} field in this class is not part of this equals method because it is a
+   * value derived from this fulfillment, and is lazily initialized (so it's occasionally null until
+   * {@link #getCondition()} is called.
+   */
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+
+    PreimageSha256Fulfillment that = (PreimageSha256Fulfillment) o;
+
+    return Arrays.equals(preimage, that.preimage);
+  }
+
+  @Override
+  public int hashCode() {
+    return Arrays.hashCode(preimage);
+  }
+
+  @Override
+  public String toString() {
+    final StringBuilder sb = new StringBuilder("PreimageSha256Fulfillment{");
+    sb.append("type=").append(getType());
+    sb.append('}');
+    return sb.toString();
+  }
 }