Correctly parsing URIs

cuckoo/processing/network.py

@@ -490,11 +490,16 @@ def _add_http(self, tcpdata, dport):
                 netloc += ":" + str(entry["port"])
 
             entry["data"] = convert_to_printable(tcpdata)
-            url = urlparse.urlunparse(("http", netloc, http.uri,
+            path = http.uri
+            if netloc and netloc in http.uri:
+                path = http.uri.split(netloc)[1]
+            elif entry["host"] and entry["host"] in http.uri:
+                path = http.uri.split(entry["host"])[1]
+            url = urlparse.urlunparse(("http", netloc, path,
                                        None, None, None))
             entry["uri"] = convert_to_printable(url)
             entry["body"] = convert_to_printable(http.body)
-            entry["path"] = convert_to_printable(http.uri)
+            entry["path"] = convert_to_printable(path)
 
             if "user-agent" in http.headers:
                 entry["user-agent"] = \
@@ -809,13 +814,17 @@ def run(self):
                 resp_path = os.path.join(self.network_path, resp_sha1)
                 open(resp_path, "wb").write(recv.body or "")
 
+                path = sent.uri
+                host = sent.headers.get("host", dstip)
+                if host in path:
+                    path = path.split(host)[1]
                 results["%s_ex" % protocol].append({
                     "src": srcip, "sport": srcport,
                     "dst": dstip, "dport": dstport,
                     "protocol": protocol,
                     "method": sent.method,
-                    "host": sent.headers.get("host", dstip),
-                    "uri": sent.uri,
+                    "host": host,
+                    "uri": path,
                     "status": int(getattr(recv, "status", 0)),
 
                     # We'll keep these fields here for now.