Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-26 00:55:59 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Extra checks and enforce the singleton core plugin ##js

Browse Source
This commit is contained in:
pancake 2022-12-27 13:35:02 +01:00
parent 15a92dbd0a
commit 77c3797c71
2 changed files with 48 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
libr/lang/p/qjs.c
View File

@ -93,7 +93,6 @@ static JSValue b64(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst
}
static int r2plugin_core_call(void *_core, const char *input) {
// RCore *core = _core;
JSValueConst args[1] = {
JS_NewString (Gctx, input)
};
@ -102,6 +101,9 @@ static int r2plugin_core_call(void *_core, const char *input) {
}
static JSValue r2plugin_core(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
if (Gctx) {
return JS_ThrowRangeError (ctx, "r2plugin core already registered (only one exists)");
}
JSRuntime *rt = JS_GetRuntime (ctx);
QjsContext *k = JS_GetRuntimeOpaque (rt);
RCore *core = k->core;
@ -125,6 +127,8 @@ static JSValue r2plugin_core(JSContext *ctx, JSValueConst this_val, int argc, JS
const char *nameptr = JS_ToCStringLen2 (ctx, &namelen, name, false);
if (nameptr) {
ap->name = strdup (nameptr);
} else {
return JS_ThrowRangeError(ctx, "r2plugin requires the function to return an object with the `name` field");
}
JSValue desc = JS_GetPropertyStr (ctx, res, "desc");
const char *descptr = JS_ToCStringLen2 (ctx, &namelen, desc, false);
@ -137,21 +141,25 @@ static JSValue r2plugin_core(JSContext *ctx, JSValueConst this_val, int argc, JS
ap->license = strdup (licenseptr);
}
JSValue func = JS_GetPropertyStr (ctx, res, "call");
Gctx = ctx; // XXX dont do globals
if (!JS_IsFunction (ctx, func)) {
return JS_ThrowRangeError(ctx, "r2plugin requires the function to return an object with the `call` field to be a function");
}
// XXX dont do globals
Gctx = ctx;
Gfunc = func;
ap->call = r2plugin_core_call;
int ret = -1;
RLibStruct *lib = R_NEW0 (RLibStruct);
lib->type = R_LIB_TYPE_CORE;
lib->data = ap;
lib->version = R2_VERSION;
r_lib_open_ptr (core->lib, "qjs", NULL, lib);
// ret = k->core->pluginAdd (k->core, n);
// r_core_plugin_add (core, ap);
return JS_NewBool (ctx, true);
if (lib) {
lib->type = R_LIB_TYPE_CORE;
lib->data = ap;
lib->version = R2_VERSION;
ret = r_lib_open_ptr (core->lib, "qjs", NULL, lib);
}
return JS_NewBool (ctx, ret == 0);
}
static JSValue r2plugin(JSContext *ctx, JSValueConst this_val, int argc, JSValueConst *argv) {
@ -221,25 +229,29 @@ static JSValue js_os_read_write(JSContext *ctx, JSValueConst this_val, int argc,
uint64_t pos, len;
size_t size;
int ret;
uint8_t *buf;
if (JS_ToInt32 (ctx, &fd, argv[0])) {
return JS_EXCEPTION;
}
if (JS_ToIndex (ctx, &pos, argv[2]))
if (JS_ToIndex (ctx, &pos, argv[2])) {
return JS_EXCEPTION;
if (JS_ToIndex(ctx, &len, argv[3]))
}
if (JS_ToIndex(ctx, &len, argv[3])) {
return JS_EXCEPTION;
buf = JS_GetArrayBuffer(ctx, &size, argv[1]);
if (!buf)
}
uint8_t *buf = JS_GetArrayBuffer(ctx, &size, argv[1]);
if (!buf) {
return JS_EXCEPTION;
if (pos + len > size)
}
if (pos + len > size) {
return JS_ThrowRangeError(ctx, "read/write array buffer overflow");
if (magic)
ret = write(fd, buf + pos, len);
else
ret = read(fd, buf + pos, len);
return JS_NewInt64(ctx, ret);
}
if (magic) {
ret = write (fd, buf + pos, len);
} else {
ret = read (fd, buf + pos, len);
}
return JS_NewInt64 (ctx, ret);
}
@ -256,8 +268,8 @@ static int js_r2_init(JSContext *ctx, JSModuleDef *m) {
static const JSCFunctionListEntry js_os_funcs[] = {
JS_CFUNC_MAGIC_DEF("read", 4, js_os_read_write, 0 ),
JS_CFUNC_MAGIC_DEF("write", 4, js_os_read_write, 1 ),
JS_CFUNC_MAGIC_DEF ("read", 4, js_os_read_write, 0 ),
JS_CFUNC_MAGIC_DEF ("write", 4, js_os_read_write, 1 ),
#if 0
JS_CFUNC_MAGIC_DEF("setReadHandler", 2, js_os_setReadHandler, 0 ),
JS_CFUNC_DEF("setTimeout", 2, js_os_setTimeout ),
@ -273,9 +285,9 @@ static int js_os_init(JSContext *ctx, JSModuleDef *m) {
}
JSModuleDef *js_init_module_os(JSContext *ctx, const char *module_name) {
JSModuleDef *m = JS_NewCModule(ctx, module_name, js_os_init);
JSModuleDef *m = JS_NewCModule (ctx, module_name, js_os_init);
if (m) {
JS_AddModuleExportList(ctx, m, js_os_funcs, countof(js_os_funcs));
JS_AddModuleExportList (ctx, m, js_os_funcs, countof(js_os_funcs));
}
return m;
}
@ -296,20 +308,14 @@ static void register_helpers(JSContext *ctx) {
js_init_module_os (ctx, "os");
JS_AddModuleExportList (ctx, m, js_r2_funcs, countof (js_r2_funcs));
JSValue global_obj = JS_GetGlobalObject (ctx);
JS_SetPropertyStr (ctx, global_obj, "b64",
JS_NewCFunction (ctx, b64, "b64", 1));
JS_SetPropertyStr (ctx, global_obj, "r2cmd",
JS_NewCFunction (ctx, r2cmd, "r2cmd", 1));
JS_SetPropertyStr (ctx, global_obj, "r2plugin",
JS_NewCFunction (ctx, r2plugin, "r2plugin", 1));
JS_SetPropertyStr (ctx, global_obj, "r2log",
JS_NewCFunction (ctx, r2log, "r2log", 1));
JS_SetPropertyStr (ctx, global_obj, "write",
JS_NewCFunction (ctx, js_write, "write", 1));
JS_SetPropertyStr (ctx, global_obj, "flush", // fflush stdout
JS_NewCFunction (ctx, js_flush, "flush", 1));
JS_SetPropertyStr (ctx, global_obj, "print", // write + newline
JS_NewCFunction (ctx, js_print, "print", 1));
JS_SetPropertyStr (ctx, global_obj, "b64", JS_NewCFunction (ctx, b64, "b64", 1));
JS_SetPropertyStr (ctx, global_obj, "r2cmd", JS_NewCFunction (ctx, r2cmd, "r2cmd", 1));
JS_SetPropertyStr (ctx, global_obj, "r2plugin", JS_NewCFunction (ctx, r2plugin, "r2plugin", 1));
// JS_SetPropertyStr (ctx, global_obj, "r2unplugin", JS_NewCFunction (ctx, r2unplugin, "r2unplugin", 1));
JS_SetPropertyStr (ctx, global_obj, "r2log", JS_NewCFunction (ctx, r2log, "r2log", 1));
JS_SetPropertyStr (ctx, global_obj, "write", JS_NewCFunction (ctx, js_write, "write", 1));
JS_SetPropertyStr (ctx, global_obj, "flush", JS_NewCFunction (ctx, js_flush, "flush", 1));
JS_SetPropertyStr (ctx, global_obj, "print", JS_NewCFunction (ctx, js_print, "print", 1));
eval (ctx, "setTimeout = (x,y) => x();");
eval (ctx, "function dir(x) {"
"console.log(JSON.stringify(x).replace(/,/g,',\\n '));"

4
libr/util/lib.c
View File

@ -189,10 +189,10 @@ static bool __lib_dl_check_filename(const char *file) {
R_API int r_lib_run_handler(RLib *lib, RLibPlugin *plugin, RLibStruct *symbol) {
RLibHandler *h = plugin->handler;
if (h && h->constructor) {
IFDBG eprintf ("PLUGIN LOADED %p fcn %p\n", h, h->constructor);
R_LOG_DEBUG ("PLUGIN LOADED %p fcn %p", h, h->constructor);
return h->constructor (plugin, h->user, symbol->data);
}
IFDBG R_LOG_ERROR ("Cannot find plugin constructor");
R_LOG_DEBUG ("Cannot find plugin constructor");
return -1;
}