Merge branch 'dos-dual-deauth' into 'master'

add deauth method combination option See merge request 2020-dp-wifi-attacks-using-esp32-8266/esp32-wifi-penetration-tool!41
risinek · Apr 7, 2021 · e84e4a3 · e84e4a3
2 parents 549cdaa + a62e9b2
commit e84e4a3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/components/webserver/pages/page_index.h b/components/webserver/pages/page_index.h
@@ -330,7 +330,7 @@ const char page_index[] =
             "case AttackTypeEnum.ATTACK_TYPE_DOS:\n"
                 "console.log(\"DOS configuration\");\n"
                 "document.getElementById(\"attack_timeout\").value = 120;\n"
-                "setAttackMethods([\"DEAUTH_ROGUE_AP (PASSIVE)\", \"DEAUTH_BROADCAST (ACTIVE)\"]);\n"
+                "setAttackMethods([\"DEAUTH_ROGUE_AP (PASSIVE)\", \"DEAUTH_BROADCAST (ACTIVE)\", \"DEAUTH_COMBINE_ALL\"]);\n"
                 "break;\n"
             "default:\n"
                 "console.log(\"Unknown attack type\");\n"

diff --git a/components/webserver/utils/index.html b/components/webserver/utils/index.html
@@ -326,7 +326,7 @@ <h2>Attack configuration</h2>
             case AttackTypeEnum.ATTACK_TYPE_DOS:
                 console.log("DOS configuration");
                 document.getElementById("attack_timeout").value = 120;
-                setAttackMethods(["DEAUTH_ROGUE_AP (PASSIVE)", "DEAUTH_BROADCAST (ACTIVE)"]);
+                setAttackMethods(["DEAUTH_ROGUE_AP (PASSIVE)", "DEAUTH_BROADCAST (ACTIVE)", "DEAUTH_COMBINE_ALL"]);
                 break;
             default:
                 console.log("Unknown attack type");

diff --git a/main/attack_dos.c b/main/attack_dos.c
@@ -31,6 +31,11 @@ void attack_dos_start(attack_config_t *attack_config) {
             ESP_LOGD(TAG, "ATTACK_DOS_METHOD_ROGUE_AP");
             attack_method_rogueap(attack_config->ap_record);
             break;
+        case ATTACK_DOS_METHOD_COMBINE_ALL:
+            ESP_LOGD(TAG, "ATTACK_DOS_METHOD_ROGUE_AP");
+            attack_method_rogueap(attack_config->ap_record);
+            attack_method_broadcast(attack_config->ap_record, 1);
+            break;
         default:
             ESP_LOGE(TAG, "Method unknown! DoS attack not started.");
     }
@@ -45,6 +50,11 @@ void attack_dos_stop() {
             wifictl_mgmt_ap_start();
             wifictl_restore_ap_mac();
             break;
+        case ATTACK_DOS_METHOD_COMBINE_ALL:
+            attack_method_broadcast_stop();
+            wifictl_mgmt_ap_start();
+            wifictl_restore_ap_mac();
+            break;
         default:
             ESP_LOGE(TAG, "Unknown attack method! Attack may not be stopped properly.");
     }

diff --git a/main/attack_dos.h b/main/attack_dos.h
@@ -19,6 +19,7 @@ typedef enum{
     ATTACK_DOS_METHOD_ROGUE_AP,   ///< Method using rogue/duplicated AP utilising native ESP-IDF behaviour only
     ATTACK_DOS_METHOD_BROADCAST,  ///< Method that takes advantage of WSL Bypasser component that bypass blocking mechanism in Wi-Fi Stack Libraries 
                                   /// to send raw 802.11 frames
+    ATTACK_DOS_METHOD_COMBINE_ALL ///< Method combines all approches above 
 } attack_dos_methods_t;
 
 /**