Modified: merge plugins belongs to same vpn service

3 files changed, 105 insertions, 207 deletions

diff --git a/test/__pycache__/test_vpn_detector.cpython-39.pyc b/test/__pycache__/test_vpn_detector.cpython-39.pyc
index 152359b..7da115a 100644
--- a/test/__pycache__/test_vpn_detector.cpython-39.pyc
+++ b/test/__pycache__/test_vpn_detector.cpython-39.pyc
diff --git a/test/test_plugins.py b/test/test_plugins.py
index 88358b0..4787b97 100644
--- a/test/test_plugins.py
+++ b/test/test_plugins.py
@@ -8,285 +8,183 @@
 
 import unittest
 
-from cyberghostvpn_serverip import CyberghostvpnServerip
-from cyberghostvpn_servername import CyberghostvpnServername
-from detection.vpnservices.hotspotvpn_serverip import HotspotvpnServerip
-from geckovpn_serverip import GeckovpnServerip
-from ipvanishvpn_serverip import IpvanishvpnServerip
-from ipvanishvpn_servername import IpvanishvpnServername
-from ivacyvpn_serverip import IvacyvpnServerip
-from ivacyvpn_servername import IvacyvpnServername
-
-from detection.vpnservices.turbovpn_serverip import TurbovpnServerip
-from protonvpn_serverip import ProtonvpnServerip
-from vpnunlimited_serverip import VpnunlimitedServerip
-from windscribevpn_servername import WindscribevpnServername
-from windscribevpn_serverip import WindscribevpnServerip
+from cyberghostvpn import CyberghostvpnServerip, CyberghostvpnServername, Cyberghostvpn
+from detection.vpnservices.hotspotvpn import Hotspotvpn
+from geckovpn import Geckovpn
+from ipvanishvpn import Ipvanishvpn, IpvanishvpnServerip, IpvanishvpnServername
 
+from ivacyvpn import IvacyvpnServerip, IvacyvpnServername, Ivacyvpn
 
-class TestHotspotvpnServerip(unittest.TestCase):
-
-    def setUp(self):
-        self.hotspotvpn_detector = HotspotvpnServerip(start_time='2024-01-17 00:00:00', end_time='2024-01-18 00:00:00')
+from detection.vpnservices.turbovpn import Turbovpn
+from protonvpn import Protonvpn
+from vpnunlimited import Vpnunlimited
+from windscribevpn import WindscribevpnServername, Windscribevpn
 
-    def test_get_hotspotvpn_serverip(self):
-        self.result = self.hotspotvpn_detector.find_server()
-        print(self.result)
 
-    def test_save_to_knowledgebase(self):
-        self.hotspotvpn_detector.save_to_knowledgebase(object_type='ip',
-                                                       object_list=self.hotspotvpn_detector.find_server(),
-                                                       vpn_service_name=self.hotspotvpn_detector.vpn_service_name,
-                                                       plugin_id=self.hotspotvpn_detector.plugin_id,
-                                                       plugin_name=self.hotspotvpn_detector.plugin_name,
-                                                       output_filename=self.hotspotvpn_detector.output_file_name,
-                                                       confidence=self.hotspotvpn_detector.confidence)
-
-
-class TestGeckovpnServerip(unittest.TestCase):
+class TestHotspotvpnServerip(unittest.TestCase):
 
     def setUp(self):
-        self.geckovpn_detector = GeckovpnServerip(start_time='2023-10-17 00:00:00', end_time='2023-10-18 00:00:00')
+        self.hotspotvpn_detector = Hotspotvpn(start_time='2023-10-17 10:00:00', end_time='2023-10-17 20:00:00')
 
-    def test_get_geckovpn_serverip(self):
-        self.result = self.geckovpn_detector.find_server()
-        print(self.result)
-
-    def test_save_to_knowledgebase(self):
-        self.geckovpn_detector.save_to_knowledgebase(object_type='ip',
-                                                      object_list=self.geckovpn_detector.find_server(),
-                                                      vpn_service_name=self.geckovpn_detector.vpn_service_name,
-                                                      plugin_id=self.geckovpn_detector.plugin_id,
-                                                      plugin_name=self.geckovpn_detector.plugin_name,
-                                                      output_filename=self.geckovpn_detector.output_file_name,
-                                                      confidence=self.geckovpn_detector.confidence)
 
