Bypass REST Outbound Adapter 이동

src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceBypass.java

@@ -1,4 +1,4 @@
-package com.eactive.eai.adapter.http.client.impl.kjb;
+package com.eactive.eai.adapter.http.client.impl;
 
 import java.io.IOException;
 import java.net.ConnectException;
@@ -43,7 +43,6 @@ import com.eactive.eai.adapter.http.HttpMethodType;
 import com.eactive.eai.adapter.http.client.HttpClient5AdapterServiceSupport;
 import com.eactive.eai.adapter.http.client.HttpClientAdapterServiceKey;
 import com.eactive.eai.adapter.http.client.HttpClientAdapterVO;
-import com.eactive.eai.adapter.http.client.impl.HttpClientAdapterServiceRest;
 import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
 import com.eactive.eai.adapter.http.dynamic.impl.HttpAdapterServiceBypass;
 import com.eactive.eai.common.TransactionContextKeys;

src/main/java/com/eactive/eai/adapter/http/dynamic/HttpAdapterServiceSupport.java

@@ -70,13 +70,13 @@ public abstract class HttpAdapterServiceSupport implements HttpAdapterService, H
 				throw e;
 			} catch (JwtAuthException e) { // filter error
 				logger.error(LOG_PREFIX + transactionId + "-" + adptGrpName + "-" + adptName + ">>" + e.getMessage(), e);
-				UnkownMessageLogUtils.logUnkownMessage(adptGrpName, adptName, message, prop, request, response,
-						"RECEAIIRP202", e);
+//				UnkownMessageLogUtils.logUnkownMessage(adptGrpName, adptName, message, prop, request, response,
+//						"RECEAIIRP202", e);
 				throw e;
 			} catch (Exception e) { // filter error
 				logger.error(LOG_PREFIX + transactionId + "-" + adptGrpName + "-" + adptName + ">>" + e.getMessage(), e);
-				UnkownMessageLogUtils.logUnkownMessage(adptGrpName, adptName, message, prop, request, response,
-						"RECEAIIRP201", e);
+//				UnkownMessageLogUtils.logUnkownMessage(adptGrpName, adptName, message, prop, request, response,
+//						"RECEAIIRP201", e);
 				throw e;
 			}
 			

src/main/java/com/eactive/eai/adapter/http/dynamic/filter/ApiKeyExtractFilter.java

@@ -6,6 +6,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpStatus;
 
 import com.eactive.eai.adapter.http.dynamic.filter.HttpAdapterFilter;
 import com.eactive.eai.adapter.http.dynamic.filter.JwtAuthException;
