Merge pull request #112 from Venafi/contacts-support

Fix Policy contacts multiple matching in TPP

Author: rvelaVenafi

src/main/java/com/venafi/vcert/sdk/connectors/tpp/AbstractTppConnector.java

@@ -5,6 +5,7 @@
 import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import com.venafi.vcert.sdk.connectors.tpp.endpoint.BrowseIdentitiesResponse;
 import com.venafi.vcert.sdk.connectors.tpp.endpoint.BrowseIdentitiesRequest;
@@ -126,7 +127,8 @@ public TPPPolicy getTPPPolicy(String policyName) throws VCertException {
     protected String[] resolveTPPContacts(String[] contacts) throws VCertException{
         List<String> identitiesIdList = new ArrayList<>();
         if (contacts != null){
-            for (String contact: contacts) {
+            HashSet<String> contactSet = Arrays.stream(contacts).collect(Collectors.toCollection(HashSet::new));
+            for (String contact: contactSet) {
                 IdentityEntry identity = this.getTPPIdentity(contact);
                 identitiesIdList.add(identity.prefixedUniversal());
             }
@@ -145,11 +147,22 @@ public IdentityEntry getTPPIdentity(String username) throws VCertException{
         if (response.identities().length == 0){
             throw new TPPUsernameNotFoundException(username);
         }
+
+        IdentityEntry identity = null;
         if (response.identities().length > 1){
-            throw new IdentityExtraneousInformationException(response.identities());
+            for (IdentityEntry entry: response.identities()){
+                if (entry.name().equalsIgnoreCase(username)){
+                    identity = entry;
+                    break;
+                }
+            }
+        }else {
+            identity = response.identities()[0];
         }
 
-        IdentityEntry identity = response.identities()[0];
+        if (identity == null){
+            throw new TPPUsernameNotFoundException(username);
+        }
 
         return identity;
     }

src/test/java/com/venafi/vcert/sdk/TestUtils.java

@@ -49,6 +49,8 @@ public class TestUtils {
 	public static final String TPP_PM_ROOT = System.getenv("TPP_PM_ROOT");
 	public static final String TPP_CA_NAME = System.getenv("TPP_CA_NAME");
 	public static final String CLIENT_ID = "vcert-sdk";
+	public static final String TPP_IDENTITY_USER = System.getenv("TPP_IDENTITY_USER");
+
 	public static final String CLOUD_ZONE = System.getenv("CLOUDZONE");
 	public static final String API_KEY = System.getenv("APIKEY");
 	public static final String CLOUD_ENTRUST_CA_NAME = System.getenv("CLOUD_ENTRUST_CA_NAME");

src/test/java/com/venafi/vcert/sdk/connectors/tpp/TppTokenConnectorPolicyAT.java

@@ -1,6 +1,6 @@
 package com.venafi.vcert.sdk.connectors.tpp;
 
-import com.venafi.vcert.sdk.Config;
+import com.venafi.vcert.sdk.TestUtils;
 import com.venafi.vcert.sdk.VCertException;
 import com.venafi.vcert.sdk.connectors.tpp.endpoint.IdentityEntry;
 import com.venafi.vcert.sdk.connectors.tpp.endpoint.IdentityInformation;
@@ -28,6 +28,13 @@ public void browseIdentities() throws VCertException {
         prefixedUniversal = identity.prefixedUniversal();
     }
 
+//    @Test
+//    @DisplayName("TPP - Retrieve and Identity using a partial match. Ensure that only one entry is returned")
+//    public void browseIdentitiesPartialMatch() throws VCertException {
+//        IdentityEntry identity = connectorResource.connector().getTPPIdentity(TestUtils.TPP_IDENTITY_USER);
+//        Assertions.assertEquals(TestUtils.TPP_IDENTITY_USER, identity.name());
+//    }
+
     @Test
     @DisplayName("TPP - Retrieve the details of an Identity Entry by prefixedUniversal")
     public void validateIdentity() throws VCertException {