Merge pull request #48 from fkie-cad/dev

Merge dev into main

provisioning/ansible/roles/configure_win10_client/files/win10_assets/init_tbf_client.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

provisioning/ansible/roles/configure_win10_client/files/win10_assets/run_userbehavior.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

provisioning/ansible/roles/configure_win10_client/files/win10_assets/test_init_tbf_client.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

provisioning/ansible/roles/external_mail_handler/files/external_mail_handler.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

provisioning/ansible/roles/external_mail_handler/files/test_external_mail_handler.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

provisioning/ansible/roles/postfix/files/useraccounts/create_email_accounts.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

provisioning/ansible/roles/samba/files/useraccounts/create_samba_accounts.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

requirements.txt

@@ -1,6 +1,6 @@
 ansible==5.1.0
 colorama==0.4.1
-paramiko==2.7.2
+paramiko==2.10.1
 pytest==5.2.0
 pyvmomi==6.7.1.2018.12
 pywinrm==0.4.1

setup.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack_c2_exfiltration.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack_change_wallpaper.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack_download_malware.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack_download_malware_meterpreter.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack_email_exe.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack_execute_malware.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack_flashdrive_exe.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack_flashdrive_exfiltration.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack_hashdump.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack_kill_reverse_connection.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack_mimikatz.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack_set_autostart.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack_sqlmap.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attack_take_screenshot.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/attackconsole.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #
@@ -140,11 +140,14 @@ def do_options(self, arg):
         print(v)
 
     def do_set(self, arg):
-        option, value = shlex.split(arg)[:2]
-        if option in self.attack_option_descriptions.keys():
-            self.attack.options.__setattr__(option, value)
+        if len(shlex.split(arg)) == 2:
+            option, value = shlex.split(arg)[:2]
+            if option in self.attack_option_descriptions.keys():
+                self.attack.options.__setattr__(option, value)
+            else:
+                print(f"*** Unknown option: {option}")
         else:
-            print("*** Unknown option: {option}".format(option=option))
+            print("*** Invalid number of option arguments\n*** Usage: set <option> <value>")
 
     def complete_set(self, text, line, begidx, endidx):
         return [option + " " for option in self.attack_option_descriptions.keys() if
@@ -297,7 +300,11 @@ def main(argv=None):
     args = parse_args(argv=argv)
     setup_logging(level=logging.INFO, log_file=args.log_file, log_to_console=args.verbose)
     console = AttackConsole()
-    console.cmdloop(intro=IntroGenerator().generate())
+    try:
+        console.cmdloop(intro=IntroGenerator().generate())
+    except KeyboardInterrupt:
+        print("\n*** Keyboard Interrupt, closing attackconsole.")
+        console.do_exit(argv)
 
 
 if __name__ == '__main__':

src/attacks/generateattackchains.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/printer.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/reverseconnectionhandler.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/ssh.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_attack.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_attack_c2_exfiltration.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_attack_download_malware.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_attack_email_exe.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_attack_execute_malware.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_attack_flashdrive_exe.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_attack_flashdrive_exfiltration.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_attack_hashdump.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_attack_kill_reverse_connection.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_attack_mimikatz.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_attack_set_autostart.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_attack_sqlmap.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_attackconsole.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_generateattackchains.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_printer.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_reverseconnectionhandler.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/attacks/tests/test_ssh.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/systests/__init__.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/systests/helpers.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/systests/test_attacks.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #
@@ -60,9 +60,10 @@ def timeout_counter():
 @pytest.mark.usefixtures("session")
 class TestAttack:
     attacks = [
-        # Misc attacks: These attacks are all self-contained, their order does not matter.
+        # Dependent misc attacks: Attacks need to be executed in this order
         DownloadMalwareAttack(),
         ExecuteMalwareAttack(),
+        # Independent misc attacks: Attacks are self-contained, their order does not matter.
         FlashdriveExfiltrationAttack(),
         SetAutostartAttack(),
         SQLMapAttack(),

src/systests/test_client_management_ips.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #

src/systests/test_helpers.py

@@ -1,4 +1,4 @@
-# Copyright 2016-2021 Fraunhofer FKIE
+# Copyright 2016-2022 Fraunhofer FKIE
 #
 # This file is part of SOCBED.
 #