Merge pull request #496 from lostsnow/fix/form-urlencoded-post-body-character-encoding-error

fixes character encoding error when collect form urlencoded post body

Author: lostsnow

dongtai-core/src/main/java/io/dongtai/iast/core/handler/hookpoint/controller/impl/HttpImpl.java

@@ -109,34 +109,6 @@ public static void solveHttpRequest(Object obj, Object req, Object resp, Map<Str
         } catch (Throwable ignore) {
         }
 
-        try {
-            String contentType = ((Map<String, String>) requestMeta.get("headers")).get("Content-Type");
-            String method = (String) requestMeta.get("method");
-            if (("POST".equalsIgnoreCase(method) || "PUT".equalsIgnoreCase(method))
-                    && !isRawBody(contentType)) {
-                Method getParameterNamesMethod = ReflectUtils.getDeclaredMethodFromSuperClass(req.getClass(),
-                        "getParameterNames", null);
-                Method getParameterMethod = ReflectUtils.getDeclaredMethodFromSuperClass(req.getClass(),
-                        "getParameter", new Class[]{String.class});
-                Enumeration<?> parameterNames = (Enumeration<?>) getParameterNamesMethod.invoke(req);
-                StringBuilder postBody = new StringBuilder();
-                boolean first = true;
-                while (parameterNames.hasMoreElements()) {
-                    String key = (String) parameterNames.nextElement();
-                    if (first) {
-                        first = false;
-                        postBody.append(key).append("=").append((String) getParameterMethod.invoke(req, key));
-                    } else {
-                        postBody.append("&").append(key).append("=").append((String) getParameterMethod.invoke(req, key));
-                    }
-                }
-                if (postBody.length() > 0) {
-                    requestMeta.put("body", postBody.toString());
-                }
-            }
-        } catch (Throwable ignore) {
-        }
-
         EngineManager.enterHttpEntry(requestMeta);
         DongTaiLog.debug("HTTP Request:{} {} from: {}", requestMeta.get("method"), requestMeta.get("requestURI"),
                 obj.getClass().getName());
@@ -205,6 +177,39 @@ public static void solveHttpResponse(Object obj, Object req, Object resp, Collec
         if (EngineManager.REQUEST_CONTEXT.get() == null) {
             return;
         }
+
+        Map<String, Object> requestMeta = EngineManager.REQUEST_CONTEXT.get();
+        try {
+            // Collecting the form urlencoded POST body must be done at the exit of the http method
+            // Otherwise, it may cause character encoding errors
+            String contentType = ((Map<String, String>) requestMeta.get("headers")).get("Content-Type");
+            String method = (String) requestMeta.get("method");
+            if (("POST".equalsIgnoreCase(method) || "PUT".equalsIgnoreCase(method))
+                    && (requestMeta.get("body") == null || requestMeta.get("body") == "")
+                    && !isRawBody(contentType)) {
+                Method getParameterNamesMethod = ReflectUtils.getDeclaredMethodFromSuperClass(req.getClass(),
+                        "getParameterNames", null);
+                Method getParameterMethod = ReflectUtils.getDeclaredMethodFromSuperClass(req.getClass(),
+                        "getParameter", new Class[]{String.class});
+                Enumeration<?> parameterNames = (Enumeration<?>) getParameterNamesMethod.invoke(req);
+                StringBuilder postBody = new StringBuilder();
+                boolean first = true;
+                while (parameterNames.hasMoreElements()) {
+                    String key = (String) parameterNames.nextElement();
+                    if (first) {
+                        first = false;
+                        postBody.append(key).append("=").append((String) getParameterMethod.invoke(req, key));
+                    } else {
+                        postBody.append("&").append(key).append("=").append((String) getParameterMethod.invoke(req, key));
+                    }
+                }
+                if (postBody.length() > 0) {
+                    requestMeta.put("body", postBody.toString());
+                }
+            }
+        } catch (Throwable ignore) {
+        }
+
         Map<String, Collection<String>> headers = parseResponseHeaders(resp, headerNames);
         EngineManager.REQUEST_CONTEXT.get().put("responseStatus",
                 (String) EngineManager.REQUEST_CONTEXT.get().get("protocol") + " " + status);