Ruby: split tests to match stdlib changes

hmac · hmac · commit 546bfcb8ea53 · 2022-02-17T20:44:04.000+13:00
diff --git a/ruby/ql/test/library-tests/frameworks/Core.expected b/ruby/ql/test/library-tests/frameworks/Core.expected
@@ -0,0 +1,8 @@
+subshellLiteralExecutions
+| Core.rb:1:1:1:10 | `echo foo` |
+| Core.rb:2:1:2:12 | `echo foo` |
+| Core.rb:3:1:3:12 | `echo foo` |
+| Core.rb:4:1:4:12 | `echo foo` |
+| Core.rb:5:1:5:12 | `echo foo` |
+subshellHeredocExecutions
+| Core.rb:7:1:7:7 | <<`EOF` |
diff --git a/ruby/ql/test/library-tests/frameworks/Core.ql b/ruby/ql/test/library-tests/frameworks/Core.ql
@@ -0,0 +1,6 @@
+import codeql.ruby.frameworks.Core
+import codeql.ruby.DataFlow
+
+query predicate subshellLiteralExecutions(SubshellLiteralExecution e) { any() }
+
+query predicate subshellHeredocExecutions(SubshellHeredocExecution e) { any() }
diff --git a/ruby/ql/test/library-tests/frameworks/Eval.rb b/ruby/ql/test/library-tests/frameworks/Eval.rb
@@ -21,6 +21,4 @@ def run
 end
 
 Foo.new.send("exit", 1)
-Foo.new.instance_eval("self.class", "file.rb", 3)
-Foo.class_eval("def foo; 1; end", "file.rb", 1)
 Foo.module_eval("def bar; 1; end", "other_file.rb", 2)
