Skip to content

Added CSA,Quiet commands and moved all BLE spams #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Clawzman wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Added CSA,Quiet commands and moved all BLE spams #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions wifi_marauder_companion/application.fam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
App(
appid="esp32_wifi_marauder",
name="[ESP32] WiFi Marauder",
fap_version=(7, 8),
fap_version=(7, 9),
apptype=FlipperAppType.EXTERNAL,
entry_point="wifi_marauder_app",
requires=["gui"],
stack_size=4 * 1024,
order=90,
fap_icon="wifi_10px.png",
fap_category="GPIO/ESP",
fap_category="GPIO",
fap_icon_assets="assets",
)
46 changes: 24 additions & 22 deletions wifi_marauder_companion/scenes/wifi_marauder_scene_start.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,14 @@
// For each command, define whether additional arguments are needed
// (enabling text input to fill them out), and whether the console
// text box should focus at the start of the output or the end
typedef enum {
NO_ARGS = 0,
INPUT_ARGS,
TOGGLE_ARGS
} InputArgs;
typedef enum { NO_ARGS = 0, INPUT_ARGS, TOGGLE_ARGS } InputArgs;

typedef enum {
FOCUS_CONSOLE_END = 0,
FOCUS_CONSOLE_START,
FOCUS_CONSOLE_TOGGLE
} FocusConsole;
typedef enum { FOCUS_CONSOLE_END = 0, FOCUS_CONSOLE_START, FOCUS_CONSOLE_TOGGLE } FocusConsole;

#define SHOW_STOPSCAN_TIP (true)
#define NO_TIP (false)
#define NO_TIP (false)

