Skip to content

Commit 007ab2b

Browse files
hvitvedhvitved
committed
Ruby: Do not expose AST layer through ruby.qll 
1 parent 2739b9c commit 007ab2b

File tree

174 files changed

+174
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+174
-174
lines changed

‎.github/workflows/ruby-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ jobs:
197197
- name: Prepare test files
198198
shell: bash
199199
run: |
200-
echo "import ruby select count(File f)" > "test.ql"
200+
echo "import codeql.ruby.AST select count(File f)" > "test.ql"
201201
echo "| 4 |" > "test.expected"
202202
echo 'name: sample-tests
203203
version: 0.0.0

‎ruby/ql/examples/snippets/emptythen.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* statement
1212
*/
1313

14-
import ruby
14+
import codeql.ruby.AST
1515

1616
from IfExpr i
1717
where not exists(i.getThen().getAChild())

‎ruby/ql/lib/Customizations.qll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@
99
* to model frameworks that are not covered by the standard library.
1010
*/
1111

12-
import ruby

‎ruby/ql/lib/codeql/ruby/AST.qll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ private import ast.internal.AST
1717
private import ast.internal.Scope
1818
private import ast.internal.Synthesis
1919
private import ast.internal.TreeSitter
20+
private import Customizations
2021

2122
cached
2223
private module Cached {

‎ruby/ql/lib/codeql/ruby/ApiGraphs.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* directed and labeled; they specify how the components represented by nodes relate to each other.
77
*/
88

9-
private import ruby
9+
private import codeql.ruby.AST
1010
private import codeql.ruby.DataFlow
1111
private import codeql.ruby.typetracking.TypeTracker
1212
private import codeql.ruby.ast.internal.Module

‎ruby/ql/lib/codeql/ruby/CFG.qll

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/** Provides classes representing the control flow graph. */
22

3+
import codeql.Locations
34
import controlflow.ControlFlowGraph
45
import controlflow.CfgNodes as CfgNodes
56
import controlflow.BasicBlocks

‎ruby/ql/lib/codeql/ruby/DataFlow.qll

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
* Provides classes for performing local (intra-procedural) and
33
* global (inter-procedural) data flow analyses.
44
*/
5+
6+
import codeql.Locations
7+
58
module DataFlow {
69
import codeql.ruby.dataflow.internal.DataFlowImpl
710
}

‎ruby/ql/lib/codeql/ruby/InclusionTests.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Contains classes for recognizing array and string inclusion tests.
33
*/
44

5-
private import ruby
5+
private import codeql.ruby.AST
66
private import codeql.ruby.DataFlow
77
private import codeql.ruby.controlflow.CfgNodes
88

‎ruby/ql/lib/codeql/ruby/StringOps.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Provides classes and predicates for reasoning about string-manipulating expressions.
33
*/
44

5-
private import ruby
5+
private import codeql.ruby.AST
66
private import codeql.ruby.DataFlow
77
private import codeql.ruby.controlflow.CfgNodes
88
private import InclusionTests

‎ruby/ql/lib/codeql/ruby/ast/Erb.qll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
private import codeql.Locations
21
private import codeql.ruby.AST
32
private import internal.Erb
43
private import internal.TreeSitter

‎ruby/ql/lib/codeql/ruby/ast/internal/Module.qll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
private import codeql.Locations
21
private import codeql.ruby.AST
32

43
// Names of built-in modules and classes

‎ruby/ql/lib/codeql/ruby/ast/internal/Variable.qll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
private import TreeSitter
2-
private import codeql.Locations
32
private import codeql.ruby.AST
43
private import codeql.ruby.ast.internal.AST
54
private import codeql.ruby.ast.internal.Parameter

‎ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/** Provides classes representing basic blocks. */
22

3-
private import codeql.Locations
43
private import codeql.ruby.AST
54
private import codeql.ruby.ast.internal.AST
65
private import codeql.ruby.ast.internal.TreeSitter

‎ruby/ql/lib/codeql/ruby/controlflow/ControlFlowGraph.qll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/** Provides classes representing the control flow graph. */
22

3-
private import codeql.Locations
43
private import codeql.ruby.AST
54
private import codeql.ruby.controlflow.BasicBlocks
65
private import SuccessorTypes

‎ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplSpecific.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
private import ruby as RB
1+
private import codeql.ruby.AST as RB
22
private import ControlFlowGraphImpl as Impl
33
private import Completion as Comp
44
private import codeql.ruby.ast.internal.Synthesis

‎ruby/ql/lib/codeql/ruby/dataflow/BarrierGuards.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** Provides commonly used barriers to dataflow. */
22

3-
private import ruby
3+
private import codeql.ruby.AST
44
private import codeql.ruby.DataFlow
55
private import codeql.ruby.CFG
66
private import codeql.ruby.controlflow.CfgNodes

‎ruby/ql/lib/codeql/ruby/dataflow/FlowSummary.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** Provides classes and predicates for defining flow summaries. */
22

3-
import ruby
3+
import codeql.ruby.AST
44
import codeql.ruby.DataFlow
55
private import codeql.ruby.frameworks.data.ModelsAsData
66
private import codeql.ruby.ApiGraphs

‎ruby/ql/lib/codeql/ruby/dataflow/SSA.qll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* Provides classes for working with static single assignment (SSA) form.
77
*/
88
module Ssa {
9-
private import codeql.Locations
109
private import codeql.ruby.CFG
1110
private import codeql.ruby.ast.Variable
1211
private import internal.SsaImpl as SsaImpl

‎ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
private import ruby
1+
private import codeql.ruby.AST
22
private import codeql.ruby.CFG
33
private import DataFlowPrivate
44
private import codeql.ruby.typetracking.TypeTracker

‎ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
private import ruby
1+
private import codeql.ruby.AST
22
private import codeql.ruby.ast.internal.Synthesis
33
private import codeql.ruby.CFG
44
private import codeql.ruby.dataflow.SSA

‎ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
private import ruby
1+
private import codeql.ruby.AST
22
private import DataFlowDispatch
33
private import DataFlowPrivate
44
private import codeql.ruby.CFG

‎ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImplSpecific.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Provides Ruby specific classes and predicates for defining flow summaries.
33
*/
44

5-
private import ruby
5+
private import codeql.ruby.AST
66
private import DataFlowDispatch
77
private import DataFlowPrivate
88
private import DataFlowPublic

‎ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
private import ruby
1+
private import codeql.ruby.AST
22
private import DataFlowPrivate
33
private import TaintTrackingPublic
44
private import codeql.ruby.CFG

‎ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPublic.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
private import ruby
1+
private import codeql.ruby.AST
22
private import TaintTrackingPrivate
33
private import codeql.ruby.CFG
44
private import codeql.ruby.DataFlow

‎ruby/ql/lib/codeql/ruby/filters/GeneratedCode.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/** Provides classes for detecting generated code. */
22

3-
private import ruby
3+
private import codeql.ruby.AST
44
private import codeql.ruby.ast.internal.TreeSitter
55

66
/** A source file that contains generated code. */

‎ruby/ql/lib/codeql/ruby/frameworks/ActionCable.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* https://rubygems.org/gems/actioncable
44
*/
55

6-
private import ruby
6+
private import codeql.ruby.AST
77
private import codeql.ruby.Concepts
88
private import codeql.ruby.ApiGraphs
99
private import codeql.ruby.frameworks.stdlib.Logger::Logger as StdlibLogger

‎ruby/ql/lib/codeql/ruby/frameworks/ActiveResource.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Version: 6.0.0.
44
*/
55

6-
private import ruby
6+
private import codeql.ruby.AST
77
private import codeql.ruby.Concepts
88
private import codeql.ruby.controlflow.CfgNodes
99
private import codeql.ruby.ast.internal.Module

‎ruby/ql/lib/codeql/ruby/frameworks/ActiveSupport.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* https://rubygems.org/gems/activesupport
44
*/
55

6-
private import ruby
6+
private import codeql.ruby.AST
77
private import codeql.ruby.Concepts
88
private import codeql.ruby.DataFlow
99
private import codeql.ruby.dataflow.FlowSummary

‎ruby/ql/lib/codeql/ruby/frameworks/Archive.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Provides classes for working with archive libraries.
33
*/
44

5-
private import ruby
5+
private import codeql.ruby.AST
66
private import codeql.ruby.Concepts
77
private import codeql.ruby.DataFlow
88
private import codeql.ruby.ApiGraphs

‎ruby/ql/lib/codeql/ruby/frameworks/Files.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Provides classes for working with file system libraries.
33
*/
44

5-
private import ruby
5+
private import codeql.ruby.AST
66
private import codeql.ruby.Concepts
77
private import codeql.ruby.ApiGraphs
88
private import codeql.ruby.DataFlow

‎ruby/ql/lib/codeql/ruby/frameworks/Rails.qll

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
* Provides classes for working with Rails.
33
*/
44

5-
private import codeql.files.FileSystem
65
private import codeql.ruby.AST
76
private import codeql.ruby.Concepts
87
private import codeql.ruby.DataFlow

‎ruby/ql/lib/codeql/ruby/frameworks/Railties.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* https://rubygems.org/gems/railties
44
*/
55

6-
private import ruby
6+
private import codeql.ruby.AST
77
private import codeql.ruby.Concepts
88
private import codeql.ruby.ApiGraphs
99
private import codeql.ruby.DataFlow

‎ruby/ql/lib/codeql/ruby/frameworks/core/internal/IOOrFile.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Provides modeling for concepts shared across `File` and `IO`.
33
*/
44

5-
private import ruby
5+
private import codeql.ruby.AST
66
private import codeql.ruby.DataFlow
77
private import codeql.ruby.ApiGraphs
88
private import codeql.ruby.frameworks.Files

‎ruby/ql/lib/codeql/ruby/frameworks/data/ModelsAsData.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* - the name of a type definition from `ModelInput::TypeModelCsv`
1515
*/
1616

17-
private import ruby
17+
private import codeql.ruby.AST
1818
private import internal.ApiGraphModels as Shared
1919
private import internal.ApiGraphModelsSpecific as Specific
2020
import Shared::ModelInput as ModelInput

‎ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModelsSpecific.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* ```
2020
*/
2121

22-
private import ruby
22+
private import codeql.ruby.AST
2323
private import codeql.ruby.dataflow.internal.DataFlowPrivate as DataFlowPrivate
2424
private import ApiGraphModels
2525

‎ruby/ql/lib/codeql/ruby/frameworks/http_clients/Excon.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Provides modeling for the `Excon` library.
33
*/
44

5-
private import ruby
5+
private import codeql.ruby.AST
66
private import codeql.ruby.CFG
77
private import codeql.ruby.Concepts
88
private import codeql.ruby.ApiGraphs

‎ruby/ql/lib/codeql/ruby/frameworks/http_clients/Faraday.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Provides modeling for the `Faraday` library.
33
*/
44

5-
private import ruby
5+
private import codeql.ruby.AST
66
private import codeql.ruby.CFG
77
private import codeql.ruby.Concepts
88
private import codeql.ruby.ApiGraphs

‎ruby/ql/lib/codeql/ruby/frameworks/http_clients/HttpClient.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Provides modeling for the `HTTPClient` library.
33
*/
44

5-
private import ruby
5+
private import codeql.ruby.AST
66
private import codeql.ruby.Concepts
77
private import codeql.ruby.ApiGraphs
88
private import codeql.ruby.DataFlow

‎ruby/ql/lib/codeql/ruby/frameworks/http_clients/Httparty.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Provides modeling for the `HTTParty` library.
33
*/
44

5-
private import ruby
5+
private import codeql.ruby.AST
66
private import codeql.ruby.CFG
77
private import codeql.ruby.Concepts
88
private import codeql.ruby.ApiGraphs

‎ruby/ql/lib/codeql/ruby/frameworks/http_clients/OpenURI.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Provides modeling for the `OpenURI` library.
33
*/
44

5-
private import ruby
5+
private import codeql.ruby.AST
66
private import codeql.ruby.CFG
77
private import codeql.ruby.Concepts
88
private import codeql.ruby.ApiGraphs

‎ruby/ql/lib/codeql/ruby/frameworks/http_clients/RestClient.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Provides modeling for the `RestClient` library.
33
*/
44

5-
private import ruby
5+
private import codeql.ruby.AST
66
private import codeql.ruby.CFG
77
private import codeql.ruby.Concepts
88
private import codeql.ruby.ApiGraphs

‎ruby/ql/lib/codeql/ruby/frameworks/http_clients/Typhoeus.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Provides modeling for the `Typhoeus` library.
33
*/
44

5-
private import ruby
5+
private import codeql.ruby.AST
66
private import codeql.ruby.CFG
77
private import codeql.ruby.Concepts
88
private import codeql.ruby.ApiGraphs

‎ruby/ql/lib/codeql/ruby/security/CleartextLoggingCustomizations.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* adding your own.
55
*/
66

7-
private import ruby
7+
private import codeql.ruby.AST
88
private import codeql.ruby.DataFlow
99
private import codeql.ruby.Concepts
1010
private import internal.CleartextSources

‎ruby/ql/lib/codeql/ruby/security/CleartextLoggingQuery.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* `CleartextLoggingCustomizations` should be imported instead.
77
*/
88

9-
private import ruby
9+
private import codeql.ruby.AST
1010
private import codeql.ruby.DataFlow
1111
private import codeql.ruby.TaintTracking
1212
import CleartextLoggingCustomizations::CleartextLogging

‎ruby/ql/lib/codeql/ruby/security/CleartextStorageCustomizations.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* adding your own.
55
*/
66

7-
private import ruby
7+
private import codeql.ruby.AST
88
private import codeql.ruby.DataFlow
99
private import codeql.ruby.Concepts
1010
private import internal.CleartextSources

‎ruby/ql/lib/codeql/ruby/security/CleartextStorageQuery.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* imported instead.
77
*/
88

9-
private import ruby
9+
private import codeql.ruby.AST
1010
private import codeql.ruby.DataFlow
1111
private import codeql.ruby.TaintTracking
1212
private import CleartextStorageCustomizations::CleartextStorage as CleartextStorage

‎ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
private import ruby
1+
private import codeql.ruby.AST
22
private import codeql.ruby.DataFlow
33
private import codeql.ruby.Concepts
44
private import codeql.ruby.Frameworks

‎ruby/ql/lib/codeql/ruby/security/CommandInjectionQuery.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* `CommandInjectionCustomizations` should be imported instead.
88
*/
99

10-
import ruby
10+
import codeql.ruby.AST
1111
import codeql.ruby.TaintTracking
1212
import CommandInjectionCustomizations::CommandInjection
1313
import codeql.ruby.DataFlow

‎ruby/ql/lib/codeql/ruby/security/HttpToFileAccessSpecific.qll

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Provides imports and classes needed for `HttpToFileAccessQuery` and `HttpToFileAccessCustomizations`.
33
*/
44

5-
import ruby
5+
import codeql.ruby.AST
66
import codeql.ruby.DataFlow
77
import codeql.ruby.dataflow.RemoteFlowSources
88
import codeql.ruby.Concepts

0 commit comments

Comments
 (0)