diff options
author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-12 14:20:51 +0000 |
---|---|---|
committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-12 14:20:51 +0000 |
commit | 1f828497d1e8df2b7b68ac2a093ab4439585d88a (patch) | |
tree | 6cf1bd0f1cc7921226608ccc133930aae49e7c82 /io.c | |
parent | b53a183c009b3cb72b5964cf5652763b4cebf0f6 (diff) | |
download | ruby-1f828497d1e8df2b7b68ac2a093ab4439585d88a.tar.gz |
* 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
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 22 |
1 files changed, 0 insertions, 22 deletions
@@ -597,8 +597,6 @@ rb_eof_error(void) VALUE rb_io_taint_check(VALUE io) { - if (!OBJ_UNTRUSTED(io) && rb_safe_level() >= 4) - rb_raise(rb_eSecurityError, "Insecure: operation on trusted IO"); rb_check_frozen(io); return io; } @@ -1376,7 +1374,6 @@ io_write(VALUE io, VALUE str, int nosync) long n; VALUE tmp; - rb_secure(4); io = GetWriteIO(io); str = rb_obj_as_string(str); tmp = rb_io_check_io(io); @@ -2610,7 +2607,6 @@ rb_io_write_nonblock(VALUE io, VALUE str) rb_io_t *fptr; long n; - rb_secure(4); if (!RB_TYPE_P(str, T_STRING)) str = rb_obj_as_string(str); @@ -4256,9 +4252,6 @@ rb_io_close(VALUE io) static VALUE rb_io_close_m(VALUE io) { - if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(io)) { - rb_raise(rb_eSecurityError, "Insecure: can't close"); - } rb_io_check_closed(RFILE(io)->fptr); rb_io_close(io); return Qnil; @@ -4339,9 +4332,6 @@ rb_io_close_read(VALUE io) rb_io_t *fptr; VALUE write_io; - if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(io)) { - rb_raise(rb_eSecurityError, "Insecure: can't close"); - } GetOpenFile(io, fptr); if (is_socket(fptr->fd, fptr->pathv)) { #ifndef SHUT_RD @@ -4397,9 +4387,6 @@ rb_io_close_write(VALUE io) rb_io_t *fptr; VALUE write_io; - if (rb_safe_level() >= 4 && !OBJ_UNTRUSTED(io)) { - rb_raise(rb_eSecurityError, "Insecure: can't close"); - } write_io = GetWriteIO(io); GetOpenFile(write_io, fptr); if (is_socket(fptr->fd, fptr->pathv)) { @@ -4486,7 +4473,6 @@ rb_io_syswrite(VALUE io, VALUE str) rb_io_t *fptr; long n; - rb_secure(4); if (!RB_TYPE_P(str, T_STRING)) str = rb_obj_as_string(str); @@ -6411,10 +6397,6 @@ io_reopen(VALUE io, VALUE nfile) off_t pos = 0; nfile = rb_io_get_io(nfile); - if (rb_safe_level() >= 4 && - (!OBJ_UNTRUSTED(io) || !OBJ_UNTRUSTED(nfile))) { - rb_raise(rb_eSecurityError, "Insecure: can't reopen"); - } GetOpenFile(io, fptr); GetOpenFile(nfile, orig); @@ -6516,7 +6498,6 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file) int oflags; rb_io_t *fptr; - rb_secure(4); if (rb_scan_args(argc, argv, "11:", &fname, &nmode, &opt) == 1) { VALUE tmp = rb_io_check_io(fname); if (!NIL_P(tmp)) { @@ -7308,7 +7289,6 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io) struct stat st; #endif - rb_secure(4); argc = rb_scan_args(argc, argv, "11:", &fnum, &vmode, &opt); rb_io_extract_modeenc(&vmode, 0, opt, &oflags, &fmode, &convconfig); @@ -7436,7 +7416,6 @@ static VALUE rb_io_autoclose_p(VALUE io) { rb_io_t *fptr; - rb_secure(4); GetOpenFile(io, fptr); return (fptr->mode & FMODE_PREP) ? Qfalse : Qtrue; } @@ -7462,7 +7441,6 @@ static VALUE rb_io_set_autoclose(VALUE io, VALUE autoclose) { rb_io_t *fptr; - rb_secure(4); GetOpenFile(io, fptr); if (!RTEST(autoclose)) fptr->mode |= FMODE_PREP; |