Back to certInfo endpoint as cerinfoFromUrl is not available in older releases

#221

Author: Chris Wiechmann

modules/apim-adapter/src/main/java/com/axway/apim/adapter/APIManagerAdapter.java

@@ -1,5 +1,6 @@
 package com.axway.apim.adapter;
 
+import java.io.File;
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URL;
@@ -542,21 +543,26 @@ public static String getApiManagerName() throws AppException {
 		return APIManagerAdapter.apiManagerName;
 	}
 
-	public static JsonNode getCertInfoFromFile(InputStream certFile, CaCert cert) throws AppException {
+	public static JsonNode getCertInfo(InputStream certificate, String password, CaCert cert) throws AppException {
 		URI uri;
 		HttpResponse httpResponse = null;
 		try {
 			uri = new URIBuilder(cmd.getAPIManagerURL()).setPath(cmd.getApiBasepath() + "/certinfo").build();
 			HttpEntity entity = MultipartEntityBuilder.create()
-					.addBinaryBody("file", IOUtils.toByteArray(certFile), ContentType.create("application/x-x509-ca-cert"), cert.getCertFile())
+					.addBinaryBody("file", certificate, ContentType.create("application/x-x509-ca-cert"), cert.getCertFile())
 					.addTextBody("inbound", cert.getInbound())
 					.addTextBody("outbound", cert.getOutbound())
+					.addTextBody("passphrase", password)
 					.build();
 			POSTRequest postRequest = new POSTRequest(entity, uri);
 			httpResponse = postRequest.execute();
 			int statusCode = httpResponse.getStatusLine().getStatusCode();
 			String response = EntityUtils.toString(httpResponse.getEntity());
 			if( statusCode != 200){
+				if(response!=null && response.contains("Bad password")) {
+					LOG.debug("API-Manager failed to read certificate information: " + cert.getCertFile() + ". Got response: '"+response+"'.");
+					throw new AppException("Password for keystore: '" + cert.getCertFile() + "' is wrong.", ErrorCode.WRONG_KEYSTORE_PASSWORD);
+				}
 				throw new AppException("API-Manager failed to read certificate information from file. Got response: '"+response+"'", ErrorCode.API_MANAGER_COMMUNICATION);
 			}
 			JsonNode jsonResponse = mapper.readTree(response);

modules/apis/src/main/java/com/axway/apim/apiimport/APIImportConfigAdapter.java

@@ -458,7 +458,7 @@ private void completeCaCerts(API apiConfig) throws AppException {
 			for(CaCert cert :apiConfig.getCaCerts()) {
 				if(cert.getCertBlob()==null) {
 					try(InputStream is = getInputStreamForCertFile(cert)) {
-						JsonNode certInfo = APIManagerAdapter.getCertInfoFromFile(is, cert);
+						JsonNode certInfo = APIManagerAdapter.getCertInfo(is, null, cert);
 						CaCert completedCert = mapper.readValue(certInfo.get(0).toString(), CaCert.class);
 						completedCaCerts.add(completedCert);
 					} catch (Exception e) {
@@ -829,7 +829,7 @@ private void handleOutboundSSLAuthN(AuthenticationProfile authnProfile) throws A
 			cert.setInbound("false");
 			cert.setOutbound("true");
 			// This call is to validate the given password, keystore is valid
-			APIManagerAdapter.getCertInfoFromUrl(fileData.get("data").asText(), password, cert);
+			APIManagerAdapter.getCertInfo(new FileInputStream(clientCertFile), password, cert);
 			String data = fileData.get("data").asText();
 			authnProfile.getParameters().put("pfx", data);
 			authnProfile.getParameters().remove("certFile");