Monkey: Support WINDOW EXEC WIN n cmd...

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
This commit is contained in:
Daniel Silverstone 2019-05-05 15:59:30 +01:00
parent 3021142aad
commit 689458aa6e
2 changed files with 45 additions and 2 deletions

View File

@ -130,14 +130,22 @@ Commands
Cause a browser window to reload its current content.
Expect responses similar to a GO command.
* `WINDOW EXEC WIN` _%id%_ _%str%_
Cause a browser window to execute some javascript. It won't
work if the window doesn't have a *finished* HTML content.
This will send a `WINDOW JS WIN` _%id%_ `RET` `TRUE`/`FALSE`
where `FALSE` indicates that some issue prevented the injection of
the script.
### Login commands
* `LOGIN USERNAME` _%id%_ _%str_
* `LOGIN USERNAME` _%id%_ _%str%_
Set the username for the login
* `LOGIN PASSWORD` _%id%_ _%str_
* `LOGIN PASSWORD` _%id%_ _%str%_
Set the password for the login

View File

@ -500,6 +500,39 @@ monkey_window_handle_reload(int argc, char **argv)
}
}
static void
monkey_window_handle_exec(int argc, char **argv)
{
struct gui_window *gw;
if (argc < 5) {
moutf(MOUT_ERROR, "WINDOW EXEC ARGS BAD\n");
}
gw = monkey_find_window_by_num(atoi(argv[2]));
if (gw == NULL) {
moutf(MOUT_ERROR, "WINDOW NUM BAD");
} else {
/* Gather argv[4] onward into a string to pass to js_exec */
int total = 0;
for (int i = 4; i < argc; ++i) {
total += strlen(argv[i]) + 1;
}
char *cmd = calloc(total, 1);
strcpy(cmd, argv[4]);
for (int i = 5; i < argc; ++i) {
strcat(cmd, " ");
strcat(cmd, argv[i]);
}
/* Now execute the JS */
moutf(MOUT_WINDOW, "JS WIN %d RET %s", atoi(argv[2]),
browser_window_exec(gw->bw, cmd, total - 1) ? "TRUE" : "FALSE");
free(cmd);
}
}
void
monkey_window_handle_command(int argc, char **argv)
@ -517,6 +550,8 @@ monkey_window_handle_command(int argc, char **argv)
monkey_window_handle_redraw(argc, argv);
} else if (strcmp(argv[1], "RELOAD") == 0) {
monkey_window_handle_reload(argc, argv);
} else if (strcmp(argv[1], "EXEC") == 0) {
monkey_window_handle_exec(argc, argv);
} else {
moutf(MOUT_ERROR, "WINDOW COMMAND UNKNOWN %s\n", argv[1]);
}