push

2025-12-05 18:16:03 +09:00
parent 7dca401e13
commit 642af96cf3
1 changed files with 402 additions and 502 deletions
@@ -87,7 +87,6 @@ import java.util.Base64;
 import com.kjbank.encrypt.exchange.crypto.AES256Cipher;
 import com.kjbank.encrypt.exchange.crypto.AESCipher;
 import com.nimbusds.jwt.SignedJWT;
-import com.nimbusds.jwt.SignedJWT;
 import com.kjbank.encrypt.exchange.crypto.AES256GCMCipher;
 import com.kjbank.encrypt.exchange.crypto.ECDHESA256Cipher;
 import com.eactive.eai.authserver.service.OAuth2Manager;
@@ -167,7 +166,7 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 		String messageType = prop.getProperty("MESSAGE_TYPE", MessageType.JSON);
 		String inboundMethod = tempProp.getProperty(HttpAdapterServiceKey.INBOUND_METHOD, "POST");

-		//Outbound 요청에 대한 응답 메시지의 복호화 여부 결정위해
+		//Outbound 요청에 대한 응답 메시지의 복호화 여부 결정위해 jwhong
 		encryptResponseApply = StringUtils.equalsIgnoreCase(prop.getProperty("ENCRYPT_RESPONSE_APPLY", "N"), "Y");

 		/**
@@ -810,20 +809,10 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 		//Properties inboundHeaders = (Properties) tempProp.get(HttpAdapterServiceKey.INBOUND_HEADER);
 		Properties inboundHeaders = null;
 		String authorization ="";
-		String authorization ="";
 		try {
 			Object headerObj = tempProp.get(HttpAdapterServiceKey.INBOUND_HEADER);
-			System.out.println("*** inboundheader Ojb:"+headerObj);
 			if (headerObj instanceof Properties) {    //tomcat
 				inboundHeaders = (Properties) headerObj;
-				System.out.println("*** inboundHeaders tomcat:"+inboundHeaders);
-				for (String k : inboundHeaders.stringPropertyNames()) {
-					System.out.println("*** inboundheader k is:"+k);
-					if (k.equalsIgnoreCase("authorization")) {
-						authorization = inboundHeaders.getProperty(k);
-						break;
-					}
-				}
 				for ( String k : inboundHeaders.stringPropertyNames()) {
 					if(k.equalsIgnoreCase("authorization")) {
 						authorization = inboundHeaders.getProperty(k);
@@ -832,11 +821,10 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 				}
 			} else if (headerObj instanceof String) {  //weblogic
 				String str = (String) headerObj;
-				System.out.println("*** inboundHeaders weblogic str:"+str);
 				str = str.substring(1, str.length() - 1);
-				
+				// 2. key=value 쌍 분리
 				String[] entries = str.split(",");
-				
+				// map에 담기
 				Map<String, String> map = new HashMap<>();
 				for (String entry : entries) {
 					String[] kv = entry.split("=", 2);
@@ -861,13 +849,9 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 			jwtToken = authorization.substring(7); // "Bearer " 이후의 JWT만 추출
 		}

-		System.out.println("*** authorization is:"+authorization);
-		System.out.println("*** jwtToken is:"+jwtToken);
-		
 		/* 업체정보 */
 		String clientId = JwtClientIdExtractor(jwtToken);
 		method.setHeader("clientId", clientId);
-        System.out.println("*** header clientID biz company code:"+clientId);

 		/* APIM 거래추적자 */
 		String uuid = tempProp.getProperty(TransactionContextKeys.TRANSACTION_UUID, "");
@@ -921,13 +905,11 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp

 		Properties properties = AdapterPropManager.getInstance().getProperties(adapterName); // jwhong
 		String encryptAlgorithm = properties.getProperty("ENCRYPT_ALGORITHM","");   // jwhong
-		//String encryptBaseKeyType = properties.getProperty("ENCRYPT_BASE_TYPE");   
+		String encryptBaseKeyType = properties.getProperty("ENCRYPT_BASE_TYPE");
 		String encryptClientId = properties.getProperty("ENCRYPT_CLIENT_ID");
 		String encryptAES256Iv = properties.getProperty("ENCRYPT_AES256_IV");
 		String encryptAES256Key = properties.getProperty("ENCRYPT_AES256_KEY");
 		String certPath = properties.getProperty("ENCRYPT_CERT_PATH");
-		String encryptAES256Iv = properties.getProperty("ENCRYPT_AES256_IV");  
-		String encryptAES256Key = properties.getProperty("ENCRYPT_AES256_KEY");  

 		// outbound encrypt 는 SecretKey 또는 NICE-auth 가 암호화 key로 사용된다.
 		// outbound 알림결과는 SecretKey, NICE-auth, Token을 사용한다.
@@ -1071,24 +1053,6 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 	}


