Test changes to have Kerberos authentication work.

Author: Ajit George

test-complete/src/test/java/com/marklogic/client/functionaltest/ConnectedRESTQA.java

@@ -2600,7 +2600,8 @@ public static void createExternalSecurityForKerberos(String restServerName,Strin
 				+ "\"ldap-attribute\":\"\","
 				+ "\"ldap-default-user\":\"\","
 				+ "\"ldap-password\":\"\","
-				+ "\"ldap-bind-method\":\"MD5\""
+				+ "\"ldap-bind-method\":\"MD5\","
+				+ "\"ssl-require-client-certificate\":\"false\""
 				+ "}";
 
 		HttpPost post = new HttpPost("http://localhost:8002/manage/v2/external-security");
@@ -2632,10 +2633,10 @@ public static void createRESTKerberosUser(String usrName, String pass, String ex
 			HttpResponse resp = clientReq.execute(getrequest);
 
 			if(resp.getStatusLine().getStatusCode() == 200) {
-				System.out.println("User already exist");
+				System.out.println("Kerberos User already exist");
 			}
 			else {
-				System.out.println("User dont exist");
+				System.out.println("Kerberos User dont exist");
 				clientPost = new DefaultHttpClient();
 				clientPost.getCredentialsProvider().setCredentials(
 						new AuthScope("localhost", 8002),
@@ -2668,14 +2669,14 @@ public static void createRESTKerberosUser(String usrName, String pass, String ex
 				HttpResponse response = clientPost.execute(post);
 				HttpEntity respEntity = response.getEntity();
 				if( response.getStatusLine().getStatusCode() == 400) {
-					System.out.println("User already exist");
+					System.out.println("Kerberos User already exist - Status Code 400");
 				}
 				else if (respEntity != null) {
 					// EntityUtils to get the response content
 					String content =  EntityUtils.toString(respEntity);
 					System.out.println(content);
 				}
-				else {System.out.println("No Proper Response");}
+				else {System.out.println("No Proper Response - Kerberos User");}
 			}
 		} catch (Exception e) {
 			// writing error to Log

test-complete/src/test/java/com/marklogic/client/functionaltest/TestDatabaseClientWithKerberos.java

@@ -28,13 +28,11 @@
 import java.io.IOException;
 import java.io.StringReader;
 import java.security.KeyManagementException;
-import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.CertificateException;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 import javax.net.ssl.SSLContext;
 import javax.xml.parsers.DocumentBuilder;
@@ -61,41 +59,41 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.DatabaseClientFactory;
-import com.marklogic.client.Transaction;
-import com.marklogic.client.DatabaseClientFactory.KerberosAuthContext;
 import com.marklogic.client.DatabaseClientFactory.BasicAuthContext;
+import com.marklogic.client.DatabaseClientFactory.KerberosAuthContext;
+import com.marklogic.client.Transaction;
 import com.marklogic.client.admin.ExtensionMetadata;
 import com.marklogic.client.admin.ServerConfigurationManager;
 import com.marklogic.client.admin.TransformExtensionsManager;
 import com.marklogic.client.alerting.RuleDefinition;
 import com.marklogic.client.alerting.RuleDefinitionList;
 import com.marklogic.client.alerting.RuleManager;
 import com.marklogic.client.document.DocumentManager;
+import com.marklogic.client.document.DocumentManager.Metadata;
 import com.marklogic.client.document.DocumentPage;
 import com.marklogic.client.document.DocumentRecord;
 import com.marklogic.client.document.DocumentWriteSet;
 import com.marklogic.client.document.JSONDocumentManager;
 import com.marklogic.client.document.ServerTransform;
 import com.marklogic.client.document.TextDocumentManager;
 import com.marklogic.client.document.XMLDocumentManager;
-import com.marklogic.client.document.DocumentManager.Metadata;
 import com.marklogic.client.eval.EvalResult;
+import com.marklogic.client.eval.EvalResult.Type;
 import com.marklogic.client.eval.EvalResultIterator;
 import com.marklogic.client.eval.ServerEvaluationCall;
-import com.marklogic.client.eval.EvalResult.Type;
 import com.marklogic.client.io.BytesHandle;
 import com.marklogic.client.io.DOMHandle;
 import com.marklogic.client.io.DocumentMetadataHandle;
+import com.marklogic.client.io.DocumentMetadataHandle.Capability;
+import com.marklogic.client.io.DocumentMetadataHandle.DocumentCollections;
+import com.marklogic.client.io.DocumentMetadataHandle.DocumentPermissions;
+import com.marklogic.client.io.DocumentMetadataHandle.DocumentProperties;
 import com.marklogic.client.io.FileHandle;
 import com.marklogic.client.io.Format;
 import com.marklogic.client.io.JacksonDatabindHandle;
 import com.marklogic.client.io.JacksonHandle;
 import com.marklogic.client.io.StringHandle;
 import com.marklogic.client.io.XMLStreamReaderHandle;
-import com.marklogic.client.io.DocumentMetadataHandle.Capability;
-import com.marklogic.client.io.DocumentMetadataHandle.DocumentCollections;
-import com.marklogic.client.io.DocumentMetadataHandle.DocumentPermissions;
-import com.marklogic.client.io.DocumentMetadataHandle.DocumentProperties;
 import com.marklogic.client.pojo.PojoPage;
 import com.marklogic.client.pojo.PojoQueryBuilder;
 import com.marklogic.client.pojo.PojoQueryDefinition;
@@ -106,7 +104,6 @@
 import com.marklogic.client.query.StructuredQueryBuilder;
 import com.marklogic.client.query.StructuredQueryDefinition;
 import com.marklogic.client.util.RequestLogger;
-import java.util.Map;
 
 public class TestDatabaseClientWithKerberos extends BasicJavaClientREST {
 
@@ -145,14 +142,16 @@ public static void setUpBeforeClass() throws Exception {
 		createExternalSecurityForKerberos(appServerName, extSecurityName);
 		// Associate the external security with the App Server.
 		associateRESTServerWithKerberosExtSecurity(appServerName, extSecurityName);
-		createUserRolesWithPrevilages("test-eval","xdbc:eval", "xdbc:eval-in","xdmp:eval-in","any-uri","xdbc:invoke");
-		createRESTKerberosUser("user2", "MarkLogic200", kdcPrincipalUser, "admin", "test-eval");
+		createUserRolesWithPrevilages("test-evalKer","xdbc:eval", "xdbc:eval-in","xdmp:eval-in","any-uri","xdbc:invoke");
+		createRESTKerberosUser("user2", "MarkLogic200", kdcPrincipalUser, "admin", "test-evalKer");
 		createRESTUser("rest-admin","x","rest-admin");
 	}
 
 	@AfterClass
 	public static void tearDownAfterClass() throws Exception {
 		System.out.println("In tear down" );
+		deleteUserRole("test-evalKer");
+		deleteRESTUser("user2");
 		tearDownJavaRESTServer(dbName, fNames, appServerName);	
 	}
 
@@ -167,7 +166,7 @@ public void setUp() throws KeyManagementException, NoSuchAlgorithmException, Exc
 					new KerberosAuthContext().withSSLContext(sslcontext));
 		} else
 			client = DatabaseClientFactory.newClient(appServerHostName,
-					appServerHostPort, new KerberosAuthContext());
+					appServerHostPort, new KerberosAuthContext(kdcPrincipalUser));
 	}
 
 	@After