+    def test_get_hotspotvpn_serverip(self):
+        self.result = self.hotspotvpn_detector.find_server()
+        for result in self.result:
+            print(result.object_type)
+            print(result.server_list)
 
 
-class TestCyberghostvpnServerip(unittest.TestCase):
+class TestIpvanishvpnServername(unittest.TestCase):
 
     def setUp(self):
-        self.cyberghostvpn_detector = CyberghostvpnServerip(start_time='2024-01-17 10:00:00', end_time='2024-01-18 00:00:00')
+        self.ipvanishvpn_detector = IpvanishvpnServername(start_time='2023-10-17 00:00:00', end_time='2023-10-18 00:00:00')
 
-    def test_get_cyberghostvpn_serverip(self):
-        self.result = self.cyberghostvpn_detector.find_server()
+    def test_get_ipvanishvpn_servername(self):
+        self.result = self.ipvanishvpn_detector.find_server()
+        for result in self.result:
+            print(result.object_type)
+            print(result.server_list)
 
     def test_save_to_knowledgebase(self):
-        self.cyberghostvpn_detector.save_to_knowledgebase(object_type='ip',
-                                                       object_list=self.cyberghostvpn_detector.find_server(),
-                                                       vpn_service_name=self.cyberghostvpn_detector.vpn_service_name,
-                                                       plugin_id=self.cyberghostvpn_detector.plugin_id,
-                                                       plugin_name=self.cyberghostvpn_detector.plugin_name,
-                                                       output_filename=self.cyberghostvpn_detector.output_file_name,
-                                                       confidence=self.cyberghostvpn_detector.confidence)
-
-
-class TestCyberghostvpnServername(unittest.TestCase):
-
-    def setUp(self):
-        self.cyberghostvpn_detector = CyberghostvpnServername(start_time='2024-01-17 10:00:00', end_time='2024-01-18 00:00:00')
-
-    def test_get_cyberghostvpn_servername(self):
-        self.result = self.cyberghostvpn_detector.find_server()
+        self.ipvanishvpn_detector.save_to_knowledgebase(object_type='domain',
+                                                       object_list=self.ipvanishvpn_detector.find_server(),
+                                                       vpn_service_name=self.ipvanishvpn_detector.vpn_service_name,
+                                                       plugin_id=self.ipvanishvpn_detector.plugin_id,
+                                                       plugin_name=self.ipvanishvpn_detector.plugin_name,
+                                                       output_filename=self.ipvanishvpn_detector.output_file_name,
+                                                       confidence=self.ipvanishvpn_detector.confidence)
 
-    def test_save_to_knowledgebase(self):
-        self.cyberghostvpn_detector.save_to_knowledgebase(object_type='domain',
-                                                       object_list=self.cyberghostvpn_detector.find_server(),
-                                                       vpn_service_name=self.cyberghostvpn_detector.vpn_service_name,
-                                                       plugin_id=self.cyberghostvpn_detector.plugin_id,
-                                                       plugin_name=self.cyberghostvpn_detector.plugin_name,
-                                                       output_filename=self.cyberghostvpn_detector.output_file_name,
-                                                       confidence=self.cyberghostvpn_detector.confidence)
 
 class TestIpvanishvpnServerip(unittest.TestCase):
 
     def setUp(self):
-        self.ipvanishvpn_detector = IpvanishvpnServerip(start_time='2023-10-17 00:00:00',
-                                                        end_time='2023-10-18 00:00:00')
+        self.ipvanishvpn_detector = IpvanishvpnServerip()
 
     def test_get_ipvanishvpn_serverip(self):
         self.result = self.ipvanishvpn_detector.find_server()
-
-    def test_save_to_knowledgebase(self):
-        self.ipvanishvpn_detector.save_to_knowledgebase(object_type='ip',
-                                                        object_list=self.ipvanishvpn_detector.find_server(),
-                                                        vpn_service_name=self.ipvanishvpn_detector.vpn_service_name,
-                                                        plugin_id=self.ipvanishvpn_detector.plugin_id,
-                                                        plugin_name=self.ipvanishvpn_detector.plugin_name,
-                                                        output_filename=self.ipvanishvpn_detector.output_file_name,
-                                                        confidence=self.ipvanishvpn_detector.confidence)
+        for result in self.result:
+            print(result.object_type)
+            print(result.server_list)
 
 
-class TestIpvanishvpnServername(unittest.TestCase):
+class TestIpvanishvpn(unittest.TestCase):
 
     def setUp(self):
