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. --- ext/etc/etc.c | 2 -- ext/io/console/console.c | 1 - ext/openssl/ossl_rand.c | 8 -------- ext/openssl/ossl_x509store.c | 2 -- ext/readline/readline.c | 1 - ext/socket/constants.c | 1 - ext/socket/raddrinfo.c | 8 ++------ ext/socket/unixsocket.c | 1 - ext/syslog/syslog.c | 1 - ext/win32ole/win32ole.c | 12 ------------ ext/win32ole/win32ole_event.c | 4 ---- 11 files changed, 2 insertions(+), 39 deletions(-) (limited to 'ext') diff --git a/ext/etc/etc.c b/ext/etc/etc.c index 28761df8c1..1bb10e0b38 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -219,7 +219,6 @@ etc_getpwnam(VALUE obj, VALUE nam) struct passwd *pwd; const char *p = StringValueCStr(nam); - rb_check_safe_obj(nam); pwd = getpwnam(p); if (pwd == 0) rb_raise(rb_eArgError, "can't find user for %"PRIsVALUE, nam); return setup_passwd(pwd); @@ -463,7 +462,6 @@ etc_getgrnam(VALUE obj, VALUE nam) struct group *grp; const char *p = StringValueCStr(nam); - rb_check_safe_obj(nam); grp = getgrnam(p); if (grp == 0) rb_raise(rb_eArgError, "can't find group for %"PRIsVALUE, nam); return setup_group(grp); diff --git a/ext/io/console/console.c b/ext/io/console/console.c index 4f0470940a..42b000fc30 100644 --- a/ext/io/console/console.c +++ b/ext/io/console/console.c @@ -1483,7 +1483,6 @@ prompt(int argc, VALUE *argv, VALUE io) if (argc > 0 && !NIL_P(argv[0])) { VALUE str = argv[0]; StringValueCStr(str); - rb_check_safe_obj(str); rb_io_write(io, str); } } diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c index c95857060a..4a4f9dd5bf 100644 --- a/ext/openssl/ossl_rand.c +++ b/ext/openssl/ossl_rand.c @@ -67,8 +67,6 @@ ossl_rand_add(VALUE self, VALUE str, VALUE entropy) static VALUE ossl_rand_load_file(VALUE self, VALUE filename) { - rb_check_safe_obj(filename); - if(!RAND_load_file(StringValueCStr(filename), -1)) { ossl_raise(eRandomError, NULL); } @@ -86,8 +84,6 @@ ossl_rand_load_file(VALUE self, VALUE filename) static VALUE ossl_rand_write_file(VALUE self, VALUE filename) { - rb_check_safe_obj(filename); - if (RAND_write_file(StringValueCStr(filename)) == -1) { ossl_raise(eRandomError, NULL); } @@ -164,8 +160,6 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE len) static VALUE ossl_rand_egd(VALUE self, VALUE filename) { - rb_check_safe_obj(filename); - if (RAND_egd(StringValueCStr(filename)) == -1) { ossl_raise(eRandomError, NULL); } @@ -186,8 +180,6 @@ ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len) { int n = NUM2INT(len); - rb_check_safe_obj(filename); - if (RAND_egd_bytes(StringValueCStr(filename), n) == -1) { ossl_raise(eRandomError, NULL); } diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c index 2909eeda17..61543d44f6 100644 --- a/ext/openssl/ossl_x509store.c +++ b/ext/openssl/ossl_x509store.c @@ -304,7 +304,6 @@ ossl_x509store_add_file(VALUE self, VALUE file) char *path = NULL; if(file != Qnil){ - rb_check_safe_obj(file); path = StringValueCStr(file); } GetX509Store(self, store); @@ -340,7 +339,6 @@ ossl_x509store_add_path(VALUE self, VALUE dir) char *path = NULL; if(dir != Qnil){ - rb_check_safe_obj(dir); path = StringValueCStr(dir); } GetX509Store(self, store); diff --git a/ext/readline/readline.c b/ext/readline/readline.c index b686f99645..646be2b194 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -95,7 +95,6 @@ static char **readline_attempted_completion_function(const char *text, #define OutputStringValue(str) do {\ StringValueCStr(str);\ - rb_check_safe_obj(str);\ (str) = rb_str_conv_enc((str), rb_enc_get(str), rb_locale_encoding());\ } while (0)\ diff --git a/ext/socket/constants.c b/ext/socket/constants.c index 6fc862777e..1bbb53b173 100644 --- a/ext/socket/constants.c +++ b/ext/socket/constants.c @@ -28,7 +28,6 @@ constant_arg(VALUE arg, int (*str_to_int)(const char*, long, int*), const char * else if (!NIL_P(tmp = rb_check_string_type(arg))) { arg = tmp; str: - rb_check_safe_obj(arg); ptr = RSTRING_PTR(arg); if (str_to_int(ptr, RSTRING_LEN(arg), &ret) == -1) rb_raise(rb_eSocket, "%s: %s", errmsg, ptr); diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index 0499b845b5..cc296749b0 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -503,10 +503,6 @@ str_is_number(const char *p) #define str_equal(ptr, len, name) \ ((ptr)[0] == name[0] && \ rb_strlen_lit(name) == (len) && memcmp(ptr, name, len) == 0) -#define SafeStringValueCStr(v) do {\ - StringValueCStr(v);\ - rb_check_safe_obj(v);\ -} while(0) static char* host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr) @@ -525,7 +521,7 @@ host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr) const char *name; size_t len; - SafeStringValueCStr(host); + StringValueCStr(host); RSTRING_GETMEM(host, name, len); if (!len || str_equal(name, len, "")) { make_inetaddr(INADDR_ANY, hbuf, hbuflen); @@ -564,7 +560,7 @@ port_str(VALUE port, char *pbuf, size_t pbuflen, int *flags_ptr) const char *serv; size_t len; - SafeStringValueCStr(port); + StringValueCStr(port); RSTRING_GETMEM(port, serv, len); if (len >= pbuflen) { rb_raise(rb_eArgError, "service name too long (%"PRIuSIZE")", diff --git a/ext/socket/unixsocket.c b/ext/socket/unixsocket.c index 8bdfc84575..0c3a01d21e 100644 --- a/ext/socket/unixsocket.c +++ b/ext/socket/unixsocket.c @@ -39,7 +39,6 @@ unixsock_path_value(VALUE path) #endif if (isstr) { if (RSTRING_LEN(name) == 0 || RSTRING_PTR(name)[0] == '\0') { - rb_check_safe_obj(name); return name; /* ignore encoding */ } } diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c index 23dcf6c092..4c540fc9c7 100644 --- a/ext/syslog/syslog.c +++ b/ext/syslog/syslog.c @@ -162,7 +162,6 @@ static VALUE mSyslog_open(int argc, VALUE *argv, VALUE self) ident = rb_gv_get("$0"); } ident_ptr = StringValueCStr(ident); - rb_check_safe_obj(ident); syslog_ident = strdup(ident_ptr); if (NIL_P(opt)) { diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index c46d3937c3..f20bfc84f6 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -1985,10 +1985,6 @@ fole_s_connect(int argc, VALUE *argv, VALUE self) rb_scan_args(argc, argv, "1*", &svr_name, &others); StringValue(svr_name); - if (rb_safe_level() > 0 && OBJ_TAINTED(svr_name)) { - rb_raise(rb_eSecurityError, "insecure connection - `%s'", - StringValuePtr(svr_name)); - } /* get CLSID from OLE server name */ pBuf = ole_vstr2wc(svr_name); @@ -2478,16 +2474,8 @@ fole_initialize(int argc, VALUE *argv, VALUE self) rb_scan_args(argc, argv, "11*:", &svr_name, &host, &others, &opts); StringValue(svr_name); - if (rb_safe_level() > 0 && OBJ_TAINTED(svr_name)) { - rb_raise(rb_eSecurityError, "insecure object creation - `%s'", - StringValuePtr(svr_name)); - } if (!NIL_P(host)) { StringValue(host); - if (rb_safe_level() > 0 && OBJ_TAINTED(host)) { - rb_raise(rb_eSecurityError, "insecure object creation - `%s'", - StringValuePtr(host)); - } return ole_create_dcom(self, svr_name, host, others); } diff --git a/ext/win32ole/win32ole_event.c b/ext/win32ole/win32ole_event.c index ddb5200b9a..041639af6c 100644 --- a/ext/win32ole/win32ole_event.c +++ b/ext/win32ole/win32ole_event.c @@ -922,10 +922,6 @@ ev_advise(int argc, VALUE *argv, VALUE self) if(!RB_TYPE_P(itf, T_NIL)) { pitf = StringValuePtr(itf); - if (rb_safe_level() > 0 && OBJ_TAINTED(itf)) { - rb_raise(rb_eSecurityError, "insecure event creation - `%s'", - StringValuePtr(itf)); - } hr = find_iid(ole, pitf, &iid, &pTypeInfo); } else { -- cgit v1.2.3