✨ fea: 最后一次更新

freekatz · Jun 6, 2020 · 6f77ebe · 6f77ebe
1 parent cb3dbc1
commit 6f77ebe
Show file tree

Hide file tree

Showing 15 changed files with 96 additions and 36 deletions.
diff --git a/README.md b/README.md
@@ -17,6 +17,14 @@
 
 ---
 
+## 物语
+
+**本项目是我的毕业设计，最终凭借它，我的毕业答辩取得了优。**
+
+**另外，由于一些不想提及的原因，我的研究生方向最终确定为区块链算法及应用，网安从此变成本人的一个爱好，因此，此项目就此荒废。**
+
+**再见，网安。再见，青春。再见，学生时代。**
+
 ## 目录
 
 - [基本信息](#基本信息)

diff --git a/doc/bug.md b/doc/bug.md
@@ -6,4 +6,5 @@
 - 捕获、过滤、发送配置在编辑之后需要重新点击选中一次才会生效：解决-调整配置逻辑
 - 分析界面出现加载上次分析结果的情况：解决-为每次分析定制json文件名称(由于·webEngine 加载上次的缓存，因此也可通过禁用缓存来解决)
 - 底部状态栏捕获配置不会自动更名
-- 配置界面点击ok按钮无反应
+- 配置界面点击ok按钮无反应
+- 由于大多数网卡没有物理地址，因此转发数据包时会失效。：使无地址网卡无法作为目标网卡。
diff --git a/pkit/res/config/filter.json b/pkit/res/config/filter.json
@@ -1 +1 @@
-[{"name":"default","expression":"","comment":"default config"}]
+[{"name":"default","expression":"","comment":"default config"},{"name":"ip dst loopback addr","expression":"ip dst 127.0.0.1","comment":"dst loopback addr"}]
diff --git a/pkit/res/history/filter.json b/pkit/res/history/filter.json
@@ -1 +1 @@
-{"history":["tcp","udp","ip src 192.168.2.107","ip dst 47.112.175.110","ip","dns","udp ","dst ff:ff:ff:ff:ff:ff","eth dst 00:00:00:00:00:01","DHCP","ip src 192.168.2.105","ip src 47.112.175.110","ip src 192.168.0.1","ip dst 127.0.0.1","ipv4","port 10408","port 11408","ip 192.168.2.105","tcp port 10408","ip src 192.168.2.107 and ip dst 239.255.255.250","arp","DHC"],"name":"filterHistory"}
+{"history":["udp","src port 8000","udp ","dst ff:ff:ff:ff:ff:ff","eth dst 00:00:00:00:00:01","ipv4","port 10408","src port 80","ip src 192.168.2.107 and ip dst 239.255.255.250","arp","tcp","ip src 192.168.2.107","ip dst 47.112.175.110","ip","dns","DHCP","ip src 192.168.2.105","ip dst 127.0.0.2","ip src 47.112.175.110","ip src 192.168.0.1","ip dst 127.0.0.1","port 11408","ip 192.168.2.105","tcp port 10408","DHC"],"name":"filterHistory"}
diff --git a/pkit/res/temp/tmp.pcapng b/pkit/res/temp/tmp.pcapng
diff --git a/pkit/res/web/api/ioLineChart.json b/pkit/res/web/api/ioLineChart.json
@@ -1 +1 @@
-{"pointStart":1588846543517,"pointInterval":1000,"dataLength":30,"data":[[6,0,1,0,4,0,8,0,2,0,2,0,3,0,1,0,6,0,5,0,8,0,21,0,32,0,25,0,17,0,1],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]}
+{"pointStart":1591432010269,"pointInterval":1000,"dataLength":68,"data":[[2,0,1,0,2,0,4,0,1,0,1,0,3,0,3,0,4,0,4,0,5,0,0,12,0,0,12,0,19,0,6,0,5,0,26,0,0,0,3,0,3,0,7,0,0,0,0,4,0,4,0,0,0,4,0,5,0,0,0,0,5,0,4,0,0,0,18,0,9],[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]}
diff --git a/pkit/res/web/api/ipv4StatBarChart.json b/pkit/res/web/api/ipv4StatBarChart.json
@@ -1 +1 @@
-{"data":{"125.39.132.162":11.185546875,"192.168.2.107":6.55078125,"47.112.175.110":2.3837890625,"220.194.95.147":0.5029296875,"118.178.135.232":0.15234375,"203.119.169.76":0.111328125,"128.16.39.218":0.08984375,"101.71.154.241":0.064453125,"54.222.174.10":0.064453125,"220.194.95.218":0.052734375,"128.16.39.217":0.044921875,"128.16.39.216":0.044921875}}
+{"data":{"139.226.172.190":17.2529296875,"192.168.43.12":7.6650390625,"183.232.93.22":2.67578125,"128.24.39.245":1.119140625,"128.24.39.247":1.0185546875,"120.241.186.91":0.888671875,"128.24.39.139":0.5595703125,"160.18.255.255":0.421875,"128.24.39.242":0.373046875,"118.178.135.232":0.3125,"183.220.199.249":0.193359375,"192.168.43.1":0.103515625,"223.252.199.69":0.076171875,"112.13.122.1":0.064453125,"218.201.36.35":0.064453125,"52.80.12.51":0.064453125,"128.16.39.139":0.044921875,"128.16.39.244":0.044921875,"128.16.39.243":0.044921875,"80.4.0.0":0.033203125}}
diff --git a/pkit/res/web/api/networkChart.json b/pkit/res/web/api/networkChart.json
@@ -1 +1 @@
-{"data":{"192.168.2.107:118.178.135.232":110,"192.168.2.107:101.71.154.241":66,"118.178.135.232:192.168.2.107":156,"101.71.154.241:192.168.2.107":66,"192.168.2.107:47.112.175.110":1461,"47.112.175.110:192.168.2.107":2441,"125.39.132.162:192.168.2.107":11454,"192.168.2.107:125.39.132.162":3895,"203.119.169.76:192.168.2.107":114,"192.168.2.107:203.119.169.76":108,"192.168.2.107:220.194.95.218":108,"192.168.2.107:220.194.95.147":894,"220.194.95.147:192.168.2.107":515,"220.194.95.218:192.168.2.107":54,"54.222.174.10:192.168.2.107":66,"192.168.2.107:54.222.174.10":66}}
+{"data":{"192.168.43.12:239.255.255.250":430,"192.168.43.12:52.80.12.51":120,"192.168.43.12:112.13.122.1":66,"112.13.122.1:192.168.43.12":66,"192.168.43.12:183.220.199.249":165,"183.220.199.249:192.168.43.12":198,"192.168.43.12:139.226.172.190":3772,"139.226.172.190:192.168.43.12":17667,"192.168.43.12:183.232.93.22":890,"183.232.93.22:192.168.43.12":2740,"192.168.43.12:118.178.135.232":280,"118.178.135.232:192.168.43.12":320,"192.168.43.12:192.168.43.255":552,"192.168.43.12:120.241.186.91":1316,"120.241.186.91:192.168.43.12":910,"192.168.43.12:218.201.36.35":55,"218.201.36.35:192.168.43.12":66,"52.80.12.51:192.168.43.12":66,"192.168.43.12:223.252.199.69":55,"223.252.199.69:192.168.43.12":78,"192.168.43.12:192.168.43.1":148,"192.168.43.1:192.168.43.12":106}}
diff --git a/pkit/res/web/api/o2sSankeyChart.json b/pkit/res/web/api/o2sSankeyChart.json
@@ -1 +1 @@
-{"data":{"118.178.135.232:443(TCP)":156,"443(TCP):192.168.2.107":156,"101.71.154.241:80(TCP)":66,"80(TCP):192.168.2.107":11754,"47.112.175.110:8888(TCP)":2441,"8888(TCP):192.168.2.107":2441,"125.39.132.162:80(TCP)":11454,"203.119.169.76:80(TCP)":114,"220.194.95.147:8080(TCP)":515,"8080(TCP):192.168.2.107":515,"220.194.95.218:80(TCP)":54,"54.222.174.10:80(TCP)":66}}
+{"data":{"112.13.122.1:80(TCP)":66,"80(TCP):192.168.43.12":1042,"183.220.199.249:443(TCP)":198,"443(TCP):192.168.43.12":584,"139.226.172.190:10017(TCP)":17667,"10017(TCP):192.168.43.12":17667,"183.232.93.22:8000(UDP)":2740,"8000(UDP):192.168.43.12":2740,"118.178.135.232:443(TCP)":320,"192.168.43.12:137(UDP)":552,"137(UDP):192.168.43.255":552,"120.241.186.91:80(TCP)":910,"218.201.36.35:443(TCP)":66,"52.80.12.51:80(TCP)":66,"223.252.199.69:6003(TCP)":78,"6003(TCP):192.168.43.12":78,"192.168.43.12:59656(UDP)":148,"59656(UDP):192.168.43.1":148,"192.168.43.1:53(UDP)":106,"53(UDP):192.168.43.12":106}}
diff --git a/pkit/res/web/api/protocolPieChart.json b/pkit/res/web/api/protocolPieChart.json
@@ -1 +1 @@
-{"data":{"TCP":0.9647887323943662,"IPv4":0.028169014084507043,"ARP":0.007042253521126761}}
+{"data":{"UDP":0.1875,"TCP":0.6420454545454546,"IPv4":0.13636363636363635,"ARP":0.03409090909090909}}
diff --git a/pkit/res/web/api/s2oSankeyChart.json b/pkit/res/web/api/s2oSankeyChart.json
@@ -1 +1 @@
-{"data":{"192.168.2.107:1788(TCP)":110,"1788(TCP):118.178.135.232":110,"192.168.2.107:12979(TCP)":66,"12979(TCP):101.71.154.241":66,"192.168.2.107:1786(TCP)":110,"1786(TCP):47.112.175.110":110,"192.168.2.107:12695(TCP)":262,"12695(TCP):47.112.175.110":262,"192.168.2.107:2912(TCP)":3895,"2912(TCP):125.39.132.162":3895,"192.168.2.107:11408(TCP)":751,"11408(TCP):47.112.175.110":751,"192.168.2.107:12752(TCP)":283,"12752(TCP):47.112.175.110":283,"192.168.2.107:1895(TCP)":55,"1895(TCP):47.112.175.110":55,"192.168.2.107:12943(TCP)":108,"12943(TCP):203.119.169.76":108,"192.168.2.107:12984(TCP)":108,"12984(TCP):220.194.95.218":108,"192.168.2.107:12980(TCP)":108,"12980(TCP):220.194.95.147":108,"192.168.2.107:12993(TCP)":786,"12993(TCP):220.194.95.147":786,"192.168.2.107:12897(TCP)":66,"12897(TCP):54.222.174.10":66}}
+{"data":{"192.168.43.12:57289(UDP)":430,"57289(UDP):239.255.255.250":430,"192.168.43.12:15318(TCP)":54,"15318(TCP):52.80.12.51":54,"192.168.43.12:15517(TCP)":66,"15517(TCP):112.13.122.1":66,"192.168.43.12:15402(TCP)":165,"15402(TCP):183.220.199.249":165,"192.168.43.12:14877(TCP)":2692,"14877(TCP):139.226.172.190":2692,"192.168.43.12:4026(UDP)":890,"4026(UDP):183.232.93.22":890,"192.168.43.12:14913(TCP)":280,"14913(TCP):118.178.135.232":280,"192.168.43.12:14967(TCP)":1080,"14967(TCP):139.226.172.190":1080,"192.168.43.12:137(UDP)":552,"137(UDP):192.168.43.255":552,"192.168.43.12:15353(TCP)":378,"15353(TCP):120.241.186.91":378,"192.168.43.12:15525(TCP)":938,"15525(TCP):120.241.186.91":938,"192.168.43.12:15394(TCP)":55,"15394(TCP):218.201.36.35":55,"192.168.43.12:15508(TCP)":66,"15508(TCP):52.80.12.51":66,"192.168.43.12:10160(TCP)":55,"10160(TCP):223.252.199.69":55,"192.168.43.12:59656(UDP)":148,"59656(UDP):192.168.43.1":148,"192.168.43.1:53(UDP)":106,"53(UDP):192.168.43.12":106}}
diff --git a/pkit/res/web/api/s2sSankeyChart.json b/pkit/res/web/api/s2sSankeyChart.json
@@ -1 +1 @@
-{"data":{}}
+{"data":{"192.168.43.12:137(UDP)":552,"137(UDP):192.168.43.255":552,"192.168.43.12:59656(UDP)":148,"59656(UDP):192.168.43.1":148,"192.168.43.1:53(UDP)":106,"53(UDP):192.168.43.12":106}}
diff --git a/pkit/src/main/java/gui/ctrl/bar/CaptureMenuBar.java b/pkit/src/main/java/gui/ctrl/bar/CaptureMenuBar.java
@@ -37,6 +37,7 @@ public class CaptureMenuBar {
 
     IndexView view;
 
+    //  文件菜单项目
     @FXML
     Menu fileMenu;
 
@@ -67,16 +68,14 @@ public class CaptureMenuBar {
     @FXML
     MenuItem quitItem;
 
-    /*
-    Tool
-     */
-
+    //  工具菜单项目
     @FXML
     MenuItem sendItem;
 
     @FXML
     MenuItem analysisItem;
 
+    //  关于菜单项目
     @FXML
     MenuItem websiteItem;
 
@@ -102,6 +101,7 @@ public void initialize() {
         recentMenu.getItems().add(new SeparatorMenuItem());
         ViewHandle.InitializeCapturePcapFileMenu(SettingProperty.capturePcapFileHistory, recentMenu);
 
+        //  初始化历史记录菜单的列表
         for (int i = 2; i < recentMenu.getItems().size(); i++) {
             RadioMenuItem item = (RadioMenuItem) recentMenu.getItems().get(i);
             item.setOnAction(new EventHandler<ActionEvent>() {

diff --git a/pkit/src/main/java/gui/ctrl/bar/FilterBar.java b/pkit/src/main/java/gui/ctrl/bar/FilterBar.java
@@ -151,6 +151,7 @@ public void handle(ActionEvent actionEvent) {
                             if (item.getText().equals(property.getName())) {
                                 filterBox.setValue(property.getExpression());
                                 view.setFilterProperty(property);
+                                // TODO: 2020/6/1 点击选择配置，应用过滤器
                                 break;
                             }
                         }