-        self.ipvanishvpn_detector = IpvanishvpnServername(start_time='2024-01-17 00:00:00', end_time='2024-01-18 00:00:00')
+        self.ipvanishvpn_detector = Ipvanishvpn(start_time='2023-10-17 00:00:00', end_time='2023-10-18 00:00:00')
 
-    def test_get_ipvanishvpn_servername(self):
+    def test_get_ipvanishvpn_serverip(self):
         self.result = self.ipvanishvpn_detector.find_server()
-
-    def test_save_to_knowledgebase(self):
-        self.ipvanishvpn_detector.save_to_knowledgebase(object_type='domain',
-                                                       object_list=self.ipvanishvpn_detector.find_server(),
-                                                       vpn_service_name=self.ipvanishvpn_detector.vpn_service_name,
-                                                       plugin_id=self.ipvanishvpn_detector.plugin_id,
-                                                       plugin_name=self.ipvanishvpn_detector.plugin_name,
-                                                       output_filename=self.ipvanishvpn_detector.output_file_name,
-                                                       confidence=self.ipvanishvpn_detector.confidence)
-
+        for result in self.result:
+            print(result.object_type)
+            print(result.server_list)
 
 
 
 class TestIvacyvpnServername(unittest.TestCase):
 
-    def setUp(self):
-        self.ivacyvpn_detector = IvacyvpnServername(start_time='2023-10-17 00:00:00',
-                                                  end_time='2023-10-18 00:00:00')
+        def setUp(self):
+            self.ivacyvpn_detector = IvacyvpnServername(start_time='2023-10-17 00:00:00', end_time='2023-10-18 00:00:00')
 
-    def test_get_ivacyvpn_servername(self):
-        self.result = self.ivacyvpn_detector.find_server()
+        def test_get_ivacyvpn_servername(self):
+            self.result = self.ivacyvpn_detector.find_server()
+            for result in self.result:
+                print(result.object_type)
+                print(result.server_list)
 
-    def test_save_to_knowledgebase(self):
-        self.ivacyvpn_detector.save_to_knowledgebase(object_type='domain',
-                                                      object_list=self.ivacyvpn_detector.find_server(),
-                                                      vpn_service_name=self.ivacyvpn_detector.vpn_service_name,
-                                                      plugin_id=self.ivacyvpn_detector.plugin_id,
-                                                      plugin_name=self.ivacyvpn_detector.plugin_name,
-                                                      output_filename=self.ivacyvpn_detector.output_file_name,
-                                                      confidence=self.ivacyvpn_detector.confidence)
 
 
 class TestIvacyvpnServerip(unittest.TestCase):
 
     def setUp(self):
-        self.ivacyvpn_detector = IvacyvpnServerip(start_time='2023-10-16 00:00:00',
-                                                  end_time='2023-10-19 00:00:00')
+        self.ivacyvpn_detector = IvacyvpnServerip()
 
-    def test_get_ivacyvpn_serverip(self):
+    def test_get_ivacyvpn_servername(self):
         self.result = self.ivacyvpn_detector.find_server()
+        for result in self.result:
+            print(result.object_type)
+            print(result.server_list)
 
-    def test_save_to_knowledgebase(self):
-        self.ivacyvpn_detector.save_to_knowledgebase(object_type='ip',
-                                                      object_list=self.ivacyvpn_detector.find_server(),
-                                                      vpn_service_name=self.ivacyvpn_detector.vpn_service_name,
-                                                      plugin_id=self.ivacyvpn_detector.plugin_id,
-                                                      plugin_name=self.ivacyvpn_detector.plugin_name,
-                                                      output_filename=self.ivacyvpn_detector.output_file_name,
-                                                      confidence=self.ivacyvpn_detector.confidence)
 
-class TestTurbovpnServerip(unittest.TestCase):
+class TestIvacyvpn(unittest.TestCase):
 
     def setUp(self):
-        self.turbovpn_detector = TurbovpnServerip(start_time='2024-01-16 00:00:00',
-                                                  end_time='2024-01-19 00:00:00')
+        self.ivacyvpn_detector = Ivacyvpn(start_time='2023-10-17 00:00:00', end_time='2023-10-18 00:00:00')
 
-    def test_get_turbovpn_serverip(self):
-        self.result = self.turbovpn_detector.find_server()
+    def test_get_ivacyvpn_servername(self):
+        self.result = self.ivacyvpn_detector.find_server()
+        for result in self.result:
+            print(result.object_type)
+            print(result.server_list)
 
