xbase-util 0.8.3__tar.gz → 0.8.5__tar.gz

{xbase_util-0.8.3 → xbase_util-0.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xbase_util
-Version: 0.8.3
+Version: 0.8.5
 Summary: 网络安全基础工具
 Home-page: https://gitee.com/jimonik/xbase_util.git
 Author: xyt

{xbase_util-0.8.3 → xbase_util-0.8.5}/setup.py

@@ -3,7 +3,7 @@ from distutils.core import setup
 from setuptools import find_packages
 
 setup(name="xbase_util",
-      version="0.8.3",
+      version="0.8.5",
       description="网络安全基础工具",
       long_description="包含提取，预测，训练的基础工具",
       author="xyt",

{xbase_util-0.8.3 → xbase_util-0.8.5}/xbase_util/common_util.py

@@ -3,6 +3,7 @@ import json
 import logging
 import os
 import re
+from collections import Counter
 from datetime import datetime
 from logging.handlers import TimedRotatingFileHandler
 from urllib.parse import urlparse, parse_qs
@@ -68,43 +69,38 @@ def parse_expression(expression):
         return None
 
 
-def get_cookie_end_with_semicolon_count(text_data):
-    count = 0
-    for text in text_data.replace("-", "_").lower().splitlines():
-        item_text = text.replace("\n", "").replace("\t", "").replace(" ", "")
-        if "cookie:" in item_text and f"{item_text}".endswith(";"):
-            count = count + 1
-    if count == 0:
-        return -1
-    return count
+def get_cookie_end_with_semicolon_count(all_packets):
+    headers = [item['req_header'] + item['res_header'] for item in all_packets]
+    c = 0
+    for header in headers:
+        lines = [item for item in header.split('\r\n') if 'Cookie:' in item and item.strip().endswith(';')]
+        c += len(lines)
+    return c
 
 
-def get_ua_duplicate_count(text_data):
+def get_ua_duplicate_count(all_packets):
+    headers = [item['req_header'] + item['res_header'] for item in all_packets]
     ua_list = []
-    for text in text_data.replace("-", "_").lower().splitlines():
-        item_text = text.replace("\n", "").replace("\t", "").replace(" ", "")
-        if "user_agent:" in item_text and f"{item_text}".endswith(";"):
-            ua_list.append(item_text.replace("user_agent:", ""))
-    count = list(set(ua_list))
-    if count == 0:
-        return -1
-    return sum(count)
+    for header in headers:
+        lines = [item for item in header.split('\r\n') if 'User-Agent:' in item]
+        ua_list.extend(lines)
+    counter = Counter(ua_list)
+    pairs = sum(count // 2 for count in counter.values())
+    print(pairs)
+    return pairs
 
 
-def get_res_status_code_list(text_data):
+def get_res_status_code_list(all_packets):
     value_res = []
-    res = []
     num_1 = 0
     num_2 = 0
     num_3 = 0
     num_4 = 0
     num_5 = 0
-
-    res.extend([item for item in text_data.splitlines() if item.startswith("HTTP/")])
-    for item in res:
-        m = re.search(r"\b(\d{3})\b", item)
-        if m:
-            value_res.append(int(m.group(0)))
+    for item in all_packets:
+        match = re.search(r'HTTP/\d\.\d (\d{3})', item['res_header'])
+        if match:
+            value_res.append(int(match.group(1)))
     for value in value_res:
         if 0 <= value < 200:
             num_1 = num_1 + 1

xbase_util-0.8.5/xbase_util/test.py

@@ -0,0 +1,21 @@
+import re
+from collections import Counter
+
+import numpy as np
+from scapy.packet import Raw
+from scapy.utils import rdpcap
+
+from xbase_util.common_util import get_res_status_code_list
+from xbase_util.pcap_util import reassemble_tcp_pcap, reassemble_session_pcap
+from xbase_util.xbase_constant import res_status_code_pattern
+
+if __name__ == '__main__':
+    packets_scapy = reassemble_tcp_pcap(rdpcap("gzip2.pcap"))
+    skey = '10.28.7.16:54398'
+    streams = b""
+    for pkt in packets_scapy:
+        if Raw in pkt:
+            streams += pkt[Raw].load
+    text_data = streams.decode('ascii', errors='ignore')
+    all_packets = reassemble_session_pcap(packets_scapy, skey=skey)
+

{xbase_util-0.8.3 → xbase_util-0.8.5}/xbase_util.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xbase-util
-Version: 0.8.3
+Version: 0.8.5
 Summary: 网络安全基础工具
 Home-page: https://gitee.com/jimonik/xbase_util.git
 Author: xyt

xbase_util-0.8.3/xbase_util/test.py

@@ -1,8 +0,0 @@
-from scapy.utils import rdpcap
-
-from xbase_util.pcap_util import reassemble_tcp_pcap, reassemble_session_pcap
-
-if __name__ == '__main__':
-    packets = reassemble_tcp_pcap(rdpcap("gzip2.pcap"))
-    res=reassemble_session_pcap(packets, skey='10.28.7.16:54398')
-    print(res)