From 1f828497d1e8df2b7b68ac2a093ab4439585d88a Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 12 Jun 2013 14:20:51 +0000
Subject: * safe.c (rb_set_safe_level, safe_setter): raise an ArgumentError  
 when $SAFE is set to 4.  $SAFE=4 is now obsolete.   [ruby-core:55222]
 [Feature #8468]

* object.c (rb_obj_untrusted, rb_obj_untrust, rb_obj_trust):
  Kernel#untrusted?, untrust, and trust are now deprecated.
  Their behavior is same as tainted?, taint, and untaint,
  respectively.

* include/ruby/ruby.h (OBJ_UNTRUSTED, OBJ_UNTRUST): OBJ_UNTRUSTED()
  and OBJ_UNTRUST() are aliases of OBJ_TAINTED() and OBJ_TAINT(),
  respectively.

* array.c, class.c, debug.c, dir.c, encoding.c, error.c, eval.c,
  ext/curses/curses.c, ext/dbm/dbm.c, ext/dl/cfunc.c,
  ext/dl/cptr.c, ext/dl/dl.c, ext/etc/etc.c, ext/fiddle/fiddle.c,
  ext/fiddle/pointer.c, ext/gdbm/gdbm.c, ext/readline/readline.c,
  ext/sdbm/init.c, ext/socket/ancdata.c, ext/socket/basicsocket.c,
  ext/socket/socket.c, ext/socket/udpsocket.c,
  ext/stringio/stringio.c, ext/syslog/syslog.c, ext/tk/tcltklib.c,
  ext/win32ole/win32ole.c, file.c, gc.c, hash.c, io.c, iseq.c,
  load.c, marshal.c, object.c, proc.c, process.c, random.c, re.c,
  safe.c, string.c, thread.c, transcode.c, variable.c,
  vm_insnhelper.c, vm_method.c, vm_trace.c: remove code for
  $SAFE=4.

* test/dl/test_dl2.rb, test/erb/test_erb.rb,
  test/readline/test_readline.rb,
  test/readline/test_readline_history.rb, test/ruby/test_alias.rb,
  test/ruby/test_array.rb, test/ruby/test_dir.rb,
  test/ruby/test_encoding.rb, test/ruby/test_env.rb,
  test/ruby/test_eval.rb, test/ruby/test_exception.rb,
  test/ruby/test_file_exhaustive.rb, test/ruby/test_hash.rb,
  test/ruby/test_io.rb, test/ruby/test_method.rb,
  test/ruby/test_module.rb, test/ruby/test_object.rb,
  test/ruby/test_pack.rb, test/ruby/test_rand.rb,
  test/ruby/test_regexp.rb, test/ruby/test_settracefunc.rb,
  test/ruby/test_struct.rb, test/ruby/test_thread.rb,
  test/ruby/test_time.rb: remove tests for $SAFE=4.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 vm_method.c | 26 --------------------------
 1 file changed, 26 deletions(-)

(limited to 'vm_method.c')

diff --git a/vm_method.c b/vm_method.c
index 35e1d6f45b..70fda7bf8b 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -234,10 +234,6 @@ rb_method_entry_make(VALUE klass, ID mid, rb_method_type_t type,
     if (NIL_P(klass)) {
 	klass = rb_cObject;
     }
-    if (rb_safe_level() >= 4 &&
-	(klass == rb_cObject || !OBJ_UNTRUSTED(klass))) {
-	rb_raise(rb_eSecurityError, "Insecure: can't define method");
-    }
     if (!FL_TEST(klass, FL_SINGLETON) &&
 	type != VM_METHOD_TYPE_NOTIMPLEMENTED &&
 	type != VM_METHOD_TYPE_ZSUPER &&
@@ -657,10 +653,6 @@ remove_method(VALUE klass, ID mid)
 
     klass = RCLASS_ORIGIN(klass);
     if (klass == rb_cObject) {
-	rb_secure(4);
-    }
-    if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(klass)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't remove method");
     }
     rb_check_frozen(klass);
     if (mid == object_id || mid == id__send__ || mid == idInitialize) {
@@ -744,7 +736,6 @@ rb_export_method(VALUE klass, ID name, rb_method_flag_t noex)
     VALUE defined_class;
 
     if (klass == rb_cObject) {
-	rb_secure(4);
     }
 
     me = search_method(klass, name, &defined_class);
@@ -847,10 +838,6 @@ rb_undef(VALUE klass, ID id)
 	rb_raise(rb_eTypeError, "no class to undef method");
     }
     if (rb_vm_cbase() == rb_cObject && klass == rb_cObject) {
-	rb_secure(4);
-    }
-    if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(klass)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't undef `%s'", rb_id2name(id));
     }
     rb_frozen_class_p(klass);
     if (id == object_id || id == id__send__ || id == idInitialize) {
@@ -1201,7 +1188,6 @@ rb_alias(VALUE klass, ID name, ID def)
 
     rb_frozen_class_p(klass);
     if (klass == rb_cObject) {
-	rb_secure(4);
     }
 
   again:
@@ -1258,20 +1244,10 @@ rb_mod_alias_method(VALUE mod, VALUE newname, VALUE oldname)
     return mod;
 }
 
-static void
-secure_visibility(VALUE self)
-{
-    if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(self)) {
-	rb_raise(rb_eSecurityError,
-		 "Insecure: can't change method visibility");
-    }
-}
-
 static void
 set_method_visibility(VALUE self, int argc, VALUE *argv, rb_method_flag_t ex)
 {
     int i;
-    secure_visibility(self);
 
     if (argc == 0) {
 	rb_warning("%"PRIsVALUE" with no argument is just ignored",
@@ -1293,7 +1269,6 @@ set_method_visibility(VALUE self, int argc, VALUE *argv, rb_method_flag_t ex)
 static VALUE
 set_visibility(int argc, VALUE *argv, VALUE module, rb_method_flag_t ex)
 {
-    secure_visibility(module);
     if (argc == 0) {
 	SCOPE_SET(ex);
     }
@@ -1495,7 +1470,6 @@ rb_mod_modfunc(int argc, VALUE *argv, VALUE module)
 	rb_raise(rb_eTypeError, "module_function must be called for modules");
     }
 
-    secure_visibility(module);
     if (argc == 0) {
 	SCOPE_SET(NOEX_MODFUNC);
 	return module;
-- 
cgit v1.2.3