Compare commits
25 Commits
c38643b099
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| c44b331a32 | |||
| 88f774e6b5 | |||
| a77f4d4ef0 | |||
| 73a50e5db4 | |||
| ebf3cfa98d | |||
| 15ac0fa2a2 | |||
| e0039aca81 | |||
| 5c094ef9b4 | |||
| 3772805301 | |||
| d31b7a343c | |||
| 47cb243ff4 | |||
| e3fb52343d | |||
| 46463a27a4 | |||
| 7e1af96fcf | |||
| f91b50a121 | |||
| 9cf16c9f49 | |||
| 7e83c36a79 | |||
| c5577fd973 | |||
| 0dd3c89238 | |||
| 6343ff23b7 | |||
| 6597464515 | |||
| 72a39b8d9c | |||
| 4094058745 | |||
| 0a692f8a07 | |||
| 0dfab56d0c |
Vendored
+127
-133
@@ -1,163 +1,157 @@
|
|||||||
pipeline {
|
pipeline {
|
||||||
agent { label 'djb-vm' }
|
agent none
|
||||||
|
|
||||||
options {
|
options {
|
||||||
timestamps()
|
timestamps()
|
||||||
disableConcurrentBuilds()
|
disableConcurrentBuilds()
|
||||||
|
skipDefaultCheckout() // stage별 agent의 자동 SCM checkout 방지 (Deploy 노드는 git 접근 불필요, unstash로만 WAR 수신)
|
||||||
buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20'))
|
buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20'))
|
||||||
}
|
}
|
||||||
|
|
||||||
environment {
|
environment {
|
||||||
JAVA_HOME = '/apps/opts/jdk8'
|
|
||||||
JAVA_HOME_TOMCAT = '/apps/opts/jdk17'
|
|
||||||
GRADLE_HOME = '/apps/opts/gradle-8.7'
|
|
||||||
GRADLE_USER_HOME = '/apps/opts/gradle-home'
|
|
||||||
NODE_HOME = '/apps/opts/node-v24'
|
|
||||||
PATH = "/apps/opts/jdk8/bin:/apps/opts/gradle-8.7/bin:/apps/opts/node-v24/bin:/apps/opts/bin:${env.PATH}"
|
|
||||||
GIT_SSH_COMMAND = 'ssh -o StrictHostKeyChecking=accept-new'
|
GIT_SSH_COMMAND = 'ssh -o StrictHostKeyChecking=accept-new'
|
||||||
CATALINA_BASE = '/prod/eapim/apigw'
|
WEBHOOK_URL = 'http://172.30.1.50:18000/api/hooks/01ba51b01d3c4c98ae8f3183a23a84ed713197857d024b5da4f303458195eb32'
|
||||||
CATALINA_HOME = '/prod/eapim/apache-tomcat-9.0.116'
|
|
||||||
CATALINA_PID = '/prod/eapim/apigw/logs/catalina.pid'
|
|
||||||
DEPLOY_HTTP_PORT = '39110'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
stages {
|
stages {
|
||||||
stage('Checkout') {
|
stage('Build (djb-vm)') {
|
||||||
steps {
|
agent { label 'djb-vm' }
|
||||||
checkout scm
|
environment {
|
||||||
|
JAVA_HOME = '/apps/opts/jdk8'
|
||||||
|
GRADLE_HOME = '/apps/opts/gradle-8.7'
|
||||||
|
GRADLE_USER_HOME = '/apps/opts/gradle-home'
|
||||||
|
NODE_HOME = '/apps/opts/node-v24'
|
||||||
|
PATH = "/apps/opts/jdk8/bin:/apps/opts/gradle-8.7/bin:/apps/opts/node-v24/bin:/apps/opts/bin:${env.PATH}"
|
||||||
}
|
}
|
||||||
}
|
stages {
|
||||||
|
stage('Checkout') {
|
||||||
|
steps { checkout scm }
|
||||||
|
}
|
||||||
|
|
||||||
stage('Checkout modules') {
|
stage('Checkout modules') {
|
||||||
steps {
|
steps {
|
||||||
sh '''
|
sh '''
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
for REPO in elink-online-core elink-online-transformer elink-online-common elink-online-emsclient elink-online-core-jpa; do
|
for REPO in elink-online-core elink-online-transformer elink-online-common elink-online-emsclient elink-online-core-jpa; do
|
||||||
if [ ! -e "$REPO/.git" ]; then
|
if [ ! -e "$REPO/.git" ]; then
|
||||||
rm -rf "$REPO"
|
rm -rf "$REPO"
|
||||||
git clone --depth=1 --branch master \
|
git clone --depth=1 --branch master \
|
||||||
"ssh://git@172.30.1.50:2222/djb-eapim/$REPO.git" \
|
"ssh://git@172.30.1.50:2222/djb-eapim/$REPO.git" \
|
||||||
"$REPO"
|
"$REPO"
|
||||||
else
|
else
|
||||||
git -C "$REPO" fetch --depth=1 origin master
|
git -C "$REPO" fetch --depth=1 origin master
|
||||||
git -C "$REPO" reset --hard origin/master
|
git -C "$REPO" reset --hard origin/master
|
||||||
git -C "$REPO" clean -fdx
|
git -C "$REPO" clean -fdx
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stage('Verify toolchain') {
|
stage('Verify toolchain') {
|
||||||
steps {
|
steps {
|
||||||
sh '''
|
sh '''
|
||||||
set -eu
|
set -eu
|
||||||
java -version
|
java -version
|
||||||
gradle --version
|
gradle --version
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stage('Build WAR') {
|
stage('Build WAR') {
|
||||||
steps {
|
steps { sh 'gradle clean build -x test --no-daemon -Pprofile=weblogic' }
|
||||||
sh 'gradle clean build -x test --no-daemon'
|
post {
|
||||||
}
|
success {
|
||||||
post {
|
sh '''
|
||||||
success {
|
set -eu
|
||||||
sh '''
|
cd build/libs
|
||||||
set -eu
|
sha256sum eapim-online.war > eapim-online.war.sha256
|
||||||
cd build/libs
|
'''
|
||||||
sha1sum eapim-online.war > eapim-online.war.sha1
|
archiveArtifacts artifacts: 'build/libs/eapim-online.war,build/libs/eapim-online.war.sha256', fingerprint: true
|
||||||
sha256sum eapim-online.war > eapim-online.war.sha256
|
stash name: 'war', includes: 'build/libs/eapim-online.war'
|
||||||
md5sum eapim-online.war > eapim-online.war.md5
|
}
|
||||||
'''
|
}
|
||||||
archiveArtifacts artifacts: 'build/libs/eapim-online.war,build/libs/eapim-online.war.sha1,build/libs/eapim-online.war.sha256,build/libs/eapim-online.war.md5', fingerprint: true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stage('Stop Tomcat') {
|
stage('Deploy (weblogic)') {
|
||||||
steps {
|
agent { label 'weblogic' }
|
||||||
sh '''
|
environment {
|
||||||
set +e
|
JENKINS_NODE_COOKIE = 'dontKillMe' // background weblogic를 빌드 종료 시 죽이지 않게
|
||||||
systemctl --user stop eapim-apigw 2>/dev/null
|
WL_HOME = '/app/eapim/apigw'
|
||||||
|
WL_DEPLOY_DIR = '/app/eapim/apigw'
|
||||||
if [ -f "$CATALINA_PID" ] && kill -0 "$(cat "$CATALINA_PID")" 2>/dev/null; then
|
WL_WAR_NAME = 'eapim-online.war'
|
||||||
JAVA_HOME="$JAVA_HOME_TOMCAT" "$CATALINA_HOME/bin/shutdown.sh" 30 -force || true
|
WL_HTTP_PORT = '39110'
|
||||||
for i in $(seq 1 30); do
|
WL_NOHUP = '/logs/weblogic/domains/eapimDomain/nohup.agwSvr11.out'
|
||||||
[ -f "$CATALINA_PID" ] && kill -0 "$(cat "$CATALINA_PID")" 2>/dev/null || break
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
rm -f "$CATALINA_PID"
|
|
||||||
'''
|
|
||||||
}
|
}
|
||||||
}
|
stages {
|
||||||
|
stage('Stop WebLogic') {
|
||||||
|
steps {
|
||||||
|
sh '"$WL_HOME/stopAgw11.sh"' // 동기: 완전 종료까지 블록, 미기동 시에도 안전
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Deploy WAR') {
|
||||||
|
steps {
|
||||||
|
unstash 'war'
|
||||||
|
sh '''
|
||||||
|
set -eu
|
||||||
|
cp build/libs/eapim-online.war "$WL_DEPLOY_DIR/$WL_WAR_NAME"
|
||||||
|
ls -la "$WL_DEPLOY_DIR"
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Start WebLogic and readiness') {
|
||||||
|
steps {
|
||||||
|
sh '''
|
||||||
|
set -eu
|
||||||
|
"$WL_HOME/startAgw11.sh" # nohup & 로 백그라운드 기동, 즉시 리턴
|
||||||
|
|
||||||
stage('Deploy ROOT.war') {
|
DEADLINE=$(($(date +%s) + 300))
|
||||||
steps {
|
STATUS=000
|
||||||
sh '''
|
while [ "$(date +%s)" -lt "$DEADLINE" ]; do
|
||||||
set -eu
|
STATUS=$(curl -sS -o /dev/null -w '%{http_code}' --max-time 3 \
|
||||||
DEPLOY_DIR="$CATALINA_BASE/webapps"
|
"http://localhost:$WL_HTTP_PORT/" 2>/dev/null || echo "000")
|
||||||
rm -rf "$DEPLOY_DIR/ROOT" "$DEPLOY_DIR/ROOT.war"
|
case "$STATUS" in
|
||||||
cp build/libs/eapim-online.war "$DEPLOY_DIR/ROOT.war"
|
200|302|401|403|404) echo "Readiness OK (/ HTTP $STATUS)"; break ;;
|
||||||
ls -la "$DEPLOY_DIR"
|
esac
|
||||||
'''
|
sleep 3
|
||||||
}
|
done
|
||||||
}
|
|
||||||
|
|
||||||
stage('Start Tomcat and readiness') {
|
case "$STATUS" in
|
||||||
steps {
|
200|302|401|403|404) ;;
|
||||||
sh '''
|
*)
|
||||||
set -eu
|
echo "Readiness failed within 300s, last HTTP=$STATUS"
|
||||||
LOG="$CATALINA_BASE/logs/catalina.$(date +%Y-%m-%d).log"
|
[ -f "$WL_NOHUP" ] && tail -120 "$WL_NOHUP"
|
||||||
BEFORE=0
|
exit 1
|
||||||
[ -f "$LOG" ] && BEFORE=$(stat -c %s "$LOG")
|
;;
|
||||||
|
esac
|
||||||
systemctl --user start eapim-apigw
|
'''
|
||||||
|
}
|
||||||
PROBE_URL="http://localhost:$DEPLOY_HTTP_PORT/"
|
}
|
||||||
DEADLINE=$(($(date +%s) + 300))
|
|
||||||
STATUS=000
|
|
||||||
|
|
||||||
while [ "$(date +%s)" -lt "$DEADLINE" ]; do
|
|
||||||
STATUS=$(curl -sS -o /dev/null -w '%{http_code}' --max-time 3 \
|
|
||||||
"$PROBE_URL" 2>/dev/null || echo "000")
|
|
||||||
case "$STATUS" in
|
|
||||||
200|302|401|403|404)
|
|
||||||
echo "Readiness OK ($PROBE_URL HTTP $STATUS)"
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | grep -qE "Application listener .* Exception|SEVERE.*startup.Catalina"; then
|
|
||||||
echo "Startup error detected in log"
|
|
||||||
tail -c +$((BEFORE+1)) "$LOG" | tail -80
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
|
|
||||||
case "$STATUS" in
|
|
||||||
200|302|401|403|404) ;;
|
|
||||||
*)
|
|
||||||
echo "Readiness probe failed within 300s, last HTTP status: $STATUS"
|
|
||||||
echo "--- last 300 lines of catalina log ---"
|
|
||||||
[ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | tail -300
|
|
||||||
echo "--- systemd unit status ---"
|
|
||||||
systemctl --user status eapim-apigw --no-pager || true
|
|
||||||
echo "--- listening ports ---"
|
|
||||||
ss -tlnp 2>/dev/null | grep -E ":$DEPLOY_HTTP_PORT\\b" || echo "(port $DEPLOY_HTTP_PORT not listening)"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
echo "--- key boot log lines ---"
|
|
||||||
tail -c +$((BEFORE+1)) "$LOG" | grep -E "Server startup|Deployment of web" | head -10 || true
|
|
||||||
'''
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
success {
|
||||||
|
node('weblogic') {
|
||||||
|
sh '''
|
||||||
|
set +e
|
||||||
|
payload=$(printf '{"text":"[%s #%s](%s) SUCCESS"}' "$JOB_NAME" "$BUILD_NUMBER" "$BUILD_URL")
|
||||||
|
curl -sS --fail --max-time 5 -H 'Content-Type: application/json' -X POST --data "$payload" "$WEBHOOK_URL" >/dev/null || echo "Webhook failed"
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
failure {
|
||||||
|
node('weblogic') {
|
||||||
|
sh '''
|
||||||
|
set +e
|
||||||
|
payload=$(printf '{"text":"[%s #%s](%s) FAILURE"}' "$JOB_NAME" "$BUILD_NUMBER" "$BUILD_URL")
|
||||||
|
curl -sS --fail --max-time 5 -H 'Content-Type: application/json' -X POST --data "$payload" "$WEBHOOK_URL" >/dev/null || echo "Webhook failed"
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,15 +23,15 @@
|
|||||||
<url-pattern>/mgr/*</url-pattern>
|
<url-pattern>/mgr/*</url-pattern>
|
||||||
</filter-mapping>
|
</filter-mapping>
|
||||||
|
|
||||||
<filter>
|
<!-- <filter>
|
||||||
<filter-name>ApiRequestBodyFilter</filter-name>
|
<filter-name>ApiRequestBodyFilter</filter-name>
|
||||||
<filter-class>com.eactive.eai.adapter.controller.ApiRequestBodyFilter</filter-class>
|
<filter-class>com.eactive.eai.adapter.controller.ApiRequestBodyFilter</filter-class>
|
||||||
</filter>
|
</filter>
|
||||||
<filter-mapping>
|
<filter-mapping>
|
||||||
<filter-name>ApiRequestBodyFilter</filter-name>
|
<filter-name>ApiRequestBodyFilter</filter-name>
|
||||||
<url-pattern>/api/*</url-pattern> <!-- 필요한 URL 패턴 -->
|
<url-pattern>/api/*</url-pattern> 필요한 URL 패턴
|
||||||
<url-pattern>/dj/*</url-pattern> <!-- 필요한 URL 패턴 -->
|
<url-pattern>/dj/*</url-pattern> 필요한 URL 패턴
|
||||||
</filter-mapping>
|
</filter-mapping> -->
|
||||||
|
|
||||||
|
|
||||||
<context-param>
|
<context-param>
|
||||||
|
|||||||
@@ -35,8 +35,7 @@ public class ApiRequestBodyFilter extends OncePerRequestFilter {
|
|||||||
HttpServletResponse response,
|
HttpServletResponse response,
|
||||||
FilterChain filterChain)
|
FilterChain filterChain)
|
||||||
throws ServletException, IOException {
|
throws ServletException, IOException {
|
||||||
System.out.println("ApiRequestBodyFilter : " + request.getRequestURI());
|
if (!isTarget(request)) {
|
||||||
if (!isTarget(request)) {
|
|
||||||
filterChain.doFilter(request, response);
|
filterChain.doFilter(request, response);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ import com.eactive.eai.adapter.AdapterVO;
|
|||||||
import com.eactive.eai.adapter.handler.AdapterErrorMessageHandler;
|
import com.eactive.eai.adapter.handler.AdapterErrorMessageHandler;
|
||||||
import com.eactive.eai.adapter.handler.AdapterErrorMessageHandlerFactory;
|
import com.eactive.eai.adapter.handler.AdapterErrorMessageHandlerFactory;
|
||||||
import com.eactive.eai.adapter.http.HttpStatusException;
|
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.HttpAdapterServiceKey;
|
||||||
import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceSupport;
|
import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceSupport;
|
||||||
import com.eactive.eai.adapter.http.dynamic.HttpDynamicInAdapterManager;
|
import com.eactive.eai.adapter.http.dynamic.HttpDynamicInAdapterManager;
|
||||||
@@ -34,9 +33,11 @@ import com.eactive.eai.common.TransactionContextKeys;
|
|||||||
import com.eactive.eai.common.exception.ExceptionUtil;
|
import com.eactive.eai.common.exception.ExceptionUtil;
|
||||||
import com.eactive.eai.common.server.EAIServerManager;
|
import com.eactive.eai.common.server.EAIServerManager;
|
||||||
import com.eactive.eai.common.util.DatetimeUtil;
|
import com.eactive.eai.common.util.DatetimeUtil;
|
||||||
|
import com.eactive.eai.common.util.HttpAdapterExtraLogUtil;
|
||||||
import com.eactive.eai.common.util.InboundErrorLogger;
|
import com.eactive.eai.common.util.InboundErrorLogger;
|
||||||
import com.eactive.eai.common.util.Logger;
|
import com.eactive.eai.common.util.Logger;
|
||||||
import com.eactive.eai.common.util.MessageUtil;
|
import com.eactive.eai.common.util.MessageUtil;
|
||||||
|
import com.eactive.eai.common.util.RestSendBodyLogUtils;
|
||||||
import com.eactive.eai.common.util.TxFileLogger;
|
import com.eactive.eai.common.util.TxFileLogger;
|
||||||
import com.eactive.eai.common.util.TxSiftContext;
|
import com.eactive.eai.common.util.TxSiftContext;
|
||||||
import com.eactive.eai.common.util.UUIDGenerator;
|
import com.eactive.eai.common.util.UUIDGenerator;
|
||||||
@@ -66,7 +67,7 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey {
|
|||||||
"/tsb/{path:^(?!oauth).*$}", "/tsb/{path:^(?!oauth).*$}/**",
|
"/tsb/{path:^(?!oauth).*$}", "/tsb/{path:^(?!oauth).*$}/**",
|
||||||
"/shb/{path:^(?!oauth).*$}", "/shb/{path:^(?!oauth).*$}/**",
|
"/shb/{path:^(?!oauth).*$}", "/shb/{path:^(?!oauth).*$}/**",
|
||||||
"/tst/{path:^(?!oauth).*$}", "/tst/{path:^(?!oauth).*$}/**",
|
"/tst/{path:^(?!oauth).*$}", "/tst/{path:^(?!oauth).*$}/**",
|
||||||
"/**/{path:^(?!oauth).*$}", "/**/{path:^(?!oauth).*$}/**",
|
"/**/{path:^(?!oauth)(?!favicon\\.ico$).*$}", "/**/{path:^(?!oauth)(?!favicon\\.ico$).*$}/**",
|
||||||
})
|
})
|
||||||
public ResponseEntity<String> callApi(HttpServletRequest servletRequest, HttpServletResponse servletResponse)
|
public ResponseEntity<String> callApi(HttpServletRequest servletRequest, HttpServletResponse servletResponse)
|
||||||
throws Exception {
|
throws Exception {
|
||||||
@@ -82,17 +83,25 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey {
|
|||||||
logger.debug("ApiAdapterController] service request uri : " + servletRequest.getRequestURI());
|
logger.debug("ApiAdapterController] service request uri : " + servletRequest.getRequestURI());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (adptUri == null) {
|
|
||||||
logError(servletRequest);
|
|
||||||
String errorMsg = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_SERVICE_NOT_FOUND,
|
|
||||||
"can not find Adapter Uri");
|
|
||||||
return ResponseEntity.status(HttpStatus.NOT_FOUND).contentType(MediaType.APPLICATION_JSON).body(errorMsg);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Received time , jwhong
|
// Received time , jwhong
|
||||||
long receivedTimeMillis = System.currentTimeMillis(); // 밀리세컨 단위로 보내야함
|
long receivedTimeMillis = System.currentTimeMillis(); // 밀리세컨 단위로 보내야함
|
||||||
String receivedTimeStr = String.valueOf(receivedTimeMillis);
|
String receivedTimeStr = String.valueOf(receivedTimeMillis);
|
||||||
|
|
||||||
|
ResponseEntity<String> responseEntity = null;
|
||||||
|
Properties transactionProp = new Properties();
|
||||||
|
String uuid = UUIDGenerator.getUUID().toString().replaceAll("-", "");
|
||||||
|
transactionProp.setProperty(TransactionContextKeys.TRANSACTION_UUID, uuid);
|
||||||
|
transactionProp.put(INBOUND_REQUESTED_TIME, receivedTimeStr);
|
||||||
|
|
||||||
|
if (adptUri == null) {
|
||||||
|
//logError(servletRequest);
|
||||||
|
String errorMsg = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_SERVICE_NOT_FOUND,
|
||||||
|
"can not find Adapter Uri");
|
||||||
|
logError(servletRequest, "HTTP_IN_NO_URI", MessageUtil.ERROR_CODE_SERVICE_NOT_FOUND,
|
||||||
|
errorMsg, transactionProp, null);
|
||||||
|
return ResponseEntity.status(HttpStatus.NOT_FOUND).contentType(MediaType.APPLICATION_JSON).body(errorMsg);
|
||||||
|
}
|
||||||
|
|
||||||
String adapterGroupName = adptUri.getAdptGrpName();
|
String adapterGroupName = adptUri.getAdptGrpName();
|
||||||
String adapterName = adptUri.getAdptName();
|
String adapterName = adptUri.getAdptName();
|
||||||
AdapterGroupVO adapterGroupVO = AdapterManager.getInstance().getAdapterGroupVO(adapterGroupName);
|
AdapterGroupVO adapterGroupVO = AdapterManager.getInstance().getAdapterGroupVO(adapterGroupName);
|
||||||
@@ -100,6 +109,8 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey {
|
|||||||
if (adapterVO == null) {
|
if (adapterVO == null) {
|
||||||
String errorMsg = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_AP_ERROR,
|
String errorMsg = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_AP_ERROR,
|
||||||
"Adapter not found error");
|
"Adapter not found error");
|
||||||
|
logError(servletRequest, adapterGroupName, MessageUtil.ERROR_CODE_AP_ERROR,
|
||||||
|
errorMsg, transactionProp, null);
|
||||||
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).contentType(MediaType.APPLICATION_JSON)
|
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).contentType(MediaType.APPLICATION_JSON)
|
||||||
.body(errorMsg);
|
.body(errorMsg);
|
||||||
}
|
}
|
||||||
@@ -111,16 +122,10 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey {
|
|||||||
MediaType mediaType = MediaType.valueOf("application/json;charset=" + encode);
|
MediaType mediaType = MediaType.valueOf("application/json;charset=" + encode);
|
||||||
String errorResponseFormat = httpProp.getProperty(ERROR_RESPONSE_FORMAT);
|
String errorResponseFormat = httpProp.getProperty(ERROR_RESPONSE_FORMAT);
|
||||||
|
|
||||||
ResponseEntity<String> responseEntity = null;
|
|
||||||
Properties transactionProp = new Properties();
|
|
||||||
String uuid = UUIDGenerator.getUUID().toString().replaceAll("-", "");
|
|
||||||
transactionProp.setProperty(TransactionContextKeys.TRANSACTION_UUID, uuid);
|
|
||||||
|
|
||||||
TxSiftContext.begin(uuid);
|
TxSiftContext.begin(uuid);
|
||||||
|
|
||||||
// jwhong, put api received time, eaiSvcCode
|
// jwhong, put api received time, eaiSvcCode
|
||||||
transactionProp.put(INBOUND_REQUESTED_TIME, receivedTimeStr);
|
|
||||||
|
|
||||||
String responseData = "";
|
String responseData = "";
|
||||||
try {
|
try {
|
||||||
responseData = service.callApi(servletRequest, servletResponse, httpProp, adapterGroupVO, adapterVO,
|
responseData = service.callApi(servletRequest, servletResponse, httpProp, adapterGroupVO, adapterVO,
|
||||||
@@ -170,6 +175,14 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey {
|
|||||||
responseData = responseErrorMsg;
|
responseData = responseErrorMsg;
|
||||||
|
|
||||||
} finally {
|
} finally {
|
||||||
|
|
||||||
|
// 어댑터 HTTP 로그에 응답 body 출력
|
||||||
|
if (RestSendBodyLogUtils.isBodyLoggingApi(transactionProp.getProperty("API_SERVICE_CODE"))) {
|
||||||
|
String trimmedBody = RestSendBodyLogUtils.getBodyByMaxSize(responseData);
|
||||||
|
transactionProp.setProperty(HttpAdapterExtraLogUtil.BODY_FIELD_NAME, trimmedBody);
|
||||||
|
}
|
||||||
|
servletRequest.setAttribute(TransactionContextKeys.TRANSACTION_PROP, transactionProp);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 로깅 인터셉터에 데이터를 전달하기 위한 처리 이미 거래처리가 끝나서 영향도가 없을만한 servletRequest에 Attribute로 전달
|
* 로깅 인터셉터에 데이터를 전달하기 위한 처리 이미 거래처리가 끝나서 영향도가 없을만한 servletRequest에 Attribute로 전달
|
||||||
* 추후 더 좋은방법이 생길경우 개선 요망
|
* 추후 더 좋은방법이 생길경우 개선 요망
|
||||||
@@ -223,14 +236,15 @@ public class DJBApiAdapterController implements HttpAdapterServiceKey {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// * manager 출력
|
if(logger.isDebug()) {
|
||||||
logger.warn("===== adptUriMap 상세 내용 =====");
|
logger.debug("===== adptUriMap 상세 내용 =====");
|
||||||
for (Map.Entry<String, HttpDynamicInAdapterUri> entry : manager.adptUriMap.entrySet()) {
|
for (Map.Entry<String, HttpDynamicInAdapterUri> entry : manager.adptUriMap.entrySet()) {
|
||||||
HttpDynamicInAdapterUri uriObj = entry.getValue();
|
HttpDynamicInAdapterUri uriObj = entry.getValue();
|
||||||
logger.warn("GroupName=" + uriObj.getAdptGrpName() + ", AdapterName=" + uriObj.getAdptName() + ", URI="
|
logger.debug("GroupName=" + uriObj.getAdptGrpName() + ", AdapterName=" + uriObj.getAdptName() + ", URI="
|
||||||
+ uriObj.getUri());
|
+ uriObj.getUri());
|
||||||
|
}
|
||||||
|
logger.debug("================================");
|
||||||
}
|
}
|
||||||
logger.warn("================================");
|
|
||||||
|
|
||||||
//
|
//
|
||||||
for (int i = 0; i < 10; i++) {
|
for (int i = 0; i < 10; i++) {
|
||||||
|
|||||||
+18
-10
@@ -1,19 +1,22 @@
|
|||||||
package com.eactive.eai.adapter.interceptor;
|
package com.eactive.eai.adapter.interceptor;
|
||||||
|
|
||||||
import com.eactive.eai.adapter.http.client.HttpClientAdapterServiceKey;
|
import java.util.HashMap;
|
||||||
import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
|
import java.util.List;
|
||||||
import com.eactive.eai.common.TransactionContextKeys;
|
import java.util.Map;
|
||||||
import com.eactive.eai.common.util.HttpAdapterExtraLogUtil;
|
import java.util.Properties;
|
||||||
import com.eactive.eai.common.util.Logger;
|
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import org.apache.commons.lang.StringUtils;
|
import org.apache.commons.lang.StringUtils;
|
||||||
import org.springframework.web.servlet.HandlerInterceptor;
|
import org.springframework.web.servlet.HandlerInterceptor;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import com.eactive.eai.adapter.http.client.HttpClientAdapterServiceKey;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
|
||||||
import java.util.HashMap;
|
import com.eactive.eai.common.TransactionContextKeys;
|
||||||
import java.util.Map;
|
import com.eactive.eai.common.logger.HttpAdapterExtraHeaderVo;
|
||||||
import java.util.Properties;
|
import com.eactive.eai.common.util.HttpAdapterExtraLogUtil;
|
||||||
|
import com.eactive.eai.common.util.Logger;
|
||||||
|
|
||||||
public class HttpResponseLoggingInterceptor implements HandlerInterceptor {
|
public class HttpResponseLoggingInterceptor implements HandlerInterceptor {
|
||||||
|
|
||||||
@@ -56,6 +59,11 @@ public class HttpResponseLoggingInterceptor implements HandlerInterceptor {
|
|||||||
headerMap.put(headerName, headerValue);
|
headerMap.put(headerName, headerValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String body = transactionProp.getProperty(HttpAdapterExtraLogUtil.BODY_FIELD_NAME);
|
||||||
|
if (StringUtils.isNotEmpty(body)) {
|
||||||
|
headerMap.put(HttpAdapterExtraLogUtil.BODY_FIELD_NAME, body);
|
||||||
|
}
|
||||||
|
|
||||||
int httpStatusCode = response.getStatus();
|
int httpStatusCode = response.getStatus();
|
||||||
HttpAdapterExtraLogUtil.insertHttpAdapterExtraLog(uuid, 400, adapterGroupName, adapterName, headerMap, url, method, httpStatusCode);
|
HttpAdapterExtraLogUtil.insertHttpAdapterExtraLog(uuid, 400, adapterGroupName, adapterName, headerMap, url, method, httpStatusCode);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ import org.dom4j.Element;
|
|||||||
import org.dom4j.Node;
|
import org.dom4j.Node;
|
||||||
import org.dom4j.io.OutputFormat;
|
import org.dom4j.io.OutputFormat;
|
||||||
import org.dom4j.io.XMLWriter;
|
import org.dom4j.io.XMLWriter;
|
||||||
import org.json.simple.JSONObject;
|
|
||||||
import org.json.simple.JSONValue;
|
import org.json.simple.JSONValue;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.HttpMethod;
|
import org.springframework.http.HttpMethod;
|
||||||
@@ -46,7 +45,6 @@ import com.eactive.eai.common.context.ElinkTransactionContext;
|
|||||||
import com.eactive.eai.common.exception.ExceptionUtil;
|
import com.eactive.eai.common.exception.ExceptionUtil;
|
||||||
import com.eactive.eai.common.message.MessageType;
|
import com.eactive.eai.common.message.MessageType;
|
||||||
import com.eactive.eai.common.util.CommonLib;
|
import com.eactive.eai.common.util.CommonLib;
|
||||||
import com.eactive.eai.common.util.JSONUtils;
|
|
||||||
import com.eactive.eai.common.util.JacksonUtil;
|
import com.eactive.eai.common.util.JacksonUtil;
|
||||||
import com.eactive.eai.common.util.Logger;
|
import com.eactive.eai.common.util.Logger;
|
||||||
import com.eactive.eai.common.util.TxFileLogger;
|
import com.eactive.eai.common.util.TxFileLogger;
|
||||||
@@ -55,6 +53,7 @@ import com.eactive.eai.inbound.action.ActionFactory;
|
|||||||
import com.eactive.eai.inbound.action.RequestAction;
|
import com.eactive.eai.inbound.action.RequestAction;
|
||||||
import com.eactive.eai.inbound.processor.Processor;
|
import com.eactive.eai.inbound.processor.Processor;
|
||||||
import com.eactive.eai.message.StandardMessageUtil;
|
import com.eactive.eai.message.StandardMessageUtil;
|
||||||
|
import com.eactive.eai.util.JsonPathUtil;
|
||||||
import com.fasterxml.jackson.databind.JsonNode;
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
import com.fasterxml.jackson.databind.node.ObjectNode;
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||||
@@ -75,7 +74,9 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
|
|||||||
|
|
||||||
public static final String PAYLOAD_PARAM_NAME_CLIENT_ID = "client_id"; // jwhong
|
public static final String PAYLOAD_PARAM_NAME_CLIENT_ID = "client_id"; // jwhong
|
||||||
|
|
||||||
public String callApi(HttpServletRequest request, HttpServletResponse response, Properties httpProp,
|
private ObjectMapper mapper = new ObjectMapper();
|
||||||
|
|
||||||
|
public String callApi(HttpServletRequest request, HttpServletResponse response, Properties httpProp,
|
||||||
AdapterGroupVO adapterGroupVO, AdapterVO adapterVO, Properties transactionProp) throws Exception {
|
AdapterGroupVO adapterGroupVO, AdapterVO adapterVO, Properties transactionProp) throws Exception {
|
||||||
int traceLevel = 0;
|
int traceLevel = 0;
|
||||||
|
|
||||||
@@ -153,6 +154,8 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
|
|||||||
transactionProp.put(HEADER_GROUP, headerGroupName);
|
transactionProp.put(HEADER_GROUP, headerGroupName);
|
||||||
transactionProp.put(HEADER_KEYS, relayRequestHeaderKeys);
|
transactionProp.put(HEADER_KEYS, relayRequestHeaderKeys);
|
||||||
|
|
||||||
|
transactionProp.put(ADAPTER_TOKEN_HEADER_NAME, httpProp.getProperty(ADAPTER_TOKEN_HEADER_NAME, "")); // OAuth 인증 토큰 헤더 이름
|
||||||
|
transactionProp.put(ADAPTER_APIKEY_HEADER_NAME, httpProp.getProperty(ADAPTER_APIKEY_HEADER_NAME, "")); // API-KEY 인증 헤더 이름
|
||||||
// SEED 컬럼암호하 시 Key로 사용함
|
// SEED 컬럼암호하 시 Key로 사용함
|
||||||
String seedkey = inboundHeaderProp.getOrDefault("x-obp-partnercode", "").toString();
|
String seedkey = inboundHeaderProp.getOrDefault("x-obp-partnercode", "").toString();
|
||||||
ElinkTransactionContext.setSeedKey(seedkey);
|
ElinkTransactionContext.setSeedKey(seedkey);
|
||||||
@@ -304,48 +307,17 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
|
|||||||
|
|
||||||
|
|
||||||
adptMsgType = adapterVO.getAdapterGroupVO().getMessageType();
|
adptMsgType = adapterVO.getAdapterGroupVO().getMessageType();
|
||||||
// HttpHeaders responseHeaders = new HttpHeaders();
|
|
||||||
// responseHeaders.setContentType(MediaType.valueOf("application/json;charset=" + encode));
|
|
||||||
|
|
||||||
// HEADER_GROUP 셋팅
|
|
||||||
// if (MessageType.JSON.equals(adptMsgType) && StringUtils.isNotBlank(headerGroupName)
|
|
||||||
// && StringUtils.isNotBlank(relayRequestHeaderKeys)) {
|
|
||||||
// JSONObject jsonMessage = (JSONObject) JSONValue.parse(message);
|
|
||||||
// JSONObject headerJson = new JSONObject();
|
|
||||||
// if (StringUtils.equalsIgnoreCase(relayRequestHeaderKeys, "ALL")) {
|
|
||||||
// for (Enumeration<String> e = request.getHeaderNames(); e.hasMoreElements(); ) {
|
|
||||||
// String key = e.nextElement();
|
|
||||||
// headerJson.put(key, request.getHeader(key));
|
|
||||||
// }
|
|
||||||
// } else {
|
|
||||||
// String[] relayKeyArr = org.springframework.util.StringUtils
|
|
||||||
// .tokenizeToStringArray(relayRequestHeaderKeys, ",");
|
|
||||||
//
|
|
||||||
// for (String key : relayKeyArr) {
|
|
||||||
// String headerValue = request.getHeader(key);
|
|
||||||
// if (StringUtils.isNotBlank(headerValue)) {
|
|
||||||
// headerJson.put(key, headerValue);
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// if (headerJson.size() > 0) {
|
|
||||||
// jsonMessage.put(headerGroupName, headerJson);
|
|
||||||
// message = jsonMessage.toJSONString();
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
Object reqObject = assignHeaderGroupRequestHeaders(adptGrpName, adptName, message,
|
Object reqObject = assignHeaderGroupRequestHeaders(adptGrpName, adptName, message,
|
||||||
transactionProp, request, response, adptMsgType);
|
transactionProp, request, response, adptMsgType);
|
||||||
|
|
||||||
// 위치변경 : 가공되지 않은 Body값을 저장하기 위하여 위쪽으로 이동.
|
// 위치변경 : 가공되지 않은 Body값을 저장하기 위하여 위쪽으로 이동.
|
||||||
// transactionProp.put(INBOUND_REQUEST_MESSAGE, message);
|
// transactionProp.put(INBOUND_REQUEST_MESSAGE, message);
|
||||||
// 로컬 서비스 호출 ,encoding 처리 추가
|
|
||||||
|
|
||||||
ApiKeyExtractFilter apiKeyExtractor = new ApiKeyExtractFilter();
|
ApiKeyExtractFilter apiKeyExtractor = new ApiKeyExtractFilter();
|
||||||
apiKeyExtractor.doPreFilter(adptGrpName, adptName, reqObject, transactionProp, request, response);
|
apiKeyExtractor.doPreFilter(adptGrpName, adptName, transactionProp.get(INBOUND_REQUEST_MESSAGE), transactionProp, request, response);
|
||||||
|
|
||||||
String result = (String) service(adptGrpName, adptName, reqObject, transactionProp, request, response);
|
Object result = service(adptGrpName, adptName, reqObject, transactionProp, request, response);
|
||||||
|
|
||||||
// bypass만 필요
|
// bypass만 필요
|
||||||
applyOutboundResponseHeaders(transactionProp, response);
|
applyOutboundResponseHeaders(transactionProp, response);
|
||||||
@@ -361,8 +333,7 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
|
|||||||
String syncAsyncType = transactionProp.getProperty(INBOUND_SYNC_ASYNC_TYPE);
|
String syncAsyncType = transactionProp.getProperty(INBOUND_SYNC_ASYNC_TYPE);
|
||||||
|
|
||||||
if (!"ASYN".equals(syncAsyncType) && MessageType.JSON.equals(adptMsgType) && StringUtils.isNotBlank(headerGroupName)) {
|
if (!"ASYN".equals(syncAsyncType) && MessageType.JSON.equals(adptMsgType) && StringUtils.isNotBlank(headerGroupName)) {
|
||||||
ObjectMapper mapper = new ObjectMapper();
|
ObjectNode rootNode = (ObjectNode) JacksonUtil.readTree(result, mapper);
|
||||||
ObjectNode rootNode = (ObjectNode) mapper.readTree(result);
|
|
||||||
JsonNode headerGroup = rootNode.get(headerGroupName);
|
JsonNode headerGroup = rootNode.get(headerGroupName);
|
||||||
if(headerGroup != null) {
|
if(headerGroup != null) {
|
||||||
for(Iterator<String> it = headerGroup.fieldNames(); it.hasNext();) {
|
for(Iterator<String> it = headerGroup.fieldNames(); it.hasNext();) {
|
||||||
@@ -371,23 +342,22 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
|
|||||||
response.addHeader(name, value);
|
response.addHeader(name, value);
|
||||||
}
|
}
|
||||||
rootNode.remove(headerGroupName);
|
rootNode.remove(headerGroupName);
|
||||||
result = mapper.writeValueAsString(rootNode);
|
result = rootNode;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// KJBank는 요청에 대한 응답 (Sync응답, Aync 에 대한 Ack응답) 에 대하여 암호화 하지 않는다. 무조건 안한다. 따라서 아래부분은 구현은 했지만 사용하지 않는다.
|
String strResult = null;
|
||||||
// 위 2가지 경우 암호화 하는걸로 요청 변경되어 아래 암호화 수행하도록 수정함
|
if(result instanceof JsonNode)
|
||||||
// encryptResponseApply = StringUtils.equalsIgnoreCase(httpProp.getProperty("ENCRYPT_RESPONSE_APPLY", "N"), "Y");
|
strResult = OBJECT_MAPPER.writeValueAsString(result);
|
||||||
// if ( encryptResponseApply) {
|
else
|
||||||
// result = doPostEncryption(result, transactionProp, request); // jwhong Encrypt
|
strResult = (String) result;
|
||||||
// }
|
|
||||||
|
|
||||||
return result;
|
return strResult;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private Object assignHeaderGroupRequestHeaders(String adptGrpName, String adptName, Object message, Properties prop,
|
private Object assignHeaderGroupRequestHeaders(String adptGrpName, String adptName, Object message, Properties prop,
|
||||||
HttpServletRequest request, HttpServletResponse response, String adptMsgType) throws DocumentException, IOException {
|
HttpServletRequest request, HttpServletResponse response, String adptMsgType) throws DocumentException, IOException, Exception {
|
||||||
// XML 지원 개발
|
// XML 지원 개발
|
||||||
String headerGroupName = prop.getProperty(HEADER_GROUP);
|
String headerGroupName = prop.getProperty(HEADER_GROUP);
|
||||||
String relayRequestHeaderKeys = prop.getProperty(HEADER_KEYS);
|
String relayRequestHeaderKeys = prop.getProperty(HEADER_KEYS);
|
||||||
@@ -396,31 +366,37 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
|
|||||||
if(message instanceof String && StringUtils.isEmpty((String)message))
|
if(message instanceof String && StringUtils.isEmpty((String)message))
|
||||||
message = "{}";
|
message = "{}";
|
||||||
|
|
||||||
JSONObject jsonMessage = JSONUtils.parseJson(message);
|
JsonNode jsonMessageNode = JacksonUtil.readTree(message, mapper);
|
||||||
JSONObject headerJson = JSONUtils.getChildJson(jsonMessage, headerGroupName);
|
if (jsonMessageNode == null || !jsonMessageNode.isObject()) {
|
||||||
if (headerJson == null)
|
jsonMessageNode = OBJECT_MAPPER.createObjectNode();
|
||||||
headerJson = new JSONObject();
|
}
|
||||||
|
ObjectNode jsonNode = (ObjectNode) jsonMessageNode;
|
||||||
|
|
||||||
|
JsonNode childNode = jsonNode.get(headerGroupName);
|
||||||
|
ObjectNode headerJson = (childNode != null && childNode.isObject())
|
||||||
|
? (ObjectNode) childNode
|
||||||
|
: OBJECT_MAPPER.createObjectNode();
|
||||||
|
|
||||||
if (StringUtils.equalsIgnoreCase(relayRequestHeaderKeys, "ALL")) {
|
if (StringUtils.equalsIgnoreCase(relayRequestHeaderKeys, "ALL")) {
|
||||||
for (Enumeration<String> e = request.getHeaderNames(); e.hasMoreElements(); ) {
|
for (Enumeration<String> e = request.getHeaderNames(); e.hasMoreElements(); ) {
|
||||||
String key = e.nextElement();
|
String key = e.nextElement();
|
||||||
headerJson.put(StringUtils.lowerCase(key), request.getHeader(key));
|
headerJson.put(StringUtils.lowerCase(key), request.getHeader(key));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
String[] relayKeyArr = org.springframework.util.StringUtils
|
String[] relayKeyArr = org.springframework.util.StringUtils
|
||||||
.tokenizeToStringArray(relayRequestHeaderKeys, ",");
|
.tokenizeToStringArray(relayRequestHeaderKeys, ",");
|
||||||
|
|
||||||
for (String key : relayKeyArr) {
|
for (String key : relayKeyArr) {
|
||||||
String headerValue = request.getHeader(key);
|
String headerValue = request.getHeader(key);
|
||||||
if (StringUtils.isNotBlank(headerValue)) {
|
if (StringUtils.isNotBlank(headerValue)) {
|
||||||
headerJson.put(StringUtils.lowerCase(key), headerValue);
|
headerJson.put(StringUtils.lowerCase(key), headerValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (headerJson.size() > 0) {
|
if (!headerJson.isEmpty()) {
|
||||||
jsonMessage.put(headerGroupName, headerJson);
|
jsonNode.set(headerGroupName, headerJson);
|
||||||
message = jsonMessage.toJSONString();
|
message = jsonNode;
|
||||||
}
|
}
|
||||||
} else if(MessageType.XML.equals(adptMsgType)) {
|
} else if(MessageType.XML.equals(adptMsgType)) {
|
||||||
Document document = XMLUtils.convertXmlDocument(message);
|
Document document = XMLUtils.convertXmlDocument(message);
|
||||||
@@ -535,7 +511,7 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private String applyHeaderGroupResponseHeaders(String adptGrpName, String adptName, Object resultMessage, Properties prop,
|
private Object applyHeaderGroupResponseHeaders(String adptGrpName, String adptName, Object resultMessage, Properties prop,
|
||||||
HttpServletRequest request, HttpServletResponse response, String adptMsgType) throws Exception {
|
HttpServletRequest request, HttpServletResponse response, String adptMsgType) throws Exception {
|
||||||
// body headergroup -> http header 세팅
|
// body headergroup -> http header 세팅
|
||||||
String headerGroupName = prop.getProperty(HEADER_GROUP);
|
String headerGroupName = prop.getProperty(HEADER_GROUP);
|
||||||
@@ -572,10 +548,13 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
|
|||||||
if (valueNode.isTextual()) {
|
if (valueNode.isTextual()) {
|
||||||
String value = valueNode.asText();
|
String value = valueNode.asText();
|
||||||
|
|
||||||
if (fieldEntry.getKey().equalsIgnoreCase("content-type")) {
|
if (StringUtils.equalsIgnoreCase(fieldEntry.getKey(), "content-type")) {
|
||||||
logger.debug("set content-type {}: {}", fieldEntry.getKey(), value);
|
logger.debug("set content-type {}: {}", fieldEntry.getKey(), value);
|
||||||
response.setContentType(value);
|
response.setContentType(value);
|
||||||
} else {
|
} else if (StringUtils.equalsIgnoreCase(fieldEntry.getKey(), HttpHeaders.CONTENT_LENGTH)) {
|
||||||
|
logger.debug("skip content-length {}: {}", fieldEntry.getKey(), value);
|
||||||
|
continue;
|
||||||
|
} else {
|
||||||
logger.debug("add header {}: {}", fieldEntry.getKey(), value);
|
logger.debug("add header {}: {}", fieldEntry.getKey(), value);
|
||||||
response.addHeader(fieldEntry.getKey(), value);
|
response.addHeader(fieldEntry.getKey(), value);
|
||||||
}
|
}
|
||||||
@@ -588,7 +567,7 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
|
|||||||
}
|
}
|
||||||
|
|
||||||
((ObjectNode) jsonNode).remove(headerGroupName);
|
((ObjectNode) jsonNode).remove(headerGroupName);
|
||||||
return jsonNode.toString();
|
return jsonNode;
|
||||||
} else if(MessageType.XML.equals(adptMsgType)) {
|
} else if(MessageType.XML.equals(adptMsgType)) {
|
||||||
Document document = XMLUtils.convertXmlDocument(resultMessage);
|
Document document = XMLUtils.convertXmlDocument(resultMessage);
|
||||||
if(document != null) {
|
if(document != null) {
|
||||||
@@ -603,8 +582,12 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
|
|||||||
String value = headerElement.getTextTrim();
|
String value = headerElement.getTextTrim();
|
||||||
|
|
||||||
if(StringUtils.isNoneBlank(value)) {
|
if(StringUtils.isNoneBlank(value)) {
|
||||||
if(value.equalsIgnoreCase("content-type")) {
|
if(StringUtils.equalsIgnoreCase(name, "content-type")) {
|
||||||
response.setContentType(value);
|
logger.debug("set content-type {}: {}", name, value);
|
||||||
|
response.setContentType(value);
|
||||||
|
} else if(StringUtils.equalsIgnoreCase(name, "content-length")) {
|
||||||
|
logger.debug("skip content-length {}: {}", name, value);
|
||||||
|
continue;
|
||||||
} else {
|
} else {
|
||||||
logger.debug("add header {}: {}", name, value);
|
logger.debug("add header {}: {}", name, value);
|
||||||
response.addHeader(name, value);
|
response.addHeader(name, value);
|
||||||
@@ -709,7 +692,7 @@ public class DJBApiAdapterService extends HttpAdapterServiceSupport {
|
|||||||
if (sb.length() > 0) sb.append(", ");
|
if (sb.length() > 0) sb.append(", ");
|
||||||
sb.append(values.nextElement());
|
sb.append(values.nextElement());
|
||||||
}
|
}
|
||||||
prop.setProperty(key, sb.toString());
|
prop.setProperty(key.toLowerCase(), sb.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
return prop;
|
return prop;
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
|
|||||||
import org.springframework.web.bind.annotation.RequestParam;
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
|
|
||||||
import com.eactive.eai.adapter.http.dynamic.UnkownMessageLogUtils;
|
import com.eactive.eai.adapter.http.dynamic.UnknownMessageLogUtils;
|
||||||
import com.eactive.eai.adapter.http.dynamic.filter.JwtAuthException;
|
import com.eactive.eai.adapter.http.dynamic.filter.JwtAuthException;
|
||||||
import com.eactive.eai.authserver.config.RequestContextData;
|
import com.eactive.eai.authserver.config.RequestContextData;
|
||||||
import com.eactive.eai.authserver.dao.TokenIssuanceLogDAO;
|
import com.eactive.eai.authserver.dao.TokenIssuanceLogDAO;
|
||||||
@@ -55,7 +55,7 @@ public class DJBOAuth2Controller {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private TokenIssuanceLogDAO tokenIssuanceLogDAO;
|
private TokenIssuanceLogDAO tokenIssuanceLogDAO;
|
||||||
|
|
||||||
@RequestMapping(value = { "/dj/oauth/token", "/dj/oauth2/token" }, method = RequestMethod.POST,
|
@RequestMapping(value = { "/*/oauth/token", "/*/oauth2/token" }, method = RequestMethod.POST,
|
||||||
consumes = "application/json", produces = "application/json; charset=UTF-8")
|
consumes = "application/json", produces = "application/json; charset=UTF-8")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public ResponseEntity<?> tokenJson(@RequestBody DJBOAuth2AccessTokenRequest tokenRequest,
|
public ResponseEntity<?> tokenJson(@RequestBody DJBOAuth2AccessTokenRequest tokenRequest,
|
||||||
@@ -63,7 +63,7 @@ public class DJBOAuth2Controller {
|
|||||||
return issueToken(tokenRequest, request, response);
|
return issueToken(tokenRequest, request, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = { "/dj/oauth/token", "/dj/oauth2/token" }, method = RequestMethod.POST,
|
@RequestMapping(value = { "/*/oauth/token", "/*/oauth2/token" }, method = RequestMethod.POST,
|
||||||
consumes = "application/x-www-form-urlencoded", produces = "application/json; charset=UTF-8")
|
consumes = "application/x-www-form-urlencoded", produces = "application/json; charset=UTF-8")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public ResponseEntity<?> tokenForm(@RequestParam Map<String, String> params,
|
public ResponseEntity<?> tokenForm(@RequestParam Map<String, String> params,
|
||||||
@@ -76,7 +76,7 @@ public class DJBOAuth2Controller {
|
|||||||
return issueToken(tokenRequest, request, response);
|
return issueToken(tokenRequest, request, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping(value = { "/dj/oauth/token", "/dj/oauth2/token" }, produces = "application/json; charset=UTF-8")
|
@GetMapping(value = { "/*/oauth/token", "/*/oauth2/token" }, produces = "application/json; charset=UTF-8")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public ResponseEntity<?> tokenGet(@RequestParam Map<String, String> params,
|
public ResponseEntity<?> tokenGet(@RequestParam Map<String, String> params,
|
||||||
HttpServletRequest request, HttpServletResponse response) {
|
HttpServletRequest request, HttpServletResponse response) {
|
||||||
@@ -164,7 +164,7 @@ public class DJBOAuth2Controller {
|
|||||||
|
|
||||||
Properties logProp = new Properties();
|
Properties logProp = new Properties();
|
||||||
logProp.put("clientId", clientId);
|
logProp.put("clientId", clientId);
|
||||||
UnkownMessageLogUtils.logUnkownMessage(this.getClass().getSimpleName(), this.getClass().getSimpleName(),
|
UnknownMessageLogUtils.logUnkownMessage(this.getClass().getSimpleName(), this.getClass().getSimpleName(),
|
||||||
tokenRequest.toString(), logProp, request, response, "RECEAIIRP301", e);
|
tokenRequest.toString(), logProp, request, response, "RECEAIIRP301", e);
|
||||||
|
|
||||||
String errorJson = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_AUTH_FAIL, e.getMessage());
|
String errorJson = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_AUTH_FAIL, e.getMessage());
|
||||||
@@ -179,7 +179,7 @@ public class DJBOAuth2Controller {
|
|||||||
|
|
||||||
Properties logProp = new Properties();
|
Properties logProp = new Properties();
|
||||||
logProp.put("clientId", clientId);
|
logProp.put("clientId", clientId);
|
||||||
UnkownMessageLogUtils.logUnkownMessage(this.getClass().getSimpleName(), this.getClass().getSimpleName(),
|
UnknownMessageLogUtils.logUnkownMessage(this.getClass().getSimpleName(), this.getClass().getSimpleName(),
|
||||||
tokenRequest.toString(), logProp, request, response, "RECEAIIRP301", e);
|
tokenRequest.toString(), logProp, request, response, "RECEAIIRP301", e);
|
||||||
|
|
||||||
String errorJson = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_AUTH_FAIL, "Unauthorized. [Unknown]");
|
String errorJson = MessageUtil.makeJsonErrorMessage(MessageUtil.ERROR_CODE_AUTH_FAIL, "Unauthorized. [Unknown]");
|
||||||
|
|||||||
+136
@@ -0,0 +1,136 @@
|
|||||||
|
package com.eactive.eai.custom.adapter.http.client.impl;
|
||||||
|
|
||||||
|
import java.io.UnsupportedEncodingException;
|
||||||
|
import java.security.InvalidKeyException;
|
||||||
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
|
import javax.crypto.Mac;
|
||||||
|
import javax.crypto.spec.SecretKeySpec;
|
||||||
|
|
||||||
|
import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
|
||||||
|
|
||||||
|
import com.eactive.eai.adapter.http.client.HttpClientAdapterServiceKey;
|
||||||
|
import com.eactive.eai.adapter.http.client.impl.HttpClient5AdapterServiceRest;
|
||||||
|
import com.eactive.eai.common.property.PropManager;
|
||||||
|
import com.eactive.eai.common.util.MaskingUtils;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 1. 기능 : EAI HTTP OutBound 용 어댑터로 수동 시스템의 HTTP 웹 컴포넌트를 GET/POST 방식으로 호출할 수 있는
|
||||||
|
* 기능을 제공한다.<br>
|
||||||
|
* 2. 처리 개요 : <br>
|
||||||
|
* * - 2020-09-25: Http Header 받아서 처리할 수 있게 기능 추가<br>
|
||||||
|
* 3. 주의사항 <br>
|
||||||
|
*
|
||||||
|
* @author :
|
||||||
|
* @version : v 1.0.0
|
||||||
|
* @see : HttpClientAdapterServiceFactory.java,
|
||||||
|
* HttpClientAdapterServiceSupport.java
|
||||||
|
* @since :
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public class HttpClient5AdapterServiceBigTech extends HttpClient5AdapterServiceRest
|
||||||
|
implements HttpClientAdapterServiceKey {
|
||||||
|
|
||||||
|
private static final char[] _HEX_LOWER = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd',
|
||||||
|
'e', 'f' };
|
||||||
|
|
||||||
|
private static String hexEncode(byte[] data) {
|
||||||
|
|
||||||
|
if (data == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
int length = data.length;
|
||||||
|
char[] encoded = new char[length << 1];
|
||||||
|
|
||||||
|
for (int i = 0, j = 0; i < length; i++) {
|
||||||
|
encoded[j++] = _HEX_LOWER[(0xF0 & data[i]) >>> 4];
|
||||||
|
encoded[j++] = _HEX_LOWER[0x0F & data[i]];
|
||||||
|
}
|
||||||
|
|
||||||
|
return new String(encoded);
|
||||||
|
} // end of hex_encode
|
||||||
|
|
||||||
|
private static final String _BTP_CHARSET = "UTF-8";
|
||||||
|
private static final String _BTP_ALGORITHM = "HmacSHA256";
|
||||||
|
private static final String _BTP_ACCESS_KEY = "{BTP_ACCESS_KEY}";
|
||||||
|
private static final String _BTP_SECRET_KEY = "{BTP_SECRET_KEY}";
|
||||||
|
|
||||||
|
private static byte[] mac(String charset, String algorithm, String timestamp, String accessKey, String secretKey,
|
||||||
|
String url) throws UnsupportedEncodingException, NoSuchAlgorithmException, InvalidKeyException {
|
||||||
|
String message = String.join(" ", Arrays.asList(url, timestamp, accessKey));
|
||||||
|
SecretKeySpec secretKeySpec = new SecretKeySpec(secretKey.getBytes(charset), algorithm);
|
||||||
|
Mac mac = Mac.getInstance(algorithm);
|
||||||
|
mac.init(secretKeySpec);
|
||||||
|
|
||||||
|
return mac.doFinal(message.getBytes(charset));
|
||||||
|
}// end of mac
|
||||||
|
|
||||||
|
private static String macHex(String charset, String algorithm, String timestamp, String accessKey, String secretKey,
|
||||||
|
String url) throws InvalidKeyException, UnsupportedEncodingException, NoSuchAlgorithmException {
|
||||||
|
return hexEncode(mac(charset, algorithm, timestamp, accessKey, secretKey, url));
|
||||||
|
}// end of macHex
|
||||||
|
|
||||||
|
protected void assignRequestHeaders(HttpUriRequestBase method, Object httpHeader, Properties prop, Properties tempProp) {
|
||||||
|
super.assignRequestHeaders(method, httpHeader, prop, tempProp);
|
||||||
|
|
||||||
|
try {
|
||||||
|
String adapterGroupName = tempProp.getProperty(ADAPTER_GROUP_NAME);
|
||||||
|
Properties customProp = PropManager.getInstance().getProperties(adapterGroupName);
|
||||||
|
String charset = customProp.getProperty("_BTP_CHARSET", _BTP_CHARSET);
|
||||||
|
String algorithm = customProp.getProperty("_BTP_ALGORITHM", _BTP_ALGORITHM);
|
||||||
|
String timestamp = System.currentTimeMillis() + "";
|
||||||
|
String accessKey = customProp.getProperty("_BTP_ACCESS_KEY", _BTP_ACCESS_KEY);
|
||||||
|
String secretKey = customProp.getProperty("_BTP_SECRET_KEY", _BTP_SECRET_KEY);
|
||||||
|
if(logger.isDebug()) {
|
||||||
|
logger.debug("charset={}", charset);
|
||||||
|
logger.debug("algorithm={}", algorithm);
|
||||||
|
logger.debug("timestamp={}", timestamp);
|
||||||
|
logger.debug("accessKey={}", accessKey);
|
||||||
|
logger.debug("secretKey={}", MaskingUtils.maskPassword(secretKey));
|
||||||
|
logger.debug("url={}", method.getRequestUri());
|
||||||
|
}
|
||||||
|
|
||||||
|
String signature = macHex(charset// charset
|
||||||
|
, algorithm// algorithm
|
||||||
|
, timestamp// timestamp
|
||||||
|
, accessKey// accessKey
|
||||||
|
, secretKey// secretKey
|
||||||
|
, method.getRequestUri());
|
||||||
|
|
||||||
|
method.setHeader("x-btp-access-key", accessKey);
|
||||||
|
method.setHeader("x-btp-timestamp", timestamp);
|
||||||
|
method.setHeader("x-btp-signature-v1", signature);
|
||||||
|
|
||||||
|
} catch (InvalidKeyException | UnsupportedEncodingException | NoSuchAlgorithmException e) {
|
||||||
|
throw new RuntimeException("BigTech 헤더 설정 실패", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// public static void main(String[] args) {
|
||||||
|
// try {
|
||||||
|
// String url = "/rest/v1/service?param0=¶m1=";
|
||||||
|
// String timestamp = System.currentTimeMillis()+"";
|
||||||
|
// String accessKey = _BTP_ACCESS_KEY;
|
||||||
|
// String secretKey = _BTP_SECRET_KEY;
|
||||||
|
// String signature = macHex(
|
||||||
|
// _BTP_CHARSET//charset
|
||||||
|
// , _BTP_ALGORITHM//algorithm
|
||||||
|
// , timestamp// timestamp
|
||||||
|
// , _BTP_ACCESS_KEY//accessKey
|
||||||
|
// , _BTP_SECRET_KEY//secretKey
|
||||||
|
// , url
|
||||||
|
// );
|
||||||
|
// System.out.println(String.format("charset=%s", _BTP_CHARSET));
|
||||||
|
// System.out.println(String.format("algorithm=%s", _BTP_ALGORITHM));
|
||||||
|
// System.out.println(String.format("accessKey=%s", accessKey));
|
||||||
|
// System.out.println(String.format("secretKey=%s", secretKey));
|
||||||
|
// System.out.println(String.format("timestamp=%s", timestamp));
|
||||||
|
// System.out.println(String.format("signature=%s", signature));
|
||||||
|
// } catch (Exception e) {
|
||||||
|
// e.printStackTrace();
|
||||||
|
// }
|
||||||
|
// }// end of main
|
||||||
|
}
|
||||||
+147
@@ -0,0 +1,147 @@
|
|||||||
|
package com.eactive.eai.custom.adapter.http.client.impl;
|
||||||
|
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.dom4j.Node;
|
||||||
|
import org.json.simple.JSONObject;
|
||||||
|
|
||||||
|
import com.eactive.eai.adapter.http.client.HttpClientAdapterServiceKey;
|
||||||
|
import com.eactive.eai.adapter.http.client.impl.filter.HttpClient5AdapterFilterFactory;
|
||||||
|
import com.eactive.eai.adapter.http.client.impl.filter.HttpClientAdapterFilter;
|
||||||
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 1. 기능 : HttpClient5AdapterServiceRest 호출 전후 Filter 적용할 수 있는 기능을 제공한다.<br>
|
||||||
|
* 2. 처리 개요 : <br>
|
||||||
|
* 3. 주의사항 <br>
|
||||||
|
*
|
||||||
|
* @author :
|
||||||
|
* @version : v 1.0.0
|
||||||
|
* @see : HttpClientAdapterServiceFactory.java,
|
||||||
|
* HttpClientAdapterServiceSupport.java, HttpClient5AdapterServiceRest.java
|
||||||
|
* @since :
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
public class HttpClient5AdapterServiceBigTechAddFilter extends HttpClient5AdapterServiceBigTech
|
||||||
|
implements HttpClientAdapterServiceKey {
|
||||||
|
|
||||||
|
// 요청전 수행할 필터(쉼표(,)로 구분)
|
||||||
|
static final String PRE_FILTERS = "PRE_FILTERS";
|
||||||
|
|
||||||
|
// 요청후 수행할 필터(쉼표(,)로 구분)
|
||||||
|
static final String POST_FILTERS = "POST_FILTERS";
|
||||||
|
|
||||||
|
// // Adapter에서 Exception이 발생한 경우, 처리할 필터
|
||||||
|
// static final String EXCEPTION_FILTER = "EXCEPTION_FILTER";
|
||||||
|
|
||||||
|
private ObjectMapper mapper = new ObjectMapper();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 1. 기능 : HttpClient 호출 전후 Filter 적용용 2. 처리 개요 : <br>
|
||||||
|
* 3. 주의사항 <br>
|
||||||
|
*
|
||||||
|
* @param prop Http Adapter 속성 정보
|
||||||
|
* @return 반환 된 Object
|
||||||
|
* @exception Exception 수동 시스템 간 통신 중 발생
|
||||||
|
*/
|
||||||
|
public Object execute(Properties prop, Object data, Properties tempProp) throws Exception {
|
||||||
|
|
||||||
|
String adptGrpName = tempProp.getProperty(ADAPTER_GROUP_NAME);
|
||||||
|
String adptName = tempProp.getProperty(ADAPTER_NAME);
|
||||||
|
|
||||||
|
data = doPreFilters(adptGrpName, adptName, prop, data, tempProp);
|
||||||
|
|
||||||
|
Object adapterResponse = super.execute(prop, data, tempProp);
|
||||||
|
|
||||||
|
adapterResponse = doPostFilters(adptGrpName, adptName, prop, adapterResponse, tempProp);
|
||||||
|
if (adapterResponse instanceof JSONObject)
|
||||||
|
adapterResponse = ((JSONObject) adapterResponse).toJSONString();
|
||||||
|
else if (adapterResponse instanceof ObjectNode)
|
||||||
|
adapterResponse = mapper.writeValueAsString((ObjectNode) adapterResponse);
|
||||||
|
else if (adapterResponse instanceof Node)
|
||||||
|
adapterResponse = ((Node) adapterResponse).asXML();
|
||||||
|
|
||||||
|
return adapterResponse;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected Object doPreFilters(String adptGrpName, String adptName, Properties prop, Object message,
|
||||||
|
Properties tempProp) throws Exception {
|
||||||
|
|
||||||
|
// boolean isSetCommonFilterInAdapterProp = false;
|
||||||
|
// 1. adapter에 설정된 필터 수행
|
||||||
|
String preFiltersStr = prop.getProperty(PRE_FILTERS);
|
||||||
|
if (StringUtils.isNotEmpty(preFiltersStr)) {
|
||||||
|
String[] preFilters = StringUtils.split(preFiltersStr, ",");
|
||||||
|
for (String filterName : preFilters) {
|
||||||
|
if (StringUtils.isBlank(filterName)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.debug("HttpClient5AdapterServiceRestAddFilter] Processing Start [" + filterName + "]");
|
||||||
|
HttpClientAdapterFilter adapterFilter = HttpClient5AdapterFilterFactory.createFilter(filterName.trim());
|
||||||
|
|
||||||
|
if (adapterFilter != null) {
|
||||||
|
// if (adapterFilter instanceof IBKOutCommonFilter)
|
||||||
|
// isSetCommonFilterInAdapterProp = true;
|
||||||
|
|
||||||
|
message = adapterFilter.doPreFilter(adptGrpName, adptName, prop, message, tempProp);
|
||||||
|
} else {
|
||||||
|
throw new Exception("Failed get Filter Class: " + filterName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// // 2. IBKOutCommonFilter 필터 수행(adapter 필터에서 수행하지 않을 때만)
|
||||||
|
// if (!isSetCommonFilterInAdapterProp) {
|
||||||
|
// HttpClientAdapterFilter ibkFilter = HttpClient5AdapterFilterFactory
|
||||||
|
// .createFilter(IBKOutCommonFilter.class.getName());
|
||||||
|
// if (ibkFilter != null) {
|
||||||
|
// message = ibkFilter.doPreFilter(adptGrpName, adptName, prop, message, tempProp);
|
||||||
|
// }
|
||||||
|
// } else {
|
||||||
|
// logger.debug("IBKOutCommonFilter isSetCommonFilterInAdapterProp 'POST_FILTERS'. already in adapter filters");
|
||||||
|
// }
|
||||||
|
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected Object doPostFilters(String adptGrpName, String adptName, Properties prop, Object message,
|
||||||
|
Properties tempProp) throws Exception {
|
||||||
|
|
||||||
|
// boolean isSetCommonFilterInAdapterProp = false;
|
||||||
|
// 1. adapter에 설정된 필터 수행
|
||||||
|
String postFiltersStr = prop.getProperty(POST_FILTERS);
|
||||||
|
if (StringUtils.isNotEmpty(postFiltersStr)) {
|
||||||
|
String[] postFilters = StringUtils.split(postFiltersStr, ",");
|
||||||
|
for (String filterName : postFilters) {
|
||||||
|
if (StringUtils.isBlank(filterName)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
HttpClientAdapterFilter adapterFilter = HttpClient5AdapterFilterFactory.createFilter(filterName.trim());
|
||||||
|
if (adapterFilter != null) {
|
||||||
|
// if (adapterFilter instanceof IBKOutCommonFilter)
|
||||||
|
// isSetCommonFilterInAdapterProp = true;
|
||||||
|
message = adapterFilter.doPostFilter(adptGrpName, adptName, prop, message, tempProp);
|
||||||
|
} else {
|
||||||
|
throw new Exception("Failed get Filter Class: " + filterName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// // 2. IBKOutCommonFilter 필터 수행
|
||||||
|
// if (!isSetCommonFilterInAdapterProp) {
|
||||||
|
// HttpClientAdapterFilter ibkFilter = HttpClient5AdapterFilterFactory
|
||||||
|
// .createFilter(IBKOutCommonFilter.class.getName());
|
||||||
|
// if (ibkFilter != null) {
|
||||||
|
// message = ibkFilter.doPostFilter(adptGrpName, adptName, prop, message, tempProp);
|
||||||
|
// }
|
||||||
|
// } else {
|
||||||
|
// logger.debug("IBKOutCommonFilter isSetCommonFilterInAdapterProp 'PRE_FILTERS'. already in adapter filters");
|
||||||
|
// }
|
||||||
|
return message;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+57
@@ -0,0 +1,57 @@
|
|||||||
|
package com.eactive.eai.custom.adapter.http.client.impl.filter;
|
||||||
|
|
||||||
|
import java.util.Properties;
|
||||||
|
|
||||||
|
import com.eactive.eai.adapter.http.client.impl.HttpClient5AdapterServiceRest;
|
||||||
|
import com.eactive.eai.adapter.http.client.impl.filter.OutCryptoFilter;
|
||||||
|
import com.eactive.eai.adapter.http.dynamic.filter.InCryptoFilter;
|
||||||
|
import com.eactive.eai.common.util.JacksonUtil;
|
||||||
|
import com.eactive.eai.util.JsonPathUtil;
|
||||||
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 토스 암복호화에 맟추어 커스텀
|
||||||
|
*/
|
||||||
|
public class DouzoneEncFieldOutCryptoFilter extends EncFieldOutCryptoFilter {
|
||||||
|
|
||||||
|
private final OutCryptoFilter filter = new OutCryptoFilter();
|
||||||
|
|
||||||
|
protected Properties setProp(Properties tempProp) {
|
||||||
|
tempProp.setProperty(OutCryptoFilter.PROP_DEC_FROM_PATH, "/encryptedData");
|
||||||
|
tempProp.setProperty(OutCryptoFilter.PROP_ENC_TO_PATH, "/encryptedData");
|
||||||
|
return tempProp;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object doPreFilter(String adptGrpName, String adptName, Properties prop, Object message, Properties tempProp)
|
||||||
|
throws Exception {
|
||||||
|
String headerGroupName = prop.getProperty(HttpClient5AdapterServiceRest.HEADER_GROUP);
|
||||||
|
|
||||||
|
JsonNode root = JacksonUtil.readTree(message);
|
||||||
|
ObjectNode rootObjectNode = (ObjectNode) root;
|
||||||
|
JsonNode header = rootObjectNode.get(headerGroupName);
|
||||||
|
rootObjectNode.remove(headerGroupName);
|
||||||
|
|
||||||
|
String xEmpNm = header.get("x-emp-nm").asText();
|
||||||
|
tempProp.setProperty("x-emp-nm", xEmpNm);
|
||||||
|
tempProp.setProperty(InCryptoFilter.PROP_AAD_HEADER, xEmpNm);
|
||||||
|
String xChnlNm = header.get("x-chnl-nm").asText();
|
||||||
|
tempProp.setProperty("x-chnl-nm", xChnlNm);
|
||||||
|
|
||||||
|
Object enc = filter.doPreFilter(adptGrpName, adptName, prop, rootObjectNode, setProp(tempProp));
|
||||||
|
|
||||||
|
ObjectNode encJson = (ObjectNode)JacksonUtil.readTree(enc);
|
||||||
|
encJson.set(headerGroupName, header);
|
||||||
|
|
||||||
|
return encJson;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object doPostFilter(String adptGrpName, String adptName, Properties prop, Object message,
|
||||||
|
Properties tempProp) throws Exception {
|
||||||
|
return filter.doPostFilter(adptGrpName, adptName, setProp(prop), message, setProp(tempProp));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
+7
-6
@@ -5,6 +5,7 @@ import java.util.Properties;
|
|||||||
import com.eactive.eai.adapter.http.client.impl.HttpClient5AdapterServiceRest;
|
import com.eactive.eai.adapter.http.client.impl.HttpClient5AdapterServiceRest;
|
||||||
import com.eactive.eai.adapter.http.client.impl.filter.HttpClientAdapterFilter;
|
import com.eactive.eai.adapter.http.client.impl.filter.HttpClientAdapterFilter;
|
||||||
import com.eactive.eai.adapter.http.client.impl.filter.OutCryptoFilter;
|
import com.eactive.eai.adapter.http.client.impl.filter.OutCryptoFilter;
|
||||||
|
import com.eactive.eai.common.util.JacksonUtil;
|
||||||
import com.eactive.eai.util.JsonPathUtil;
|
import com.eactive.eai.util.JsonPathUtil;
|
||||||
import com.fasterxml.jackson.databind.JsonNode;
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
import com.fasterxml.jackson.databind.node.ObjectNode;
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||||
@@ -15,10 +16,10 @@ public class EncFieldOutCryptoFilter implements HttpClientAdapterFilter {
|
|||||||
|
|
||||||
private final OutCryptoFilter filter = new OutCryptoFilter();
|
private final OutCryptoFilter filter = new OutCryptoFilter();
|
||||||
|
|
||||||
protected Properties setProp(Properties p) {
|
protected Properties setProp(Properties tempProp) {
|
||||||
p.setProperty(OutCryptoFilter.PROP_DEC_FROM_PATH, "/encryptedData");
|
tempProp.setProperty(OutCryptoFilter.PROP_DEC_FROM_PATH, "/encryptedData");
|
||||||
p.setProperty(OutCryptoFilter.PROP_ENC_TO_PATH, "/encryptedData");
|
tempProp.setProperty(OutCryptoFilter.PROP_ENC_TO_PATH, "/encryptedData");
|
||||||
return p;
|
return tempProp;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -26,14 +27,14 @@ public class EncFieldOutCryptoFilter implements HttpClientAdapterFilter {
|
|||||||
throws Exception {
|
throws Exception {
|
||||||
String headerGroupName = prop.getProperty(HttpClient5AdapterServiceRest.HEADER_GROUP);
|
String headerGroupName = prop.getProperty(HttpClient5AdapterServiceRest.HEADER_GROUP);
|
||||||
|
|
||||||
JsonNode root = JsonPathUtil.toTree(message);
|
JsonNode root = JacksonUtil.readTree(message);
|
||||||
ObjectNode rootObjectNode = (ObjectNode) root;
|
ObjectNode rootObjectNode = (ObjectNode) root;
|
||||||
JsonNode header = rootObjectNode.get(headerGroupName);
|
JsonNode header = rootObjectNode.get(headerGroupName);
|
||||||
rootObjectNode.remove(headerGroupName);
|
rootObjectNode.remove(headerGroupName);
|
||||||
|
|
||||||
Object enc = filter.doPreFilter(adptGrpName, adptName, prop, rootObjectNode, setProp(tempProp));
|
Object enc = filter.doPreFilter(adptGrpName, adptName, prop, rootObjectNode, setProp(tempProp));
|
||||||
|
|
||||||
ObjectNode encJson = (ObjectNode)JsonPathUtil.toTree(enc);
|
ObjectNode encJson = (ObjectNode)JacksonUtil.readTree(enc);
|
||||||
encJson.set(headerGroupName, header);
|
encJson.set(headerGroupName, header);
|
||||||
|
|
||||||
return encJson;
|
return encJson;
|
||||||
|
|||||||
+23
-7
@@ -9,10 +9,12 @@ import org.springframework.http.HttpStatus;
|
|||||||
|
|
||||||
import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
|
import com.eactive.eai.adapter.http.dynamic.HttpAdapterServiceKey;
|
||||||
import com.eactive.eai.adapter.http.dynamic.filter.FilterCryptoException;
|
import com.eactive.eai.adapter.http.dynamic.filter.FilterCryptoException;
|
||||||
import com.eactive.eai.adapter.http.dynamic.filter.FilterException;
|
|
||||||
import com.eactive.eai.adapter.http.dynamic.filter.HttpAdapterFilter;
|
import com.eactive.eai.adapter.http.dynamic.filter.HttpAdapterFilter;
|
||||||
import com.eactive.eai.adapter.http.dynamic.filter.InCryptoFilter;
|
import com.eactive.eai.adapter.http.dynamic.filter.InCryptoFilter;
|
||||||
import com.eactive.eai.common.security.keyderiv.KeyDerivationStrategy;
|
import com.eactive.eai.adapter.service.DJBApiAdapterService;
|
||||||
|
import com.eactive.eai.common.util.JacksonUtil;
|
||||||
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 더존 연동용 수신 암복호화 필터.
|
* 더존 연동용 수신 암복호화 필터.
|
||||||
@@ -31,8 +33,6 @@ import com.eactive.eai.common.security.keyderiv.KeyDerivationStrategy;
|
|||||||
*/
|
*/
|
||||||
public class DouzoneEncFieldInCryptoFilter implements HttpAdapterFilter {
|
public class DouzoneEncFieldInCryptoFilter implements HttpAdapterFilter {
|
||||||
|
|
||||||
public static final String ERROR_DEC_FAIL = "E.DECRYPT_FAIL";
|
|
||||||
public static final String ERROR_ENC_FAIL = "E.ENCRYPT_FAIL";
|
|
||||||
private final InCryptoFilter filter = new InCryptoFilter();
|
private final InCryptoFilter filter = new InCryptoFilter();
|
||||||
|
|
||||||
protected Properties setProp(Properties p) {
|
protected Properties setProp(Properties p) {
|
||||||
@@ -56,7 +56,7 @@ public class DouzoneEncFieldInCryptoFilter implements HttpAdapterFilter {
|
|||||||
setContext(prop);
|
setContext(prop);
|
||||||
return filter.doPreFilter(adptGrpName, adptName, message, setProp(prop), request, response);
|
return filter.doPreFilter(adptGrpName, adptName, message, setProp(prop), request, response);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new FilterCryptoException("복호화 오류", ERROR_DEC_FAIL, HttpStatus.INTERNAL_SERVER_ERROR.value(), e);
|
throw new FilterCryptoException("복호화 오류", InCryptoFilter.ERROR_DEC_FAIL, HttpStatus.INTERNAL_SERVER_ERROR.value(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,9 +65,25 @@ public class DouzoneEncFieldInCryptoFilter implements HttpAdapterFilter {
|
|||||||
HttpServletRequest request, HttpServletResponse response) throws Exception {
|
HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||||
try {
|
try {
|
||||||
setContext(prop);
|
setContext(prop);
|
||||||
return filter.doPostFilter(adptGrpName, adptName, resultMessage, setProp(prop), request, response);
|
|
||||||
|
JsonNode root = JacksonUtil.readTree(resultMessage);
|
||||||
|
ObjectNode rootObjectNode = (ObjectNode) root;
|
||||||
|
String headerGroupName = prop.getProperty(DJBApiAdapterService.HEADER_GROUP);
|
||||||
|
JsonNode header = null;
|
||||||
|
if(headerGroupName != null) {
|
||||||
|
header = rootObjectNode.get(headerGroupName);
|
||||||
|
rootObjectNode.remove(headerGroupName);
|
||||||
|
}
|
||||||
|
|
||||||
|
Object enc = filter.doPostFilter(adptGrpName, adptName, rootObjectNode, setProp(prop), request, response);
|
||||||
|
ObjectNode encJson = (ObjectNode)JacksonUtil.readTree(enc);
|
||||||
|
if(header != null)
|
||||||
|
encJson.set(headerGroupName, header);
|
||||||
|
|
||||||
|
return encJson;
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new FilterCryptoException("암호화 오류", ERROR_ENC_FAIL, HttpStatus.INTERNAL_SERVER_ERROR.value(), e);
|
throw new FilterCryptoException("암호화 오류", InCryptoFilter.ERROR_ENC_FAIL, HttpStatus.INTERNAL_SERVER_ERROR.value(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+28
-2
@@ -5,8 +5,15 @@ import java.util.Properties;
|
|||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import com.eactive.eai.adapter.http.dynamic.filter.InCryptoFilter;
|
import org.springframework.http.HttpStatus;
|
||||||
|
|
||||||
|
import com.eactive.eai.adapter.http.dynamic.filter.FilterCryptoException;
|
||||||
import com.eactive.eai.adapter.http.dynamic.filter.HttpAdapterFilter;
|
import com.eactive.eai.adapter.http.dynamic.filter.HttpAdapterFilter;
|
||||||
|
import com.eactive.eai.adapter.http.dynamic.filter.InCryptoFilter;
|
||||||
|
import com.eactive.eai.adapter.service.DJBApiAdapterService;
|
||||||
|
import com.eactive.eai.common.util.JacksonUtil;
|
||||||
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* InCryptoFilter를 멤버변수로 관리하는 HttpAdapterFilter 구현체.
|
* InCryptoFilter를 멤버변수로 관리하는 HttpAdapterFilter 구현체.
|
||||||
@@ -27,7 +34,26 @@ public class EncFieldInCryptoFilter implements HttpAdapterFilter {
|
|||||||
@Override
|
@Override
|
||||||
public Object doPostFilter(String adptGrpName, String adptName, Object resultMessage, Properties prop,
|
public Object doPostFilter(String adptGrpName, String adptName, Object resultMessage, Properties prop,
|
||||||
HttpServletRequest request, HttpServletResponse response) throws Exception {
|
HttpServletRequest request, HttpServletResponse response) throws Exception {
|
||||||
return filter.doPostFilter(adptGrpName, adptName, resultMessage, setProp(prop), request, response);
|
try {
|
||||||
|
JsonNode root = JacksonUtil.readTree(resultMessage);
|
||||||
|
ObjectNode rootObjectNode = (ObjectNode) root;
|
||||||
|
String headerGroupName = prop.getProperty(DJBApiAdapterService.HEADER_GROUP);
|
||||||
|
JsonNode header = null;
|
||||||
|
if(headerGroupName != null) {
|
||||||
|
header = rootObjectNode.get(headerGroupName);
|
||||||
|
rootObjectNode.remove(headerGroupName);
|
||||||
|
}
|
||||||
|
|
||||||
|
Object enc = filter.doPostFilter(adptGrpName, adptName, rootObjectNode, setProp(prop), request, response);
|
||||||
|
ObjectNode encJson = (ObjectNode)JacksonUtil.readTree(enc);
|
||||||
|
if(header != null)
|
||||||
|
encJson.set(headerGroupName, header);
|
||||||
|
|
||||||
|
return encJson;
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new FilterCryptoException("암호화 오류", InCryptoFilter.ERROR_ENC_FAIL, HttpStatus.INTERNAL_SERVER_ERROR.value(), e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Properties setProp(Properties p) {
|
protected Properties setProp(Properties p) {
|
||||||
|
|||||||
+5
-2
@@ -37,12 +37,15 @@ public class EncrytTestFilter implements HttpAdapterFilter {
|
|||||||
String jsonStr = null;
|
String jsonStr = null;
|
||||||
if (message instanceof String) {
|
if (message instanceof String) {
|
||||||
jsonStr = (String) message;
|
jsonStr = (String) message;
|
||||||
} else if (message instanceof JSONObject) {
|
} else if (message instanceof ObjectNode) {
|
||||||
|
rootNode = (ObjectNode) message;
|
||||||
|
} else if (message instanceof JSONObject) {
|
||||||
jsonStr = ((JSONObject) message).toJSONString();
|
jsonStr = ((JSONObject) message).toJSONString();
|
||||||
} else {
|
} else {
|
||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
rootNode = (ObjectNode) OBJECT_MAPPER.readTree(jsonStr);
|
if(rootNode == null)
|
||||||
|
rootNode = (ObjectNode) OBJECT_MAPPER.readTree(jsonStr);
|
||||||
|
|
||||||
// 1. HSM에서 키 가져오기
|
// 1. HSM에서 키 가져오기
|
||||||
byte[] hsmKeyBytes = null;
|
byte[] hsmKeyBytes = null;
|
||||||
|
|||||||
+6
-3
@@ -36,10 +36,14 @@ public class HSMKeyCryptoFilter implements HttpAdapterFilter {
|
|||||||
jsonStr = (String) message;
|
jsonStr = (String) message;
|
||||||
} else if (message instanceof JSONObject) {
|
} else if (message instanceof JSONObject) {
|
||||||
jsonStr = ((JSONObject) message).toJSONString();
|
jsonStr = ((JSONObject) message).toJSONString();
|
||||||
|
} else if (message instanceof ObjectNode) {
|
||||||
|
rootNode = (ObjectNode) message;
|
||||||
} else {
|
} else {
|
||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
rootNode = (ObjectNode)OBJECT_MAPPER.readTree(jsonStr);
|
|
||||||
|
if (rootNode == null)
|
||||||
|
rootNode = (ObjectNode) OBJECT_MAPPER.readTree(jsonStr);
|
||||||
|
|
||||||
JsonNode hsmKeyAlias = rootNode.get("hsmKeyAlias");
|
JsonNode hsmKeyAlias = rootNode.get("hsmKeyAlias");
|
||||||
if (hsmKeyAlias != null) {
|
if (hsmKeyAlias != null) {
|
||||||
@@ -60,8 +64,7 @@ public class HSMKeyCryptoFilter implements HttpAdapterFilter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
String jsonString = OBJECT_MAPPER.writeValueAsString(rootNode);
|
return rootNode;
|
||||||
return jsonString;
|
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new FilterException("HSM key 가져오기 실패", ERROR_PRE_FAIL, HttpStatus.INTERNAL_SERVER_ERROR.value(), e);
|
throw new FilterException("HSM key 가져오기 실패", ERROR_PRE_FAIL, HttpStatus.INTERNAL_SERVER_ERROR.value(), e);
|
||||||
|
|||||||
+116
-77
@@ -10,6 +10,7 @@ import java.security.UnrecoverableKeyException;
|
|||||||
import java.security.cert.CertificateException;
|
import java.security.cert.CertificateException;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
import javax.net.ssl.SSLContext;
|
import javax.net.ssl.SSLContext;
|
||||||
|
|
||||||
@@ -62,6 +63,13 @@ public class DJBErpNsmapiAccessTokenService implements HttpClientAccessTokenServ
|
|||||||
|
|
||||||
private static boolean testMode = TestModeChecker.isTestMode();
|
private static boolean testMode = TestModeChecker.isTestMode();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* mTLS 여부/clientId 조합별로 CloseableHttpClient(및 내부 PoolingHttpClientConnectionManager)를
|
||||||
|
* 1회만 생성해 재사용한다. 이 서비스 인스턴스는 HttpClientAccessTokenServiceFactoryByDB에
|
||||||
|
* className 기준으로 캐시되어 재사용되므로, 이 필드도 인스턴스 생명주기 동안 안전하게 재사용된다.
|
||||||
|
*/
|
||||||
|
private final ConcurrentHashMap<String, CloseableHttpClient> httpClientCache = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 1. 기능 : 법인검증 토큰 발급에 사용 2. 처리 개요 : - 속성 정보를 설정 하고 토큰 발급 URL 호출 한다. 3. 주의사항
|
* 1. 기능 : 법인검증 토큰 발급에 사용 2. 처리 개요 : - 속성 정보를 설정 하고 토큰 발급 URL 호출 한다. 3. 주의사항
|
||||||
* - JSON 방식
|
* - JSON 방식
|
||||||
@@ -81,7 +89,7 @@ public class DJBErpNsmapiAccessTokenService implements HttpClientAccessTokenServ
|
|||||||
}
|
}
|
||||||
String connectionTimeoutTemp = adapterProp.getProperty("CONNECTION_TIMEOUT");
|
String connectionTimeoutTemp = adapterProp.getProperty("CONNECTION_TIMEOUT");
|
||||||
if (StringUtils.isBlank(connectionTimeoutTemp)) {
|
if (StringUtils.isBlank(connectionTimeoutTemp)) {
|
||||||
connectionTimeoutTemp = "30000";
|
connectionTimeoutTemp = "3000";
|
||||||
}
|
}
|
||||||
|
|
||||||
int timeout = Integer.parseInt(timeoutTemp);
|
int timeout = Integer.parseInt(timeoutTemp);
|
||||||
@@ -121,68 +129,11 @@ public class DJBErpNsmapiAccessTokenService implements HttpClientAccessTokenServ
|
|||||||
logger.info("adapterGroupName. : {}, useMtls. : {}, clientId : {}", name, useMtls, clientId);
|
logger.info("adapterGroupName. : {}, useMtls. : {}, clientId : {}", name, useMtls, clientId);
|
||||||
}
|
}
|
||||||
|
|
||||||
int maxTotalConnections = HttpClientAdapterServiceKey.DEFAULT_MAX_TOTAL_CONNECTIONS;
|
// mTLS 여부(및 clientId)별로 CloseableHttpClient를 재사용한다. 매 호출마다 새로 만들면
|
||||||
int maxHostConnections = HttpClientAdapterServiceKey.DEFAULT_MAX_CONNECTION_PER_HOST;
|
// PoolingHttpClientConnectionManager를 쓰는 의미가 없어지고 SSL 핸드셰이크 비용만 반복된다.
|
||||||
|
String httpClientCacheKey = useMtls ? "mtls:" + clientId : "default";
|
||||||
HttpOutTlsInfoVO mtlsInfo = null;
|
CloseableHttpClient httpClient = httpClientCache.computeIfAbsent(httpClientCacheKey,
|
||||||
SSLContext sslContext = null;
|
key -> buildHttpClient(useMtls, clientId, name));
|
||||||
PoolingHttpClientConnectionManagerBuilder cmBuilder = PoolingHttpClientConnectionManagerBuilder.create();
|
|
||||||
PoolingHttpClientConnectionManager connectionManager = null;
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (useMtls) {
|
|
||||||
HttpOutTlsInfoManager tlsManager = HttpOutTlsInfoManager.getInstance();
|
|
||||||
if (StringUtils.isNotEmpty(clientId)) {
|
|
||||||
mtlsInfo = tlsManager.getHttpOutTlsInfo(clientId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (useMtls && mtlsInfo != null) {
|
|
||||||
String storeType = mtlsInfo.getStoreType();
|
|
||||||
String keyStoreInfo = mtlsInfo.getKeystoreInfo();
|
|
||||||
String keyStorePassword = mtlsInfo.getKeystorePassword();
|
|
||||||
String trustStoreInfo = mtlsInfo.getTruststoreInfo();
|
|
||||||
String trustStorePassword = mtlsInfo.getTruststorePassword();
|
|
||||||
|
|
||||||
String[] tlsVersions = null;
|
|
||||||
String[] cipherSuites = null;
|
|
||||||
|
|
||||||
if (StringUtils.isAnyEmpty(keyStoreInfo, keyStorePassword)) {
|
|
||||||
throw new Exception("mTLS keyStore config error");
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean skipTrust = false;
|
|
||||||
if (StringUtils.isAnyEmpty(trustStoreInfo, trustStorePassword)) {
|
|
||||||
if (logger.isWarn())
|
|
||||||
logger.warn("Skip trustStore validation adapterGroupName : " + name);
|
|
||||||
skipTrust = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
sslContext = HttpClient5SSLContextFactory.createMTLSContextFromContent(storeType, keyStoreInfo,
|
|
||||||
keyStorePassword, trustStoreInfo, trustStorePassword, skipTrust, tlsVersions, cipherSuites);
|
|
||||||
|
|
||||||
SSLConnectionSocketFactory sslSocketFactory = null;
|
|
||||||
if (testMode) {
|
|
||||||
sslSocketFactory = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
|
|
||||||
} else {
|
|
||||||
sslSocketFactory = new SSLConnectionSocketFactory(sslContext);
|
|
||||||
}
|
|
||||||
cmBuilder.setSSLSocketFactory(sslSocketFactory);
|
|
||||||
} else {
|
|
||||||
sslContext = SSLContextBuilder.create().loadTrustMaterial(new TrustAllStrategy()).build();
|
|
||||||
SSLConnectionSocketFactory csf = new SSLConnectionSocketFactory(sslContext);
|
|
||||||
cmBuilder.setSSLSocketFactory(csf);
|
|
||||||
}
|
|
||||||
} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException | CertificateException
|
|
||||||
| IOException | UnrecoverableKeyException e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
} catch (Exception e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
connectionManager = cmBuilder.build();
|
|
||||||
connectionManager.setMaxTotal(maxTotalConnections);
|
|
||||||
connectionManager.setDefaultMaxPerRoute(maxHostConnections);
|
|
||||||
|
|
||||||
//json body setting
|
//json body setting
|
||||||
// Map<String,Object> jsonMap = new HashMap<>();
|
// Map<String,Object> jsonMap = new HashMap<>();
|
||||||
@@ -191,7 +142,7 @@ public class DJBErpNsmapiAccessTokenService implements HttpClientAccessTokenServ
|
|||||||
// ObjectMapper objMapper = new ObjectMapper();
|
// ObjectMapper objMapper = new ObjectMapper();
|
||||||
// String authJsonBody = objMapper.writeValueAsString(jsonMap);
|
// String authJsonBody = objMapper.writeValueAsString(jsonMap);
|
||||||
|
|
||||||
try (CloseableHttpClient httpClient = HttpClients.custom().setConnectionManager(connectionManager).build();) {
|
{
|
||||||
HttpPost httpPost = new HttpPost(uri);
|
HttpPost httpPost = new HttpPost(uri);
|
||||||
// httpPost.setEntity(new StringEntity(authJsonBody));
|
// httpPost.setEntity(new StringEntity(authJsonBody));
|
||||||
httpPost.setHeader("Content-Type", contentType+" charset=" + encode);
|
httpPost.setHeader("Content-Type", contentType+" charset=" + encode);
|
||||||
@@ -233,13 +184,13 @@ public class DJBErpNsmapiAccessTokenService implements HttpClientAccessTokenServ
|
|||||||
logger.debug("contentType = [" + contentType + "]");
|
logger.debug("contentType = [" + contentType + "]");
|
||||||
logger.debug("encode = [" + encode + "]");
|
logger.debug("encode = [" + encode + "]");
|
||||||
|
|
||||||
OAuth2AccessTokenVO accessToken = new OAuth2AccessTokenVO();
|
OAuth2AccessTokenVO accessToken = null;
|
||||||
try (CloseableHttpResponse response = httpClient.execute(httpPost)) {
|
try (CloseableHttpResponse response = httpClient.execute(httpPost)) {
|
||||||
if (response.getCode() != 200) {
|
if (response.getCode() != 200) {
|
||||||
throw new Exception("OAuth token receive status fail value= " + response.getCode());
|
throw new Exception("OAuth token receive status fail value= " + response.getCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.info("HttpClientAccessTokenServiceWithBase64Header==>" + response.getCode());
|
logger.info("DJBErpNsmapiAccessTokenService==>" + response.getCode());
|
||||||
|
|
||||||
HttpEntity entity = response.getEntity();
|
HttpEntity entity = response.getEntity();
|
||||||
String responseString = EntityUtils.toString(entity, encode);
|
String responseString = EntityUtils.toString(entity, encode);
|
||||||
@@ -252,32 +203,120 @@ public class DJBErpNsmapiAccessTokenService implements HttpClientAccessTokenServ
|
|||||||
|
|
||||||
if (responseJSON.has("data")) {
|
if (responseJSON.has("data")) {
|
||||||
JsonNode data = responseJSON.path("data");
|
JsonNode data = responseJSON.path("data");
|
||||||
if(data.has("token")) {
|
if(data.has("access_token")) {
|
||||||
String token = data.path("token").asText();
|
String token = data.path("access_token").asText();
|
||||||
|
long intervalSec = oAuthCredentialVo.getIntervalSec() > 0
|
||||||
|
? oAuthCredentialVo.getIntervalSec()
|
||||||
|
: 24 * 60 * 60;
|
||||||
|
accessToken = new OAuth2AccessTokenVO();
|
||||||
accessToken.setAccessToken(token);
|
accessToken.setAccessToken(token);
|
||||||
|
accessToken.setExpiration(new Date(currentTime + intervalSec * 1000L));
|
||||||
|
logger.debug("oauthToken =" + accessToken.toString());
|
||||||
|
return accessToken;
|
||||||
} else {
|
} else {
|
||||||
throw new Exception("oauth token return null");
|
throw new Exception("oauth token return null");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new Exception("oauth token return null");
|
throw new Exception("oauth token return null");
|
||||||
}
|
}
|
||||||
// accessToken.setExpiration(new Date(currentTime + oAuthCredentialVo.getIntervalSec() * 1000L));
|
|
||||||
accessToken.setExpiration(new Date(currentTime + 30_000L));
|
|
||||||
|
|
||||||
logger.debug("oauthToken =" + accessToken.toString());
|
|
||||||
|
|
||||||
return accessToken;
|
|
||||||
} else {
|
} else {
|
||||||
throw new Exception("oauth token return null");
|
throw new Exception("oauth token return null");
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
logger.error("[DJBErpNsmapiAccessTokenService] retrieve accessToken exception :" + e.getMessage(), e);
|
||||||
logger.error("[HttpClientAccessTokenServiceWithBase64Header] retrieve accessToken exception :" + e.getMessage());
|
throw e;
|
||||||
return accessToken;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* mTLS 여부/clientId 조합에 맞는 SSLContext로 PoolingHttpClientConnectionManager와
|
||||||
|
* CloseableHttpClient를 생성한다. httpClientCache에 의해 조합당 1회만 호출되며, 반환된
|
||||||
|
* CloseableHttpClient는 재사용을 위해 닫지 않는다(닫으면 커넥션 풀이 함께 종료된다).
|
||||||
|
*/
|
||||||
|
private CloseableHttpClient buildHttpClient(boolean useMtls, String clientId, String adapterGroupName) {
|
||||||
|
int maxTotalConnections = HttpClientAdapterServiceKey.DEFAULT_MAX_TOTAL_CONNECTIONS;
|
||||||
|
int maxHostConnections = HttpClientAdapterServiceKey.DEFAULT_MAX_CONNECTION_PER_HOST;
|
||||||
|
|
||||||
|
HttpOutTlsInfoVO mtlsInfo = null;
|
||||||
|
SSLContext sslContext = null;
|
||||||
|
PoolingHttpClientConnectionManagerBuilder cmBuilder = PoolingHttpClientConnectionManagerBuilder.create();
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (useMtls) {
|
||||||
|
HttpOutTlsInfoManager tlsManager = HttpOutTlsInfoManager.getInstance();
|
||||||
|
if (StringUtils.isNotEmpty(clientId)) {
|
||||||
|
mtlsInfo = tlsManager.getHttpOutTlsInfo(clientId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (useMtls && mtlsInfo != null) {
|
||||||
|
String storeType = mtlsInfo.getStoreType();
|
||||||
|
String keyStoreInfo = mtlsInfo.getKeystoreInfo();
|
||||||
|
String keyStorePassword = mtlsInfo.getKeystorePassword();
|
||||||
|
String trustStoreInfo = mtlsInfo.getTruststoreInfo();
|
||||||
|
String trustStorePassword = mtlsInfo.getTruststorePassword();
|
||||||
|
|
||||||
|
String[] tlsVersions = null;
|
||||||
|
String[] cipherSuites = null;
|
||||||
|
|
||||||
|
if (StringUtils.isAnyEmpty(keyStoreInfo, keyStorePassword)) {
|
||||||
|
throw new Exception("mTLS keyStore config error");
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean skipTrust = false;
|
||||||
|
if (StringUtils.isAnyEmpty(trustStoreInfo, trustStorePassword)) {
|
||||||
|
if (logger.isWarn())
|
||||||
|
logger.warn("Skip trustStore validation adapterGroupName : " + adapterGroupName);
|
||||||
|
skipTrust = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
sslContext = HttpClient5SSLContextFactory.createMTLSContextFromContent(storeType, keyStoreInfo,
|
||||||
|
keyStorePassword, trustStoreInfo, trustStorePassword, skipTrust, tlsVersions, cipherSuites);
|
||||||
|
|
||||||
|
SSLConnectionSocketFactory sslSocketFactory = null;
|
||||||
|
if (testMode) {
|
||||||
|
sslSocketFactory = new SSLConnectionSocketFactory(sslContext, NoopHostnameVerifier.INSTANCE);
|
||||||
|
} else {
|
||||||
|
sslSocketFactory = new SSLConnectionSocketFactory(sslContext);
|
||||||
|
}
|
||||||
|
cmBuilder.setSSLSocketFactory(sslSocketFactory);
|
||||||
|
} else {
|
||||||
|
sslContext = SSLContextBuilder.create().loadTrustMaterial(new TrustAllStrategy()).build();
|
||||||
|
SSLConnectionSocketFactory sslSocketFactory = null;
|
||||||
|
if(testMode) {
|
||||||
|
// Hostname verifier 비활성화 (테스트용)
|
||||||
|
sslSocketFactory = new SSLConnectionSocketFactory(
|
||||||
|
sslContext
|
||||||
|
, NoopHostnameVerifier.INSTANCE
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
sslSocketFactory = new SSLConnectionSocketFactory(
|
||||||
|
sslContext
|
||||||
|
);
|
||||||
|
}
|
||||||
|
cmBuilder.setSSLSocketFactory(sslSocketFactory);
|
||||||
|
}
|
||||||
|
} catch (KeyManagementException | NoSuchAlgorithmException | KeyStoreException | CertificateException
|
||||||
|
| IOException | UnrecoverableKeyException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
} catch (Exception e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
PoolingHttpClientConnectionManager connectionManager = cmBuilder.build();
|
||||||
|
connectionManager.setMaxTotal(maxTotalConnections);
|
||||||
|
connectionManager.setDefaultMaxPerRoute(maxHostConnections);
|
||||||
|
|
||||||
|
if (logger.isInfo()) {
|
||||||
|
logger.info("DJBErpNsmapiAccessTokenService] HttpClient(재사용) 생성. adapterGroupName={}, useMtls={}, clientId={}",
|
||||||
|
adapterGroupName, useMtls, clientId);
|
||||||
|
}
|
||||||
|
|
||||||
|
return HttpClients.custom().setConnectionManager(connectionManager).build();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* URL에 경로를 추가합니다. 중복되는 슬래시를 방지합니다.
|
* URL에 경로를 추가합니다. 중복되는 슬래시를 방지합니다.
|
||||||
*
|
*
|
||||||
|
|||||||
-470
@@ -1,470 +0,0 @@
|
|||||||
package com.eactive.eai.custom.adapter.http.dynamic.filter;
|
|
||||||
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertNotEquals;
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
|
||||||
import static org.junit.jupiter.api.Assumptions.assumeTrue;
|
|
||||||
import static org.mockito.ArgumentMatchers.anyString;
|
|
||||||
import static org.mockito.ArgumentMatchers.eq;
|
|
||||||
import static org.mockito.Mockito.mock;
|
|
||||||
import static org.mockito.Mockito.when;
|
|
||||||
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.lang.reflect.Constructor;
|
|
||||||
import java.nio.charset.StandardCharsets;
|
|
||||||
import java.nio.file.Files;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Properties;
|
|
||||||
import java.util.UUID;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
import javax.crypto.SecretKey;
|
|
||||||
import javax.crypto.spec.SecretKeySpec;
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
|
|
||||||
import org.junit.jupiter.api.AfterAll;
|
|
||||||
import org.junit.jupiter.api.BeforeAll;
|
|
||||||
import org.junit.jupiter.api.BeforeEach;
|
|
||||||
import org.junit.jupiter.api.DisplayName;
|
|
||||||
import org.junit.jupiter.api.MethodOrderer;
|
|
||||||
import org.junit.jupiter.api.Test;
|
|
||||||
import org.junit.jupiter.api.TestMethodOrder;
|
|
||||||
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
|
|
||||||
import org.springframework.context.support.GenericApplicationContext;
|
|
||||||
|
|
||||||
import com.eactive.eai.adapter.http.dynamic.filter.InCryptoFilter;
|
|
||||||
import com.eactive.eai.adapter.http.filter.AbstractCryptoFilter;
|
|
||||||
import com.eactive.eai.common.hsm.HsmCryptoService;
|
|
||||||
import com.eactive.eai.common.hsm.HsmManager;
|
|
||||||
import com.eactive.eai.common.property.PropManager;
|
|
||||||
import com.eactive.eai.common.security.CryptoModuleConfigVO;
|
|
||||||
import com.eactive.eai.common.security.CryptoModuleManager;
|
|
||||||
import com.eactive.eai.common.security.CryptoModuleService;
|
|
||||||
import com.eactive.eai.common.security.keyderiv.strategy.HsmKeyDerivationStrategy;
|
|
||||||
import com.eactive.eai.common.security.loader.CryptoModuleConfigLoader;
|
|
||||||
import com.eactive.eai.common.security.mapper.CryptoModuleConfigMapper;
|
|
||||||
import com.eactive.eai.common.util.ApplicationContextProvider;
|
|
||||||
import com.eactive.eai.custom.common.security.keyderiv.HsmContextSha256KeyDerivationStrategy;
|
|
||||||
import com.eactive.eai.data.entity.onl.security.CryptoModuleConfig;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* CryptoFilter HSM 연동 통합 테스트 (SoftHSM2 / SunPKCS11)
|
|
||||||
*
|
|
||||||
* SoftHSM2에서 MASTER_KEY를 조회하여 키를 도출한 뒤
|
|
||||||
* InCryptoFilter 의 암복호화 전체 흐름을 검증한다.
|
|
||||||
*
|
|
||||||
* 사전 조건:
|
|
||||||
* C:\SoftHSM2 에 SoftHSM2 설치 (미설치 시 자동 건너뜀)
|
|
||||||
* MASTER_KEY alias는 없으면 자동 생성됨
|
|
||||||
*
|
|
||||||
* 검증 전략:
|
|
||||||
* HSM → 키 도출 → CryptoModuleExtension → InCryptoFilter doPostFilter(암호화) → doPreFilter(복호화) → 원문 일치
|
|
||||||
*/
|
|
||||||
@TestMethodOrder(MethodOrderer.DisplayName.class)
|
|
||||||
public class CryptoFilterHsmIntegrationTest {
|
|
||||||
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
// 상수
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
|
|
||||||
private static final String SOFTHSM2_DLL = "C:/SoftHSM2/lib/softhsm2-x64.dll";
|
|
||||||
private static final String SOFTHSM2_UTIL = "C:/SoftHSM2/bin/softhsm2-util.exe";
|
|
||||||
private static final String TOKEN_LABEL = "eapim-test";
|
|
||||||
private static final String PIN = "1234";
|
|
||||||
private static final String MASTER_KEY_ALIAS = "MASTER_KEY";
|
|
||||||
|
|
||||||
/** HsmKeyDerivationStrategy: HSM 마스터키를 파생 없이 직접 사용 */
|
|
||||||
private static final String MOD_HSM_GCM = "HSM_GCM";
|
|
||||||
/** HsmContextSha256KeyDerivationStrategy: HSM 마스터키 + 컨텍스트값 SHA-256 파생 */
|
|
||||||
private static final String MOD_CTX_SHA_GCM = "CTX_SHA256_GCM";
|
|
||||||
|
|
||||||
private static final String CTX_KEY = "X-Api-Group-Seq";
|
|
||||||
private static final String CTX_VAL_A = "GROUP-A";
|
|
||||||
private static final String CTX_VAL_B = "GROUP-B";
|
|
||||||
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
// 정적 필드
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
|
|
||||||
private static GenericApplicationContext springCtx;
|
|
||||||
private static HsmManager hsmManager;
|
|
||||||
private static File tempCfgFile;
|
|
||||||
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
// 내부 클래스: runtimeContext를 고정값으로 반환하는 필터
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
|
|
||||||
static class ContextAwareCryptoFilter extends InCryptoFilter {
|
|
||||||
private final String key;
|
|
||||||
private final String value;
|
|
||||||
|
|
||||||
ContextAwareCryptoFilter(String key, String value) {
|
|
||||||
this.key = key;
|
|
||||||
this.value = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected Map<String, String> buildRuntimeContext(Properties prop, HttpServletRequest request) {
|
|
||||||
Map<String, String> ctx = new HashMap<>();
|
|
||||||
ctx.put(key, value);
|
|
||||||
return ctx;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
// 인스턴스 필드
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
|
|
||||||
private HttpServletRequest mockReq;
|
|
||||||
private HttpServletResponse mockRes;
|
|
||||||
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
// 전체 설정 / 해제
|
|
||||||
// -------------------------------------------------------------------------
|
|
||||||
|
|
||||||
@BeforeAll
|
|
||||||
static void setUpAll() throws Exception {
|
|
||||||
assumeTrue(new File(SOFTHSM2_DLL).exists(),
|
|
||||||
"SoftHSM2 미설치 (C:/SoftHSM2) - 테스트 건너뜀");
|
|
||||||
System.setProperty("SOFTHSM2_CONF", "C:\\SoftHSM2\\etc\\softhsm2.conf");
|
|
||||||
|
|
||||||
// 1. 토큰 초기화
|
|
||||||
ensureTokenInitialized();
|
|
||||||
|
|
||||||
// 2. PKCS11 설정 문자열
|
|
||||||
// attributes(*,...): generate/import 모두 CKA_SENSITIVE=false → getEncoded() 사용 가능
|
|
||||||
String cfgContent = "name = SoftHSM\n"
|
|
||||||
+ "library = " + SOFTHSM2_DLL + "\n"
|
|
||||||
+ "slotListIndex = 0\n"
|
|
||||||
+ "attributes(*, CKO_SECRET_KEY, CKK_AES) = {\n"
|
|
||||||
+ " CKA_SENSITIVE = false\n"
|
|
||||||
+ " CKA_EXTRACTABLE = true\n"
|
|
||||||
+ "}\n";
|
|
||||||
tempCfgFile = File.createTempFile("pkcs11-filter-it-", ".cfg");
|
|
||||||
Files.write(tempCfgFile.toPath(), cfgContent.getBytes("UTF-8"));
|
|
||||||
|
|
||||||
// 3. Mock PropManager (DB 없이 HSM 설정값 제공)
|
|
||||||
PropManager mockPropManager = mock(PropManager.class);
|
|
||||||
when(mockPropManager.getProperty("HSM", "PKCS11_CONFIG")).thenReturn(cfgContent);
|
|
||||||
when(mockPropManager.getProperty("HSM", "PIN")).thenReturn(PIN);
|
|
||||||
when(mockPropManager.getProperty(eq("HSM"), eq("CACHE_RELOAD_YN"), anyString())).thenReturn("N");
|
|
||||||
|
|
||||||
// 4. HsmManager (private 생성자 → 리플렉션)
|
|
||||||
Constructor<HsmManager> hsmCtor = HsmManager.class.getDeclaredConstructor();
|
|
||||||
hsmCtor.setAccessible(true);
|
|
||||||
hsmManager = hsmCtor.newInstance();
|
|
||||||
|
|
||||||
// 5. CryptoModuleManager (private 생성자 → 리플렉션)
|
|
||||||
CryptoModuleConfigLoader mockLoader = mock(CryptoModuleConfigLoader.class);
|
|
||||||
when(mockLoader.findAll()).thenReturn(buildModuleConfigs());
|
|
||||||
|
|
||||||
Constructor<CryptoModuleManager> managerCtor = CryptoModuleManager.class.getDeclaredConstructor();
|
|
||||||
managerCtor.setAccessible(true);
|
|
||||||
CryptoModuleManager manager = managerCtor.newInstance();
|
|
||||||
|
|
||||||
CryptoModuleService cryptoService = new CryptoModuleService();
|
|
||||||
HsmCryptoService hsmCryptoService = new HsmCryptoService();
|
|
||||||
|
|
||||||
// 6. Spring ApplicationContext 구성
|
|
||||||
springCtx = new GenericApplicationContext();
|
|
||||||
springCtx.getBeanFactory().registerSingleton("propManager", mockPropManager);
|
|
||||||
springCtx.getBeanFactory().registerSingleton("hsmManager", hsmManager);
|
|
||||||
springCtx.getBeanFactory().registerSingleton("hsmCryptoService", hsmCryptoService);
|
|
||||||
springCtx.getBeanFactory().registerSingleton("cryptoModuleConfigLoader", mockLoader);
|
|
||||||
springCtx.getBeanFactory().registerSingleton("cryptoModuleManager", manager);
|
|
||||||
springCtx.getBeanFactory().registerSingleton("cryptoModuleService", cryptoService);
|
|
||||||
springCtx.getBeanFactory().registerSingleton("cryptoModuleConfigMapper", testMapper());
|
|
||||||
springCtx.registerBeanDefinition("applicationContextProvider",
|
|
||||||
BeanDefinitionBuilder.genericBeanDefinition(ApplicationContextProvider.class)
|
|
||||||
.getBeanDefinition());
|
|
||||||
springCtx.refresh();
|
|
||||||
|
|
||||||
// 7. HsmManager 시작 (SunPKCS11 Provider 초기화 + KeyStore 오픈)
|
|
||||||
hsmManager.start();
|
|
||||||
assertTrue(hsmManager.isReady(), "HsmManager 초기화 실패");
|
|
||||||
System.out.println("[HSM] Provider: " + hsmManager.getPkcs11Provider().getName());
|
|
||||||
|
|
||||||
// 8. MASTER_KEY 등록 (없으면 자동 생성)
|
|
||||||
ensureMasterKey();
|
|
||||||
|
|
||||||
// 9. CryptoModuleManager 시작 (모듈 설정 로드)
|
|
||||||
manager.start();
|
|
||||||
System.out.println("[Crypto] 모듈 로드 완료");
|
|
||||||
}
|
|
||||||
|
|
||||||
@AfterAll
|
|
||||||
static void tearDownAll() throws Exception {
|
|
||||||
if (hsmManager != null && hsmManager.isStarted()) hsmManager.stop();
|
|
||||||
if (springCtx != null) springCtx.close();
|
|
||||||
if (tempCfgFile != null) tempCfgFile.delete();
|
|
||||||
}
|
|
||||||
|
|
||||||
@BeforeEach
|
|
||||||
void setUp() {
|
|
||||||
mockReq = mock(HttpServletRequest.class);
|
|
||||||
mockRes = mock(HttpServletResponse.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
// =========================================================================
|
|
||||||
// 1. HsmKeyDerivationStrategy — HSM 마스터키 직접 사용 (InCryptoFilter)
|
|
||||||
// =========================================================================
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@DisplayName("1-1. FIELD/GCM HsmKey — doPostFilter 암호화 → doPreFilter 복호화 라운드트립")
|
|
||||||
void testHsmGcm_field_roundTrip() throws Exception {
|
|
||||||
InCryptoFilter filter = new InCryptoFilter();
|
|
||||||
String original = "{\"acno\":\"1234567890\",\"amount\":\"100000\"}";
|
|
||||||
|
|
||||||
Properties prop = new Properties();
|
|
||||||
prop.setProperty(AbstractCryptoFilter.PROP_MODULE_NAME, MOD_HSM_GCM);
|
|
||||||
// SCOPE 기본값 FIELD, 경로 기본값 사용
|
|
||||||
|
|
||||||
// 암호화: body 전체 → /encrypted_data 필드
|
|
||||||
String encrypted = (String) filter.doPostFilter("G", "A", original, prop, mockReq, mockRes);
|
|
||||||
System.out.println("[1-1] encrypted: " + encrypted);
|
|
||||||
assertTrue(encrypted.contains("encrypted_data"), "/encrypted_data 필드가 있어야 한다");
|
|
||||||
|
|
||||||
// 복호화: /encrypted_data 필드 → body 전체 교체
|
|
||||||
String decrypted = (String) filter.doPreFilter("G", "A", encrypted, prop, mockReq, mockRes);
|
|
||||||
System.out.println("[1-1] decrypted: " + decrypted);
|
|
||||||
assertEquals(original, decrypted);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@DisplayName("1-2. BODY/GCM HsmKey — doPostFilter 암호화 → doPreFilter 복호화 라운드트립")
|
|
||||||
void testHsmGcm_body_roundTrip() throws Exception {
|
|
||||||
InCryptoFilter filter = new InCryptoFilter();
|
|
||||||
String original = "{\"acno\":\"1234567890\",\"amount\":\"100000\"}";
|
|
||||||
|
|
||||||
Properties prop = new Properties();
|
|
||||||
prop.setProperty(AbstractCryptoFilter.PROP_MODULE_NAME, MOD_HSM_GCM);
|
|
||||||
prop.setProperty(AbstractCryptoFilter.PROP_SCOPE, "BODY");
|
|
||||||
|
|
||||||
// 암호화: body 전체 → Base64 암호문
|
|
||||||
String encrypted = (String) filter.doPostFilter("G", "A", original, prop, mockReq, mockRes);
|
|
||||||
System.out.println("[1-2] encrypted(Base64): " + encrypted);
|
|
||||||
assertNotEquals(original, encrypted, "암호문은 평문과 달라야 한다");
|
|
||||||
|
|
||||||
// 복호화: Base64 암호문 → 원문
|
|
||||||
String decrypted = (String) filter.doPreFilter("G", "A", encrypted, prop, mockReq, mockRes);
|
|
||||||
System.out.println("[1-2] decrypted: " + decrypted);
|
|
||||||
assertEquals(original, decrypted);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@DisplayName("1-3. FIELD/GCM HsmKey + AAD 헤더 — 동일 요청 ID로 암복호화 성공")
|
|
||||||
void testHsmGcm_field_withAad_success() throws Exception {
|
|
||||||
InCryptoFilter filter = new InCryptoFilter();
|
|
||||||
String original = "{\"amount\":\"500000\"}";
|
|
||||||
String requestId = "REQ-20240101-001";
|
|
||||||
|
|
||||||
when(mockReq.getHeader("X-Request-Id")).thenReturn(requestId);
|
|
||||||
|
|
||||||
Properties prop = new Properties();
|
|
||||||
prop.setProperty(AbstractCryptoFilter.PROP_MODULE_NAME, MOD_HSM_GCM);
|
|
||||||
prop.setProperty(AbstractCryptoFilter.PROP_AAD_HEADER, "X-Request-Id");
|
|
||||||
|
|
||||||
String encrypted = (String) filter.doPostFilter("G", "A", original, prop, mockReq, mockRes);
|
|
||||||
String decrypted = (String) filter.doPreFilter( "G", "A", encrypted, prop, mockReq, mockRes);
|
|
||||||
System.out.println("[1-3] decrypted: " + decrypted);
|
|
||||||
assertEquals(original, decrypted);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@DisplayName("1-4. FIELD/GCM HsmKey + AAD 헤더 — 다른 요청 ID로 복호화 시 GCM 인증 실패")
|
|
||||||
void testHsmGcm_field_withAad_wrongAad_fails() throws Exception {
|
|
||||||
InCryptoFilter filter = new InCryptoFilter();
|
|
||||||
String original = "{\"amount\":\"500000\"}";
|
|
||||||
|
|
||||||
// 암호화 시 요청 ID
|
|
||||||
HttpServletRequest encReq = mock(HttpServletRequest.class);
|
|
||||||
when(encReq.getHeader("X-Request-Id")).thenReturn("REQ-CORRECT");
|
|
||||||
|
|
||||||
// 복호화 시 다른 요청 ID
|
|
||||||
HttpServletRequest decReq = mock(HttpServletRequest.class);
|
|
||||||
when(decReq.getHeader("X-Request-Id")).thenReturn("REQ-WRONG");
|
|
||||||
|
|
||||||
Properties prop = new Properties();
|
|
||||||
prop.setProperty(AbstractCryptoFilter.PROP_MODULE_NAME, MOD_HSM_GCM);
|
|
||||||
prop.setProperty(AbstractCryptoFilter.PROP_AAD_HEADER, "X-Request-Id");
|
|
||||||
|
|
||||||
String encrypted = (String) filter.doPostFilter("G", "A", original, prop, encReq, mockRes);
|
|
||||||
|
|
||||||
assertThrows(Exception.class,
|
|
||||||
() -> filter.doPreFilter("G", "A", encrypted, prop, decReq, mockRes),
|
|
||||||
"잘못된 AAD로 GCM 복호화 시 예외가 발생해야 한다");
|
|
||||||
System.out.println("[1-4] 다른 AAD 복호화 예외 확인 완료");
|
|
||||||
}
|
|
||||||
|
|
||||||
// =========================================================================
|
|
||||||
// 2. HsmContextSha256KeyDerivationStrategy — 컨텍스트 기반 SHA-256 파생 키
|
|
||||||
// =========================================================================
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@DisplayName("2-1. FIELD/GCM ContextSha256 — 동일 컨텍스트로 암복호화 라운드트립")
|
|
||||||
void testCtxSha256Gcm_field_roundTrip() throws Exception {
|
|
||||||
InCryptoFilter filter = new ContextAwareCryptoFilter(CTX_KEY, CTX_VAL_A);
|
|
||||||
String original = "{\"accNo\":\"0011234567890\",\"amount\":\"50000\"}";
|
|
||||||
|
|
||||||
Properties prop = new Properties();
|
|
||||||
prop.setProperty(AbstractCryptoFilter.PROP_MODULE_NAME, MOD_CTX_SHA_GCM);
|
|
||||||
|
|
||||||
String encrypted = (String) filter.doPostFilter("G", "A", original, prop, mockReq, mockRes);
|
|
||||||
System.out.println("[2-1] encrypted: " + encrypted);
|
|
||||||
assertTrue(encrypted.contains("encrypted_data"));
|
|
||||||
|
|
||||||
String decrypted = (String) filter.doPreFilter("G", "A", encrypted, prop, mockReq, mockRes);
|
|
||||||
System.out.println("[2-1] decrypted: " + decrypted);
|
|
||||||
assertEquals(original, decrypted);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@DisplayName("2-2. FIELD/GCM ContextSha256 — 암호화와 다른 컨텍스트로 복호화 시 GCM 인증 실패")
|
|
||||||
void testCtxSha256Gcm_differentContext_throwsException() throws Exception {
|
|
||||||
InCryptoFilter encFilter = new ContextAwareCryptoFilter(CTX_KEY, CTX_VAL_A);
|
|
||||||
InCryptoFilter decFilter = new ContextAwareCryptoFilter(CTX_KEY, CTX_VAL_B);
|
|
||||||
String original = "{\"data\":\"sensitive\"}";
|
|
||||||
|
|
||||||
Properties prop = new Properties();
|
|
||||||
prop.setProperty(AbstractCryptoFilter.PROP_MODULE_NAME, MOD_CTX_SHA_GCM);
|
|
||||||
|
|
||||||
String encrypted = (String) encFilter.doPostFilter("G", "A", original, prop, mockReq, mockRes);
|
|
||||||
|
|
||||||
assertThrows(Exception.class,
|
|
||||||
() -> decFilter.doPreFilter("G", "A", encrypted, prop, mockReq, mockRes),
|
|
||||||
"다른 컨텍스트 키로 파생된 키는 복호화에 실패해야 한다");
|
|
||||||
System.out.println("[2-2] 다른 컨텍스트 복호화 예외 확인 완료");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@DisplayName("2-3. FIELD/GCM ContextSha256 — 컨텍스트별 독립 암복호화 (GROUP-A, GROUP-B 각각 성공)")
|
|
||||||
void testCtxSha256Gcm_perGroupRoundTrip() throws Exception {
|
|
||||||
InCryptoFilter filterA = new ContextAwareCryptoFilter(CTX_KEY, CTX_VAL_A);
|
|
||||||
InCryptoFilter filterB = new ContextAwareCryptoFilter(CTX_KEY, CTX_VAL_B);
|
|
||||||
String plainA = "{\"group\":\"A\",\"amount\":\"1000\"}";
|
|
||||||
String plainB = "{\"group\":\"B\",\"amount\":\"2000\"}";
|
|
||||||
|
|
||||||
Properties prop = new Properties();
|
|
||||||
prop.setProperty(AbstractCryptoFilter.PROP_MODULE_NAME, MOD_CTX_SHA_GCM);
|
|
||||||
|
|
||||||
String encA = (String) filterA.doPostFilter("G", "A", plainA, prop, mockReq, mockRes);
|
|
||||||
String encB = (String) filterB.doPostFilter("G", "B", plainB, prop, mockReq, mockRes);
|
|
||||||
|
|
||||||
assertEquals(plainA, (String) filterA.doPreFilter("G", "A", encA, prop, mockReq, mockRes));
|
|
||||||
assertEquals(plainB, (String) filterB.doPreFilter("G", "B", encB, prop, mockReq, mockRes));
|
|
||||||
System.out.println("[2-3] GROUP-A, GROUP-B 각각 독립 암복호화 성공");
|
|
||||||
}
|
|
||||||
|
|
||||||
// =========================================================================
|
|
||||||
// 헬퍼
|
|
||||||
// =========================================================================
|
|
||||||
|
|
||||||
private static List<CryptoModuleConfig> buildModuleConfigs() {
|
|
||||||
return Arrays.asList(
|
|
||||||
buildDynamic(MOD_HSM_GCM, "AES", "GCM", "NoPadding",
|
|
||||||
HsmKeyDerivationStrategy.class.getName(),
|
|
||||||
"{\"hsmKeyAlias\":\"" + MASTER_KEY_ALIAS + "\"}"),
|
|
||||||
buildDynamic(MOD_CTX_SHA_GCM, "AES", "GCM", "NoPadding",
|
|
||||||
HsmContextSha256KeyDerivationStrategy.class.getName(),
|
|
||||||
"{\"hsmKeyAlias\":\"" + MASTER_KEY_ALIAS + "\",\"contextKey\":\"" + CTX_KEY + "\"}")
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static CryptoModuleConfig buildDynamic(String name, String alg, String mode, String padding,
|
|
||||||
String strategy, String params) {
|
|
||||||
CryptoModuleConfig c = new CryptoModuleConfig();
|
|
||||||
c.setCryptoId(UUID.randomUUID().toString());
|
|
||||||
c.setCryptoName(name);
|
|
||||||
c.setAlgType(alg);
|
|
||||||
c.setCipherMode(mode);
|
|
||||||
c.setPadding(padding);
|
|
||||||
c.setKeySourceType("DYNAMIC");
|
|
||||||
c.setKeyDerivStrategy(strategy);
|
|
||||||
c.setKeyDerivParams(params);
|
|
||||||
c.setCacheYn("Y");
|
|
||||||
c.setCacheTtlSec(60);
|
|
||||||
c.setUseYn("Y");
|
|
||||||
// ivHex = null: GCM에서 IV를 AAD 대체값으로 사용하지 않도록 의도적으로 미설정
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ensureMasterKey() throws Exception {
|
|
||||||
java.security.KeyStore ks = hsmManager.getKeyStore();
|
|
||||||
|
|
||||||
// 이전 실행 키 삭제 (sensitive 여부 무관하게 항상 고정키로 재등록)
|
|
||||||
if (ks.containsAlias(MASTER_KEY_ALIAS)) {
|
|
||||||
ks.deleteEntry(MASTER_KEY_ALIAS);
|
|
||||||
System.out.println("[HSM] 기존 MASTER_KEY 삭제");
|
|
||||||
}
|
|
||||||
|
|
||||||
// CryptoModuleServiceTest.KEY_128 과 동일한 고정 키 → 두 테스트 간 암호문 비교 가능
|
|
||||||
// attributes(*, CKO_SECRET_KEY, CKK_AES) 지시어로 임포트 시 CKA_SENSITIVE=false 적용
|
|
||||||
byte[] keyBytes = "0123456789abcdef".getBytes(StandardCharsets.UTF_8);
|
|
||||||
SecretKey fixedKey = new SecretKeySpec(keyBytes, "AES");
|
|
||||||
ks.setKeyEntry(MASTER_KEY_ALIAS, fixedKey, null, null);
|
|
||||||
|
|
||||||
// 임포트 후 getEncoded() 검증
|
|
||||||
SecretKey stored = (SecretKey) ks.getKey(MASTER_KEY_ALIAS, null);
|
|
||||||
byte[] encoded = stored.getEncoded();
|
|
||||||
System.out.println("[HSM] MASTER_KEY 등록 완료: alias=" + MASTER_KEY_ALIAS
|
|
||||||
+ " / getEncoded()=" + (encoded != null ? encoded.length + "bytes, " + new String(encoded) : "null (추출 불가!)"));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void ensureTokenInitialized() throws Exception {
|
|
||||||
ProcessBuilder pb = new ProcessBuilder(
|
|
||||||
SOFTHSM2_UTIL, "--init-token", "--free",
|
|
||||||
"--label", TOKEN_LABEL, "--pin", PIN, "--so-pin", PIN);
|
|
||||||
pb.redirectErrorStream(true);
|
|
||||||
Process p = pb.start();
|
|
||||||
String out = readOutput(p);
|
|
||||||
p.waitFor(10, TimeUnit.SECONDS);
|
|
||||||
System.out.println("[SoftHSM2] init-token: " + out.trim());
|
|
||||||
}
|
|
||||||
|
|
||||||
private static CryptoModuleConfigMapper testMapper() {
|
|
||||||
return new CryptoModuleConfigMapper() {
|
|
||||||
@Override
|
|
||||||
public CryptoModuleConfigVO toVo(CryptoModuleConfig e) {
|
|
||||||
CryptoModuleConfigVO vo = new CryptoModuleConfigVO();
|
|
||||||
vo.setCryptoId(e.getCryptoId());
|
|
||||||
vo.setCryptoName(e.getCryptoName());
|
|
||||||
vo.setCryptoDesc(e.getCryptoDesc());
|
|
||||||
vo.setAlgType(e.getAlgType());
|
|
||||||
vo.setCipherMode(e.getCipherMode());
|
|
||||||
vo.setPadding(e.getPadding());
|
|
||||||
vo.setIvHex(e.getIvHex());
|
|
||||||
vo.setKeySourceType(e.getKeySourceType());
|
|
||||||
vo.setEncKeyHex(e.getEncKeyHex());
|
|
||||||
vo.setDecKeyHex(e.getDecKeyHex());
|
|
||||||
vo.setKeyDerivStrategy(e.getKeyDerivStrategy());
|
|
||||||
vo.setKeyDerivParams(e.getKeyDerivParams());
|
|
||||||
vo.setCacheYn(e.getCacheYn());
|
|
||||||
vo.setCacheTtlSec(e.getCacheTtlSec());
|
|
||||||
vo.setUseYn(e.getUseYn());
|
|
||||||
return vo;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CryptoModuleConfig toEntity(CryptoModuleConfigVO vo) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String readOutput(Process p) throws Exception {
|
|
||||||
InputStream is = p.getInputStream();
|
|
||||||
byte[] buf = new byte[4096];
|
|
||||||
StringBuilder sb = new StringBuilder();
|
|
||||||
int len;
|
|
||||||
while ((len = is.read(buf)) != -1) {
|
|
||||||
sb.append(new String(buf, 0, len, "UTF-8"));
|
|
||||||
}
|
|
||||||
return sb.toString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user