diff --git a/ruby/ql/test/library-tests/frameworks/StandardLibrary.expected b/ruby/ql/test/library-tests/frameworks/StandardLibrary.expected
diff --git a/ruby/ql/test/library-tests/frameworks/StandardLibrary.ql b/ruby/ql/test/library-tests/frameworks/StandardLibrary.ql
diff --git a/ruby/ql/test/library-tests/frameworks/Stdlib.rb b/ruby/ql/test/library-tests/frameworks/Stdlib.rb
@@ -0,0 +1,9 @@
+`echo foo`
+%x(echo foo)
+%x{echo foo}
+%x[echo foo]
+%x/echo foo/
+
+<<`EOF`
+echo foo
+EOF
diff --git a/ruby/ql/test/library-tests/frameworks/core/BasicObject.expected b/ruby/ql/test/library-tests/frameworks/core/BasicObject.expected
@@ -0,0 +1 @@
+| BasicObject.rb:1:1:1:49 | call to instance_eval | BasicObject.rb:1:23:1:34 | "self.class" |
diff --git a/ruby/ql/test/library-tests/frameworks/core/BasicObject.ql b/ruby/ql/test/library-tests/frameworks/core/BasicObject.ql
@@ -0,0 +1,6 @@
+import codeql.ruby.frameworks.core.BasicObject::BasicObject
+import codeql.ruby.DataFlow
+
+query DataFlow::Node instanceEvalCallCodeExecutions(InstanceEvalCallCodeExecution e) {
+  result = e.getCode()
+}
diff --git a/ruby/ql/test/library-tests/frameworks/core/BasicObject.rb b/ruby/ql/test/library-tests/frameworks/core/BasicObject.rb
@@ -0,0 +1 @@
+Foo.new.instance_eval("self.class", "file.rb", 3)
diff --git a/ruby/ql/test/library-tests/frameworks/core/Kernel.expected b/ruby/ql/test/library-tests/frameworks/core/Kernel.expected
@@ -0,0 +1,44 @@
+kernelSystemCallExecutions
+| Kernel.rb:23:1:23:18 | call to system |
+| Kernel.rb:24:1:24:21 | call to system |
+| Kernel.rb:25:1:25:31 | call to system |
+| Kernel.rb:27:1:27:36 | call to system |
+| Kernel.rb:28:1:28:39 | call to system |
+| Kernel.rb:29:1:29:49 | call to system |
+| Kernel.rb:31:1:31:41 | call to system |
+| Kernel.rb:32:1:32:44 | call to system |
+| Kernel.rb:33:1:33:54 | call to system |
+| Kernel.rb:35:1:35:59 | call to system |
+| Kernel.rb:36:1:36:62 | call to system |
+| Kernel.rb:37:1:37:72 | call to system |
+kernelExecCallExecutions
+| Kernel.rb:39:1:39:16 | call to exec |
+| Kernel.rb:40:1:40:19 | call to exec |
+| Kernel.rb:41:1:41:29 | call to exec |
+| Kernel.rb:43:1:43:34 | call to exec |
+| Kernel.rb:44:1:44:37 | call to exec |
+| Kernel.rb:45:1:45:47 | call to exec |
+| Kernel.rb:47:1:47:39 | call to exec |
+| Kernel.rb:48:1:48:42 | call to exec |
+| Kernel.rb:49:1:49:52 | call to exec |
+| Kernel.rb:51:1:51:57 | call to exec |
+| Kernel.rb:52:1:52:60 | call to exec |
+| Kernel.rb:53:1:53:70 | call to exec |
+kernelSpawnCallExecutions
+| Kernel.rb:55:1:55:17 | call to spawn |
+| Kernel.rb:56:1:56:20 | call to spawn |
+| Kernel.rb:57:1:57:30 | call to spawn |
+| Kernel.rb:59:1:59:35 | call to spawn |
+| Kernel.rb:60:1:60:38 | call to spawn |
+| Kernel.rb:61:1:61:48 | call to spawn |
+| Kernel.rb:63:1:63:40 | call to spawn |
+| Kernel.rb:64:1:64:43 | call to spawn |
+| Kernel.rb:65:1:65:53 | call to spawn |
+| Kernel.rb:67:1:67:58 | call to spawn |
+| Kernel.rb:68:1:68:61 | call to spawn |
+| Kernel.rb:69:1:69:71 | call to spawn |
+sendCallCodeExecutions
+| Kernel.rb:2:1:2:22 | call to send | Kernel.rb:2:6:2:12 | "raise" |
+| Kernel.rb:5:1:5:19 | call to send | Kernel.rb:5:8:5:13 | "push" |
+evalCallCodeExecutions
+| Kernel.rb:1:1:1:43 | call to eval | Kernel.rb:1:6:1:22 | "raise \\"error\\"" |
diff --git a/ruby/ql/test/library-tests/frameworks/core/Kernel.ql b/ruby/ql/test/library-tests/frameworks/core/Kernel.ql
@@ -0,0 +1,12 @@
+import codeql.ruby.frameworks.core.Kernel::Kernel
+import codeql.ruby.DataFlow
+
+query predicate kernelSystemCallExecutions(KernelSystemCall c) { any() }
+
+query predicate kernelExecCallExecutions(KernelExecCall c) { any() }
+
+query predicate kernelSpawnCallExecutions(KernelSpawnCall c) { any() }
+
+query DataFlow::Node sendCallCodeExecutions(SendCallCodeExecution e) { result = e.getCode() }
+
+query DataFlow::Node evalCallCodeExecutions(EvalCallCodeExecution e) { result = e.getCode() }
diff --git a/ruby/ql/test/library-tests/frameworks/core/Kernel.rb b/ruby/ql/test/library-tests/frameworks/core/Kernel.rb
@@ -1,8 +1,24 @@
-`echo foo`
-%x(echo foo)
-%x{echo foo}
-%x[echo foo]
-%x/echo foo/
+eval("raise \"error\"", binding, "file", 1)
+send("raise", "error")
+
+a = []
+a.send("push", "1")
+
+class Foo
+  def eval(x)
+    x + 1
+  end
+
+  def send(*args)
+    2
+  end
+
+  def run
+    eval("exit 1")
+  end
+end
+
+Foo.new.send("exit", 1)
 
 system("echo foo")
 system("echo", "foo")
@@ -52,22 +68,6 @@
 spawn({"FOO" => "BAR"}, "echo", "foo", unsetenv_others: true)
 spawn({"FOO" => "BAR"}, ["echo", "echo"], "foo", unsetenv_others: true)
 
