From 04215b1394f99adf714c3af6cf1496bd84e4f407 Mon Sep 17 00:00:00 2001
From: Thorsten Sick <thorsten.sick@avast.com>
Date: Tue, 13 Jul 2021 11:06:21 +0200
Subject: [PATCH] Fixed plugins

---
 plugins/base/sensor.py                                      | 6 +++---
 .../metasploit_clearev_t1070/metasploit_clearev_t1070.py    | 2 +-
 .../metasploit_getuid_t1033/metasploit_getuid.py            | 2 +-
 .../metasploit_sysinfo_t1082/metasploit_sysinfo.py          | 2 +-
 tests/data/partial.yaml                                     | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/base/sensor.py b/plugins/base/sensor.py
index 8529048..a7f07ad 100644
--- a/plugins/base/sensor.py
+++ b/plugins/base/sensor.py
@@ -39,7 +39,7 @@ class SensorPlugin(BasePlugin):
         """ Install the sensor. Executed on the target. Take the sensor from the share and (maybe) copy it to its destination. Do some setup
         """
 
-        raise NotImplementedError
+        raise True
 
     def start(self, disown=None):
         """ Start the sensor. The connection to the client is disowned here. = Sent to background. This keeps the process running.
@@ -47,12 +47,12 @@ class SensorPlugin(BasePlugin):
         @param disown: Send async into background
         """
 
-        raise NotImplementedError
+        raise True
 
     def stop(self):
         """ Stop the sensor """
 
-        raise NotImplementedError
+        raise True
 
     def __call_collect__(self, machine_path):
         """ Generate the data collect command
diff --git a/plugins/default/metasploit_attacks/metasploit_clearev_t1070/metasploit_clearev_t1070.py b/plugins/default/metasploit_attacks/metasploit_clearev_t1070/metasploit_clearev_t1070.py
index 8cc46c4..e3fb0d0 100644
--- a/plugins/default/metasploit_attacks/metasploit_clearev_t1070/metasploit_clearev_t1070.py
+++ b/plugins/default/metasploit_attacks/metasploit_clearev_t1070/metasploit_clearev_t1070.py
@@ -6,7 +6,7 @@ from plugins.base.attack import AttackPlugin
 from app.metasploit import MetasploitInstant
 
 
-class MetasploitMigratePlugin(AttackPlugin):
+class MetasploitClearevPlugin(AttackPlugin):
 
     # Boilerplate
     name = "metasploit_clearev"
diff --git a/plugins/default/metasploit_attacks/metasploit_getuid_t1033/metasploit_getuid.py b/plugins/default/metasploit_attacks/metasploit_getuid_t1033/metasploit_getuid.py
index 93dde65..f83e7bc 100644
--- a/plugins/default/metasploit_attacks/metasploit_getuid_t1033/metasploit_getuid.py
+++ b/plugins/default/metasploit_attacks/metasploit_getuid_t1033/metasploit_getuid.py
@@ -6,7 +6,7 @@ from plugins.base.attack import AttackPlugin
 from app.metasploit import MetasploitInstant
 
 
-class MetasploitKeyloggingPlugin(AttackPlugin):
+class MetasploitGetuidPlugin(AttackPlugin):
 
     # Boilerplate
     name = "metasploit_getuid"
diff --git a/plugins/default/metasploit_attacks/metasploit_sysinfo_t1082/metasploit_sysinfo.py b/plugins/default/metasploit_attacks/metasploit_sysinfo_t1082/metasploit_sysinfo.py
index 3e1d1aa..71647fa 100644
--- a/plugins/default/metasploit_attacks/metasploit_sysinfo_t1082/metasploit_sysinfo.py
+++ b/plugins/default/metasploit_attacks/metasploit_sysinfo_t1082/metasploit_sysinfo.py
@@ -6,7 +6,7 @@ from plugins.base.attack import AttackPlugin
 from app.metasploit import MetasploitInstant
 
 
-class MetasploitKeyloggingPlugin(AttackPlugin):
+class MetasploitSysinfoPlugin(AttackPlugin):
 
     # Boilerplate
     name = "metasploit_sysinfo"
diff --git a/tests/data/partial.yaml b/tests/data/partial.yaml
index 11ac422..84a076e 100644
--- a/tests/data/partial.yaml
+++ b/tests/data/partial.yaml
@@ -116,8 +116,8 @@ caldera_attacks:
     - "bd527b63-9f9e-46e0-9816-b8434d2b8989"
 
 ###
-# Kali tool based attacks. Will result in kali commandline tools to be called. Currently supported are: "hydra"
-kali_attacks:
+# Plugin based attacks. Will result in plugins being called
+plugin_based_attacks:
   ###
   # Linux specific attacks, a list
   linux: