Add support for r2pipe client apis over http-post ##http

Author: trufae

libr/core/task.c

@@ -1,4 +1,4 @@
-/* radare - LGPL - Copyright 2014-2025 - pancake, thestr4ng3r */
+/* radare - LGPL - Copyright 2014-2025 - pancake */
 
 #include <r_core.h>
 
@@ -7,7 +7,7 @@ static R_TH_LOCAL RCoreTask *task_tls_current = NULL;
 
 R_API void r_core_task_scheduler_init(RCoreTaskScheduler *tasks, RCore *core) {
 	tasks->task_id_next = 0;
-	tasks->tasks = r_list_newf ((RListFree)r_core_task_decref);
+	tasks->tasks = r_list_newf ( (RListFree)r_core_task_decref);
 	tasks->tasks_queue = r_list_new ();
 	tasks->oneshot_queue = r_list_newf (free);
 	tasks->oneshots_enqueued = 0;
@@ -105,7 +105,7 @@ R_API void r_core_task_print(RCore *core, RCoreTask *task, PJ *pj, int mode) {
 		}
 		r_cons_printf (core->cons, "%3d %3s %12s  %s\n",
 					   task->id,
-					   task->transient ? "(t)" : "",
+					   task->transient ? " (t)" : "",
 					   r_core_task_status (task),
 					   r_str_get (info));
 		}