-Open3.popen3("echo foo")
-Open3.popen2("echo foo")
-Open3.popen2e("echo foo")
-Open3.capture3("echo foo")
-Open3.capture2("echo foo")
-Open3.capture2e("echo foo")
-Open3.pipeline_rw("echo foo", "grep bar")
-Open3.pipeline_r("echo foo", "grep bar")
-Open3.pipeline_w("echo foo", "grep bar")
-Open3.pipeline_start("echo foo", "grep bar")
-Open3.pipeline("echo foo", "grep bar")
-
-<<`EOF`
-echo foo
-EOF
-
 module MockSystem
   def system(*args)
     args
@@ -87,4 +87,4 @@ def run
   end
 end
 
-UnknownModule.system("ls")
+UnknownModule.system("ls")
diff --git a/ruby/ql/test/library-tests/frameworks/core/Module.expected b/ruby/ql/test/library-tests/frameworks/core/Module.expected
@@ -0,0 +1,11 @@
+classEvalCallCodeExecutions
+| Module.rb:29:1:29:47 | call to class_eval | Module.rb:29:16:29:32 | "def foo; 1; end" |
+moduleEvalCallCodeExecutions
+| Module.rb:30:1:30:54 | call to module_eval | Module.rb:30:17:30:33 | "def bar; 1; end" |
+moduleConstGetCallCodeExecutions
+| Module.rb:1:1:1:24 | call to const_get | Module.rb:1:18:1:23 | "Math" |
+| Module.rb:2:1:2:28 | call to const_get | Module.rb:2:22:2:27 | "Math" |
+| Module.rb:3:1:3:20 | call to const_get | Module.rb:3:16:3:19 | "PI" |
+| Module.rb:4:1:4:19 | call to const_get | Module.rb:4:16:4:18 | :PI |
+| Module.rb:22:1:22:33 | call to const_get | Module.rb:22:18:22:32 | "Foo::Baz::VAL" |
+| Module.rb:23:1:23:25 | call to const_get | Module.rb:23:15:23:24 | "Bar::VAL" |
diff --git a/ruby/ql/test/library-tests/frameworks/core/Module.ql b/ruby/ql/test/library-tests/frameworks/core/Module.ql
@@ -0,0 +1,14 @@
+import codeql.ruby.DataFlow
+import codeql.ruby.frameworks.core.Module::Module
+
+query DataFlow::Node classEvalCallCodeExecutions(ClassEvalCallCodeExecution e) {
+  result = e.getCode()
+}
+
+query DataFlow::Node moduleEvalCallCodeExecutions(ModuleEvalCallCodeExecution e) {
+  result = e.getCode()
+}
+
+query DataFlow::Node moduleConstGetCallCodeExecutions(ModuleConstGetCallCodeExecution e) {
+  result = e.getCode()
+}
diff --git a/ruby/ql/test/library-tests/frameworks/core/Module.rb b/ruby/ql/test/library-tests/frameworks/core/Module.rb
@@ -24,4 +24,7 @@ def self.const_get(x)
 
 # Should not be identified as a use of Module#const_get
 Foo::Bar.new.const_get 5
