FAB-5827 Support attrib. req. for enrollment.

Change-Id: Ibf57b250b43ed796da1178231bdf06d53476d978
Signed-off-by: rickr <cr22rc@gmail.com>

Author: cr22rc

src/main/java/org/hyperledger/fabric/sdk/Endpoint.java

@@ -79,7 +79,7 @@ class Endpoint {
         if (properties != null) {
             if ("grpcs".equals(protocol)) {
                 if (properties.containsKey("pemFile") && properties.containsKey("pemBytes")) {
-                    throw new RuntimeException("Properties \"pemBytes\" and \"pemBytes\" can not be both set.");
+                    throw new RuntimeException("Properties \"pemBytes\" and \"pemFile\" can not be both set.");
                 }
                 if (properties.containsKey("pemFile")) {
                     Path path = Paths.get(properties.getProperty("pemFile"));

src/main/java/org/hyperledger/fabric_ca/sdk/EnrollmentRequest.java

@@ -19,13 +19,17 @@
 import java.security.KeyPair;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.json.Json;
 import javax.json.JsonArrayBuilder;
 import javax.json.JsonObject;
 import javax.json.JsonObjectBuilder;
 import javax.json.JsonWriter;
 
+import org.hyperledger.fabric_ca.sdk.exception.InvalidArgumentException;
+
 /**
  * An enrollment request is information required to enroll the user with member service.
  */
@@ -34,16 +38,18 @@ public class EnrollmentRequest {
     // A PEM-encoded string containing the CSR (Certificate Signing Request) based on PKCS #10
     private String csr;
     // Comma-separated list of host names to associate with the certificate
-    private Collection<String> hosts;
+    private Collection<String> hosts = new ArrayList<String>();
     // Name of the signing profile to use when issuing the certificate
-    private String profile;
+    private String profile = null;
     // Label used in HSM operations
-    private String label;
+    private String label = null;
     // Key pair for generating certification request
-    private KeyPair keypair;
+    private KeyPair keypair = null;
     // The Certificate Authority's name
     private String caName;
 
+    // Attribute requests. added v1.1
+    private Map<String, AttrReq> attrreqs = new HashMap<>();
     /**
      * The certificate signing request if it's not supplied it will be generated.
      *
@@ -56,11 +62,7 @@ public void setCsr(String csr) {
 
     // Constructor
     public EnrollmentRequest() {
-        this.csr = null;
-        this.hosts = new ArrayList<String>();
-        this.profile = null;
-        this.label = null;
-        this.keypair = null;
+
     }
 
     String getCsr() {
@@ -75,8 +77,6 @@ String getCsr() {
      * @param keypair Keypair used to sign or create the certificate if needed.
      */
     public EnrollmentRequest(String profile, String label, KeyPair keypair) {
-        this.csr = null;
-        this.hosts = new ArrayList<String>();
         this.profile = profile;
         this.label = label;
         this.keypair = keypair;
@@ -125,7 +125,7 @@ public void setLabel(String label) {
     }
 
     public Collection<String> getHosts() {
-        return hosts;
+        return new ArrayList<>(hosts);
     }
 
     public void addHost(String host) {
@@ -136,7 +136,7 @@ public void addHost(String host) {
     String toJson() {
         StringWriter stringWriter = new StringWriter();
         JsonWriter jsonWriter = Json.createWriter(new PrintWriter(stringWriter));
-        jsonWriter.writeObject(this.toJsonObject());
+        jsonWriter.writeObject(toJsonObject());
         jsonWriter.close();
         return stringWriter.toString();
     }
@@ -162,6 +162,44 @@ private JsonObject toJsonObject() {
             factory.add(HFCAClient.FABRIC_CA_REQPROP, caName);
         }
         factory.add("certificate_request", csr);
+
+        if (!attrreqs.isEmpty()) {
+            JsonArrayBuilder ab = Json.createArrayBuilder();
+            for (AttrReq attrReq : attrreqs.values()) {
+                JsonObjectBuilder i = Json.createObjectBuilder();
+                i.add("name", attrReq.name);
+                if (attrReq.require != null) {
+                    i.add("require", attrReq.require);
+                }
+                ab.add(i);
+
+            }
+            factory.add("attr_reqs", ab.build());
+        }
+
         return factory.build();
     }
+
+    public AttrReq addAttrReq(String name) throws InvalidArgumentException {
+        if (name == null || name.isEmpty()) {
+            throw new InvalidArgumentException("name may not be null or empty.");
+
+        }
+        return new AttrReq(name);
+    }
+
+    public class AttrReq {
+        final String name;
+        Boolean require = null;
+
+        AttrReq(String name) {
+            this.name = name;
+            attrreqs.put(name, this);
+        }
+
+        public AttrReq setRequire(boolean require) {
+            this.require = require;
+            return this;
+        }
+    }
 }

src/test/java/org/hyperledger/fabric_ca/sdk/EnrollmentRequestTest.java

@@ -15,10 +15,21 @@
 package org.hyperledger.fabric_ca.sdk;
 
 import java.security.KeyPair;
+
+import org.hyperledger.fabric_ca.sdk.exception.InvalidArgumentException;
 import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 public class EnrollmentRequestTest {
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
     private static final String caName = "certsInc";
     private static final String csr = "11436845810603";
     private static final String profile = "test profile";
@@ -31,7 +42,7 @@ public void testNewInstanceEmpty() {
         try {
             EnrollmentRequest testEnrollReq = new EnrollmentRequest();
             Assert.assertNull(testEnrollReq.getCsr());
-            Assert.assertTrue(testEnrollReq.getHosts().isEmpty());
+            assertTrue(testEnrollReq.getHosts().isEmpty());
             Assert.assertNull(testEnrollReq.getProfile());
             Assert.assertNull(testEnrollReq.getLabel());
             Assert.assertNull(testEnrollReq.getKeyPair());
@@ -47,7 +58,7 @@ public void testNewInstanceParms() {
         try {
             EnrollmentRequest testEnrollReq = new EnrollmentRequest(profile, label, keyPair);
             Assert.assertNull(testEnrollReq.getCsr());
-            Assert.assertTrue(testEnrollReq.getHosts().isEmpty());
+            assertTrue(testEnrollReq.getHosts().isEmpty());
             Assert.assertEquals(testEnrollReq.getProfile(), profile);
             Assert.assertEquals(testEnrollReq.getLabel(), label);
             Assert.assertNull(testEnrollReq.getKeyPair());
@@ -65,13 +76,13 @@ public void testEnrollReqSetGet() {
             testEnrollReq.addHost("d.com");
             testEnrollReq.setCsr(csr);
             testEnrollReq.setCSR(csr); // Unsure why there are two methods that
-                                       // set csr
+            // set csr
             testEnrollReq.setProfile(profile);
             testEnrollReq.setLabel(label);
             testEnrollReq.setKeyPair(null);
             testEnrollReq.setCAName(caName);
             Assert.assertEquals(testEnrollReq.getCsr(), csr);
-            Assert.assertTrue(testEnrollReq.getHosts().contains("d.com"));
+            assertTrue(testEnrollReq.getHosts().contains("d.com"));
             Assert.assertEquals(testEnrollReq.getProfile(), profile);
             Assert.assertEquals(testEnrollReq.getLabel(), label);
             Assert.assertNull(testEnrollReq.getKeyPair());
@@ -94,10 +105,69 @@ public void testEnrollReqToJson() {
             testEnrollReq.setKeyPair(null);
             testEnrollReq.setCAName(caName);
 
-            Assert.assertTrue(testEnrollReq.toJson().contains(csr));
+            assertTrue(testEnrollReq.toJson().contains(csr));
 
         } catch (Exception e) {
             Assert.fail("Unexpected Exception " + e.getMessage());
         }
     }
+
+    @Test
+    public void testEnrollReqToJsonAttr() throws Exception {
+
+        EnrollmentRequest testEnrollReq = new EnrollmentRequest();
+        testEnrollReq.addHost("d.com");
+        testEnrollReq.setCsr(csr);
+        testEnrollReq.setProfile(profile);
+        testEnrollReq.setLabel(label);
+        testEnrollReq.setKeyPair(null);
+        testEnrollReq.setCAName(caName);
+        testEnrollReq.addAttrReq("foo");
+        testEnrollReq.addAttrReq("foorequired").setRequire(true);
+        testEnrollReq.addAttrReq("foofalse").setRequire(false);
+
+        String s = testEnrollReq.toJson();
+        assertNotNull(s);
+        assertTrue(s.contains("\"attr_reqs\":["));
+        assertTrue(s.contains("\"name\":\"foorequired\",\"require\":true"));
+        assertTrue(s.contains("\"name\":\"foofalse\",\"require\":false"));
+
+    }
+
+    @Test
+    public void testEnrollReqToJsonAttrNotThere() throws Exception {
+
+        EnrollmentRequest testEnrollReq = new EnrollmentRequest();
+        testEnrollReq.addHost("d.com");
+        testEnrollReq.setCsr(csr);
+        testEnrollReq.setProfile(profile);
+        testEnrollReq.setLabel(label);
+        testEnrollReq.setKeyPair(null);
+        testEnrollReq.setCAName(caName);
+
+        String s = testEnrollReq.toJson();
+        assertNotNull(s);
+        assertFalse(s.contains("\"attr_reqs\":["));
+    }
+
+    @Test
+    public void testEnrollReqToJsonAttrNullName() throws Exception {
+        thrown.expect(InvalidArgumentException.class);
+        thrown.expectMessage("name may not be null or empty.");
+
+        EnrollmentRequest testEnrollReq = new EnrollmentRequest();
+        testEnrollReq.addAttrReq(null);
+
+    }
+
+    @Test
+    public void testEnrollReqToJsonAttrEmptyName() throws Exception {
+        thrown.expect(InvalidArgumentException.class);
+        thrown.expectMessage("name may not be null or empty.");
+
+        EnrollmentRequest testEnrollReq = new EnrollmentRequest();
+        testEnrollReq.addAttrReq("");
+
+    }
+
 }