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 /ext/win32ole | |
parent | 7b6a8b5b54448235e17ed187d9d73f56893e1b6f (diff) | |
download | ruby-c5c05460ac20abcbc0ed686eb4acf06da7a39a79.tar.gz |
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.
Diffstat (limited to 'ext/win32ole')
-rw-r--r-- | ext/win32ole/win32ole.c | 12 | ||||
-rw-r--r-- | ext/win32ole/win32ole_event.c | 4 |
2 files changed, 0 insertions, 16 deletions
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 { |