-	private byte[] doOutboundPostFilter(byte[] eaiBody, String decryptAlgorithm, String adapterName, OAuth2AccessTokenVO niceAccessToken ) {
-		
-		if ( !encryptResponseApply)  {
-			return eaiBody;
-		}
-			return encryptedMessage;
-			//break;
-		}
-		
-		Map<String, Object> map = new HashMap<>();
-		map.put(encryptedJsonKey, encryptedMessage);
-		JSONObject json = new JSONObject();
-		json.putAll(map);
-		return json.toJSONString();
-		//return encryptedMessage;
-	}
-	
-	
 	private byte[] doOutboundPostFilter(byte[] eaiBody, String decryptAlgorithm, String adapterName, OAuth2AccessTokenVO niceAccessToken ) {

 		if ( !encryptResponseApply)  {
@@ -1096,13 +1060,11 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 		}

 		Properties properties = AdapterPropManager.getInstance().getProperties(adapterName); // jwhong
-		////String encryptAlgorithm = properties.getProperty("ENCRYPT_ALGORITHM");   // jwhong
-		////String encryptBaseKeyType = properties.getProperty("ENCRYPT_BASE_TYPE");   
+		//String encryptAlgorithm = properties.getProperty("ENCRYPT_ALGORITHM");   // jwhong
+		//String encryptBaseKeyType = properties.getProperty("ENCRYPT_BASE_TYPE");
 		String encryptClientId = properties.getProperty("ENCRYPT_CLIENT_ID");
 		String encryptAES256Iv = properties.getProperty("ENCRYPT_AES256_IV");
 		String encryptAES256Key = properties.getProperty("ENCRYPT_AES256_KEY");
-		String encryptAES256Iv = properties.getProperty("ENCRYPT_AES256_IV");  
-		String encryptAES256Key = properties.getProperty("ENCRYPT_AES256_KEY");  

 		// outbound encrypt 는 SecretKey 또는 NICE-auth 가 암호화 key로 사용된다.
 		OAuth2Manager manager = OAuth2Manager.getInstance();
@@ -1114,16 +1076,6 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 			clientSecret = encryptClientId;
 		}

-    	// Nice-auth ,  token 값을 substring 해서 사용한다. 나이스 지키미는 adapter token에서 추출된 token을 사용한다.
-    	if  (useAdapterToken && "AES256-NICEON".equals(decryptAlgorithm)) {
-    		clientSecret = niceAccessToken.getAccessToken();
-    	}
-    	
-		byte[] resPostMessage = doOutboundPostDecrypt(eaiBody, decryptAlgorithm, clientSecret, encryptAES256Iv, encryptAES256Key);
-    	} else {
-    		clientSecret = encryptClientId; 
-    	}
-    	
 		// Nice-auth ,  token 값을 substring 해서 사용한다. 나이스 지키미는 adapter token에서 추출된 token을 사용한다.
 		if  (useAdapterToken && "AES256-NICEON".equals(decryptAlgorithm)) {
 			clientSecret = niceAccessToken.getAccessToken();
@@ -1133,7 +1085,7 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 		return resPostMessage;
 	}

-	private byte[] doOutboundPostDecrypt(byte[] eaiBody, String decryptAlgorithm, String clientSecretKey, String encryptAES256Iv, String encryptAES256Key , String encryptAES256Iv, String encryptAES256Key ) {
+	private byte[] doOutboundPostDecrypt(byte[] eaiBody, String decryptAlgorithm, String clientSecretKey, String encryptAES256Iv, String encryptAES256Key ) {

 		byte[] decryptedMessage = null;
 		String eaiStringBody = new String(eaiBody, StandardCharsets.UTF_8);
@@ -1145,8 +1097,6 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 			return eaiBody;
 		}

-		eaiStringBody = extractBodyMsg(decryptAlgorithm, eaiStringBody);
-		
 		//test source
 		/*
 		logger.debug("eaiBody 바이트 배열 길이: " + eaiBody.length);
@@ -1305,56 +1255,6 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
 		}
 		return jsonKey;
 	}
-	private String extractBodyMsg(String decryptAlgorithm, String eaiStringBody) {
-
-		String decryptedJsonKey = "";
-		String decryptedBodyMessage = "";
-		
-		decryptedJsonKey = getJsonKey(decryptAlgorithm);
-	
-		try {
-			JSONParser parser = new JSONParser();
-			JSONObject jsonObject = (JSONObject) parser.parse(eaiStringBody);
-			decryptedBodyMessage = (String) jsonObject.get(decryptedJsonKey);		
-		} catch (Exception e) {
-	        e.printStackTrace();
-	        logger.error("HttpClient5AdapterServiceRest] extractBodyMsg error : " + e.getMessage());
-		}
-
-		return decryptedBodyMessage;
-		
-	}
-	
-	private String getJsonKey(String Algorithm) {
-		
-		String jsonKey = "";
-		
-		switch (Algorithm) {
-		case "AES128-TOSS":
-			jsonKey = "preScreeningRequest"; 			
-			break;
-		case "AES128-TOGETHER":
-			jsonKey = "obpTxData";	 			
-			break;
-		case "AES256":
-			jsonKey = "preScreeningRequest";	 			
-			break;
-		case "AES256-KAKAO":
-			jsonKey = "encrypted_data";	 			
-			break;
-		case "AES256-TOSS":
-			jsonKey = "encryptedData";	 			
-			break;
-		case "AES256-NICEON":
-			jsonKey = "preScreeningRequest";	 			
-			break;
-		case "AES256GCM":	 			
-			break;
-		default:
-            break;
-		}
-		return jsonKey;
-	}
 	// by jwhong
 	private String encrypt(String plainText) {
 		try {