diff options
author | Jeremy Evans <code@jeremyevans.net> | 2019-09-20 19:06:22 -0700 |
---|---|---|
committer | Jeremy Evans <code@jeremyevans.net> | 2019-11-18 01:00:25 +0200 |
commit | c5c05460ac20abcbc0ed686eb4acf06da7a39a79 (patch) | |
tree | 991109a68f3b1cd2e256a936701d3b2badd3ddac /variable.c | |
parent | 7b6a8b5b54448235e17ed187d9d73f56893e1b6f (diff) |
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.
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/2476
Diffstat (limited to 'variable.c')
-rw-r--r-- | variable.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/variable.c b/variable.c index afa633151d..825f2d6271 100644 --- a/variable.c +++ b/variable.c @@ -1805,7 +1805,6 @@ struct autoload_const { VALUE ad; /* autoload_data_i */ VALUE value; ID id; - int safe_level; rb_const_flag_t flag; }; @@ -1999,7 +1998,6 @@ rb_autoload_str(VALUE mod, ID id, VALUE file) ac->mod = mod; ac->id = id; ac->value = Qundef; - ac->safe_level = rb_safe_level(); ac->flag = CONST_PUBLIC; ac->ad = ad; list_add_tail(&ele->constants, &ac->cnode); @@ -2039,27 +2037,12 @@ autoload_delete(VALUE mod, ID id) } static VALUE -autoload_provided(VALUE arg) -{ - const char **p = (const char **)arg; - return rb_feature_provided(*p, p); -} - -static VALUE -reset_safe(VALUE safe) -{ - rb_set_safe_level_force((int)safe); - return safe; -} - -static VALUE check_autoload_required(VALUE mod, ID id, const char **loadingpath) { VALUE file; VALUE load = autoload_data(mod, id); struct autoload_data_i *ele; const char *loading; - int safe; if (!load || !(ele = get_autoload_data(load, 0))) { return 0; @@ -2081,9 +2064,7 @@ check_autoload_required(VALUE mod, ID id, const char **loadingpath) } loading = RSTRING_PTR(file); - safe = rb_safe_level(); - rb_set_safe_level_force(0); - if (!rb_ensure(autoload_provided, (VALUE)&loading, reset_safe, (VALUE)safe)) { + if (!rb_feature_provided(loading, &loading)) { return load; } if (loadingpath && loading) { @@ -2186,12 +2167,10 @@ autoload_reset(VALUE arg) /* At the last, move a value defined in autoload to constant table */ if (RTEST(state->result)) { struct autoload_const *next; - int safe_backup = rb_safe_level(); list_for_each_safe(&ele->constants, ac, next, cnode) { if (ac->value != Qundef) { - rb_ensure(autoload_const_set, (VALUE)ac, - reset_safe, (VALUE)safe_backup); + autoload_const_set((VALUE)ac); } } } |