diff options
author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-25 11:18:17 +0000 |
---|---|---|
committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-25 11:18:17 +0000 |
commit | 108c4e4495385ccb5cab87dd723f27ef0ab52049 (patch) | |
tree | d03e75050026f00dd623376f99e77b7d8f2b010d /test/win32ole | |
parent | 682f3a788102113fdb1927e2b42ef7932106acb2 (diff) |
* ext/win32ole/win32ole.c(fole_s_connect, fole_initialize): raise a
security error with the tainted string object.
* ext/win32ole/win32ole_event.c(ev_advise): ditto.
* test/win32ole/test_win32ole.rb(test_s_new_exc_svr_tainted,
test_s_new_exc_host_tainted): ditto.
* test/win32ole/test_win32ole_event.rb(test_s_new_exc_tainted): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47274 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/win32ole')
-rw-r--r-- | test/win32ole/test_win32ole.rb | 40 | ||||
-rw-r--r-- | test/win32ole/test_win32ole_event.rb | 13 |
2 files changed, 53 insertions, 0 deletions
diff --git a/test/win32ole/test_win32ole.rb b/test/win32ole/test_win32ole.rb index 71026d48c6..b41fd591fe 100644 --- a/test/win32ole/test_win32ole.rb +++ b/test/win32ole/test_win32ole.rb @@ -169,6 +169,33 @@ if defined?(WIN32OLE) } end + def test_s_new_exc_svr_tainted + th = Thread.start { + $SAFE = 1 + svr = "Scripting.Dictionary" + svr.taint + WIN32OLE.new(svr) + } + exc = assert_raise(SecurityError) { + th.join + } + assert_match(/insecure object creation - `Scripting.Dictionary'/, exc.message) + end + + def test_s_new_exc_host_tainted + th = Thread.start { + $SAFE = 1 + svr = "Scripting.Dictionary" + host = "localhost" + host.taint + WIN32OLE.new(svr, host) + } + exc = assert_raise(SecurityError) { + th.join + } + assert_match(/insecure object creation - `localhost'/, exc.message) + end + def test_s_new_DCOM rshell = WIN32OLE.new("Shell.Application") assert_instance_of(WIN32OLE, rshell) @@ -194,6 +221,19 @@ if defined?(WIN32OLE) } end + def test_s_coonect_exc_tainted + th = Thread.start { + $SAFE = 1 + svr = "winmgmts:" + svr.taint + WIN32OLE.connect(svr) + } + exc = assert_raise(SecurityError) { + th.join + } + assert_match(/insecure connection - `winmgmts:'/, exc.message) + end + def test_invoke_accept_symbol_hash_key fso = WIN32OLE.new('Scripting.FileSystemObject') afolder = fso.getFolder(".") diff --git a/test/win32ole/test_win32ole_event.rb b/test/win32ole/test_win32ole_event.rb index 8e3915ec17..f486749113 100644 --- a/test/win32ole/test_win32ole_event.rb +++ b/test/win32ole/test_win32ole_event.rb @@ -329,6 +329,19 @@ if defined?(WIN32OLE_EVENT) message_loop assert(h2.ev != "") end + + def test_s_new_exc_tainted + th = Thread.new { + $SAFE=1 + str = 'ConnectionEvents' + str.taint + ev = WIN32OLE_EVENT.new(@db, str) + } + exc = assert_raise(SecurityError) { + th.join + } + assert_match(/insecure event creation - `ConnectionEvents'/, exc.message) + end end end end |