Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions applications/main/bad_usb/helpers/ducky_script_commands.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include <furi.h>
#include <furi_hal.h>
#include <storage/storage.h>
#include <lib/toolbox/strint.h>
#include "ducky_script.h"
#include "ducky_script_i.h"
Expand Down Expand Up @@ -253,6 +255,28 @@ static int32_t ducky_fnc_mouse_move(BadUsbScript* bad_usb, const char* line, int
return 0;
}

static int32_t ducky_fnc_string_from_file(BadUsbScript* bad_usb, const char* line, int32_t param) {
UNUSED(param);
char buffer[254];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works as a hard limit for file size - I think it should either be documented and checked or much higher

size_t read_bytes;
Storage* storage = furi_record_open("storage");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RECORD_STORAGE

File* file = storage_file_alloc(storage);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

file is leaked - never freed


line = &line[ducky_get_command_len(line) + 1];
if (file) {
storage_file_open(file, line, FSAM_READ, FSOM_OPEN_EXISTING);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing check if open was successful

read_bytes = storage_file_read(file, buffer, sizeof(buffer) - 1);
buffer[read_bytes] = '\0'; // Null-terminate the string
furi_string_set_str(bad_usb->string_print, buffer);
storage_file_close(file);
bool state = ducky_string(bad_usb, furi_string_get_cstr(bad_usb->string_print));
if(!state) {
return ducky_error(bad_usb, "Invalid string %s", line);
}
}
return 0;
}

static const DuckyCmd ducky_commands[] = {
{"REM", NULL, -1},
{"ID", NULL, -1},
Expand All @@ -279,6 +303,7 @@ static const DuckyCmd ducky_commands[] = {
{"MOUSE_MOVE", ducky_fnc_mouse_move, -1},
{"MOUSESCROLL", ducky_fnc_mouse_scroll, -1},
{"MOUSE_SCROLL", ducky_fnc_mouse_scroll, -1},
{"STRING_FROM_FILE", ducky_fnc_string_from_file, -1},
};

#define TAG "BadUsb"
Expand Down
9 changes: 5 additions & 4 deletions documentation/file_formats/BadUsbScriptFormat.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,11 @@ Up to 5 keys can be hold simultaneously.

## String

| Command | Parameters | Notes |
| ------- | ----------- | ----------------- |
| STRING | Text string | Print text string |
| STRINGLN | Text string | Print text string and press enter after it |
| Command | Parameters | Notes |
| ---------------- | ----------- | ----------------- |
| STRING | Text string | Print text string |
| STRINGLN | Text string | Print text string and press enter after it |
| STRING_FROM_FILE | File path | Print text contained in a file |

## String delay

Expand Down