X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fclient%2FMrTopicConnection.java;h=b3f713fd1c43bd23c8a22b41680cbf0c79252fac;hb=0654d98f69b80b8d932dd33a5dcc56dbecc6a64e;hp=a92dbc7e63a4a6d56c6aeadee293be2a12304c44;hpb=2023a02a1325cd710079e72b8369fa1bbea666cc;p=dmaap%2Fdbcapi.git

diff --git a/src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java b/src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java
index a92dbc7..b3f713f 100644
--- a/src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java
+++ b/src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java
@@ -31,8 +31,10 @@ import java.net.ProtocolException;
 import java.net.URL;
 import java.net.HttpURLConnection;
 
+import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSession;
 
 import org.apache.commons.codec.binary.Base64;
 import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
@@ -48,14 +50,15 @@ public class MrTopicConnection extends BaseLoggingClass  {
 	
 	private  String mmProvCred; 
 	private	String unit_test;
-	private boolean useAAF;
-
+	private String authMethod;
+	private boolean hostnameVerify;
 
 	public MrTopicConnection(String user, String pwd ) {
 		mmProvCred = new String( user + ":" + pwd );
 		DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
         unit_test = p.getProperty( "UnitTest", "No" );
-    	useAAF= "true".equalsIgnoreCase(p.getProperty("UseAAF", "false"));
+    	authMethod = p.getProperty("MR.authentication", "none");
+    	hostnameVerify= "true".equalsIgnoreCase(p.getProperty("MR.hostnameVerify", "true"));
 	}
 	
 	public boolean makeTopicConnection( MR_Cluster cluster, String topic, String overrideFqdn ) {
@@ -71,13 +74,28 @@ public class MrTopicConnection extends BaseLoggingClass  {
 		return makeConnection( topicURL );
 	}
 
+	
 	private boolean makeSecureConnection( String pURL ) {
 		logger.info( "makeConnection to " + pURL );
-	
+		
 		try {
+			HostnameVerifier hostnameVerifier = new HostnameVerifier() {
+				@Override
+				public boolean verify( String hostname, SSLSession session ) {
+					return true;
+				}
+			
+			};
+	
+		
 			URL u = new URL( pURL );
-			uc = (HttpsURLConnection) u.openConnection();
+			uc = (HttpsURLConnection) u.openConnection();			
 			uc.setInstanceFollowRedirects(false);
+			if ( ! hostnameVerify ) {
+				HttpsURLConnection ucs = (HttpsURLConnection) uc;
+				ucs.setHostnameVerifier(hostnameVerifier);
+			}
+	
 			logger.info( "open connection to " + pURL );
 			return(true);
 		} catch (Exception e) {
@@ -128,9 +146,11 @@ public class MrTopicConnection extends BaseLoggingClass  {
 		try {
 			byte[] postData = postMessage.getBytes();
 			logger.info( "post fields=" + postMessage );
-			if ( useAAF ) {
+			if ( authMethod.equalsIgnoreCase("basicAuth") ) {
 				uc.setRequestProperty("Authorization", auth);
 				logger.info( "Authenticating with " + auth );
+			} else if ( authMethod.equalsIgnoreCase("cert")) {
+				logger.error( "MR.authentication set for client certificate.  Not supported yet.");
 			}
 			uc.setRequestMethod("POST");
 			uc.setRequestProperty("Content-Type", "application/json");
@@ -184,9 +204,9 @@ public class MrTopicConnection extends BaseLoggingClass  {
             
 		} catch (Exception e) {
         	if ( unit_test.equals( "Yes" ) ) {
-				response.setCode(200);
+				response.setCode(201);
 				response.setMessage( "simulated response");
-				logger.info( "artificial 200 response from doPostMessage because unit_test =" + unit_test );
+				logger.info( "artificial 201 response from doPostMessage because unit_test =" + unit_test );
         	} else {
 
 				response.setCode(500);