From c5c05460ac20abcbc0ed686eb4acf06da7a39a79 Mon Sep 17 00:00:00 2001 From: Jeremy Evans Date: Fri, 20 Sep 2019 19:06:22 -0700 Subject: Warn on access/modify of $SAFE, and remove effects of modifying $SAFE This removes the security features added by $SAFE = 1, and warns for access or modification of $SAFE from Ruby-level, as well as warning when calling all public C functions related to $SAFE. This modifies some internal functions that took a safe level argument to no longer take the argument. rb_require_safe now warns, rb_require_string has been added as a version that takes a VALUE and does not warn. One public C function that still takes a safe level argument and that this doesn't warn for is rb_eval_cmd. We may want to consider adding an alternative method that does not take a safe level argument, and warn for rb_eval_cmd. --- vm_eval.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'vm_eval.c') diff --git a/vm_eval.c b/vm_eval.c index 4c73d7337e..8b557fab1c 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -1777,19 +1777,13 @@ rb_eval_string_wrap(const char *str, int *pstate) } VALUE -rb_eval_cmd(VALUE cmd, VALUE arg, int level) +rb_eval_cmd(VALUE cmd, VALUE arg, int _level) { enum ruby_tag_type state; volatile VALUE val = Qnil; /* OK */ - const int VAR_NOCLOBBERED(current_safe_level) = rb_safe_level(); rb_execution_context_t * volatile ec = GET_EC(); - if (OBJ_TAINTED(cmd)) { - level = RUBY_SAFE_LEVEL_MAX; - } - EC_PUSH_TAG(ec); - rb_set_safe_level_force(level); if ((state = EC_EXEC_TAG()) == TAG_NONE) { if (!RB_TYPE_P(cmd, T_STRING)) { val = rb_funcallv(cmd, idCall, RARRAY_LENINT(arg), @@ -1801,7 +1795,6 @@ rb_eval_cmd(VALUE cmd, VALUE arg, int level) } EC_POP_TAG(); - rb_set_safe_level_force(current_safe_level); if (state) EC_JUMP_TAG(ec, state); return val; } -- cgit v1.2.3