kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* file.c (rb_get_path_check): check with given safe level.

Browse source 
* file.c (rb_find_file_ext_safe, rb_find_file_safe): ditto.

* safe.c (rb_insecure_operation): function to raise security error.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23831 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-06-23 12:28:16 +00:00
parent 5be8596447
commit 8b920b4ac8
3 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
file.c
View file

@ -101,13 +101,17 @@ VALUE rb_cFile;
VALUE rb_mFileTest; VALUE rb_mFileTest;
VALUE rb_cStat; VALUE rb_cStat;
#define insecure_obj_p(obj, level) (level >= 4 || (level > 0 && OBJ_TAINTED(obj)))
static VALUE static VALUE
rb_get_path_check(VALUE obj, int check) rb_get_path_check(VALUE obj, int level)
{ {
VALUE tmp; VALUE tmp;
ID to_path; ID to_path;
if (check) rb_check_safe_obj(obj); if (insecure_obj_p(obj, level)) {
rb_insecure_operation();
}
tmp = rb_check_string_type(obj); tmp = rb_check_string_type(obj);
if (!NIL_P(tmp)) goto exit; if (!NIL_P(tmp)) goto exit;
@ -120,8 +124,8 @@ rb_get_path_check(VALUE obj, int check)
} }
exit: exit:
StringValueCStr(tmp); StringValueCStr(tmp);
if (check && obj != tmp) { if (obj != tmp && insecure_obj_p(tmp, level)) {
rb_check_safe_obj(tmp); rb_insecure_operation();
} }
return rb_str_new4(tmp); return rb_str_new4(tmp);
} }
@ -135,7 +139,7 @@ rb_get_path_no_checksafe(VALUE obj)
VALUE VALUE
rb_get_path(VALUE obj) rb_get_path(VALUE obj)
{ {
return rb_get_path_check(obj, 1); return rb_get_path_check(obj, rb_safe_level());
} }
static long static long
@ -4673,7 +4677,7 @@ rb_find_file_ext_safe(VALUE *filep, const char *const *ext, int safe_level)
for (i = 0; i < RARRAY_LEN(load_path); i++) { for (i = 0; i < RARRAY_LEN(load_path); i++) {
VALUE str = RARRAY_PTR(load_path)[i]; VALUE str = RARRAY_PTR(load_path)[i];
FilePathValue(str); RB_GC_GUARD(str) = rb_get_path_check(str, safe_level);
if (RSTRING_LEN(str) == 0) continue; if (RSTRING_LEN(str) == 0) continue;
file_expand_path(fname, str, 0, tmp); file_expand_path(fname, str, 0, tmp);
if (file_load_ok(RSTRING_PTR(tmp))) { if (file_load_ok(RSTRING_PTR(tmp))) {
@ -4732,7 +4736,7 @@ rb_find_file_safe(VALUE path, int safe_level)
tmp = rb_str_tmp_new(MAXPATHLEN + 2); tmp = rb_str_tmp_new(MAXPATHLEN + 2);
for (i = 0; i < RARRAY_LEN(load_path); i++) { for (i = 0; i < RARRAY_LEN(load_path); i++) {
VALUE str = RARRAY_PTR(load_path)[i]; VALUE str = RARRAY_PTR(load_path)[i];
FilePathValue(str); RB_GC_GUARD(str) = rb_get_path_check(str, safe_level);
if (RSTRING_LEN(str) > 0) { if (RSTRING_LEN(str) > 0) {
file_expand_path(path, str, 0, tmp); file_expand_path(path, str, 0, tmp);
f = RSTRING_PTR(tmp); f = RSTRING_PTR(tmp);

1
include/ruby/ruby.h
View file

@ -427,6 +427,7 @@ int rb_safe_level(void);
void rb_set_safe_level(int); void rb_set_safe_level(int);
void rb_set_safe_level_force(int); void rb_set_safe_level_force(int);
void rb_secure_update(VALUE); void rb_secure_update(VALUE);
NORETURN(void rb_insecure_operation(void));
VALUE rb_errinfo(void); VALUE rb_errinfo(void);
void rb_set_errinfo(VALUE); void rb_set_errinfo(VALUE);

10
safe.c
View file

@ -98,9 +98,8 @@ rb_secure_update(VALUE obj)
} }
void void
rb_check_safe_obj(VALUE x) rb_insecure_operation(void)
{ {
if (rb_safe_level() > 0 && OBJ_TAINTED(x)) {
if (rb_frame_callee()) { if (rb_frame_callee()) {
rb_raise(rb_eSecurityError, "Insecure operation - %s", rb_raise(rb_eSecurityError, "Insecure operation - %s",
rb_id2name(rb_frame_callee())); rb_id2name(rb_frame_callee()));
@ -108,6 +107,13 @@ rb_check_safe_obj(VALUE x)
else { else {
rb_raise(rb_eSecurityError, "Insecure operation: -r"); rb_raise(rb_eSecurityError, "Insecure operation: -r");
} }
}
void
rb_check_safe_obj(VALUE x)
{
if (rb_safe_level() > 0 && OBJ_TAINTED(x)) {
rb_insecure_operation();
} }
rb_secure(4); rb_secure(4);
} }