-Foo::Baz.const_get 5
+Foo::Baz.const_get 5
+
+Foo.class_eval("def foo; 1; end", "file.rb", 1)
+Foo.module_eval("def bar; 1; end", "other_file.rb", 2)
diff --git a/ruby/ql/test/library-tests/frameworks/stdlib/Logger.expected b/ruby/ql/test/library-tests/frameworks/stdlib/Logger.expected
@@ -0,0 +1,23 @@
+| Logging.rb:5:3:5:23 | call to progname= | Logging.rb:5:27:5:38 | "LoggerTest" |
+| Logging.rb:15:5:15:21 | call to debug | Logging.rb:15:19:15:21 | msg |
+| Logging.rb:20:5:22:7 | call to error | Logging.rb:21:7:21:15 | ... + ... |
+| Logging.rb:27:5:27:21 | call to fatal | Logging.rb:27:19:27:21 | msg |
+| Logging.rb:32:5:32:20 | call to warn | Logging.rb:32:18:32:20 | msg |
+| Logging.rb:37:5:37:43 | call to unknown | Logging.rb:37:21:37:34 | "unknown prog" |
+| Logging.rb:37:5:37:43 | call to unknown | Logging.rb:37:39:37:41 | msg |
+| Logging.rb:42:5:48:7 | call to info | Logging.rb:43:7:47:9 | if ... |
+| Logging.rb:54:5:54:44 | ... << ... | Logging.rb:54:21:54:44 | ( ... ) |
+| Logging.rb:58:5:58:46 | call to add | Logging.rb:58:38:58:44 | "block" |
+| Logging.rb:60:5:60:64 | call to add | Logging.rb:60:36:60:38 | nil |
+| Logging.rb:60:5:60:64 | call to add | Logging.rb:60:41:60:51 | "progname1" |
+| Logging.rb:60:5:60:64 | call to add | Logging.rb:60:56:60:62 | "block" |
+| Logging.rb:63:5:63:63 | call to add | Logging.rb:63:36:63:45 | "message1" |
+| Logging.rb:64:5:64:76 | call to add | Logging.rb:64:36:64:45 | "message2" |
+| Logging.rb:64:5:64:76 | call to add | Logging.rb:64:48:64:58 | "progname2" |
+| Logging.rb:68:5:68:46 | call to log | Logging.rb:68:38:68:44 | "block" |
+| Logging.rb:70:5:70:64 | call to log | Logging.rb:70:36:70:38 | nil |
+| Logging.rb:70:5:70:64 | call to log | Logging.rb:70:41:70:51 | "progname1" |
+| Logging.rb:70:5:70:64 | call to log | Logging.rb:70:56:70:62 | "block" |
+| Logging.rb:73:5:73:63 | call to log | Logging.rb:73:36:73:45 | "message1" |
+| Logging.rb:74:5:74:76 | call to log | Logging.rb:74:36:74:45 | "message2" |
+| Logging.rb:74:5:74:76 | call to log | Logging.rb:74:48:74:58 | "progname2" |
diff --git a/ruby/ql/test/library-tests/frameworks/stdlib/Logger.ql b/ruby/ql/test/library-tests/frameworks/stdlib/Logger.ql
@@ -0,0 +1,4 @@
+import codeql.ruby.frameworks.stdlib.Logger::Logger
+import codeql.ruby.DataFlow
+
+query DataFlow::Node loggerLoggingCallInputs(LoggerLoggingCall c) { result = c.getAnInput() }
diff --git a/ruby/ql/test/library-tests/frameworks/stdlib/Logging.rb b/ruby/ql/test/library-tests/frameworks/stdlib/Logging.rb
diff --git a/ruby/ql/test/library-tests/frameworks/stdlib/Open3.expected b/ruby/ql/test/library-tests/frameworks/stdlib/Open3.expected
@@ -0,0 +1,13 @@
+open3CallExecutions
+| Open3.rb:1:1:1:24 | call to popen3 |
+| Open3.rb:2:1:2:24 | call to popen2 |
+| Open3.rb:3:1:3:25 | call to popen2e |
+| Open3.rb:4:1:4:26 | call to capture3 |
+| Open3.rb:5:1:5:26 | call to capture2 |
+| Open3.rb:6:1:6:27 | call to capture2e |
+open3PipelineCallExecutions
+| Open3.rb:7:1:7:41 | call to pipeline_rw |
+| Open3.rb:8:1:8:40 | call to pipeline_r |
+| Open3.rb:9:1:9:40 | call to pipeline_w |
+| Open3.rb:10:1:10:44 | call to pipeline_start |
+| Open3.rb:11:1:11:38 | call to pipeline |
diff --git a/ruby/ql/test/library-tests/frameworks/stdlib/Open3.ql b/ruby/ql/test/library-tests/frameworks/stdlib/Open3.ql
diff --git a/ruby/ql/test/library-tests/frameworks/stdlib/Open3.rb b/ruby/ql/test/library-tests/frameworks/stdlib/Open3.rb

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+\| BasicObject.rb:1:1:1:49 \| call to instance_eval \| BasicObject.rb:1:23:1:34 \| "self.class" \|`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Foo.new.instance_eval("self.class", "file.rb", 3)`