From 9a730dc0b762fe491ce161efe67af95368a8b7bc Mon Sep 17 00:00:00 2001 From: curry772 Date: Fri, 24 Jul 2026 17:01:54 +0900 Subject: [PATCH] =?UTF-8?q?Test=20Filter=20=EC=88=98=EC=8B=A0=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=20JsonNode=20=EC=A7=80=EC=9B=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../http/dynamic/filter/DecrytTestFilter.java | 15 +++------------ .../http/dynamic/filter/EncrytTestFilter.java | 18 +++--------------- .../http/dynamic/filter/GenKeyFilter.java | 15 +++------------ 3 files changed, 9 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/DecrytTestFilter.java b/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/DecrytTestFilter.java index ed1819a..149918c 100644 --- a/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/DecrytTestFilter.java +++ b/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/DecrytTestFilter.java @@ -6,7 +6,6 @@ import java.util.Properties; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.json.simple.JSONObject; import org.springframework.http.HttpStatus; import com.eactive.eai.adapter.http.dynamic.filter.FilterException; @@ -16,6 +15,7 @@ import com.eactive.eai.common.security.ARIACryptoModuleExtension; import com.eactive.eai.common.security.CryptoModuleExtension; import com.eactive.eai.common.util.Logger; import com.eactive.eai.util.HexaConverter; +import com.eactive.eai.util.JsonPathUtil; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -30,17 +30,8 @@ public class DecrytTestFilter implements HttpAdapterFilter { public Object doPreFilter(String adptGrpName, String adptName, Object message, Properties prop, HttpServletRequest request, HttpServletResponse response) throws Exception { try { - ObjectNode rootNode = null; - String jsonStr = null; - if (message instanceof String) { - jsonStr = (String) message; - } else if (message instanceof JSONObject) { - jsonStr = ((JSONObject) message).toJSONString(); - } else { - return message; - } - rootNode = (ObjectNode) OBJECT_MAPPER.readTree(jsonStr); - + ObjectNode rootNode = (ObjectNode)JsonPathUtil.toTree(message); + JsonNode alg = rootNode.get("alg"); JsonNode mode = rootNode.get("mode"); JsonNode padding = rootNode.get("padding"); diff --git a/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/EncrytTestFilter.java b/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/EncrytTestFilter.java index 7b36394..0222a28 100644 --- a/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/EncrytTestFilter.java +++ b/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/EncrytTestFilter.java @@ -8,7 +8,6 @@ import javax.crypto.SecretKey; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.json.simple.JSONObject; import org.springframework.http.HttpStatus; import com.eactive.eai.adapter.http.dynamic.filter.FilterException; @@ -19,6 +18,7 @@ import com.eactive.eai.common.security.ARIACryptoModuleExtension; import com.eactive.eai.common.security.CryptoModuleExtension; import com.eactive.eai.common.util.Logger; import com.eactive.eai.util.HexaConverter; +import com.eactive.eai.util.JsonPathUtil; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -33,20 +33,8 @@ public class EncrytTestFilter implements HttpAdapterFilter { public Object doPreFilter(String adptGrpName, String adptName, Object message, Properties prop, HttpServletRequest request, HttpServletResponse response) throws Exception { try { - ObjectNode rootNode = null; - String jsonStr = null; - if (message instanceof String) { - jsonStr = (String) message; - } else if (message instanceof ObjectNode) { - rootNode = (ObjectNode) message; - } else if (message instanceof JSONObject) { - jsonStr = ((JSONObject) message).toJSONString(); - } else { - return message; - } - if(rootNode == null) - rootNode = (ObjectNode) OBJECT_MAPPER.readTree(jsonStr); - + ObjectNode rootNode = (ObjectNode)JsonPathUtil.toTree(message); + // 1. HSM에서 키 가져오기 byte[] hsmKeyBytes = null; JsonNode hsmKeyAlias = rootNode.get("hsmKeyAlias"); diff --git a/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/GenKeyFilter.java b/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/GenKeyFilter.java index a15bb76..b402dd3 100644 --- a/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/GenKeyFilter.java +++ b/src/main/java/com/eactive/eai/custom/adapter/http/dynamic/filter/GenKeyFilter.java @@ -8,7 +8,6 @@ import java.util.Properties; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.json.simple.JSONObject; import org.springframework.http.HttpStatus; import com.eactive.eai.adapter.http.dynamic.filter.FilterException; @@ -18,6 +17,7 @@ import com.eactive.eai.common.util.Logger; import com.eactive.eai.custom.common.security.keyderiv.HsmContextSha256KeyDerivationStrategy; import com.eactive.eai.custom.common.security.keyderiv.HsmKeyAndIvSliceDerivationStrategy; import com.eactive.eai.util.HexaConverter; +import com.eactive.eai.util.JsonPathUtil; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -32,17 +32,8 @@ public class GenKeyFilter implements HttpAdapterFilter { public Object doPreFilter(String adptGrpName, String adptName, Object message, Properties prop, HttpServletRequest request, HttpServletResponse response) throws Exception { try { - ObjectNode rootNode = null; - String jsonStr = null; - if (message instanceof String) { - jsonStr = (String) message; - } else if (message instanceof JSONObject) { - jsonStr = ((JSONObject) message).toJSONString(); - } else { - return message; - } - rootNode = (ObjectNode) OBJECT_MAPPER.readTree(jsonStr); - + ObjectNode rootNode = (ObjectNode)JsonPathUtil.toTree(message); + JsonNode hsmKey = rootNode.get("hsmKey"); JsonNode hsmIv = rootNode.get("hsmIv"); JsonNode contextKey = rootNode.get("contextKey");