#define MAX_OPTIONS (16)
#define MAX_OPTIONS (17)
typedef struct {
const char* item_string;
const char* options_menu[MAX_OPTIONS];
Expand Down Expand Up @@ -98,21 +90,30 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
"badmsg",
"sleep",
"sae flood",
"sour apple",
"swiftpair spam",
"samsung spam",
"google spam",
"flipper spam",
"bt spam all"},
13,
"channel switch",
"quiet time"},
9,
{"attack -t deauth",
"attack -t probe",
"attack -t rickroll",
"attack -t funny",
"attack -t badmsg",
"attack -t sleep",
"attack -t sae",
"blespam -t apple",
"attack -t csa",
"attack -t quiet"},
NO_ARGS,
FOCUS_CONSOLE_END,
SHOW_STOPSCAN_TIP},
{"BLE Spam",
{"sour apple",
"swiftpair spam",
"samsung spam",
"google spam",
"flipper spam",
"bt spam all"},
6,
{"blespam -t apple",
"blespam -t windows",
"blespam -t samsung",
"blespam -t google",
Expand Down Expand Up @@ -186,8 +187,8 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
FOCUS_CONSOLE_END,
SHOW_STOPSCAN_TIP},
{"Sniff",
{"beacon", "deauth", "pmkid", "probe", "pwn", "raw", "bt", "skim", "airtag", "flipper", "flock", "mactrack", "packetcount", "pineapple", "multissid", "sae"},
16,
{"beacon", "deauth", "pmkid", "probe", "pwn", "raw", "bt", "skim", "airtag", "flipper", "flock", "meta", "mactrack", "packetcount", "pineapple", "multissid", "sae"},
17,
{"sniffbeacon",
"sniffdeauth",
"sniffpmkid",
Expand All @@ -199,6 +200,7 @@ const WifiMarauderItem items[NUM_MENU_ITEMS] = {
"sniffbt -t airtag",
"sniffbt -t flipper",
"sniffbt -t flock",
"sniffbt -t meta",
"mactrack",
"packetcount",
"sniffpinescan",
Expand Down
2 changes: 1 addition & 1 deletion wifi_marauder_companion/wifi_marauder_app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
extern "C" {
#endif

#define WIFI_MARAUDER_APP_VERSION "v0.7.8"
#define WIFI_MARAUDER_APP_VERSION "v0.7.9"

typedef struct WifiMarauderApp WifiMarauderApp;

Expand Down
30 changes: 15 additions & 15 deletions wifi_marauder_companion/wifi_marauder_app_i.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,30 @@
#include <gui/modules/submenu.h>
#include <gui/modules/variable_item_list.h>
#include <gui/modules/widget.h>
#include <gui/modules/text_input.h>
#include "wifi_marauder_text_input.h"

#include <esp32_wifi_marauder_icons.h>
#include <storage/storage.h>
#include <lib/toolbox/path.h>
#include <dialogs/dialogs.h>

#define NUM_MENU_ITEMS (32)
#define NUM_MENU_ITEMS (33)

#define WIFI_MARAUDER_TEXT_BOX_STORE_SIZE (4096)
#define WIFI_MARAUDER_TEXT_BOX_STORE_SIZE (4096)
#define WIFI_MARAUDER_TEXT_INPUT_STORE_SIZE (512)

#define MARAUDER_APP_FOLDER_USER "apps_data/marauder"
#define MARAUDER_APP_FOLDER EXT_PATH(MARAUDER_APP_FOLDER_USER)
#define MARAUDER_APP_FOLDER_HTML MARAUDER_APP_FOLDER "/html"
#define MARAUDER_APP_FOLDER_PCAPS MARAUDER_APP_FOLDER "/pcaps"
#define MARAUDER_APP_FOLDER_DUMPS MARAUDER_APP_FOLDER "/dumps"
#define MARAUDER_APP_FOLDER_LOGS MARAUDER_APP_FOLDER "/logs"
#define MARAUDER_APP_FOLDER_USER_PCAPS MARAUDER_APP_FOLDER_USER "/pcaps"
#define MARAUDER_APP_FOLDER_USER_LOGS MARAUDER_APP_FOLDER_USER "/logs"
#define MARAUDER_APP_FOLDER_SCRIPTS MARAUDER_APP_FOLDER "/scripts"
#define MARAUDER_APP_FOLDER_USER "apps_data/marauder"
#define MARAUDER_APP_FOLDER EXT_PATH(MARAUDER_APP_FOLDER_USER)
#define MARAUDER_APP_FOLDER_HTML MARAUDER_APP_FOLDER "/html"
#define MARAUDER_APP_FOLDER_PCAPS MARAUDER_APP_FOLDER "/pcaps"
#define MARAUDER_APP_FOLDER_DUMPS MARAUDER_APP_FOLDER "/dumps"
#define MARAUDER_APP_FOLDER_LOGS MARAUDER_APP_FOLDER "/logs"
#define MARAUDER_APP_FOLDER_USER_PCAPS MARAUDER_APP_FOLDER_USER "/pcaps"
#define MARAUDER_APP_FOLDER_USER_LOGS MARAUDER_APP_FOLDER_USER "/logs"
#define MARAUDER_APP_FOLDER_SCRIPTS MARAUDER_APP_FOLDER "/scripts"
#define MARAUDER_APP_SCRIPT_PATH(file_name) MARAUDER_APP_FOLDER_SCRIPTS "/" file_name ".json"
#define SAVE_PCAP_SETTING_FILEPATH MARAUDER_APP_FOLDER "/save_pcaps_here.setting"
#define SAVE_LOGS_SETTING_FILEPATH MARAUDER_APP_FOLDER "/save_logs_here.setting"
#define SAVE_PCAP_SETTING_FILEPATH MARAUDER_APP_FOLDER "/save_pcaps_here.setting"
#define SAVE_LOGS_SETTING_FILEPATH MARAUDER_APP_FOLDER "/save_logs_here.setting"

typedef enum WifiMarauderUserInputType {
WifiMarauderUserInputTypeString,
Expand All @@ -60,7 +60,7 @@ struct WifiMarauderApp {
FuriString* text_box_store;
size_t text_box_store_strlen;
TextBox* text_box;
TextInput* text_input;
WIFI_TextInput* text_input;
Storage* storage;
File* capture_file;
File* log_file;
Expand Down