-    def test_save_to_knowledgebase(self):
-        self.turbovpn_detector.save_to_knowledgebase(object_type='ip',
-                                                      object_list=self.turbovpn_detector.find_server(),
-                                                      vpn_service_name=self.turbovpn_detector.vpn_service_name,
-                                                      plugin_id=self.turbovpn_detector.plugin_id,
-                                                      plugin_name=self.turbovpn_detector.plugin_name,
-                                                      output_filename=self.turbovpn_detector.output_file_name,
-                                                      confidence=self.turbovpn_detector.confidence)
 
 
-class TestVpnunlimitedServerip(unittest.TestCase):
+class TestProtonvpn(unittest.TestCase):
 
     def setUp(self):
-        self.vpnunlimited_detector = VpnunlimitedServerip(start_time='2023-10-16 00:00:00',
-                                                  end_time='2023-10-19 00:00:00')
+        self.protonvpn_detector = Protonvpn(start_time='2023-10-17 00:00:00', end_time='2023-10-18 00:00:00')
 
-    def test_get_vpnunlimited_serverip(self):
-        self.result = self.vpnunlimited_detector.find_server()
-        print(self.result)
+    def test_get_protonvpn_serverip(self):
+        self.result = self.protonvpn_detector.find_server()
+        for result in self.result:
+            print(result.object_type)
+            print(result.server_list)
 
-    def test_save_to_knowledgebase(self):
-        self.vpnunlimited_detector.save_to_knowledgebase(object_type='ip',
-                                                      object_list=self.vpnunlimited_detector.find_server(),
-                                                      vpn_service_name=self.vpnunlimited_detector.vpn_service_name,
-                                                      plugin_id=self.vpnunlimited_detector.plugin_id,
-                                                      plugin_name=self.vpnunlimited_detector.plugin_name,
-                                                      output_filename=self.vpnunlimited_detector.output_file_name,
-                                                      confidence=self.vpnunlimited_detector.confidence)
 
-class TestWindscribevpnServername(unittest.TestCase):
+class TestCyberghostvpn(unittest.TestCase):
 
     def setUp(self):
-        self.windscribevpn_detector = WindscribevpnServername(start_time='2024-01-16 00:00:00',
-                                                  end_time='2024-01-19 00:00:00')
-
-    def test_get_windscribevpn_servername(self):
-        self.result = self.windscribevpn_detector.find_server()
-        print(self.result)
-
-    def test_save_to_knowledgebase(self):
-        self.windscribevpn_detector.save_to_knowledgebase(object_type='domain',
-                                                      object_list=self.windscribevpn_detector.find_server(),
-                                                      vpn_service_name=self.windscribevpn_detector.vpn_service_name,
-                                                      plugin_id=self.windscribevpn_detector.plugin_id,
-                                                      plugin_name=self.windscribevpn_detector.plugin_name,
-                                                      output_filename=self.windscribevpn_detector.output_file_name,
-                                                      confidence=self.windscribevpn_detector.confidence)
+        self.cyberghostvpn_detector = Cyberghostvpn(start_time='2023-10-17 00:00:00', end_time='2023-10-18 00:00:00')
 
+    def test_get_cyberghostvpn_serverip(self):
+        self.result = self.cyberghostvpn_detector.find_server()
+        for result in self.result:
+            print(result.object_type)
+            print(result.server_list)
 
 
-class TestWindscribevpnServerip(unittest.TestCase):
+class TestWindscribevpn(unittest.TestCase):
 
         def setUp(self):
-            self.windscribevpn_detector = WindscribevpnServerip()
+            self.windscribevpn_detector = Windscribevpn(start_time='2023-10-17 00:00:00', end_time='2023-10-18 00:00:00')
 
         def test_get_windscribevpn_serverip(self):
             self.result = self.windscribevpn_detector.find_server()
-            print(self.result)
+            for result in self.result:
+                print(result.object_type)
+                print(result.server_list)
 
-        def test_save_to_knowledgebase(self):
-            self.windscribevpn_detector.save_to_knowledgebase(object_type='ip',
-                                                        object_list=self.windscribevpn_detector.find_server(),
-                                                        vpn_service_name=self.windscribevpn_detector.vpn_service_name,
-                                                        plugin_id=self.windscribevpn_detector.plugin_id,
-                                                        plugin_name=self.windscribevpn_detector.plugin_name,
-                                                        output_filename=self.windscribevpn_detector.output_file_name,
-                                                        confidence=self.windscribevpn_detector.confidence)
 
+class TestTurbovpn(unittest.TestCase):
 
