FlowAnalyzer 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- FlowAnalyzer/FlowAnalyzer.py +4 -3
- {FlowAnalyzer-0.3.2.dist-info → FlowAnalyzer-0.3.4.dist-info}/METADATA +1 -1
- FlowAnalyzer-0.3.4.dist-info/RECORD +8 -0
- FlowAnalyzer-0.3.2.dist-info/RECORD +0 -8
- {FlowAnalyzer-0.3.2.dist-info → FlowAnalyzer-0.3.4.dist-info}/LICENSE +0 -0
- {FlowAnalyzer-0.3.2.dist-info → FlowAnalyzer-0.3.4.dist-info}/WHEEL +0 -0
- {FlowAnalyzer-0.3.2.dist-info → FlowAnalyzer-0.3.4.dist-info}/top_level.txt +0 -0
FlowAnalyzer/FlowAnalyzer.py
CHANGED
|
@@ -85,8 +85,8 @@ class FlowAnalyzer:
|
|
|
85
85
|
|
|
86
86
|
frame_num = int(packet["frame.number"][0])
|
|
87
87
|
request_in = int(packet["http.request_in"][0]) if packet.get("http.request_in") else frame_num
|
|
88
|
-
full_uri = parse.unquote(packet["http.request.full_uri"][0])
|
|
89
|
-
time_epoch = packet["frame.time_epoch"][0]
|
|
88
|
+
full_uri = parse.unquote(packet["http.request.full_uri"][0]) if packet.get("http.request.full_uri") else ""
|
|
89
|
+
time_epoch = float(packet["frame.time_epoch"][0])
|
|
90
90
|
|
|
91
91
|
if packet.get("tcp.reassembled.data"):
|
|
92
92
|
full_request = packet["tcp.reassembled.data"][0]
|
|
@@ -115,6 +115,7 @@ class FlowAnalyzer:
|
|
|
115
115
|
frame_num, request_in, time_epoch, full_uri, full_request = self.parse_packet(packet)
|
|
116
116
|
header, file_data = self.extract_http_file_data(full_request)
|
|
117
117
|
|
|
118
|
+
# 请求包使用 full_uri 来记录请求 url 返回包使用 request_in 来记录请求包的序号
|
|
118
119
|
if packet.get("http.response_number"):
|
|
119
120
|
responses[frame_num] = Response(
|
|
120
121
|
frame_num=frame_num,
|
|
@@ -213,7 +214,7 @@ class FlowAnalyzer:
|
|
|
213
214
|
|
|
214
215
|
MD5Sum = FlowAnalyzer.get_hash(filePath, display_filter)
|
|
215
216
|
workDir = os.getcwd()
|
|
216
|
-
tshark_workDir = os.path.dirname(filePath)
|
|
217
|
+
tshark_workDir = os.path.dirname(os.path.abspath(filePath))
|
|
217
218
|
tshark_jsonPath = os.path.join(tshark_workDir, "output.json")
|
|
218
219
|
jsonWordPath = os.path.join(workDir, "output.json")
|
|
219
220
|
fileName = os.path.basename(filePath)
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
FlowAnalyzer/FlowAnalyzer.py,sha256=DotmrD6m24uPjyuJMo4yhbbMBDkG99MWZWURusLfK0k,11302
|
|
2
|
+
FlowAnalyzer/__init__.py,sha256=vfiHONPTrvjUU3MwhjFOEo3sWfzlhkA6gOLn_4UJ7sg,70
|
|
3
|
+
FlowAnalyzer/logging_config.py,sha256=e-73IByM1TuE2G1isOBvtIcr9XztWqPkGN-VsNEFbvY,671
|
|
4
|
+
FlowAnalyzer-0.3.4.dist-info/LICENSE,sha256=ybAV0ECduYBZCpjkHyNALVWRRmT_eM0BDgqUszhwEFU,1080
|
|
5
|
+
FlowAnalyzer-0.3.4.dist-info/METADATA,sha256=deQEWuTcklvFaSbZjBiC2XKkPkVafYrNRNXjYO4Iz04,10288
|
|
6
|
+
FlowAnalyzer-0.3.4.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
|
|
7
|
+
FlowAnalyzer-0.3.4.dist-info/top_level.txt,sha256=2MtvAF6dEe_eHipw_6G5pFLb2uOCbGnlH0bC4iBtm5A,13
|
|
8
|
+
FlowAnalyzer-0.3.4.dist-info/RECORD,,
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
FlowAnalyzer/FlowAnalyzer.py,sha256=mfqc2GO6eyJthfUM-Kg39W1TfoOxrH5KvszQVax1Wf4,11115
|
|
2
|
-
FlowAnalyzer/__init__.py,sha256=vfiHONPTrvjUU3MwhjFOEo3sWfzlhkA6gOLn_4UJ7sg,70
|
|
3
|
-
FlowAnalyzer/logging_config.py,sha256=e-73IByM1TuE2G1isOBvtIcr9XztWqPkGN-VsNEFbvY,671
|
|
4
|
-
FlowAnalyzer-0.3.2.dist-info/LICENSE,sha256=ybAV0ECduYBZCpjkHyNALVWRRmT_eM0BDgqUszhwEFU,1080
|
|
5
|
-
FlowAnalyzer-0.3.2.dist-info/METADATA,sha256=dT7quKm_d0TZ9dc0mp81HXU9M1UuoMt38h6dXDnmJYo,10288
|
|
6
|
-
FlowAnalyzer-0.3.2.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
|
|
7
|
-
FlowAnalyzer-0.3.2.dist-info/top_level.txt,sha256=2MtvAF6dEe_eHipw_6G5pFLb2uOCbGnlH0bC4iBtm5A,13
|
|
8
|
-
FlowAnalyzer-0.3.2.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|