Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-27 23:20:40 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Run a travis job that uses the radare2-shell-parser (#15879)

Browse Source 
* Run a travis job to use the radare2-shell-parser
* radare2-shell-parser: add support for grep_commands, pipes, and others
This commit is contained in:
Riccardo Schirone 2020-01-23 09:10:28 +01:00 committed by GitHub
parent cd069ce2fd
commit 65d959f299
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 115 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -45,6 +45,9 @@ matrix:
arch: arm64
dist: bionic
env: NODOCKER=1 COMPILER_NAME=gcc CXX=g++ CC=gcc CFLAGS="-DR2_ASSERT_STDOUT=1"
# Linux with new shell parser enabled
- os: linux
env: COMPILER_NAME=gcc CXX=g++ CC=gcc INSTALL_SYSTEM=meson R2_NEWSHELL=true CFLAGS="-DR2_ASSERT_STDOUT=1" R2_CFG_NEWSHELL=1
# Run Fuzzing Sanity Test on every push
# XXX its broken it complains about invalid key
#- os: linux
@ -92,6 +95,9 @@ matrix:
env: NODOCKER=1 COMPILER_NAME=gcc CXX=g++ CC=gcc CFLAGS="-DR2_ASSERT_STDOUT=1"
- os: linux
env: COMPILER_NAME=clang CXX=clang++ CC=clang ASAN=1 ASAN_OPTIONS=detect_odr_violation=0 LSAN_OPTIONS=detect_leaks=0 CFLAGS="-DR2_ASSERT_STDOUT=1"
# Linux with new shell parser enabled
- os: linux
env: COMPILER_NAME=gcc CXX=g++ CC=gcc INSTALL_SYSTEM=meson R2_NEWSHELL=true CFLAGS="-DR2_ASSERT_STDOUT=1" R2_CFG_NEWSHELL=1
cache:
- ccache

6
libr/core/cconfig.c
View File

@ -3194,13 +3194,15 @@ R_API int r_core_config_init(RCore *core) {
SETCB ("cfg.sandbox", "false", &cb_cfgsanbox, "Sandbox mode disables systems and open on upper directories");
SETBPREF ("cfg.wseek", "false", "Seek after write");
SETCB ("cfg.bigendian", "false", &cb_bigendian, "Use little (false) or big (true) endianness");
SETCB ("cfg.newshell", "false", &cb_newshell, "Use new commands parser");
p = r_sys_getenv ("R2_CFG_NEWSHELL");
SETCB ("cfg.newshell", p? "true": "false", &cb_newshell, "Use new commands parser");
free (p);
SETI ("cfg.cpuaffinity", 0, "Run on cpuid");
/* log */
// R2_LOGLEVEL / log.level
p = r_sys_getenv ("R2_LOGLEVEL");
SETICB ("log.level", p ? atoi(p) : R_DEFAULT_LOGLVL, cb_log_config_level, "Target log level/severity"\
SETICB ("log.level", p? atoi(p): R_DEFAULT_LOGLVL, cb_log_config_level, "Target log level/severity"\
" (0:SILLY, 1:DEBUG, 2:VERBOSE, 3:INFO, 4:WARN, 5:ERROR, 6:FATAL)"
);
free (p);

121
libr/core/cmd.c
View File

@ -4456,13 +4456,24 @@ DEFINE_HANDLE_TS_FCN(arged_command) {
char *command_str = ts_node_sub_string (command, cstr);
R_LOG_DEBUG ("arged_command command: %s\n", command_str);
TSNode args = ts_node_child_by_field_name (node, "args", strlen ("args"));
char *args_str = NULL;
if (!ts_node_is_null (args)) {
char *args_str = ts_node_sub_string (args, cstr);
args_str = ts_node_sub_string (args, cstr);
R_LOG_DEBUG ("arged_command args: %s\n", args_str);
free (args_str);
}
// FIXME: this special handling should be removed once we have a proper
// command tree
char *exec_string = node_string;
if (!strcmp (command_str, "|.")) {
exec_string = r_str_newf (".%s", args_str);
}
free (args_str);
free (command_str);
return r_cmd_call (core->rcmd, node_string) != -1;
bool res = r_cmd_call (core->rcmd, exec_string) != -1;
if (exec_string != node_string) {
free (exec_string);
}
return res;
}
DEFINE_HANDLE_TS_FCN(redirect_command) {
@ -4533,25 +4544,18 @@ DEFINE_HANDLE_TS_FCN(redirect_command) {
DEFINE_HANDLE_TS_FCN(help_command) {
// TODO: traverse command tree to print help
// FIXME: once we have a command tree, this special handling should be removed
if (node_string[0] == '@') {
if (node_string[1] == '?') {
r_core_cmd_help (core, help_msg_at);
return true;
}
if (node_string[1] == '@') {
if (node_string[2] == '?') {
r_core_cmd_help (core, help_msg_at_at);
return true;
}
if (node_string[2] == '@') {
if (node_string[3] == '?') {
r_core_cmd_help (core, help_msg_at_at_at);
return true;
}
}
}
if (!strcmp (node_string, "@?")) {
r_core_cmd_help (core, help_msg_at);
} else if (!strcmp (node_string, "@@?")) {
r_core_cmd_help (core, help_msg_at_at);
} else if (!strcmp (node_string, "@@@?")) {
r_core_cmd_help (core, help_msg_at_at_at);
} else if (!strcmp (node_string, "|?")) {
r_core_cmd_help (core, help_msg_vertical_bar);
} else {
return r_cmd_call (core->rcmd, node_string) != -1;
}
return r_cmd_call (core->rcmd, node_string) != -1;
return true;
}
DEFINE_HANDLE_TS_FCN(tmp_seek_command) {
@ -4583,6 +4587,71 @@ DEFINE_HANDLE_TS_FCN(last_command) {
return res;
}
DEFINE_HANDLE_TS_FCN(grep_command) {
TSNode command = ts_node_child_by_field_name (node, "command", strlen ("command"));
TSNode specifier = ts_node_child_by_field_name (node, "specifier", strlen ("specifier"));
char *specifier_str = ts_node_sub_string (specifier, cstr);
bool res = handle_ts_command (core, cstr, command, log);
r_cons_grep_process (specifier_str);
return res;
}
DEFINE_HANDLE_TS_FCN(html_disable_command) {
TSNode command = ts_node_child_by_field_name (node, "command", strlen ("command"));
int scr_html = r_config_get_i (core->config, "scr.html");
r_config_set_i (core->config, "scr.html", 0);
int scr_color = r_config_get_i (core->config, "scr.color");
r_config_set_i (core->config, "scr.color", COLOR_MODE_DISABLED);
bool res = handle_ts_command (core, cstr, command, log);
if (scr_html != -1) {
r_cons_flush ();
r_config_set_i (core->config, "scr.html", scr_html);
}
if (scr_color != -1) {
r_config_set_i (core->config, "scr.color", scr_color);
}
return res;
}
DEFINE_HANDLE_TS_FCN(html_enable_command) {
TSNode command = ts_node_child_by_field_name (node, "command", strlen ("command"));
int scr_html = r_config_get_i (core->config, "scr.html");
r_config_set_i (core->config, "scr.html", true);
bool res = handle_ts_command (core, cstr, command, log);
if (scr_html != -1) {
r_cons_flush ();
r_config_set_i (core->config, "scr.html", scr_html);
}
return res;
}
DEFINE_HANDLE_TS_FCN(pipe_command) {
TSNode first_cmd = ts_node_named_child (node, 0);
r_return_val_if_fail (!ts_node_is_null (first_cmd), false);
TSNode second_cmd = ts_node_named_child (node, 1);
r_return_val_if_fail (!ts_node_is_null (second_cmd), false);
char *first_str = ts_node_sub_string (first_cmd, cstr);
char *second_str = ts_node_sub_string (second_cmd, cstr);
int value = core->num->value;
bool res = r_core_cmd_pipe (core, first_str, second_str) != -1;
core->num->value = value;
free (first_str);
free (second_str);
return res;
}
DEFINE_HANDLE_TS_FCN(scr_tts_command) {
TSNode command = ts_node_child_by_field_name (node, "command", strlen ("command"));
int scr_color = r_config_get_i (core->config, "scr.color");
r_config_set_i (core->config, "scr.color", COLOR_MODE_DISABLED);
core->cons->use_tts = true;
bool res = handle_ts_command (core, cstr, command, log);
if (scr_color != -1) {
r_config_set_i (core->config, "scr.color", scr_color);
}
return res;
}
static bool handle_ts_command(RCore *core, const char *cstr, TSNode node, bool log) {
bool ret = false;
bool is_last_command = false;
@ -4603,6 +4672,16 @@ static bool handle_ts_command(RCore *core, const char *cstr, TSNode node, bool l
ret = handle_ts_last_command (core, cstr, node, log);
} else if (is_ts_help_command (node)) {
ret = handle_ts_help_command (core, cstr, node, log);
} else if (is_ts_grep_command (node)) {
ret = handle_ts_grep_command (core, cstr, node, log);
} else if (is_ts_html_disable_command (node)) {
ret = handle_ts_html_disable_command (core, cstr, node, log);
} else if (is_ts_html_enable_command (node)) {
ret = handle_ts_html_enable_command (core, cstr, node, log);
} else if (is_ts_pipe_command (node)) {
ret = handle_ts_pipe_command (core, cstr, node, log);
} else if (is_ts_scr_tts_command (node)) {
ret = handle_ts_scr_tts_command (core, cstr, node, log);
} else {
R_LOG_WARN ("No handler for this kind of command `%s`\n", ts_node_type (node));
}

2
shlr/Makefile
View File

@ -34,7 +34,7 @@ TS_TIP=aef62b4bc6b9654e54bd59bee1cb8cea16e3aa96
# NOTE: when you update SHELLPARSER_TIP or SHELLPARSER_BRA, also update them in shlr/meson.build
SHELLPARSER_URL=https://github.com/ret2libc/radare2-shell-parser.git
SHELLPARSER_BRA=master
SHELLPARSER_TIP=2c9d98d4be3bfddb30fe8b00f467ae2ff56a22e3
SHELLPARSER_TIP=110a050947e85b963ef6ea718478dbfe1b840193
ifeq ($(CS_RELEASE),1)
CS_VER=4.0.1

2
shlr/meson.build
View File

@ -295,7 +295,7 @@ if get_option('use_treesitter')
endif
# NOTE: when you update SHELLPARSER_TIP or SHELLPARSER_BRA, also update them in shlr/Makefile
SHELLPARSER_TIP = '2c9d98d4be3bfddb30fe8b00f467ae2ff56a22e3'
SHELLPARSER_TIP = '110a050947e85b963ef6ea718478dbfe1b840193'
SHELLPARSER_BRA = 'master'
shell_parser_user = 'ret2libc'

3
travis-script
View File

@ -26,6 +26,9 @@ if [ "${INSTALL_SYSTEM}" == "meson" ] ; then
if [ "${R2_SYS_OPENSSL}" != "" ] ; then
OPTS="${OPTS} -D use_sys_openssl=${R2_SYS_OPENSSL}"
fi
if [ "${R2_NEWSHELL}" != "" ] ; then
OPTS="${OPTS} -D use_treesitter=${R2_NEWSHELL}"
fi
if [ "${COVERAGE}" == "1" ] ; then
OPTS="${OPTS} -Db_coverage=true"
fi