@@ -48,7 +49,7 @@ public class ApiKeyExtractFilter implements HttpAdapterFilter {
 		// PathVariable 지원 추가
 		String ruledPath = getMatchedKey(requestPath);
 		if(ruledPath == null)
-			throw new IllegalAccessException("path not found - " + requestPath);
+			throw new FilterException("path not found - " + requestPath, ERROR_PRE_FAIL, HttpStatus.FORBIDDEN.value());
 		prop.setProperty(FINAL_STD_MESSAGE_KEY, ruledPath);// StandardMessageUtil.getMatchedKey(), url
 															// pathvariable도 처리
 		

src/main/java/com/eactive/eai/adapter/http/dynamic/filter/HttpAdapterFilter.java

@@ -7,6 +7,9 @@ import javax.servlet.http.HttpServletResponse;
 
 public interface HttpAdapterFilter {
 
+	public static final String ERROR_PRE_FAIL = "E.PREFILTER_FAIL";
+	public static final String ERROR_POST_FAIL = "E.POSTFILTER_FAIL";
+	
 	public Object doPreFilter(String adptGrpName, String adptName, Object message, Properties prop,
 			HttpServletRequest request, HttpServletResponse response) throws Exception;
 

src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceStandard.java

@@ -1,5 +1,27 @@
 package com.eactive.eai.adapter.http.dynamic.impl;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.StopWatch;
+import org.apache.mina.common.ByteBuffer;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
+
 import com.eactive.eai.adapter.AdapterGroupVO;
 import com.eactive.eai.adapter.AdapterManager;
 import com.eactive.eai.adapter.AdapterPropManager;
@@ -8,8 +30,8 @@ import com.eactive.eai.adapter.Keys;
 import com.eactive.eai.adapter.http.HttpMemoryLogger;
 import com.eactive.eai.adapter.http.HttpStatusException;
 import com.eactive.eai.adapter.http.client.HttpClientAdapterServiceKey;
-import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
 import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceSupport;
+import com.eactive.eai.adapter.http.dynamic.UnkownMessageLogUtils;
 import com.eactive.eai.common.TransactionContextKeys;
 import com.eactive.eai.common.exception.ExceptionUtil;
 import com.eactive.eai.common.util.CommonLib;
@@ -19,30 +41,6 @@ import com.eactive.eai.common.util.MessageUtil;
 import com.eactive.eai.env.ElinkConfig;
 import com.eactive.eai.inbound.processor.Processor;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.StopWatch;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.mina.common.ByteBuffer;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.JSONValue;
-import org.springframework.jms.support.converter.MessageType;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.net.URLDecoder;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.TreeMap;
-
 public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport
 { 
 	public static final String PROPERTIES_NAME_HTTP_REQUEST_METHOD = "httpRequestMethod";
@@ -66,7 +64,8 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport
     	
     	AdapterGroupVO adapterGroupVo = null;
     	Properties prop = null;
-    	
+    	byte[] requestBytes = null;
+    	String encode = "MS949";
         try {
             AdapterManager adapterManager = AdapterManager.getInstance();
             AdapterVO adptVO = adapterManager.getAdapterVO(adptGrpName,adptName);    
@@ -78,9 +77,9 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport
             }
             
             Properties httpProp  = manager.getProperties(adptVO.getPropGroupName());
+            encode = StringUtils.defaultIfBlank(adapterManager.getAdapterGroupVO(adptGrpName).getMessageEncode(), "MS949");
             String responseType  = httpProp.getProperty(RESPONSE_TYPE,"SYNC");
             String urlDecodeYn   = httpProp.getProperty(URL_DECODE_YN,"N");
-            String encode = StringUtils.defaultIfBlank(adapterManager.getAdapterGroupVO(adptGrpName).getMessageEncode(), "MS949");
             String messageType = adapterManager.getAdapterGroupVO(adptGrpName).getMessageType();
             String requestBodyYn = httpProp.getProperty(REQUEST_BODY_YN,"N");
             String parameterName = httpProp.getProperty(PARAMETER_NAME,PARAMETER_MESSAGE);
@@ -107,7 +106,6 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport
     		
 			logger.info("시작 >> encode = [" + encode + "]");
     		
-			byte[] requestBytes = null;
 			
             if ("Y".equals(requestBodyYn)){
             	ServletInputStream sis = request.getInputStream();
@@ -191,19 +189,19 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport
 			prop.put(PROPERTIES_NAME_HTTP_REQUEST_METHOD, request.getMethod());
 			prop.put(ALLOW_IP, httpProp.getProperty(ALLOW_IP, ""));
 			
-			String body = new String ( requestBytes,encode);
-
-			try {
-				Object root = JSONValue.parse(body);
-				if( root instanceof JSONArray ) {
-					JSONObject wrappedObject = new JSONObject();
-					wrappedObject.put("DJB_ROOTLESS_ARRAY", root);
-					requestBytes = wrappedObject.toJSONString().getBytes(encode);
-				}
-				
-			}catch (Exception e) {
-				// ignore json이 아니기에 해줄것이 없음.
-			}
+//			String body = new String ( requestBytes,encode);
+//
+//			try {
+//				Object root = JSONValue.parse(body);
+//				if( root instanceof JSONArray ) {
+//					JSONObject wrappedObject = new JSONObject();
+//					wrappedObject.put("DJB_ROOTLESS_ARRAY", root);
+//					requestBytes = wrappedObject.toJSONString().getBytes(encode);
+//				}
+//				
+//			}catch (Exception e) {
+//				// ignore json이 아니기에 해줄것이 없음.
+//			}
 			
             // 로컬 서비스 호출
             Object result = null;
@@ -338,7 +336,14 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport
 			}
 			
         } catch (Exception e) {
-    		if (traceLevel >= 3){
+        	try {
+				UnkownMessageLogUtils.logUnkownMessage(adptGrpName, adptName, requestBytes != null ? new String(requestBytes, encode) : null, prop, request, response,
+						"RECEAIIRP202", e);
+			} catch (UnsupportedEncodingException e1) {
+				UnkownMessageLogUtils.logUnkownMessage(adptGrpName, adptName, requestBytes != null ? new String(requestBytes) : null, prop, request, response,
+						"RECEAIIRP202", e);
+			}
+        	if (traceLevel >= 3){
                	HttpMemoryLogger.error(adptGrpName+adptName, e.toString(),e);
     		}
             logger.error("HttpAdapter] "+adptGrpName+"-"+adptName, e);

src/main/java/com/eactive/eai/common/hsm/HsmManager.java

@@ -16,6 +16,7 @@ import javax.crypto.SecretKey;
 
 import org.springframework.stereotype.Component;
 
+import com.eactive.eai.agent.encryption.EncryptionManager;
 import com.eactive.eai.common.exception.ExceptionUtil;
 import com.eactive.eai.common.lifecycle.Lifecycle;
 import com.eactive.eai.common.lifecycle.LifecycleException;
@@ -81,8 +82,10 @@ public class HsmManager implements Lifecycle {
     }
 
     private void init() throws Exception {
-        String configContent = PropManager.getInstance().getProperty(GROUP_NAME, PROP_CONFIG);
-        String pin = PropManager.getInstance().getProperty(GROUP_NAME, PROP_PIN);
+    	EncryptionManager encManager = EncryptionManager.getInstance();
+    	
+        String configContent = encManager.decryptDBData(PropManager.getInstance().getProperty(GROUP_NAME, PROP_CONFIG));
+        String pin = encManager.decryptDBData(PropManager.getInstance().getProperty(GROUP_NAME, PROP_PIN));
 
         if (configContent == null || configContent.trim().isEmpty()) {
             logger.warn("HsmManager] PKCS11_CONFIG 가 설정되지 않았습니다. HSM 초기화를 건너뜁니다.");

src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java

@@ -1007,7 +1007,14 @@ public class RequestProcessor extends RequestProcessorSupport {
 					if (logger.isError()) logger.error(guidLogPrefix + " : 거래통제 Log 실패 - " + vo.getRspErrorMsg());
 				}
 
-				return restrictResponse;
+				AdapterGroupVO adptGrpVO = AdapterManager.getInstance().getAdapterGroupVO(vo.getAdapterGroupName());
+				if (!Keys.IF_STANDARD.equals(vo.getStdMsgTypeCode()) && StringUtils.equalsAny(adptGrpVO.getType(),
+						Keys.TYPE_REST, Keys.TYPE_HTTP, Keys.TYPE_HTTP_CUSTOM)) {
+					throw new HttpStatusException(eaiMsg.getRspErrMsg(), eaiMsg.getRspErrCd(),
+							HttpStatus.SERVICE_UNAVAILABLE.value());
+				} else {
+					return restrictResponse;
+				}
 			}
 			else {
 				// ExceptionHandler에 의해 에러 응답송신

src/main/java/com/eactive/eai/outbound/RESTProcess.java

@@ -694,35 +694,37 @@ public class RESTProcess extends HTTPProcess {
 	public void setOutboundErrorMessage() throws Exception {
 		this.logPssSno = TranLogUtil.getResLogSeq(this.svcPssTp, this.svcPssSeq, this.isComp);
 
+		boolean setResObject = false;
 		// 에러에 대한 응답메시지
 		if(this.tempProp.get(HttpAdapterServiceKey.OUTBOUND_PROPERTY_MAP) instanceof Map) {
 			@SuppressWarnings("unchecked")
 			Map<String, Object> map = (Map<String, Object>) this.tempProp.get(HttpAdapterServiceKey.OUTBOUND_PROPERTY_MAP);
 			this.callProp.put(HttpAdapterServiceKey.OUTBOUND_PROPERTY_MAP, map);
-		}
-
-		boolean setResObject = false;
-		AdapterGroupVO outboundAdapterGroupVO = AdapterManager.getInstance().getAdapterGroupVO(adapterGroupName);
-		if (outboundAdapterGroupVO != null) {
-			AdapterVO outboundAdapterVo = null;
-			if(adapterName != null)
-				outboundAdapterVo = outboundAdapterGroupVO.getAdapterVO(adapterName);
-			else
-				outboundAdapterVo = outboundAdapterGroupVO.nextAdapterVO();
 			
-			if (outboundAdapterVo != null) {
-				String errorHandlerClass = AdapterPropManager.getInstance().getProperty(
-						outboundAdapterVo.getPropGroupName(), "ERR_MSG_HANDLER");
-				if (StringUtils.isNotBlank(errorHandlerClass)) {
-					if (logger.isInfo())
-						logger.info("ExceptionHandler] errorSyncSend ERR_MSG_HANDLER=" + errorHandlerClass);
-					AdapterErrorMessageHandler handler = AdapterErrorMessageHandlerFactory.createHandler(errorHandlerClass);
-					this.resObject = handler.generateOutboundErrorResponseMessage(adapterGroupName, adapterGroupName,
-							callProp, this.reqObject, this.resEaiMsg);
-					setResObject = true;
+			// OUTBOUND_PROPERTY_MAP 이 있는 경우, 즉 타겟서버와 통신은 정상적으로 이루진 경우 처리한다.
+			AdapterGroupVO outboundAdapterGroupVO = AdapterManager.getInstance().getAdapterGroupVO(adapterGroupName);
+			if (outboundAdapterGroupVO != null) {
+				AdapterVO outboundAdapterVo = null;
+				if(adapterName != null)
+					outboundAdapterVo = outboundAdapterGroupVO.getAdapterVO(adapterName);
+				else
+					outboundAdapterVo = outboundAdapterGroupVO.nextAdapterVO();
+				
+				if (outboundAdapterVo != null) {
+					String errorHandlerClass = AdapterPropManager.getInstance().getProperty(
+							outboundAdapterVo.getPropGroupName(), "ERR_MSG_HANDLER");
+					if (StringUtils.isNotBlank(errorHandlerClass)) {
+						if (logger.isInfo())
+							logger.info("ExceptionHandler] errorSyncSend ERR_MSG_HANDLER=" + errorHandlerClass);
+						AdapterErrorMessageHandler handler = AdapterErrorMessageHandlerFactory.createHandler(errorHandlerClass);
+						this.resObject = handler.generateOutboundErrorResponseMessage(adapterGroupName, adapterGroupName,
+								callProp, this.reqObject, this.resEaiMsg);
+						setResObject = true;
+					}
 				}
 			}
 		}
+
 		if (!setResObject) {
 			this.resObject = "";
 		}