-class TestProtonvpnServerip(unittest.TestCase):
+    def setUp(self):
+        self.turbovpn_detector = Turbovpn(start_time='2023-10-17 00:00:00', end_time='2023-10-18 00:00:00')
 
-        def setUp(self):
-            self.protonvpn_detector = ProtonvpnServerip(start_time='2023-10-16 00:00:00',
-                                                    end_time='2023-10-30 00:00:00')
+    def test_get_turbovpn_serverip(self):
+        self.result = self.turbovpn_detector.find_server()
+        for result in self.result:
+            print(result.object_type)
+            print(result.server_list)
 
-        def test_get_protonvpn_serverip(self):
-            self.result = self.protonvpn_detector.find_server()
-            print(self.result)
 
-        def test_save_to_knowledgebase(self):
-            self.protonvpn_detector.save_to_knowledgebase(object_type='ip',
-                                                        object_list=self.protonvpn_detector.find_server(),
-                                                        vpn_service_name=self.protonvpn_detector.vpn_service_name,
-                                                        plugin_id=self.protonvpn_detector.plugin_id,
-                                                        plugin_name=self.protonvpn_detector.plugin_name,
-                                                        output_filename=self.protonvpn_detector.output_file_name,
-                                                        confidence=self.protonvpn_detector.confidence)
+class TestGeckovpn(unittest.TestCase):
 
+        def setUp(self):
+            self.geckovpn_detector = Geckovpn(start_time='2023-10-17 00:00:00', end_time='2023-10-18 00:00:00')
 
+        def test_get_geckovpn_serverip(self):
+            self.result = self.geckovpn_detector.find_server()
+            for result in self.result:
+                print(result.object_type)
+                print(result.server_list)
 
-if __name__ == '__main__':
-    # # 运行指定测试用例
-    suite = unittest.TestSuite()
-    suite.addTest(TestHotspotvpnServerip('test_get_hotspotvpn_serverip'))
-    suite.addTest(TestGeckovpnServerip('test_get_geckovpn_serverip'))
-    suite.addTest(TestCyberghostvpnServerip('test_get_cyberghostvpn_serverip'))
-    suite.addTest(TestCyberghostvpnServername('test_get_cyberghostvpn_servername'))
-    suite.addTest(TestIpvanishvpnServerip('test_get_ipvanishvpn_serverip'))
-    suite.addTest(TestIpvanishvpnServername('test_get_ipvanishvpn_servername'))
-    suite.addTest(TestIvacyvpnServername('test_get_ivacyvpn_servername'))
-    suite.addTest(TestIvacyvpnServerip('test_get_ivacyvpn_serverip'))
-    suite.addTest(TestTurbovpnServerip('test_get_turbovpn_serverip'))
-    runner = unittest.TextTestRunner()
-    runner.run(suite)
 
+class TestVpnunlimited(unittest.TestCase):
 
+        def setUp(self):
+            self.vpnunlimited_detector = Vpnunlimited(start_time='2023-10-17 00:00:00', end_time='2023-10-18 00:00:00')
 
+        def test_get_vpnunlimited_serverip(self):
+            self.result = self.vpnunlimited_detector.find_server()
+            for result in self.result:
+                print(result.object_type)
+                print(result.server_list)
\ No newline at end of file
diff --git a/test/test_vpn_detector.py b/test/test_vpn_detector.py
index c8a6a50..bebc2af 100644
--- a/test/test_vpn_detector.py
+++ b/test/test_vpn_detector.py
@@ -29,11 +29,11 @@ class TestVpnDetector(unittest.TestCase):
 
     def test_file_to_knowledgebase(self):
         object_list = []
-        with open('data/psiphon3_serverip/as12876_psiphon_builtin.txt', 'r') as f:
+        with open('data/protonvpn_serverip/protonvpn_serverip_builtin.txt', 'r') as f:
             for line in f.readlines():
                 object_list.append(line.strip())
 
-        self.vpn_detector.save_to_knowledgebase(object_type='ip', object_list=object_list, vpn_service_name='psiphon3vpn',
-                                                plugin_name='psiphon3vpn_serverip', plugin_id=4, output_filename='psiphon3vpn_serverip_builtin.csv', confidence='confirmed')
+        self.vpn_detector.save_to_knowledgebase(object_type='ip', object_list=object_list, vpn_service_name='protonvpn',
+                                                plugin_name='protonvpn_serverip', plugin_id=14, output_filename='protonvpn_serverip_builtin.csv', confidence='suspected')