@@ -355,7 +355,7 @@ R_API void r_core_task_schedule(RCoreTask *current, RTaskState next_state) {
 	// oneshots always have priority.
 	// if there are any queued, run them immediately.
 	OneShot *oneshot;
-	while ((oneshot = r_list_pop_head (scheduler->oneshot_queue))) {
+	while ( (oneshot = r_list_pop_head (scheduler->oneshot_queue))) {
 		scheduler->oneshots_enqueued--;
 		scheduler->oneshot_running = true;
 		oneshot->func (oneshot->user);
@@ -585,13 +585,13 @@ R_API void r_core_task_sync_begin(RCoreTaskScheduler *scheduler) {
 	}
 }
 
-/* end running stuff synchronously, initially started with r_core_task_sync_begin() */
+/* end running stuff synchronously, initially started with r_core_task_sync_begin () */
 R_API void r_core_task_sync_end(RCoreTaskScheduler *scheduler) {
 	R_RETURN_IF_FAIL (scheduler);
 	task_end (scheduler->main_task);
 }
 
-/* To be called from within a task. Begin sleeping and schedule other tasks until r_core_task_sleep_end() is called. */
+/* To be called from within a task. Begin sleeping and schedule other tasks until r_core_task_sleep_end () is called. */
 R_API void r_core_task_sleep_begin(RCoreTask *task) {
 	R_RETURN_IF_FAIL (task);
 	r_core_task_schedule (task, R_CORE_TASK_STATE_SLEEPING);

libr/include/r_socket.h

@@ -9,7 +9,7 @@ extern "C" {
 #include "r_bind.h"
 #include "r_list.h"
 
-R_LIB_VERSION_HEADER (r_socket);
+R_LIB_VERSION_HEADER(r_socket);
 
 #if R2__UNIX__
 #include <netinet/in.h>
@@ -37,9 +37,9 @@ R_LIB_VERSION_HEADER (r_socket);
 #define MSG_DONTWAIT 0
 #endif
 #ifndef SD_BOTH
-#define SD_RECEIVE  0
-#define SD_SEND 1
-#define SD_BOTH 2
+#define SD_RECEIVE 0
+#define SD_SEND    1
+#define SD_BOTH    2
 #endif
 
 #if _MSC_VER
@@ -58,6 +58,12 @@ typedef struct {
 	int output[2];
 #endif
 	RCoreBind coreb;
+	/* HTTP/r2web support: when is_http is true, http_url contains
+	 * the base endpoint where commands are POSTed using the
+	 * r_socket_http_post API and r2pipe_cmd will return the
+	 * HTTP response instead of using fork+pipe. */
+	char *http_url;
+	bool is_http;
 } R2Pipe;
 
 typedef struct r_socket_t {
@@ -68,7 +74,7 @@ typedef struct r_socket_t {
 #endif
 	bool is_ssl;
 	int proto;
-	int local;	// TODO: merge ssl with local -> flags/options
+	int local; // TODO: merge ssl with local -> flags/options
 	int port;
 	struct sockaddr_in sa;
 #if HAVE_LIB_SSL
@@ -85,17 +91,17 @@ typedef struct r_socket_http_options {
 	bool httpauth;
 } RSocketHTTPOptions;
 
-#define R_SOCKET_PROTO_TCP IPPROTO_TCP
-#define R_SOCKET_PROTO_UDP IPPROTO_UDP
-#define R_SOCKET_PROTO_CAN 0xc42b05
-#define R_SOCKET_PROTO_SERIAL 0x534147
-#define R_SOCKET_PROTO_UNIX 0x1337
-#define R_SOCKET_PROTO_NONE 0
+#define R_SOCKET_PROTO_TCP     IPPROTO_TCP
+#define R_SOCKET_PROTO_UDP     IPPROTO_UDP
+#define R_SOCKET_PROTO_CAN     0xc42b05
+#define R_SOCKET_PROTO_SERIAL  0x534147
+#define R_SOCKET_PROTO_UNIX    0x1337
+#define R_SOCKET_PROTO_NONE    0
 #define R_SOCKET_PROTO_DEFAULT R_SOCKET_PROTO_TCP
 
 // backward compat for yara-r2
-#define r2p_cmd r2pipe_cmd
-#define r2p_open r2pipe_open
+#define r2p_cmd   r2pipe_cmd
+#define r2p_open  r2pipe_open
 #define r2p_close r2pipe_close
 
 #ifdef R_API
@@ -104,10 +110,10 @@ R_API RSocket *r_socket_new(bool is_ssl);
 R_API bool r_socket_spawn(RSocket *s, const char *cmd, unsigned int timeout);
 R_API bool r_socket_connect(RSocket *s, const char *host, const char *port, int proto, unsigned int timeout);
 R_API int r_socket_connect_serial(RSocket *sock, const char *path, int speed, int parity);
-#define r_socket_connect_tcp(a, b, c, d) r_socket_connect (a, b, c, R_SOCKET_PROTO_TCP, d)
-#define r_socket_connect_udp(a, b, c, d) r_socket_connect (a, b, c, R_SOCKET_PROTO_UDP, d)
+#define r_socket_connect_tcp(a, b, c, d) r_socket_connect(a, b, c, R_SOCKET_PROTO_TCP, d)
+#define r_socket_connect_udp(a, b, c, d) r_socket_connect(a, b, c, R_SOCKET_PROTO_UDP, d)
 #if R2__UNIX__
-#define r_socket_connect_unix(a, b) r_socket_connect (a, b, b, R_SOCKET_PROTO_UNIX, 0)
+#define r_socket_connect_unix(a, b) r_socket_connect(a, b, b, R_SOCKET_PROTO_UNIX, 0)
 #else
 #define r_socket_connect_unix(a, b) (false)
 #endif
@@ -191,15 +197,15 @@ enum {
 typedef struct r_socket_rap_server_t {
 	RSocket *fd;
 	char *port;
-	ut8 buf[RAP_PACKET_MAX + 32];	// This should be used as a static buffer for everything done by the server
+	ut8 buf[RAP_PACKET_MAX + 32]; // This should be used as a static buffer for everything done by the server
 	rap_server_open open;
 	rap_server_seek seek;
 	rap_server_read read;
 	rap_server_write write;
 	rap_server_cmd system;
 	rap_server_cmd cmd;
 	rap_server_close close;
-	void *user;	// Always first arg for callbacks
+	void *user; // Always first arg for callbacks
 } RSocketRapServer;
 
 R_API RSocketRapServer *r_socket_rap_server_new(bool is_ssl, const char *port);
@@ -262,7 +268,7 @@ typedef struct r_run_profile_t {
 	bool _noprogram;
 } RRunProfile;
 
-R_API RRunProfile *r_run_new(const char * R_NULLABLE str);
+R_API RRunProfile *r_run_new(const char *R_NULLABLE str);
 R_API bool r_run_parse(RRunProfile *pf, const char *profile);
 R_API void r_run_free(RRunProfile *r);
 R_API bool r_run_parseline(RRunProfile *p, const char *b);

libr/socket/r2pipe.c

@@ -1,29 +1,13 @@
 /* radare - LGPL - Copyright 2015-2025 - pancake */
-/*
-Usage Example:
-
-	#include <r_core.h>
-	int main() {
-		RCoreBind rcb;
-		RCore *core = r_core_new ();
-		r_core_bind (core, &rcb);
-		r2pipe_open_corebind (&rcb);
-		char *clippy = r2pipe_cmd ("?E hello");
-		eprintf ("%s\n", clippy);
-		free (clippy);
-		r2pipe_close (r2pipe);
-		r_core_free (core);
-	}
-*/
 
 #include <r_util.h>
 #include <r_lib.h>
 #include <r_socket.h>
 #include <errno.h>
 
-#define R2P_PID(x) (((R2Pipe*)(x)->data)->pid)
-#define R2P_INPUT(x) (((R2Pipe*)(x)->data)->input[0])
-#define R2P_OUTPUT(x) (((R2Pipe*)(x)->data)->output[1])
+#define R2P_PID (x) ( ( (R2Pipe *) (x)->data)->pid)
+#define R2P_INPUT (x) ( ( (R2Pipe *) (x)->data)->input[0])
+#define R2P_OUTPUT (x) ( ( (R2Pipe *) (x)->data)->output[1])
 
 #define USE_WIP_READ 0
 #if R2__WINDOWS__
@@ -32,7 +16,7 @@ Usage Example:
 #define NO_CHILD -1
 #endif
 
-#if defined(__wasi__) && __wasi__
+#if defined (__wasi__) && __wasi__
 #define HAVE_R2PIPE 0
 #else
 #define HAVE_R2PIPE 1
@@ -61,11 +45,11 @@ R_API int r2pipe_write(R2Pipe *r2pipe, const char *str) {
 	cmd[n + 1] = '\0';
 #if R2__WINDOWS__
 	DWORD dwWritten = 0;
-	WriteFile (r2pipe->pipe, cmd, (DWORD)(len - 1), &dwWritten, NULL);
-	int ret = (dwWritten == (DWORD)(len - 1));
+	WriteFile (r2pipe->pipe, cmd, (DWORD) (len - 1), &dwWritten, NULL);
+	int ret = (dwWritten == (DWORD) (len - 1));
 #else
-	ssize_t wrote = write (r2pipe->input[1], cmd, (ssize_t)(len - 1));
-	int ret = (wrote == (ssize_t)(len - 1));
+	ssize_t wrote = write (r2pipe->input[1], cmd, (ssize_t) (len - 1));
+	int ret = (wrote == (ssize_t) (len - 1));
 #endif
 	free (cmd);
 	return ret;
@@ -79,7 +63,7 @@ R_API char *r2pipe_read(R2Pipe *r2pipe) {
 	R_RETURN_VAL_IF_FAIL (r2pipe, NULL);
 	char *buf = NULL;
 #if HAVE_R2PIPE
-#	/* Read all available data from the pipe into a dynamically
+#/* Read all available data from the pipe into a dynamically
 #	 * growing buffer and return a NUL-terminated string. */
 	/* r2pipe already validated above */
 	int bufsz = 4096;
@@ -91,7 +75,7 @@ R_API char *r2pipe_read(R2Pipe *r2pipe) {
 	BOOL bSuccess = FALSE;
 	DWORD dwRead = 0;
 	// Read up to bufsz-1 bytes and NUL-terminate.
-	DWORD toRead = (DWORD)(bufsz - 1);
+	DWORD toRead = (DWORD) (bufsz - 1);
 	bSuccess = ReadFile (r2pipe->pipe, buf, toRead, &dwRead, NULL);
 	if (!bSuccess || dwRead == 0) {
 		free (buf);
@@ -121,7 +105,7 @@ R_API char *r2pipe_read(R2Pipe *r2pipe) {
 		}
 	}
 	if (buf) {
-		int zpos = (i < bufsz)? i: i - 1;
+		int zpos = (i < bufsz) ? i : i - 1;
 		buf[zpos] = 0;
 	}
 #endif
@@ -130,14 +114,12 @@ R_API char *r2pipe_read(R2Pipe *r2pipe) {
 }
 
 R_API int r2pipe_close(R2Pipe *r2pipe) {
-#if HAVE_R2PIPE
 	/* r2pipe may be NULL on non-r2pipe builds */
 	R_RETURN_VAL_IF_FAIL (r2pipe, 0);
-#endif
 #if HAVE_R2PIPE
 	/*
 	if (r2pipe->coreb.core && !r2pipe->coreb.puts) {
-		void (*rfre)(void *c) = r_lib_dl_sym (libr, "r_core_free");
+		void (*rfre) (void *c) = r_lib_dl_sym (libr, "r_core_free");
 		if (rfre) {
 			rfre (r2pipe->coreb.core);
 		}
@@ -166,11 +148,16 @@ R_API int r2pipe_close(R2Pipe *r2pipe) {
 		r2pipe->output[1] = -1;
 	}
 	if (r2pipe->child != NO_CHILD) {
-		kill (r2pipe->child, SIGTERM);
-		waitpid (r2pipe->child, NULL, 0);
+		r_sandbox_kill (r2pipe->child, SIGTERM);
 		r2pipe->child = NO_CHILD;
 	}
 #endif
+	/* free http resources if used */
+	if (r2pipe->is_http && r2pipe->http_url) {
+		free (r2pipe->http_url);
+		r2pipe->http_url = NULL;
+		r2pipe->is_http = false;
+	}
 #endif
 	free (r2pipe);
 	return 0;
@@ -180,9 +167,7 @@ R_API int r2pipe_close(R2Pipe *r2pipe) {
 static int w32_createPipe(R2Pipe *r2pipe, const char *cmd) {
 	CHAR buf[1024];
 	r2pipe->pipe = CreateNamedPipe (TEXT ("\\\\.\\pipe\\R2PIPE_IN"),
-		PIPE_ACCESS_DUPLEX,PIPE_TYPE_MESSAGE | \
-		PIPE_READMODE_MESSAGE | \
-		PIPE_WAIT, PIPE_UNLIMITED_INSTANCES,
+		PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, PIPE_UNLIMITED_INSTANCES,
 		sizeof (buf), sizeof (buf), 0, NULL);
 	if (r_sys_create_child_proc_w32 (cmd, NULL, NULL, NULL)) {
 		if (ConnectNamedPipe (r2pipe->pipe, NULL)) {
@@ -194,9 +179,9 @@ static int w32_createPipe(R2Pipe *r2pipe, const char *cmd) {
 #endif
 
 #if HAVE_R2PIPE
-static R2Pipe* r2p_open_pipes(R2Pipe* r2p) {
+static R2Pipe *r2p_open_pipes(R2Pipe *r2p) {
 	R_RETURN_VAL_IF_FAIL (r2p, NULL);
-#if R2__UNIX__ || defined(__CYGWIN__)
+#if R2__UNIX__ || defined (__CYGWIN__)
 	char *out = r_sys_getenv ("R2PIPE_IN");
 	char *in = r_sys_getenv ("R2PIPE_OUT");
 	int done = false;
@@ -217,7 +202,7 @@ static R2Pipe* r2p_open_pipes(R2Pipe* r2p) {
 	free (out);
 	return r2p;
 #else
-	R_LOG_ERROR ("r2pipe_open(NULL) not supported on this platform");
+	R_LOG_ERROR ("r2pipe_open (NULL) not supported on this platform");
 	return NULL;
 #endif
 }
@@ -230,6 +215,9 @@ static R2Pipe *r2pipe_new(void) {
 	r2pipe->output[0] = r2pipe->output[1] = -1;
 #endif
 	r2pipe->child = NO_CHILD;
+	/* init http support fields */
+	r2pipe->http_url = NULL;
+	r2pipe->is_http = false;
 	return r2pipe;
 }
 
@@ -244,8 +232,8 @@ R_API R2Pipe *r2pipe_open_dl(const char *libr_path) {
 #if HAVE_R2PIPE
 	R_RETURN_VAL_IF_FAIL (libr_path, NULL);
 	void *libr = r_lib_dl_open (libr_path, false);
-	void* (*rnew)() = r_lib_dl_sym (libr, "r_core_new");
-	char* (*rcmd)(void *c, const char *cmd) = r_lib_dl_sym (libr, "r_core_cmd_str");
+	void * (*rnew) () = r_lib_dl_sym (libr, "r_core_new");
+	char * (*rcmd) (void *c, const char *cmd) = r_lib_dl_sym (libr, "r_core_cmd_str");
 
 	if (rnew && rcmd) {
 		R2Pipe *r2pipe = r2pipe_new ();
@@ -261,12 +249,26 @@ R_API R2Pipe *r2pipe_open_dl(const char *libr_path) {
 	return NULL;
 }
 
-R_API R2Pipe *r2pipe_open(const char * R_NULLABLE cmd) {
+R_API R2Pipe *r2pipe_open(const char *R_NULLABLE cmd) {
 #if HAVE_R2PIPE
 	R2Pipe *r2p = r2pipe_new ();
 	if (!r2p) {
 		return NULL;
 	}
+	/* HTTP/r2web mode: if the command is a http (s):// or r2web:// URL,
+	 * store it in the r2pipe and use HTTP POST for commands. */
+	if (cmd && (r_str_startswith (cmd, "http://") || r_str_startswith (cmd, "https://") || r_str_startswith (cmd, "r2web://"))) {
+		char *u = NULL;
+		if (r_str_startswith (cmd, "r2web://")) {
+			u = r_str_newf ("http://%s", cmd + sizeof ("r2web://") - 1);
+		} else {
+			u = strdup (cmd);
+		}
+		r2p->http_url = u;
+		r2p->is_http = true;
+		r2p->child = NO_CHILD;
+		return r2p;
+	}
 	if (R_STR_ISEMPTY (cmd)) {
 		r2p->child = NO_CHILD;
 		return r2p_open_pipes (r2p);
@@ -351,6 +353,11 @@ R_API R2Pipe *r2pipe_open(const char * R_NULLABLE cmd) {
 R_API char *r2pipe_cmd(R2Pipe *r2p, const char *str) {
 #if HAVE_R2PIPE
 	R_RETURN_VAL_IF_FAIL (r2p && str, NULL);
+	/* HTTP mode: POST the command to the configured endpoint and return the response */
+	if (r2p->is_http) {
+		int len = 0;
+		return r_socket_http_post (r2p->http_url, NULL, str, NULL, &len);
+	}
 	if (!*str || !r2pipe_write (r2p, str)) {
 		r_sys_perror ("r2pipe_write");
 		return NULL;
@@ -391,7 +398,7 @@ R_API char *r2pipe_cmdf(R2Pipe *r2p, const char *fmt, ...) {
 	}
 	va_end (ap2);
 	va_end (ap);
-	return (char*)fmt;
+	return (char *)fmt;
 #else
 	return NULL;
 #endif

libr/util/sandbox.c

@@ -516,7 +516,12 @@ R_API int r_sandbox_kill(int pid, int sig) {
 		return -1;
 	}
 #if HAVE_SYSTEM && R2__UNIX__
-	return kill (pid, sig);
+	int ret = kill (pid, sig);
+	const bool sync_kill = false;
+	if (sync_kill) {
+		waitpid (pid, NULL, 0);
+	}
+	return ret;
 #endif
 	return -1;
 }