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. --- proc.c | 29 ----------------------------- 1 file changed, 29 deletions(-) (limited to 'proc.c') diff --git a/proc.c b/proc.c index 762f704345..607ccc33b0 100644 --- a/proc.c +++ b/proc.c @@ -2275,27 +2275,6 @@ call_method_data(rb_execution_context_t *ec, const struct METHOD *data, method_callable_method_entry(data), kw_splat); } -static VALUE -call_method_data_safe(rb_execution_context_t *ec, const struct METHOD *data, - int argc, const VALUE *argv, VALUE passed_procval, - int safe, int kw_splat) -{ - VALUE result = Qnil; /* OK */ - enum ruby_tag_type state; - - EC_PUSH_TAG(ec); - if ((state = EC_EXEC_TAG()) == TAG_NONE) { - /* result is used only if state == 0, no exceptions is caught. */ - /* otherwise it doesn't matter even if clobbered. */ - NO_CLOBBERED(result) = call_method_data(ec, data, argc, argv, passed_procval, kw_splat); - } - EC_POP_TAG(); - rb_set_safe_level_force(safe); - if (state) - EC_JUMP_TAG(ec, state); - return result; -} - VALUE rb_method_call_with_block_kw(int argc, const VALUE *argv, VALUE method, VALUE passed_procval, int kw_splat) { @@ -2306,14 +2285,6 @@ rb_method_call_with_block_kw(int argc, const VALUE *argv, VALUE method, VALUE pa if (data->recv == Qundef) { rb_raise(rb_eTypeError, "can't call unbound method; bind first"); } - if (OBJ_TAINTED(method)) { - const int safe_level_to_run = RUBY_SAFE_LEVEL_MAX; - int safe = rb_safe_level(); - if (safe < safe_level_to_run) { - rb_set_safe_level_force(safe_level_to_run); - return call_method_data_safe(ec, data, argc, argv, passed_procval, safe, kw_splat); - } - } return call_method_data(ec, data, argc, argv, passed_procval, kw_splat); } -- cgit v1.2.3