diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 6074ebf..6eec29d 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -22,16 +22,6 @@ /mgr/* - - ApiRequestBodyFilter - com.eactive.eai.adapter.controller.ApiRequestBodyFilter - - - ApiRequestBodyFilter - /api/* - /mapi/* - - logbackDisableServletContainerInitializer diff --git a/src/main/java/com/eactive/eai/adapter/controller/ApiRequestBodyFilter.java b/src/main/java/com/eactive/eai/adapter/controller/ApiRequestBodyFilter.java deleted file mode 100644 index fcad778..0000000 --- a/src/main/java/com/eactive/eai/adapter/controller/ApiRequestBodyFilter.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.eactive.eai.adapter.controller; - -import java.io.BufferedReader; -import java.io.IOException; -import java.nio.charset.Charset; - -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.json.simple.JSONValue; -import org.springframework.stereotype.Component; -import org.springframework.web.filter.OncePerRequestFilter; - -@Component -public class ApiRequestBodyFilter extends OncePerRequestFilter { - - @Override - protected void doFilterInternal(HttpServletRequest request, - HttpServletResponse response, - FilterChain filterChain) - throws ServletException, IOException { - - // 1. 필터 대상 - if (!isTarget(request)) { - filterChain.doFilter(request, response); - return; - } - - // 2. 요청 전문 읽기 - String body = readBody(request); - if (body == null || body.isEmpty()) { - filterChain.doFilter(request, response); - return; - } - - String modifiedBody = body; - - try { - Object json = JSONValue.parse(body); - - // 3. 예제: ROOTLESS ARRAY 보정 - if (json instanceof JSONArray) { - JSONObject wrap = new JSONObject(); - wrap.put("kjbrootlessarray", json); - modifiedBody = wrap.toJSONString(); - } - - } catch (Exception e) { - // 변조 실패 → 원본 유지 - modifiedBody = body; - } - - byte[] bytes = modifiedBody.getBytes(request.getCharacterEncoding() != null ? request.getCharacterEncoding() : Charset.defaultCharset().name() ); - - // 5. Wrapper로 재주입 - HttpServletRequest wrapped = - new CachedBodyHttpServletRequest(request, bytes); - - filterChain.doFilter(wrapped, response); - } - - private boolean isTarget(HttpServletRequest request) { - String uri = request.getRequestURI(); - - - return ("POST".equals(request.getMethod()) || "PUT".equals(request.getMethod())) - && (uri.startsWith("/api") || uri.startsWith("/mapi") ) && !uri.startsWith("/mapi/oauth2/token"); - } - - private String readBody(HttpServletRequest request) throws IOException { - StringBuilder sb = new StringBuilder(); - try (BufferedReader br = request.getReader()) { - String line; - while ((line = br.readLine()) != null) { - sb.append(line); - } - } - return sb.toString(); - } - -} \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/adapter/controller/ApiResponseAdvice.java b/src/main/java/com/eactive/eai/adapter/controller/ApiResponseAdvice.java deleted file mode 100644 index 6fdf3cb..0000000 --- a/src/main/java/com/eactive/eai/adapter/controller/ApiResponseAdvice.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.eactive.eai.adapter.controller; - -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; -import org.json.simple.JSONValue; -import org.springframework.core.MethodParameter; -import org.springframework.http.MediaType; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.server.ServerHttpRequest; -import org.springframework.http.server.ServerHttpResponse; -import org.springframework.web.bind.annotation.RestControllerAdvice; -import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; - -@RestControllerAdvice -public class ApiResponseAdvice implements ResponseBodyAdvice { - - @Override - public boolean supports(MethodParameter returnType, Class> converterType) { - // TODO Auto-generated method stub - return true; - } - - @Override - public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType, - Class> selectedConverterType, ServerHttpRequest request, - ServerHttpResponse response) { - - if (body instanceof String) { - - return removeRootlessArrayKeyFormResponseBody((String) body); - } - - return body; - } - - String removeRootlessArrayKeyFormResponseBody(String body) { - try { - Object root = JSONValue.parse(body); - - if (root instanceof JSONObject && ((JSONObject) root).containsKey("kjbrootlessarray")) { - JSONArray jsonArray = (JSONArray) ((JSONObject) root).get("kjbrootlessarray"); - return jsonArray.toJSONString(); - } else { - return body; - } - } catch (Exception e) { - return body; - } - - } - -} \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/adapter/controller/CachedBodyHttpServletRequest.java b/src/main/java/com/eactive/eai/adapter/controller/CachedBodyHttpServletRequest.java deleted file mode 100644 index c3c0f9e..0000000 --- a/src/main/java/com/eactive/eai/adapter/controller/CachedBodyHttpServletRequest.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.eactive.eai.adapter.controller; - -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.InputStreamReader; - -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; - -public class CachedBodyHttpServletRequest extends HttpServletRequestWrapper { - - private final byte[] cachedBody; - - public CachedBodyHttpServletRequest(HttpServletRequest request, byte[] body) { - super(request); - this.cachedBody = body; - } - - @Override - public ServletInputStream getInputStream() { - ByteArrayInputStream bais = new ByteArrayInputStream(cachedBody); - - return new ServletInputStream() { - @Override - public int read() { - return bais.read(); - } - - @Override - public boolean isFinished() { - return bais.available() == 0; - } - - @Override - public boolean isReady() { - return true; - } - - @Override - public void setReadListener(ReadListener readListener) { - } - }; - } - - @Override - public BufferedReader getReader() { - return new BufferedReader(new InputStreamReader(getInputStream())); - } - }