Merge pull request #368 from fyb007/master

FIX HttpRequest does'nt contain ip:port causing httpclient profile without http://ip:port
uavorg · Aug 10, 2018 · b9a6beb · b9a6beb
2 parents 7a4024c + dc34a3c
commit b9a6beb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/.../java/com/creditease/uav/hook/httpclients/async/interceptors/ApacheAsyncHttpClientIT.java b/.../java/com/creditease/uav/hook/httpclients/async/interceptors/ApacheAsyncHttpClientIT.java
@@ -376,6 +376,11 @@ else if (args.length == 5) {
             RequestLine rl = hr.getRequestLine();
             httpAction = rl.getMethod();
             targetURL = rl.getUri();
+
+            // 部分HttpRequest中没有ip:port，需要从httpHost中拿到再拼接
+            if (!targetURL.startsWith("http")) {
+                targetURL = requestProducer.getTarget().toURI() + targetURL;
+            }
         }
         catch (IOException e) {
             // ignore thie exception

diff --git a/...c/main/java/com/creditease/uav/hook/httpclients/sync/interceptors/ApacheHttpClientIT.java b/...c/main/java/com/creditease/uav/hook/httpclients/sync/interceptors/ApacheHttpClientIT.java
@@ -117,6 +117,11 @@ public void doStart(Object[] args) {
         httpAction = rl.getMethod();
         targetURl = rl.getUri();
 
+        // 部分HttpRequest中没有ip:port，需要从httpHost中拿到再拼接
+        if (!targetURl.startsWith("http")) {
+            targetURl = target.toURI() + targetURl;
+        }
+
         Map<String, Object> params = new HashMap<String, Object>();
 
         params.put(CaptureConstants.INFO_CLIENT_REQUEST_URL, targetURl);

diff --git a/...main/java/com/creditease/uav/hook/httpclients3/sync/interceptors/ApacheHttpClient3IT.java b/...main/java/com/creditease/uav/hook/httpclients3/sync/interceptors/ApacheHttpClient3IT.java
@@ -101,6 +101,11 @@ public void doStart(Object[] args) {
         try {
             httpAction = method.getName();
             targetURL = method.getURI().toString();
+
+            // HttpMethod中可能不包含ip:port，需要从httpHost中拿到再拼接
+            if (!targetURL.startsWith("http")) {
+                targetURL = hostconfig.getHostURL() + targetURL;
+            }
         }
         catch (URIException e) {
             // ignore