djb-eapim/elink-online-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jenkins_with_weblogic' of ssh://git@192.168.240.178:18081/eapim/elink-online-common.git into jenkins_with_weblogic

Browse Source
This commit is contained in:
pksup
2026-01-12 17:23:06 +09:00
parent 2e8d94b110 bf3b6f23c2
commit b054f5f3da
18 changed files with 518 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/eactive/eai/adapter/http/client/HttpClient5AdapterServiceSupport.java
+2
View File
@@ -418,6 +418,8 @@ public abstract class HttpClient5AdapterServiceSupport implements HttpClientAdap
};
this.client = HttpClients.custom()
.disableDefaultUserAgent()
.disableContentCompression()
.addRequestInterceptorLast(requestLogInterceptor)
.addResponseInterceptorFirst(responseLogInterceptor)
.setConnectionManager(connectionManager)
src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClient5AdapterServiceRest.java
+121 -33
View File
@@ -9,15 +9,22 @@ import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Base64;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.eactive.eai.common.property.PropManager;
// encrypt test by jwhong
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.StopWatch;
@@ -60,40 +67,32 @@ 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.dynamic.HttpAdapterServiceKey;
import com.eactive.eai.authserver.service.OAuth2Manager;
import com.eactive.eai.common.TransactionContextKeys;
import com.eactive.eai.common.authoutbound.AccessTokenManagerByDB;
import com.eactive.eai.common.exception.ExceptionUtil;
import com.eactive.eai.common.message.MessageType;
import com.eactive.eai.common.property.PropManager;
import com.eactive.eai.common.util.CommonLib;
import com.jayway.jsonpath.DocumentContext;
import com.jayway.jsonpath.JsonPath;
import com.kjbank.encrypt.exchange.crypto.AES256Cipher;
import com.kjbank.encrypt.exchange.crypto.AES256GCMCipher;
import com.kjbank.encrypt.exchange.crypto.AESCipher;
import com.kjbank.encrypt.exchange.crypto.ECDHESA256Cipher;
import com.nimbusds.jwt.SignedJWT;
import com.openbanking.eai.common.token.AccessTokenManager;
import com.openbanking.eai.common.token.AccessTokenVO;
import com.openbanking.eai.common.token.OAuth2AccessTokenVO;
import edu.emory.mathcs.backport.java.util.Arrays;
// encrypt test by jwhong
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
import java.nio.charset.StandardCharsets;
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.kjbank.encrypt.exchange.crypto.AES256GCMCipher;
import com.kjbank.encrypt.exchange.crypto.ECDHESA256Cipher;
import com.eactive.eai.authserver.service.OAuth2Manager;
import java.util.Set;
import java.util.HashSet;
import java.util.Date;
/**
* 1. 기능 : EAI HTTP OutBound 용 어댑터로 수동 시스템의 HTTP 웹 컴포넌트를 GET/POST 방식으로 호출할 수 있는
* 기능을 제공한다.<br>
* 2. 처리 개요 : <br>
* * - 2020-09-25: Http Header 받아서 처리할 수 있게 기능 추가<br>
* 3. 주의사항 <br>
* 3. 주의사항 <br>
*
* @author :
* @version : v 1.0.0
@@ -112,11 +111,13 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
public static final String HTTP_STATUS = "HTTP_STATUS";
public static final String HEADER_KEYS = "HEADER_KEYS";
public static final String AUTH_TOKEN = "AUTH_TOKEN";
public static final String HTTP_HEADER_SETTING = "HTTP_HEADER_SETTING";
public static final String PAYLOAD_PARAM_NAME_CLIENT_ID = "client_id"; // jwhong
private boolean useAdapterToken;
private boolean encryptResponseApply;
private String httpHeaderSettingByAdapter = "{}";
/**
* 1. 기능 : REST API 통신에 사용 <br>
@@ -164,6 +165,9 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
//Outbound 요청에 대한 응답 메시지의 복호화 여부 결정위해 jwhong
encryptResponseApply = StringUtils.equalsIgnoreCase(prop.getProperty("ENCRYPT_RESPONSE_APPLY", "N"), "Y");
//업체 300응답시 특정 http status code 경우 에러 아닌걸로 처리. 광주은행
String errIgnore = prop.getProperty("ERROR_IGNORE_CODE", "");
/**
* @formatter:off
@@ -390,7 +394,7 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
// 전달 header 셋팅
// Adapter 레벨 header 보다 data로 넘어온 httpHeader를 우선 적용(header명이 같다면 덮어씀)
assignRequestHeaders(method, httpHeader);
assignRequestHeaders(method, httpHeader, prop);
// KJBank API 추적정보를 Header에 제공. jwhong
//assignRequestKJHeaders(method, prop, tempProp );
@@ -496,7 +500,10 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
map.put(HttpAdapterServiceKey.OUTBOUND_RESPONSE_MESSAGE, responseString);
map.put(HttpAdapterServiceKey.OUTBOUND_RESPONSE_STATUS, status);
if (status >= 200 && status <= 207) {
if (isStatusInIgnore(status,errIgnore )) {
// 이경우 정상으로 처리함
} else if (status >= 200 && status <= 207) {
if (useAdapterToken && StringUtils.equals(tokenErrorHttpStatusCode, "200")) {
needReissue = checkTokenRetry(responseMessage, tokenErrorCodeKey, tokenErrorCodeValues,
vo.getEncode());
@@ -784,27 +791,58 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
return false;
}
private void assignRequestHeaders(HttpUriRequestBase method, Object httpHeader) {
if (httpHeader == null) {
private void assignRequestHeaders(HttpUriRequestBase method, Object httpHeader, Properties prop) {
if (httpHeader != null) {
if (httpHeader instanceof JSONObject) {
JSONObject jsonObject = (JSONObject) httpHeader;
for (Object key : jsonObject.keySet()) {
Object obj = jsonObject.get(key);
if ((obj instanceof JSONObject) || (obj instanceof JSONArray)) {
continue;
}
method.setHeader((String) key, (String) obj);
if (logger.isDebugEnabled()) {
logger.debug("Request Header :" + (String) key + "=[" + (String) obj + "]");
}
}
}
}
//전문에서 추출한 httpHeader값 외 어댑터에서 최종적으로 적용되도록,
String httpSettingJsonStr = prop.getProperty( HTTP_HEADER_SETTING );
if( StringUtils.isBlank(httpSettingJsonStr) )
{
if( logger.isInfoEnabled() ) {
logger.info("HTTP_HEADER_SETTING value is not JSONObject Type, skip.");
}
return;
}
if (httpHeader instanceof JSONObject) {
JSONObject jsonObject = (JSONObject) httpHeader;
for (Object key : jsonObject.keySet()) {
Object obj = jsonObject.get(key);
try {
JSONObject httpValues = (JSONObject) JSONValue.parse(httpSettingJsonStr);
for (Object key : httpValues.keySet()) {
Object obj = httpValues.get(key);
if ((obj instanceof JSONObject) || (obj instanceof JSONArray)) {
continue;
}
method.setHeader((String) key, (String) obj);
method.setHeader((String) key, obj);
if (logger.isDebugEnabled()) {
logger.debug("Request Header :" + (String) key + "=[" + (String) obj + "]");
}
}
}catch (Exception e) {
logger.error("HTTP_HEADER_SETTING value is not JSONObject Type, skip.", e);
}
}
private void assignFilterHeaders(HttpUriRequestBase method, Properties tempProp) {
@@ -949,11 +987,23 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
if (eaiBody == null) {
return;
}
if (eaiBody instanceof JSONObject) {
JSONObject jsonObject = (JSONObject) eaiBody;
if( jsonObject.containsKey("KJB_ROOTLESS_ARRAY") ) {
ContentType contentTypeObj = ContentType.create(contentType, charset);
JSONArray array = (JSONArray) jsonObject.get("KJB_ROOTLESS_ARRAY");
StringEntity entity = new StringEntity(array.toJSONString(), contentTypeObj);
method.setEntity(entity);
return;
}
}
if (StringUtils.contains(contentType, "application/x-www-form-urlencoded")) {
if (eaiBody instanceof JSONObject) {
List<NameValuePair> params = new ArrayList<>();
JSONObject jsonObject = (JSONObject) eaiBody;
for (Object key : jsonObject.keySet()) {
//String encryptedValue = encrypt((String) jsonObject.get(key)); // encrypt by jwhong
//params.add(new BasicNameValuePair((String) key, encryptedValue ));
@@ -1456,11 +1506,22 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
@SuppressWarnings("deprecation")
private JSONObject parseJson(String message) throws Exception {
if (message == null) {
return null;
}
if (message == null || message.trim().isEmpty()) {
return null;
}
return (JSONObject) JSONValue.parse(message);
Object obj = JSONValue.parse(message);
if (obj instanceof JSONObject) {
return (JSONObject) obj;
} else if (obj instanceof JSONArray) {
// 배열일 경우 새로운 객체로 감싸서 반환
JSONObject wrapper = new JSONObject();
wrapper.put("KJB_ROOTLESS_ARRAY", obj);
return wrapper;
}
return null; // 혹은 상황에 맞는 예외 처리
}
private Document convertXmlDocument(String message) throws Exception {
@@ -1563,4 +1624,31 @@ public class HttpClient5AdapterServiceRest extends HttpClient5AdapterServiceSupp
logger.debug("HttpClientAdapterServiceRest] after concatenate url=[" + targetUrl + "] ");
return targetUrl;
}
private boolean isStatusInIgnore(int status, String errIgnore) {
if (errIgnore == null || errIgnore.isEmpty()) return false;
String[] tokens = errIgnore.split(",");
for (String token : tokens) {
token = token.trim();
if (token.contains("-")) {
// 범위 처리
String[] range = token.split("-");
int start = Integer.parseInt(range[0].trim());
int end = Integer.parseInt(range[1].trim());
if (status >= start && status <= end) {
return true;
}
} else {
// 단일 숫자 처리
int code = Integer.parseInt(token);
if (status == code) {
return true;
}
}
}
return false;
}
}
src/main/java/com/eactive/eai/adapter/http/client/impl/HttpClientAdapterServiceNoop.java
+21
View File
@@ -0,0 +1,21 @@
package com.eactive.eai.adapter.http.client.impl;
import com.eactive.eai.adapter.http.client.HttpClientAdapterService;
import com.eactive.eai.httpouttlsinfo.HttpOutTlsInfoVO;
import java.util.Properties;
public class HttpClientAdapterServiceNoop implements HttpClientAdapterService {
public Object execute(Properties prop, Object data, Properties tempProp) throws Exception {
return null;
}
@Override
public void close() {
}
@Override
public void init(String adapterName, boolean useMtls, HttpOutTlsInfoVO mtlsInfo, int maxTotalConnections, int maxHostConnections) {
}
}
src/main/java/com/eactive/eai/adapter/http/dynamic/filter/ApiAuthFilter.java
+19 -2
View File
@@ -1,6 +1,7 @@
package com.eactive.eai.adapter.http.dynamic.filter;
import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceSupport;
import com.eactive.eai.authserver.service.BearerTokenInfo;
//import com.eactive.eai.authserver.vo.BearerTokenInfo;
//import com.eactive.eai.authserver.custom.BearerTokenService;
import com.eactive.eai.authserver.service.OAuth2Manager;
@@ -9,6 +10,7 @@ import com.eactive.eai.common.message.EAIMessage;
import com.eactive.eai.common.message.EAIMessageManager;
import com.eactive.eai.common.property.PropGroupVO;
import com.eactive.eai.common.property.PropManager;
import com.eactive.eai.common.session.SessionManager;
import com.eactive.eai.common.stdmessage.STDMessageManager;
import com.eactive.eai.common.util.Logger;
import com.eactive.eai.common.util.StringUtil;
@@ -113,7 +115,7 @@ public class ApiAuthFilter implements HttpAdapterFilter {
switch (eaiMessage.getAuthType()){
case "oauth":
try {
String token = ApiAuthFilter.extractJWTToken(request);
String token = extractBearerToken(request);
SignedJWT signedJWT = SignedJWT.parse(token);
if (signedJWT.getJWTClaimsSet().getExpirationTime() == null) {
@@ -169,6 +171,21 @@ public class ApiAuthFilter implements HttpAdapterFilter {
prop.setProperty(HttpAdapterServiceSupport.PROPERTIES_NAME_CLIENT_ID, apiKey);
isPassScope = true;
break;
case "ca":
String token = extractBearerToken(request);
BearerTokenInfo bearerTokenInfo = SessionManager.getInstance().getCAToken(token);
if ( bearerTokenInfo != null ) {
if( bearerTokenInfo.isExpired() ) {
SessionManager.getInstance().removeCAToken(token);
throw new JwtAuthException(ERROR_AUTHENTICATION_FAIL, "expried API key \""+token+"\" in Http Authrozation Header");
}
prop.setProperty(HttpAdapterServiceSupport.PROPERTIES_NAME_CLIENT_ID, bearerTokenInfo.getClientId());
isPassScope = true;
}
else {
throw new JwtAuthException(ERROR_AUTHENTICATION_FAIL, "Invalid or missing API key \""+token+"\" in Http Authrozation Header");
}
break;
case "none":
return message;
}
@@ -276,7 +293,7 @@ public class ApiAuthFilter implements HttpAdapterFilter {
return false;
}
public static String extractJWTToken(HttpServletRequest request) throws JwtAuthException {
public static String extractBearerToken(HttpServletRequest request) throws JwtAuthException {
String authorization = request.getHeader("Authorization");
if (StringUtils.isBlank(authorization)) {
throw new JwtAuthException(ERROR_AUTHENTICATION_FAIL, "No have header info: Authorization");
src/main/java/com/eactive/eai/adapter/http/dynamic/filter/HmacSha256VerifyFilterKjb.java
+15 -6
View File
@@ -15,6 +15,7 @@ import javax.servlet.http.HttpServletResponse;
import org.springframework.http.HttpStatus;
import org.apache.commons.lang3.StringUtils;
import com.eactive.eai.adapter.http.HttpMethodType;
import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceSupport;
import com.eactive.eai.authserver.service.OAuth2Manager;
@@ -43,8 +44,7 @@ public class HmacSha256VerifyFilterKjb implements HttpAdapterFilter {
String xObpSignatureUrl = request.getHeader("x-obp-signature-url");
String xObpSignatureBody = request.getHeader("x-obp-signature-body");
if (StringUtils.isBlank(xObpPartnercode)
|| StringUtils.isBlank(xObpSignatureUrl)
|| StringUtils.isBlank(xObpSignatureBody)) {
|| StringUtils.isBlank(xObpSignatureUrl)) {
throw new JwtAuthException(
String.valueOf(HttpStatus.UNAUTHORIZED.value()),
"Can not find mandatory Http Header");
@@ -67,10 +67,19 @@ public class HmacSha256VerifyFilterKjb implements HttpAdapterFilter {
"Signature verifying failed : x-obp-signature-url");
}
if (!StringUtils.equals(xObpSignatureBody, macBody)) {
throw new JwtAuthException(
String.valueOf(HttpStatus.UNAUTHORIZED.value()),
"Signature verifying failed : x-obp-signature-body");
switch (HttpMethodType.getValue(request.getMethod())) {
case GET:
case DELETE:
break;
default:
if (StringUtils.isNotBlank(inboundBody) && !StringUtils.equals("{}", inboundBody)) {
if (!StringUtils.equals(xObpSignatureBody, macBody)) {
throw new JwtAuthException(
String.valueOf(HttpStatus.UNAUTHORIZED.value()),
"Signature verifying failed : x-obp-signature-body");
}
break;
}
}
} catch (JwtAuthException e) {
src/main/java/com/eactive/eai/adapter/http/dynamic/impl/HttpAdapterServiceStandard.java
+29 -1
View File
@@ -19,6 +19,9 @@ import com.eactive.eai.inbound.processor.Processor;
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 javax.servlet.ServletException;
import javax.servlet.ServletInputStream;
@@ -180,6 +183,20 @@ 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("KJB_ROOTLESS_ARRAY", root);
requestBytes = wrappedObject.toJSONString().getBytes(encode);
}
}catch (Exception e) {
// ignore json이 아니기에 해줄것이 없음.
}
// 로컬 서비스 호출
Object result = null;
if (MessageUtil.isBytesMessage(messageType)) {
@@ -208,7 +225,7 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport
responseData = ElinkConfig.getAsyncDummyDataForAdapterGroup(adptGrpName, adptName);
}
}
response.setCharacterEncoding(encode);
response.getWriter().print(responseData);
if (traceLevel >= 3){
@@ -230,6 +247,17 @@ public class HttpAdapterServiceStandard extends HttpAdapterServiceSupport
responseData = addData + responseData;
}
try {
Object root = JSONValue.parse(responseData);
if( root instanceof JSONObject ) {
JSONObject wrappedObject = (JSONObject) root;
responseData = wrappedObject.get("KJB_ROOTLESS_ARRAY").toString();
}
}catch (Exception e) {
// ignore json이 아니기에 해줄것이 없음.
}
// 300응답에서 받은 Header정보 사용하기 위해 읽어옴.
Map<String, Object> responsePropertyMap = new HashMap<String, Object>();
responsePropertyMap = (Map<String, Object>) prop.get(OUTBOUND_PROPERTY_MAP);
src/main/java/com/eactive/eai/authoutbound/client/HttpClientAccessTokenServiceByDB.java
+1 -1
View File
@@ -31,6 +31,6 @@ public interface HttpClientAccessTokenServiceByDB {
* @return 반환 된 AccessTokenVO
* @exception Exception 수동 시스템 간 통신 중 발생
**/
public Object execute(String name, Properties adapterProp, OutboundOAuthCredentialVo oAuthCredentialVo) throws Exception ;
public Object execute(String adapterGroupName, Properties adapterProp, OutboundOAuthCredentialVo oAuthCredentialVo) throws Exception ;
}
src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithFixedToken.java
+27
View File
@@ -0,0 +1,27 @@
package com.eactive.eai.authoutbound.client.impl;
import java.util.Properties;
import com.eactive.eai.authoutbound.OutboundOAuthCredentialVo;
import com.eactive.eai.authoutbound.client.HttpClientAccessTokenServiceByDB;
import com.openbanking.eai.common.token.OAuth2AccessTokenVO;
public class HttpClientAccessTokenServiceWithFixedToken implements HttpClientAccessTokenServiceByDB {
@Override
public Object execute(String adapterGroupName, Properties adapterProp, OutboundOAuthCredentialVo oAuthCredentialVo)
throws Exception {
OAuth2AccessTokenVO fixedAccessToken = new OAuth2AccessTokenVO();
fixedAccessToken.setAccessToken(oAuthCredentialVo.getClientSecret());
fixedAccessToken.setClientId("none");
fixedAccessToken.setClientUseCode("anyone");
fixedAccessToken.setExpiresIn(60 * 60 * 24 * 365); //1년
fixedAccessToken.setScope("none");
fixedAccessToken.setTokenType("fixed");
return fixedAccessToken;
}
}
src/main/java/com/eactive/eai/authoutbound/client/impl/HttpClientAccessTokenServiceWithParam.java
+2 -1
View File
@@ -193,7 +193,8 @@ public class HttpClientAccessTokenServiceWithParam implements HttpClientAccessTo
connectionManager.setMaxTotal(maxTotalConnections);
connectionManager.setDefaultMaxPerRoute(maxHostConnections);
try (CloseableHttpClient httpClient = HttpClients.custom().setConnectionManager(connectionManager).build();) {
// http header에 zip 제외하려면 disableContentCompression() 추가해서 제외할것
try (CloseableHttpClient httpClient = HttpClients.custom().setConnectionManager(connectionManager).disableContentCompression().disableDefaultUserAgent().build();) {
HttpPost httpPost = new HttpPost(uri);
httpPost.setEntity(new UrlEncodedFormEntity(formParams, charset));
httpPost.setHeader("Content-Type", "application/x-www-form-urlencoded; charset=" + encode);
src/main/java/com/eactive/eai/authserver/service/BearerTokenInfo.java
+49
View File
@@ -0,0 +1,49 @@
package com.eactive.eai.authserver.service;
import java.util.Set;
import com.fasterxml.jackson.annotation.JsonProperty;
public class BearerTokenInfo {
@JsonProperty("client_id")
private String clientId;
private Long expiresIn;
private Long expiresAt;
private Set<String> scopeSet;
public String getClientId() {
return clientId;
}
public void setClientId(String clientId) {
this.clientId = clientId;
}
public Long getExpiresIn() {
return expiresIn;
}
public void setExpiresIn(Long expiresIn) {
this.expiresIn = expiresIn;
}
public Long getExpiresAt() {
return expiresAt;
}
public void setExpiresAt(Long expiresIn) {
this.expiresAt = System.currentTimeMillis() + (expiresIn * 1000);
}
public Set<String> getScopeSet() {
return scopeSet;
}
public void setScopeSet(Set<String> scopeSet) {
this.scopeSet = scopeSet;
}
public boolean isExpired() {
return System.currentTimeMillis() > expiresAt;
}
}
src/main/java/com/eactive/eai/authserver/service/BearerTokenService.java
+73
View File
@@ -0,0 +1,73 @@
package com.eactive.eai.authserver.service;
import java.security.SecureRandom;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import javax.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.eactive.eai.common.session.SessionManager;
import com.eactive.eai.common.session.SessionManagerForIgnite;
@Service
public class BearerTokenService {
public String generateCAToken(String clientId, Long expiresIn, Set<String> scopeSet) {
String token = UUID.randomUUID().toString();
BearerTokenInfo CATokenInfo = new BearerTokenInfo();
CATokenInfo.setClientId(clientId);
CATokenInfo.setExpiresIn(expiresIn);
CATokenInfo.setExpiresAt(expiresIn);
CATokenInfo.setScopeSet(scopeSet);
//CATokenStore.put(token, CATokenInfo);
SessionManager.getInstance().putCAToken(token, CATokenInfo);
return token;
}
public boolean validateCA(String token) {
BearerTokenInfo CATokenInfo = SessionManager.getInstance().getCAToken(token);
if (CATokenInfo == null) return false;
if (CATokenInfo.isExpired()) {
SessionManager.getInstance().removeCAToken(token);
return false;
}else {
return true;
}
}
public String getClientIdFromCA(String token) {
BearerTokenInfo CATokenInfo = SessionManager.getInstance().getCAToken(token);
return CATokenInfo.getClientId();
}
// private static final String CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
// private static final SecureRandom secureRandom = new SecureRandom();
//
// public static String generateTokenString(int length) {
// // Java 8의 IntStream과 Collectors.joining을 사용한 효율적인 방법
// return IntStream.range(0, length)
// .map(i -> secureRandom.nextInt(CHARACTERS.length()))
// .mapToObj(CHARACTERS::charAt)
// .map(String::valueOf)
// .collect(Collectors.joining());
// }
}
src/main/java/com/eactive/eai/common/message/EAIMessage.java
+41
View File
@@ -3,7 +3,9 @@ package com.eactive.eai.common.message;
import java.io.Serializable;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.eactive.eai.message.StandardMessage;
import com.eactive.eai.message.manager.StandardMessageManager;
@@ -108,6 +110,7 @@ public class EAIMessage implements EAIMessageKeys, Serializable, Comparable<EAIM
private String authCheckdYn;
public EAIMessage() {
this.svcMsgs = new ArrayList<>();
this.svcPssSeq = 1;
@@ -633,6 +636,42 @@ public class EAIMessage implements EAIMessageKeys, Serializable, Comparable<EAIM
this.authCheckdYn = authCheckdYn;
}
/**
* [주의] 비동기 JMS 전달 전용 - 직접 사용 금지!
*
* 이 필드는 비동기 거래 시 JMS ObjectMessage 직렬화를 통해
* Consumer 스레드로 컨텍스트를 전달하기 위한 용도로만 사용됩니다.
*
* 컨텍스트 값 읽기/쓰기는 반드시 ElinkTransactionContext를 사용하세요:
* - ElinkTransactionContext.setSeedSalt() / getSeedSalt()
* - ElinkTransactionContext.setEncryptionKey() / getEncryptionKey()
*
* 설정 위치:
* - FlowRouter: getAll()로 복사하여 이 필드에 설정
* - ElinkESBProcessProxy: 이 필드에서 restore()로 복원
*
* @see com.eactive.eai.common.context.ElinkTransactionContext
*/
private Map<String, Object> transactionContextTransfer;
/**
* [비동기 전달 전용] 컨텍스트 전달용 Map 반환
* @see #transactionContextTransfer
*/
public Map<String, Object> getTransactionContextTransfer() {
return transactionContextTransfer;
}
/**
* [비동기 전달 전용] 컨텍스트 전달용 Map 설정
* @see #transactionContextTransfer
*/
public void setTransactionContextTransfer(Map<String, Object> transactionContextTransfer) {
this.transactionContextTransfer = transactionContextTransfer;
}
@Override
public Object clone() throws CloneNotSupportedException {
EAIMessage cloned = (EAIMessage) super.clone();
@@ -645,6 +684,8 @@ public class EAIMessage implements EAIMessageKeys, Serializable, Comparable<EAIM
cloned.setStandardMessage((StandardMessage) standardMessage.clone());
if (subMessage != null)
cloned.setSubMessage((StandardMessage) subMessage.clone());
if (transactionContextTransfer != null)
cloned.setTransactionContextTransfer(new HashMap<>(transactionContextTransfer));
return cloned;
}
src/main/java/com/eactive/eai/common/routing/ElinkESBProcessProxy.java
+30 -10
View File
@@ -1,11 +1,13 @@
package com.eactive.eai.common.routing;
import com.eactive.eai.common.message.EAIMessage;
import com.eactive.eai.common.util.Logger;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import com.eactive.eai.common.context.ElinkTransactionContext;
import com.eactive.eai.common.message.EAIMessage;
import com.eactive.eai.common.message.EAIMessageKeys;
import com.eactive.eai.common.util.Logger;
/**
* 1. 기능 : ElinkESBProcess를 호출하는 공통 Class
@@ -42,17 +44,30 @@ public class ElinkESBProcessProxy
public static EAIMessage callElinkESBProcess(String serviceURI, EAIMessage eaiMessage, boolean isLocal, Properties prop) throws Exception
{
EAIMessage retMsg = null;
// [ElinkTransactionContext] 비동기 거래 시 컨텍스트 초기화 여부 판단
// - ASYNC 거래이고, outbound Process 호출이 아닌 경우에만 초기화
boolean shouldManageContext = eaiMessage != null
&& EAIMessageKeys.ASYNC_SVC.equals(eaiMessage.getSvcTsmtUsgTp())
&& (serviceURI == null || !serviceURI.startsWith("com.eactive.eai.outbound"));
try {
if (isLocal){
// [ElinkTransactionContext] 비동기 거래 진입점 - 컨텍스트 복원
if (shouldManageContext) {
ElinkTransactionContext.restore(eaiMessage.getTransactionContextTransfer());
eaiMessage.setTransactionContextTransfer(null); // 복원 후 전달용 필드 초기화
}
if (isLocal){
Class cl = classLocalCache.get(serviceURI);
if(cl == null) {
cl = Class.forName(serviceURI);
classLocalCache.put(serviceURI, cl);
}
Process proc = (Process)cl.newInstance();
proc.callService(eaiMessage, prop);
retMsg = proc.clientReturn();
}else{
if(eaiMessage == null) {
@@ -62,12 +77,17 @@ public class ElinkESBProcessProxy
retMsg = RemoteProxyClient.callProxyBean(eaiMessage, prop);
}
}
} catch( ClassNotFoundException e) {
} catch( ClassNotFoundException e) {
if (logger.isError()) logger.error("ElinkProcessProxy] callElinkESBProcess["+serviceURI+"] Class Not Found Exception : ");
throw new Exception(PROXY_ERROR_CODE);
} catch( Exception e) {
throw new Exception(PROXY_ERROR_CODE);
} catch( Exception e) {
if (logger.isError()) logger.error("ElinkProcessProxy] callElinkESBProcess["+serviceURI+"] Exception : "+e.getMessage(),e);
throw new Exception(PROXY_ERROR_CODE);
throw new Exception(PROXY_ERROR_CODE);
} finally {
// [ElinkTransactionContext] 비동기 거래 - 해제
if (shouldManageContext) {
ElinkTransactionContext.clear();
}
}
return retMsg;
}
src/main/java/com/eactive/eai/common/routing/FlowRouter.java
+5
View File
@@ -2,6 +2,7 @@ package com.eactive.eai.common.routing;
import java.util.Properties;
import com.eactive.eai.common.context.ElinkTransactionContext;
import com.eactive.eai.common.exception.ExceptionUtil;
import com.eactive.eai.common.message.EAIMessage;
import com.eactive.eai.common.property.PropManager;
@@ -136,6 +137,8 @@ public class FlowRouter
}
try {
// [ElinkTransactionContext] 비동기 송신 전 컨텍스트 복사
eaiMessage.setTransactionContextTransfer(ElinkTransactionContext.getAll());
JMSSender.sendToQueue(eaiMessage, queueConFactory, routeQueueName, prop);
} catch(Exception e) {
if (logger.isError()) logger.error(guidLogPrefix +" process.Queue Error. Queue Name[" + routeQueueName + "]- " + e.getMessage(), e);
@@ -164,6 +167,8 @@ public class FlowRouter
}
try {
// [ElinkTransactionContext] 비동기 송신 전 컨텍스트 복사
eaiMessage.setTransactionContextTransfer(ElinkTransactionContext.getAll());
if (ElinkConfig.isUseCacheTopic()) {
SessionManager.getInstance().putTopic(traceKey, eaiMessage);
}
src/main/java/com/eactive/eai/common/session/SessionManager.java
+10
View File
@@ -1,5 +1,6 @@
package com.eactive.eai.common.session;
import com.eactive.eai.authserver.service.BearerTokenInfo;
import com.eactive.eai.common.lifecycle.Lifecycle;
import com.eactive.eai.common.lifecycle.LifecycleException;
import com.eactive.eai.common.lifecycle.LifecycleListener;
@@ -58,6 +59,7 @@ public abstract class SessionManager implements Lifecycle {
public static final String USERID_CAHCE_NAME = "convertUserIdSession";
public static final String WEBSOCKER_CAHCE_NAME = "webSocketTimeout";
public static final String TERMINAL_CAHCE_NAME = "terminalSession";
public static final String CAGATEWAY_TOKEN_CACHE_NAME = "CAGatewayToken";
public static final String SESSION_MANAGER_GROUPNAME = "RMIInfo";
public static final String SESSION_MANAGER_CACHETYPE = "cacheType";
@@ -193,6 +195,14 @@ public abstract class SessionManager implements Lifecycle {
public abstract void putLogin(String key, SessionVO value);
public abstract void removeLogin(String key);
//CA Token Cache
public abstract BearerTokenInfo getCAToken(String key);
public abstract void putCAToken(String key, BearerTokenInfo value);
public abstract void removeCAToken(String key);
// HTTP Cache
public abstract SessionVO getHttpLogin(String key);
src/main/java/com/eactive/eai/common/session/SessionManagerForEhcache.java
+16
View File
@@ -3,6 +3,7 @@ package com.eactive.eai.common.session;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import com.eactive.eai.authserver.service.BearerTokenInfo;
import com.eactive.eai.common.ehcache.CustomRMICacheReplicatorFactory;
import com.eactive.eai.common.logger.EAIDBLogControl;
import com.eactive.eai.common.message.EAIMessage;
@@ -921,4 +922,19 @@ public class SessionManagerForEhcache extends SessionManager {
sb.append("</Caches>");
return sb.toString();
}
@Override
public BearerTokenInfo getCAToken(String key) {
throw new UnsupportedOperationException();
}
@Override
public void putCAToken(String key, BearerTokenInfo value) {
throw new UnsupportedOperationException();
}
@Override
public void removeCAToken(String key) {
throw new UnsupportedOperationException();
}
}
src/main/java/com/eactive/eai/common/session/SessionManagerForIgnite.java
+35 -1
View File
@@ -42,6 +42,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMultic
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
import com.eactive.eai.adapter.socket2.common.Env;
import com.eactive.eai.authserver.service.BearerTokenInfo;
import com.eactive.eai.common.logger.EAIDBLogControl;
import com.eactive.eai.common.message.EAIMessage;
import com.eactive.eai.common.property.PropManager;
@@ -63,6 +64,7 @@ import ch.qos.logback.classic.Level;
// 에러내용 : Failed to execute the cache operation
// (all partition owners have left the grid, partition data has been lost)
//------------------------------------------------------------------------------------
public class SessionManagerForIgnite extends SessionManager {
// evictMaster Instance - single socket 관련
private static IgniteCache<String, String> evictMasterCache = null;
@@ -72,7 +74,8 @@ public class SessionManagerForIgnite extends SessionManager {
private static IgniteCache<String, EAIMessage> cacheTopic = null;
// 비동기 거래 복원용
private static IgniteCache<String, CacheStoreObject> cacheStore = null;
// CA Gateway Token 관리용
private static IgniteCache<String, BearerTokenInfo> cacheCAToken = null;
// webSocket Login cache 정보
private static IgniteCache<String, SessionVO> cacheLogin = null; // key = loginId
private static IgniteCache<String, String> cacheConvertUserId = null; // 단말ID 를 userID로 변경
@@ -364,6 +367,7 @@ public class SessionManagerForIgnite extends SessionManager {
caches.add(initCache(config, sessionTimeout, bootstrapAsynchronously, USERID_CAHCE_NAME, 20000, false));
caches.add(initCache(config, webSocketTimeout, bootstrapAsynchronously, WEBSOCKER_CAHCE_NAME, 20000, false));
caches.add(initCache(config, sessionTimeout, bootstrapAsynchronously, TERMINAL_CAHCE_NAME, 20000, false));
caches.add(initCache(config, 0, bootstrapAsynchronously, CAGATEWAY_TOKEN_CACHE_NAME, 1000, false));
config.setCacheConfiguration(caches.stream().toArray(CacheConfiguration[]::new));
@@ -391,6 +395,7 @@ public class SessionManagerForIgnite extends SessionManager {
cacheSocket = manager.cache(ADAPTER_CAHCE_NAME);
cacheTopic = manager.cache(TOPIC_CAHCE_NAME);
cacheStore = manager.cache(STORE_CAHCE_NAME);
cacheCAToken = manager.cache(CAGATEWAY_TOKEN_CACHE_NAME);
cacheLogin = manager.cache(LOGIN_CAHCE_NAME);
httpLogin = manager.cache(HTTP_CAHCE_NAME);
@@ -810,4 +815,33 @@ public class SessionManagerForIgnite extends SessionManager {
sb.append("</Caches>");
return sb.toString();
}
@Override
public BearerTokenInfo getCAToken(String key) {
try {
return cacheCAToken.get(key);
} catch (Exception e) {
logger.error("getCAToken null key=" + key, e);
return null;
}
}
@Override
public void putCAToken(String key, BearerTokenInfo value) {
if (logger.isWarn()) {
logger.warn("Put CAToken key - " + key + ", CAToken - " + value.toString());
}
cacheCAToken.put(key, value);
}
@Override
public void removeCAToken(String key) {
if (logger.isWarn()) {
logger.warn("Remove CAToken key - " + key);
}
cacheCAToken.remove(key);
}
}
src/main/java/com/eactive/eai/inbound/processor/RequestProcessor.java
+22 -17
View File
@@ -5,6 +5,7 @@ import java.util.Properties;
import java.util.Set;
import com.eactive.eai.common.TransactionContextKeys;
import com.eactive.eai.common.context.ElinkTransactionContext;
import com.eactive.eai.common.util.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.HttpStatus;
@@ -59,7 +60,7 @@ import org.json.simple.JSONObject;
import java.util.HashMap;
import java.util.Map;
//import org.apache.commons.lang3.StringUtils;
//import org.springframework.http.HttpStatus;
//import org.springframework.http.HttpStatus;
//import java.util.Calendar;
//import java.util.Properties;
@@ -75,7 +76,7 @@ import java.util.Map;
* - 응답 거래로깅
* 3. 주의사항
*
* @author :
* @author :
* @version : v 1.0.0
* @see :
* @since :
@@ -176,7 +177,7 @@ public class RequestProcessor extends RequestProcessorSupport {
* @param prop 호출시 전달할 Property 값(추후 확장을 위해)
* @param msgRcvTm 메시지 수신시각
* @return Object
* @throws Exception
* @throws Exception
**/
protected Object hookup(Object message, Properties prop, long msgRcvTm) throws Exception {
EAIMessage retEaiMsg = null;
@@ -184,7 +185,7 @@ public class RequestProcessor extends RequestProcessorSupport {
ProcessVO vo = setVO(prop, msgRcvTm);
prop.setProperty(TransactionContextKeys.TRANSACTION_UUID, vo.getUuid());
String inboundCharset = prop.getProperty(Keys.CHARSET_KEY_IN);
String inboundCharset = prop.getProperty(Keys.CHARSET_KEY_IN);
// Unknown Message 로깅시 표준메시지일 경우 원본 자체를 남기기 위해 변수로 저장한다.
// logUnknownMessage 호출시 사용하도록 함
@@ -199,7 +200,7 @@ public class RequestProcessor extends RequestProcessorSupport {
} catch (Exception e1) {
logger.error("deep copy error : " + e1.getMessage(), e1);
}
// 2. StandardMessage 생성
EAIServerManager eaiServerManager = EAIServerManager.getInstance();
StandardMessage standardMessage = null;
@@ -207,17 +208,17 @@ public class RequestProcessor extends RequestProcessorSupport {
StandardReader reader = null;
InterfaceMapper mapper = standardManager.getMapper();
StandardMessage subMessage = null;
if(Keys.IF_STANDARD.equals(vo.getStdMsgTypeCode())) {
if (logger.isDebug()) logger.debug("RequestProcessor] Get Message from INPUT MESSAGE");
try {
standardMessage = standardManager.getStandardMessage();
reader = standardManager.getReader(vo.getAdptrMsgType());
standardMessage = standardManager.getStandardMessage();
reader = standardManager.getReader(vo.getAdptrMsgType());
reader.parse(standardMessage, message);
// 표준전문 파싱 후 어댑터의 charset을 설정한다.
standardMessage.setBizDataCharset(inboundCharset);
standardManager.getMessageCoordinator().coordinateAfterParsing(standardMessage, vo, prop);
} catch(Exception e) {
vo.setRspErrorCode("RECEAIIRP008");
vo.setRspErrorMsg(ExceptionUtil.make(e, vo.getRspErrorCode(), new String[]{ e.getMessage()}));
@@ -226,7 +227,7 @@ public class RequestProcessor extends RequestProcessorSupport {
logUnknownMessage(vo,orgMessage);
throw new RequestProcessorException(vo.getRspErrorMsg());
}
}
}
else {
try {
if(eaiServerManager.isTASEnabledEAIServer() && Keys.TESTMASTER_TAS.equals(vo.getTestMasterYn())) { //비표준 시뮬레이터
@@ -269,7 +270,7 @@ public class RequestProcessor extends RequestProcessorSupport {
else {
throw ex;
}
}
}
} else {
if (logger.isInfo()) logger.info("RequestProcessor] The RequestAction is null in Adapter properties. - "+vo.getAdapterName());
}
@@ -290,7 +291,7 @@ public class RequestProcessor extends RequestProcessorSupport {
}
}
}
if(Keys.IF_SUBSTANDARD.equals(vo.getStdMsgTypeCode())) {
if (logger.isDebug()) logger.debug("RequestProcessor] Mapping StandardMessage from INPUT MESSAGE - SUBSTANDARD");
try {
@@ -301,7 +302,7 @@ public class RequestProcessor extends RequestProcessorSupport {
subMessage = versionMapper.parseSub(vo.getAdptrMsgType(), message);
subMessage.setBizDataCharset(inboundCharset);
standardMessage = versionMapper.mapFromSub(subMessage, standardMessage);
// 변경된 값이 있을 수 있으므로 재처리.
standardManager.getMessageCoordinator().coordinateAfterParsing(standardMessage, vo, prop);
if(logger.isDebug() && standardMessage !=null) {
@@ -350,9 +351,9 @@ public class RequestProcessor extends RequestProcessorSupport {
String guid = mapper.getGuid(standardMessage);
String guidSeq = mapper.getGuidSeq(standardMessage);
String returnType = mapper.getSendRecvDivision(standardMessage); // S|R
String receivedBizData = standardMessage.getBizData();
vo.setEaiSvcCd(eaiSvcCd);
if (StringUtils.isBlank(eaiSvcCd)) {
vo.setRspErrorCode("RECEAIIRP009");
@@ -383,7 +384,7 @@ public class RequestProcessor extends RequestProcessorSupport {
return getInboundErrorResponse(prop, standardMessage, mapper, vo.getRspErrorCode(), vo.getRspErrorMsg(), inboundCharset);
}
}
// 채널분류코드별로 GUID 중복체크
if (eaiServerManager.isMCI() && STDMessageKeys.SEND_RECV_CD_SEND.equals(mapper.getSendRecvDivision(standardMessage))
&& PropManager.getInstance().isContainProperties("DUPLICATION_GUID") ) {
@@ -414,7 +415,11 @@ public class RequestProcessor extends RequestProcessorSupport {
}
}
prop.setProperty(TransactionContextKeys.GUID, guid);
// INBOUND MESSAGE 스레드 로컬에 저장
String bizData = standardMessage.getBizData();
ElinkTransactionContext.setRequestBizData(bizData);
// INBOUND_HEADER 가 NULL인 경우는 HTTP가 아닌것으로 간주함.
if(prop.get(HttpClientAdapterServiceKey.INBOUND_HEADER) != null) {
HttpAdapterExtraLogUtil.insertHttpAdapterExtraLog(vo.getUuid(), 100,