diff --git a/.github/workflows/ruby-build.yml b/.github/workflows/ruby-build.yml index 08e2b0b4ab6..247d6eb4e63 100644 --- a/.github/workflows/ruby-build.yml +++ b/.github/workflows/ruby-build.yml @@ -197,7 +197,7 @@ jobs: - name: Prepare test files shell: bash run: | - echo "import ruby select count(File f)" > "test.ql" + echo "import codeql.ruby.AST select count(File f)" > "test.ql" echo "| 4 |" > "test.expected" echo 'name: sample-tests version: 0.0.0 diff --git a/docs/codeql/codeql-language-guides/basic-query-for-ruby-code.rst b/docs/codeql/codeql-language-guides/basic-query-for-ruby-code.rst index c820bf007df..1881dfc71a7 100644 --- a/docs/codeql/codeql-language-guides/basic-query-for-ruby-code.rst +++ b/docs/codeql/codeql-language-guides/basic-query-for-ruby-code.rst @@ -36,7 +36,7 @@ Running the query .. code-block:: ql - import ruby + import codeql.ruby.AST from IfExpr ifexpr where @@ -80,7 +80,7 @@ After the initial ``import`` statement, this simple query comprises three parts +---------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------+ | Query part | Purpose | Details | +===============================================================+===================================================================================================================+========================================================================================================================+ -| ``import ruby`` | Imports the standard CodeQL libraries for Ruby. | Every query begins with one or more ``import`` statements. | +| ``import codeql.ruby.AST`` | Imports the standard CodeQL AST libraries for Ruby. | Every query begins with one or more ``import`` statements. | +---------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------+ | ``from IfExpr ifexpr`` | Defines the variables for the query. | We use: an ``IfExpr`` variable for ``if`` expressions. | | | Declarations are of the form: | | diff --git a/docs/codeql/codeql-language-guides/codeql-library-for-ruby.rst b/docs/codeql/codeql-language-guides/codeql-library-for-ruby.rst index ede3182fd56..ad6ecdb591c 100644 --- a/docs/codeql/codeql-language-guides/codeql-library-for-ruby.rst +++ b/docs/codeql/codeql-language-guides/codeql-library-for-ruby.rst @@ -18,7 +18,7 @@ library by beginning your query with: .. code-block:: ql - import ruby + import codeql.ruby.AST The CodeQL libraries model various aspects of Ruby code, depending on the type of query you want to write. For example the abstract syntax tree (AST) library is used for locating program elements, to match syntactic @@ -138,7 +138,7 @@ The following example lists all methods in the class `ApiController`: .. code-block:: ql - import ruby + import codeql.ruby.AST from ClassDeclaration m where m.getName() = "ApiController" @@ -223,7 +223,7 @@ Example .. code-block:: ql - import ruby + import codeql.ruby.AST from Method m where m.getName() = "show" @@ -274,7 +274,7 @@ The following example finds all literals that are returned by a `return` stateme .. code-block:: ql - import ruby + import codeql.ruby.AST from ReturnStmt return, Literal lit where lit.getParent() = return @@ -421,7 +421,7 @@ The following example finds "chained assignments" (of the form ``A=B=C``): .. code-block:: ql - import ruby + import codeql.ruby.AST from Assignment op where op.getRightOperand() instanceof Assignment @@ -460,7 +460,7 @@ The following example finds all method calls to a method called `delete`. .. code-block:: ql - import ruby + import codeql.ruby.AST from MethodCall call where call.getMethodName() = "delete" @@ -517,7 +517,7 @@ The following example finds `if`-expressions that are missing a `then` branch. .. code-block:: ql - import ruby + import codeql.ruby.AST from IfExpr expr where not exists(expr.getThen()) @@ -559,7 +559,7 @@ The following example finds all class variables in the class `StaticController`: .. code-block:: ql - import ruby + import codeql.ruby.AST from ClassDeclaration cd, ClassVariable v where @@ -612,7 +612,7 @@ The following example finds writes to class variables in the class `StaticContro .. code-block:: ql - import ruby + import codeql.ruby.AST from ClassVariableWriteAccess write, ClassDeclaration cd, ClassVariable v where diff --git a/ruby/ql/examples/snippets/emptythen.ql b/ruby/ql/examples/snippets/emptythen.ql index b6e9bb87f13..00a9b7ca038 100644 --- a/ruby/ql/examples/snippets/emptythen.ql +++ b/ruby/ql/examples/snippets/emptythen.ql @@ -11,7 +11,7 @@ * statement */ -import ruby +import codeql.ruby.AST from IfExpr i where not exists(i.getThen().getAChild()) diff --git a/ruby/ql/lib/Customizations.qll b/ruby/ql/lib/Customizations.qll index 9b7fc73c31f..3880d464cb6 100644 --- a/ruby/ql/lib/Customizations.qll +++ b/ruby/ql/lib/Customizations.qll @@ -9,4 +9,3 @@ * to model frameworks that are not covered by the standard library. */ -import ruby diff --git a/ruby/ql/lib/change-notes/2022-09-14-ruby-qll.md b/ruby/ql/lib/change-notes/2022-09-14-ruby-qll.md new file mode 100644 index 00000000000..1c58f66618b --- /dev/null +++ b/ruby/ql/lib/change-notes/2022-09-14-ruby-qll.md @@ -0,0 +1,4 @@ +--- +category: breaking +--- +* `import ruby` no longer brings the standard Ruby AST library into scope; it instead brings a module `Ast` into scope, which must be imported. Alternatively, it is also possible to import `codeql.ruby.AST`. \ No newline at end of file diff --git a/ruby/ql/lib/codeql/ruby/AST.qll b/ruby/ql/lib/codeql/ruby/AST.qll index a9f8f8b5f9f..6ba833b2108 100644 --- a/ruby/ql/lib/codeql/ruby/AST.qll +++ b/ruby/ql/lib/codeql/ruby/AST.qll @@ -17,6 +17,7 @@ private import ast.internal.AST private import ast.internal.Scope private import ast.internal.Synthesis private import ast.internal.TreeSitter +private import Customizations cached private module Cached { diff --git a/ruby/ql/lib/codeql/ruby/ApiGraphs.qll b/ruby/ql/lib/codeql/ruby/ApiGraphs.qll index 8cec5f0d190..94b82e85107 100644 --- a/ruby/ql/lib/codeql/ruby/ApiGraphs.qll +++ b/ruby/ql/lib/codeql/ruby/ApiGraphs.qll @@ -6,7 +6,7 @@ * directed and labeled; they specify how the components represented by nodes relate to each other. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.typetracking.TypeTracker private import codeql.ruby.ast.internal.Module diff --git a/ruby/ql/lib/codeql/ruby/CFG.qll b/ruby/ql/lib/codeql/ruby/CFG.qll index 77507b05a7f..d3401821f19 100644 --- a/ruby/ql/lib/codeql/ruby/CFG.qll +++ b/ruby/ql/lib/codeql/ruby/CFG.qll @@ -1,5 +1,6 @@ /** Provides classes representing the control flow graph. */ +import codeql.Locations import controlflow.ControlFlowGraph import controlflow.CfgNodes as CfgNodes import controlflow.BasicBlocks diff --git a/ruby/ql/lib/codeql/ruby/DataFlow.qll b/ruby/ql/lib/codeql/ruby/DataFlow.qll index e7645ce0c10..3576f51f23e 100644 --- a/ruby/ql/lib/codeql/ruby/DataFlow.qll +++ b/ruby/ql/lib/codeql/ruby/DataFlow.qll @@ -1,3 +1,10 @@ +/** + * Provides classes for performing local (intra-procedural) and + * global (inter-procedural) data flow analyses. + */ + +import codeql.Locations + /** * Provides classes for performing local (intra-procedural) and * global (inter-procedural) data flow analyses. diff --git a/ruby/ql/lib/codeql/ruby/InclusionTests.qll b/ruby/ql/lib/codeql/ruby/InclusionTests.qll index f6e9c67c1e6..2e74aac336e 100644 --- a/ruby/ql/lib/codeql/ruby/InclusionTests.qll +++ b/ruby/ql/lib/codeql/ruby/InclusionTests.qll @@ -2,7 +2,7 @@ * Contains classes for recognizing array and string inclusion tests. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.controlflow.CfgNodes diff --git a/ruby/ql/lib/codeql/ruby/StringOps.qll b/ruby/ql/lib/codeql/ruby/StringOps.qll index 8fc0c2a507f..4fca5959a85 100644 --- a/ruby/ql/lib/codeql/ruby/StringOps.qll +++ b/ruby/ql/lib/codeql/ruby/StringOps.qll @@ -2,7 +2,7 @@ * Provides classes and predicates for reasoning about string-manipulating expressions. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.controlflow.CfgNodes private import InclusionTests diff --git a/ruby/ql/lib/codeql/ruby/ast/Erb.qll b/ruby/ql/lib/codeql/ruby/ast/Erb.qll index d6e7b6acd8f..88d882ca210 100644 --- a/ruby/ql/lib/codeql/ruby/ast/Erb.qll +++ b/ruby/ql/lib/codeql/ruby/ast/Erb.qll @@ -1,4 +1,3 @@ -private import codeql.Locations private import codeql.ruby.AST private import internal.Erb private import internal.TreeSitter @@ -38,6 +37,7 @@ class ErbTemplate extends TTemplate, ErbAstNode { final override string getAPrimaryQlClass() { result = "ErbTemplate" } + /** Gets a child node, if any. */ ErbAstNode getAChildNode() { toGenerated(result) = g.getChild(_) } } diff --git a/ruby/ql/lib/codeql/ruby/ast/Expr.qll b/ruby/ql/lib/codeql/ruby/ast/Expr.qll index c02535885b6..3468c733d0d 100644 --- a/ruby/ql/lib/codeql/ruby/ast/Expr.qll +++ b/ruby/ql/lib/codeql/ruby/ast/Expr.qll @@ -207,6 +207,7 @@ class BodyStmt extends StmtSequence, TBodyStmt { result = unique(Ensure s | toGenerated(s) = getBodyStmtChild(this, _)) } + /** Holds if this block has an `ensure` block. */ final predicate hasEnsure() { exists(this.getEnsure()) } override AstNode getAChild(string pred) { diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll index ae904319112..19846b7be33 100644 --- a/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll +++ b/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll @@ -1,4 +1,3 @@ -private import codeql.Locations private import codeql.ruby.AST // Names of built-in modules and classes diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Variable.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Variable.qll index 9e1e2c38de9..454a8119dd6 100644 --- a/ruby/ql/lib/codeql/ruby/ast/internal/Variable.qll +++ b/ruby/ql/lib/codeql/ruby/ast/internal/Variable.qll @@ -1,5 +1,4 @@ private import TreeSitter -private import codeql.Locations private import codeql.ruby.AST private import codeql.ruby.ast.internal.AST private import codeql.ruby.ast.internal.Parameter diff --git a/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll b/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll index cff386d8122..9ce0bf32fd7 100644 --- a/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll +++ b/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll @@ -1,6 +1,5 @@ /** Provides classes representing basic blocks. */ -private import codeql.Locations private import codeql.ruby.AST private import codeql.ruby.ast.internal.AST private import codeql.ruby.ast.internal.TreeSitter diff --git a/ruby/ql/lib/codeql/ruby/controlflow/ControlFlowGraph.qll b/ruby/ql/lib/codeql/ruby/controlflow/ControlFlowGraph.qll index 4670bc692f5..89d9d967ce4 100644 --- a/ruby/ql/lib/codeql/ruby/controlflow/ControlFlowGraph.qll +++ b/ruby/ql/lib/codeql/ruby/controlflow/ControlFlowGraph.qll @@ -1,6 +1,5 @@ /** Provides classes representing the control flow graph. */ -private import codeql.Locations private import codeql.ruby.AST private import codeql.ruby.controlflow.BasicBlocks private import SuccessorTypes diff --git a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplSpecific.qll b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplSpecific.qll index a72334cafa5..8853ba1c1bd 100644 --- a/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplSpecific.qll +++ b/ruby/ql/lib/codeql/ruby/controlflow/internal/ControlFlowGraphImplSpecific.qll @@ -1,4 +1,4 @@ -private import ruby as RB +private import codeql.ruby.AST as RB private import ControlFlowGraphImpl as Impl private import Completion as Comp private import codeql.ruby.ast.internal.Synthesis diff --git a/ruby/ql/lib/codeql/ruby/dataflow/BarrierGuards.qll b/ruby/ql/lib/codeql/ruby/dataflow/BarrierGuards.qll index c79e4311489..c22aa4ca1cf 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/BarrierGuards.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/BarrierGuards.qll @@ -1,6 +1,6 @@ /** Provides commonly used barriers to dataflow. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.CFG private import codeql.ruby.controlflow.CfgNodes diff --git a/ruby/ql/lib/codeql/ruby/dataflow/FlowSummary.qll b/ruby/ql/lib/codeql/ruby/dataflow/FlowSummary.qll index 0562f798d7e..55cad66e060 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/FlowSummary.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/FlowSummary.qll @@ -1,6 +1,6 @@ /** Provides classes and predicates for defining flow summaries. */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow private import codeql.ruby.frameworks.data.ModelsAsData private import codeql.ruby.ApiGraphs diff --git a/ruby/ql/lib/codeql/ruby/dataflow/SSA.qll b/ruby/ql/lib/codeql/ruby/dataflow/SSA.qll index efae79e8d29..d828420682c 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/SSA.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/SSA.qll @@ -6,7 +6,6 @@ * Provides classes for working with static single assignment (SSA) form. */ module Ssa { - private import codeql.Locations private import codeql.ruby.CFG private import codeql.ruby.ast.Variable private import internal.SsaImpl as SsaImpl diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll index 6c8696afd3e..d9d46abef24 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll @@ -1,4 +1,4 @@ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.CFG private import DataFlowPrivate private import codeql.ruby.typetracking.TypeTracker diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll index 34d737e8c97..faa25c55deb 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll @@ -1,4 +1,4 @@ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.ast.internal.Synthesis private import codeql.ruby.CFG private import codeql.ruby.dataflow.SSA diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll index 5c99237193f..3b0c0094386 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPublic.qll @@ -1,4 +1,4 @@ -private import ruby +private import codeql.ruby.AST private import DataFlowDispatch private import DataFlowPrivate private import codeql.ruby.CFG diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImplSpecific.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImplSpecific.qll index 7b6d0fc8443..a9aef4bf8e3 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImplSpecific.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/FlowSummaryImplSpecific.qll @@ -2,7 +2,7 @@ * Provides Ruby specific classes and predicates for defining flow summaries. */ -private import ruby +private import codeql.ruby.AST private import DataFlowDispatch private import DataFlowPrivate private import DataFlowPublic diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll index 95a2602f87c..e0745844801 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPrivate.qll @@ -1,4 +1,4 @@ -private import ruby +private import codeql.ruby.AST private import DataFlowPrivate private import TaintTrackingPublic private import codeql.ruby.CFG diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPublic.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPublic.qll index 2243bcd0ecf..46cee6f221c 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPublic.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/TaintTrackingPublic.qll @@ -1,4 +1,4 @@ -private import ruby +private import codeql.ruby.AST private import TaintTrackingPrivate private import codeql.ruby.CFG private import codeql.ruby.DataFlow diff --git a/ruby/ql/lib/codeql/ruby/filters/GeneratedCode.qll b/ruby/ql/lib/codeql/ruby/filters/GeneratedCode.qll index 18d12be3aac..8e48a82ae1d 100644 --- a/ruby/ql/lib/codeql/ruby/filters/GeneratedCode.qll +++ b/ruby/ql/lib/codeql/ruby/filters/GeneratedCode.qll @@ -1,6 +1,6 @@ /** Provides classes for detecting generated code. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.ast.internal.TreeSitter /** A source file that contains generated code. */ diff --git a/ruby/ql/lib/codeql/ruby/frameworks/ActionCable.qll b/ruby/ql/lib/codeql/ruby/frameworks/ActionCable.qll index 06327c4d9fa..e306b7d2b99 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/ActionCable.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/ActionCable.qll @@ -3,7 +3,7 @@ * https://rubygems.org/gems/actioncable */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.Concepts private import codeql.ruby.ApiGraphs private import codeql.ruby.frameworks.stdlib.Logger::Logger as StdlibLogger diff --git a/ruby/ql/lib/codeql/ruby/frameworks/ActiveResource.qll b/ruby/ql/lib/codeql/ruby/frameworks/ActiveResource.qll index b212f420fc6..125a1a34cff 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/ActiveResource.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/ActiveResource.qll @@ -3,7 +3,7 @@ * Version: 6.0.0. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.Concepts private import codeql.ruby.controlflow.CfgNodes private import codeql.ruby.ast.internal.Module diff --git a/ruby/ql/lib/codeql/ruby/frameworks/ActiveSupport.qll b/ruby/ql/lib/codeql/ruby/frameworks/ActiveSupport.qll index fc2b7c44cda..7e8c09a407e 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/ActiveSupport.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/ActiveSupport.qll @@ -3,7 +3,7 @@ * https://rubygems.org/gems/activesupport */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.Concepts private import codeql.ruby.DataFlow private import codeql.ruby.dataflow.FlowSummary diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Archive.qll b/ruby/ql/lib/codeql/ruby/frameworks/Archive.qll index 8d9fa16b77d..00285c3f0a3 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/Archive.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/Archive.qll @@ -2,7 +2,7 @@ * Provides classes for working with archive libraries. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.Concepts private import codeql.ruby.DataFlow private import codeql.ruby.ApiGraphs diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Files.qll b/ruby/ql/lib/codeql/ruby/frameworks/Files.qll index c409a4a7884..42c442c3a24 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/Files.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/Files.qll @@ -2,7 +2,7 @@ * Provides classes for working with file system libraries. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.Concepts private import codeql.ruby.ApiGraphs private import codeql.ruby.DataFlow diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Rails.qll b/ruby/ql/lib/codeql/ruby/frameworks/Rails.qll index 75596d64a6e..49d86b0c10a 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/Rails.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/Rails.qll @@ -2,7 +2,6 @@ * Provides classes for working with Rails. */ -private import codeql.files.FileSystem private import codeql.ruby.AST private import codeql.ruby.Concepts private import codeql.ruby.DataFlow diff --git a/ruby/ql/lib/codeql/ruby/frameworks/Railties.qll b/ruby/ql/lib/codeql/ruby/frameworks/Railties.qll index 807cc9f9c51..179b6b0655e 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/Railties.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/Railties.qll @@ -3,7 +3,7 @@ * https://rubygems.org/gems/railties */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.Concepts private import codeql.ruby.ApiGraphs private import codeql.ruby.DataFlow diff --git a/ruby/ql/lib/codeql/ruby/frameworks/core/internal/IOOrFile.qll b/ruby/ql/lib/codeql/ruby/frameworks/core/internal/IOOrFile.qll index af7058ee7ab..25bd4474ce6 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/core/internal/IOOrFile.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/core/internal/IOOrFile.qll @@ -2,7 +2,7 @@ * Provides modeling for concepts shared across `File` and `IO`. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.ApiGraphs private import codeql.ruby.frameworks.Files diff --git a/ruby/ql/lib/codeql/ruby/frameworks/data/ModelsAsData.qll b/ruby/ql/lib/codeql/ruby/frameworks/data/ModelsAsData.qll index 615568fec6a..5af2eda1f92 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/data/ModelsAsData.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/data/ModelsAsData.qll @@ -14,7 +14,7 @@ * - the name of a type definition from `ModelInput::TypeModelCsv` */ -private import ruby +private import codeql.ruby.AST private import internal.ApiGraphModels as Shared private import internal.ApiGraphModelsSpecific as Specific import Shared::ModelInput as ModelInput diff --git a/ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModelsSpecific.qll b/ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModelsSpecific.qll index b3a0fab20fd..998c24d9105 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModelsSpecific.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/data/internal/ApiGraphModelsSpecific.qll @@ -19,7 +19,7 @@ * ``` */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.dataflow.internal.DataFlowPrivate as DataFlowPrivate private import ApiGraphModels diff --git a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Excon.qll b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Excon.qll index 0cca7e268dc..4468f8ffa58 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Excon.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Excon.qll @@ -2,7 +2,7 @@ * Provides modeling for the `Excon` library. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.CFG private import codeql.ruby.Concepts private import codeql.ruby.ApiGraphs diff --git a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Faraday.qll b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Faraday.qll index 049998ce8f3..ae4bb25c265 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Faraday.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Faraday.qll @@ -2,7 +2,7 @@ * Provides modeling for the `Faraday` library. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.CFG private import codeql.ruby.Concepts private import codeql.ruby.ApiGraphs diff --git a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/HttpClient.qll b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/HttpClient.qll index 255ff0277bc..0d8e6cfa0fc 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/HttpClient.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/HttpClient.qll @@ -2,7 +2,7 @@ * Provides modeling for the `HTTPClient` library. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.Concepts private import codeql.ruby.ApiGraphs private import codeql.ruby.DataFlow diff --git a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Httparty.qll b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Httparty.qll index 99fd9e00f18..08ab0f94141 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Httparty.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Httparty.qll @@ -2,7 +2,7 @@ * Provides modeling for the `HTTParty` library. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.CFG private import codeql.ruby.Concepts private import codeql.ruby.ApiGraphs diff --git a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/OpenURI.qll b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/OpenURI.qll index 557c75f77ec..f11a4b2908f 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/OpenURI.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/OpenURI.qll @@ -2,7 +2,7 @@ * Provides modeling for the `OpenURI` library. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.CFG private import codeql.ruby.Concepts private import codeql.ruby.ApiGraphs diff --git a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/RestClient.qll b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/RestClient.qll index 6693f94585a..4b9ddfaab41 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/RestClient.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/RestClient.qll @@ -2,7 +2,7 @@ * Provides modeling for the `RestClient` library. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.CFG private import codeql.ruby.Concepts private import codeql.ruby.ApiGraphs diff --git a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Typhoeus.qll b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Typhoeus.qll index f9dcc29a266..163560e61f9 100644 --- a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Typhoeus.qll +++ b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Typhoeus.qll @@ -2,7 +2,7 @@ * Provides modeling for the `Typhoeus` library. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.CFG private import codeql.ruby.Concepts private import codeql.ruby.ApiGraphs diff --git a/ruby/ql/lib/codeql/ruby/security/CleartextLoggingCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/CleartextLoggingCustomizations.qll index c297b242724..cb5e6786943 100644 --- a/ruby/ql/lib/codeql/ruby/security/CleartextLoggingCustomizations.qll +++ b/ruby/ql/lib/codeql/ruby/security/CleartextLoggingCustomizations.qll @@ -4,7 +4,7 @@ * adding your own. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.Concepts private import internal.CleartextSources diff --git a/ruby/ql/lib/codeql/ruby/security/CleartextLoggingQuery.qll b/ruby/ql/lib/codeql/ruby/security/CleartextLoggingQuery.qll index dbb172868a1..109ce5c0f6e 100644 --- a/ruby/ql/lib/codeql/ruby/security/CleartextLoggingQuery.qll +++ b/ruby/ql/lib/codeql/ruby/security/CleartextLoggingQuery.qll @@ -6,7 +6,7 @@ * `CleartextLoggingCustomizations` should be imported instead. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.TaintTracking import CleartextLoggingCustomizations::CleartextLogging diff --git a/ruby/ql/lib/codeql/ruby/security/CleartextStorageCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/CleartextStorageCustomizations.qll index fa3c9343bd1..7dcea302c6a 100644 --- a/ruby/ql/lib/codeql/ruby/security/CleartextStorageCustomizations.qll +++ b/ruby/ql/lib/codeql/ruby/security/CleartextStorageCustomizations.qll @@ -4,7 +4,7 @@ * adding your own. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.Concepts private import internal.CleartextSources diff --git a/ruby/ql/lib/codeql/ruby/security/CleartextStorageQuery.qll b/ruby/ql/lib/codeql/ruby/security/CleartextStorageQuery.qll index ff835f9bdf3..9dc4e5bd0a5 100644 --- a/ruby/ql/lib/codeql/ruby/security/CleartextStorageQuery.qll +++ b/ruby/ql/lib/codeql/ruby/security/CleartextStorageQuery.qll @@ -6,7 +6,7 @@ * imported instead. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.TaintTracking private import CleartextStorageCustomizations::CleartextStorage as CleartextStorage diff --git a/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll index 30ec1ab0ecd..03291509977 100644 --- a/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll +++ b/ruby/ql/lib/codeql/ruby/security/CodeInjectionCustomizations.qll @@ -1,4 +1,4 @@ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.Concepts private import codeql.ruby.Frameworks diff --git a/ruby/ql/lib/codeql/ruby/security/CommandInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/CommandInjectionQuery.qll index 4ad02320cfc..ed2c133336f 100644 --- a/ruby/ql/lib/codeql/ruby/security/CommandInjectionQuery.qll +++ b/ruby/ql/lib/codeql/ruby/security/CommandInjectionQuery.qll @@ -7,7 +7,7 @@ * `CommandInjectionCustomizations` should be imported instead. */ -import ruby +import codeql.ruby.AST import codeql.ruby.TaintTracking import CommandInjectionCustomizations::CommandInjection import codeql.ruby.DataFlow diff --git a/ruby/ql/lib/codeql/ruby/security/HttpToFileAccessSpecific.qll b/ruby/ql/lib/codeql/ruby/security/HttpToFileAccessSpecific.qll index 3cbf144d398..ef0c1c61fdd 100644 --- a/ruby/ql/lib/codeql/ruby/security/HttpToFileAccessSpecific.qll +++ b/ruby/ql/lib/codeql/ruby/security/HttpToFileAccessSpecific.qll @@ -2,7 +2,7 @@ * Provides imports and classes needed for `HttpToFileAccessQuery` and `HttpToFileAccessCustomizations`. */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.dataflow.RemoteFlowSources import codeql.ruby.Concepts diff --git a/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll b/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll index e76e261598e..46fc231c6fc 100644 --- a/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll +++ b/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll @@ -2,7 +2,7 @@ * Provides predicates for reasoning about improper memoization methods. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.dataflow.internal.DataFlowDispatch diff --git a/ruby/ql/lib/codeql/ruby/security/InsecureDependencyQuery.qll b/ruby/ql/lib/codeql/ruby/security/InsecureDependencyQuery.qll index 16ac6e05c92..b8298420f81 100644 --- a/ruby/ql/lib/codeql/ruby/security/InsecureDependencyQuery.qll +++ b/ruby/ql/lib/codeql/ruby/security/InsecureDependencyQuery.qll @@ -2,7 +2,7 @@ * Provides predicates for reasoning about insecure dependency configurations. */ -private import ruby +private import codeql.ruby.AST /** * A method call in a Gemfile. diff --git a/ruby/ql/lib/codeql/ruby/security/InsecureDownloadCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/InsecureDownloadCustomizations.qll index 3c718655722..12bd40efd21 100644 --- a/ruby/ql/lib/codeql/ruby/security/InsecureDownloadCustomizations.qll +++ b/ruby/ql/lib/codeql/ruby/security/InsecureDownloadCustomizations.qll @@ -4,7 +4,7 @@ * extension points for adding your own. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.Concepts private import codeql.ruby.typetracking.TypeTracker diff --git a/ruby/ql/lib/codeql/ruby/security/InsecureDownloadQuery.qll b/ruby/ql/lib/codeql/ruby/security/InsecureDownloadQuery.qll index d43789dfd86..b701a3d1dd4 100644 --- a/ruby/ql/lib/codeql/ruby/security/InsecureDownloadQuery.qll +++ b/ruby/ql/lib/codeql/ruby/security/InsecureDownloadQuery.qll @@ -6,7 +6,7 @@ * `InsecureDownloadCustomizations` should be imported instead. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow import InsecureDownloadCustomizations::InsecureDownload diff --git a/ruby/ql/lib/codeql/ruby/security/LogInjectionQuery.qll b/ruby/ql/lib/codeql/ruby/security/LogInjectionQuery.qll index 679f60d3695..beb21d0e734 100644 --- a/ruby/ql/lib/codeql/ruby/security/LogInjectionQuery.qll +++ b/ruby/ql/lib/codeql/ruby/security/LogInjectionQuery.qll @@ -2,7 +2,7 @@ * Provides a taint-tracking configuration for reasoning about untrusted user input used in log entries. */ -import ruby +import codeql.ruby.AST import codeql.ruby.Concepts import codeql.ruby.DataFlow import codeql.ruby.TaintTracking diff --git a/ruby/ql/lib/codeql/ruby/security/PathInjectionCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/PathInjectionCustomizations.qll index 333da6dfdba..de20776cad8 100644 --- a/ruby/ql/lib/codeql/ruby/security/PathInjectionCustomizations.qll +++ b/ruby/ql/lib/codeql/ruby/security/PathInjectionCustomizations.qll @@ -4,7 +4,7 @@ * adding your own. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.ApiGraphs private import codeql.ruby.CFG private import codeql.ruby.Concepts diff --git a/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll b/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll index f6684148d3d..e94ddf45d3e 100644 --- a/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll +++ b/ruby/ql/lib/codeql/ruby/security/ReflectedXSSQuery.qll @@ -6,7 +6,7 @@ * `XSS::ReflectedXSS` should be imported instead. */ -private import ruby +private import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.TaintTracking diff --git a/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryCustomizations.qll index 30ccee6d986..cda3d0a0c3d 100644 --- a/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryCustomizations.qll +++ b/ruby/ql/lib/codeql/ruby/security/ServerSideRequestForgeryCustomizations.qll @@ -3,7 +3,7 @@ * server side request forgery, as well as extension points for adding your own. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.ApiGraphs private import codeql.ruby.CFG private import codeql.ruby.DataFlow diff --git a/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll b/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll index 5bc1ab906e5..1a731ae463a 100644 --- a/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll +++ b/ruby/ql/lib/codeql/ruby/security/StoredXSSQuery.qll @@ -7,7 +7,7 @@ * `XSS::StoredXSS` should be imported instead. */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.TaintTracking diff --git a/ruby/ql/lib/codeql/ruby/security/TaintedFormatStringSpecific.qll b/ruby/ql/lib/codeql/ruby/security/TaintedFormatStringSpecific.qll index b30caa7b12e..2f5f6069594 100644 --- a/ruby/ql/lib/codeql/ruby/security/TaintedFormatStringSpecific.qll +++ b/ruby/ql/lib/codeql/ruby/security/TaintedFormatStringSpecific.qll @@ -2,7 +2,7 @@ * Provides Ruby-specific imports and classes needed for `TaintedFormatStringQuery` and `TaintedFormatStringCustomizations`. */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.dataflow.RemoteFlowSources import codeql.ruby.ApiGraphs diff --git a/ruby/ql/lib/codeql/ruby/security/UnsafeDeserializationCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/UnsafeDeserializationCustomizations.qll index c7974e9337c..ff8f91d2320 100644 --- a/ruby/ql/lib/codeql/ruby/security/UnsafeDeserializationCustomizations.qll +++ b/ruby/ql/lib/codeql/ruby/security/UnsafeDeserializationCustomizations.qll @@ -3,7 +3,7 @@ * deserialization, as well as extension points for adding your own. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.ApiGraphs private import codeql.ruby.CFG private import codeql.ruby.DataFlow diff --git a/ruby/ql/lib/codeql/ruby/security/UnsafeDeserializationQuery.qll b/ruby/ql/lib/codeql/ruby/security/UnsafeDeserializationQuery.qll index d08b73da936..07b488da487 100644 --- a/ruby/ql/lib/codeql/ruby/security/UnsafeDeserializationQuery.qll +++ b/ruby/ql/lib/codeql/ruby/security/UnsafeDeserializationQuery.qll @@ -6,7 +6,7 @@ * `UnsafeDeserializationCustomizations` should be imported instead. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.TaintTracking import UnsafeDeserializationCustomizations diff --git a/ruby/ql/lib/codeql/ruby/security/UrlRedirectCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/UrlRedirectCustomizations.qll index 998bb0ff110..bbc53e86655 100644 --- a/ruby/ql/lib/codeql/ruby/security/UrlRedirectCustomizations.qll +++ b/ruby/ql/lib/codeql/ruby/security/UrlRedirectCustomizations.qll @@ -4,7 +4,7 @@ * own. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.Concepts private import codeql.ruby.dataflow.RemoteFlowSources diff --git a/ruby/ql/lib/codeql/ruby/security/UrlRedirectQuery.qll b/ruby/ql/lib/codeql/ruby/security/UrlRedirectQuery.qll index 64d3e997caf..26c003d10c8 100644 --- a/ruby/ql/lib/codeql/ruby/security/UrlRedirectQuery.qll +++ b/ruby/ql/lib/codeql/ruby/security/UrlRedirectQuery.qll @@ -5,7 +5,7 @@ * otherwise `UrlRedirectCustomizations` should be imported instead. */ -private import ruby +private import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.TaintTracking import UrlRedirectCustomizations diff --git a/ruby/ql/lib/codeql/ruby/security/XSS.qll b/ruby/ql/lib/codeql/ruby/security/XSS.qll index bae45069edd..28877b15ed8 100644 --- a/ruby/ql/lib/codeql/ruby/security/XSS.qll +++ b/ruby/ql/lib/codeql/ruby/security/XSS.qll @@ -2,7 +2,7 @@ * Provides classes and predicates used by the XSS queries. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.DataFlow2 private import codeql.ruby.CFG diff --git a/ruby/ql/lib/codeql/ruby/security/internal/CleartextSources.qll b/ruby/ql/lib/codeql/ruby/security/internal/CleartextSources.qll index 672340fb535..af3d64ef27c 100644 --- a/ruby/ql/lib/codeql/ruby/security/internal/CleartextSources.qll +++ b/ruby/ql/lib/codeql/ruby/security/internal/CleartextSources.qll @@ -4,7 +4,7 @@ * your own sources and sanitizers. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.TaintTracking::TaintTracking private import codeql.ruby.dataflow.RemoteFlowSources diff --git a/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionCustomizations.qll index 5e9b134a027..465f7415ae2 100644 --- a/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionCustomizations.qll +++ b/ruby/ql/lib/codeql/ruby/security/regexp/RegExpInjectionCustomizations.qll @@ -3,7 +3,7 @@ * injection vulnerabilities, as well as extension points for adding your own. */ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.DataFlow private import codeql.ruby.Concepts private import codeql.ruby.Frameworks diff --git a/ruby/ql/lib/ruby.qll b/ruby/ql/lib/ruby.qll index 1ae1e35d6aa..407d58220dc 100644 --- a/ruby/ql/lib/ruby.qll +++ b/ruby/ql/lib/ruby.qll @@ -2,5 +2,6 @@ * Provides classes for working with Ruby programs. */ -private import Customizations -import codeql.ruby.AST +import codeql.ruby.AST as Ast +import codeql.ruby.CFG as Cfg +import codeql.ruby.DataFlow // already defines its own wrapper module diff --git a/ruby/ql/src/AlertSuppression.ql b/ruby/ql/src/AlertSuppression.ql index b10c4ecbb45..9ee80abe099 100644 --- a/ruby/ql/src/AlertSuppression.ql +++ b/ruby/ql/src/AlertSuppression.ql @@ -5,7 +5,7 @@ * @id rb/alert-suppression */ -import ruby +import codeql.ruby.AST import codeql.ruby.ast.internal.TreeSitter /** diff --git a/ruby/ql/src/experimental/cwe-807/ConditionalBypass.ql b/ruby/ql/src/experimental/cwe-807/ConditionalBypass.ql index fb197110fe8..60a05351d91 100644 --- a/ruby/ql/src/experimental/cwe-807/ConditionalBypass.ql +++ b/ruby/ql/src/experimental/cwe-807/ConditionalBypass.ql @@ -11,7 +11,7 @@ * external/cwe/cwe-290 */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.dataflow.internal.DataFlowPublic import codeql.ruby.security.ConditionalBypassQuery diff --git a/ruby/ql/src/experimental/decompression-api/DecompressionApi.ql b/ruby/ql/src/experimental/decompression-api/DecompressionApi.ql index cab1f3a94a5..280569b10ee 100644 --- a/ruby/ql/src/experimental/decompression-api/DecompressionApi.ql +++ b/ruby/ql/src/experimental/decompression-api/DecompressionApi.ql @@ -9,7 +9,7 @@ * @tags security external/cwe/cwe-409 */ -import ruby +import codeql.ruby.AST import codeql.ruby.ApiGraphs import codeql.ruby.DataFlow import codeql.ruby.dataflow.RemoteFlowSources diff --git a/ruby/ql/src/experimental/improper-memoization/ImproperMemoization.ql b/ruby/ql/src/experimental/improper-memoization/ImproperMemoization.ql index 45f0b709a2f..0cbfa1ec759 100644 --- a/ruby/ql/src/experimental/improper-memoization/ImproperMemoization.ql +++ b/ruby/ql/src/experimental/improper-memoization/ImproperMemoization.ql @@ -8,7 +8,7 @@ * @id rb/improper-memoization */ -import ruby +import codeql.ruby.AST import codeql.ruby.security.ImproperMemoizationQuery from Method m, Parameter p, AssignLogicalOrExpr s diff --git a/ruby/ql/src/experimental/manually-check-http-verb/ManuallyCheckHttpVerb.ql b/ruby/ql/src/experimental/manually-check-http-verb/ManuallyCheckHttpVerb.ql index 2ddf7fe87b3..a452889a663 100644 --- a/ruby/ql/src/experimental/manually-check-http-verb/ManuallyCheckHttpVerb.ql +++ b/ruby/ql/src/experimental/manually-check-http-verb/ManuallyCheckHttpVerb.ql @@ -9,7 +9,7 @@ * @tags security */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.controlflow.CfgNodes import codeql.ruby.frameworks.ActionController diff --git a/ruby/ql/src/experimental/performance/UseDetect.ql b/ruby/ql/src/experimental/performance/UseDetect.ql index cbd8dc9d0ab..f69b4d07069 100644 --- a/ruby/ql/src/experimental/performance/UseDetect.ql +++ b/ruby/ql/src/experimental/performance/UseDetect.ql @@ -10,7 +10,7 @@ // This is an implementation of the Rubocop rule // https://github.com/rubocop/rubocop-performance/blob/master/lib/rubocop/cop/performance/detect.rb -import ruby +import codeql.ruby.AST import codeql.ruby.dataflow.SSA /** A call that extracts the first or last element of a list. */ diff --git a/ruby/ql/src/experimental/weak-params/WeakParams.ql b/ruby/ql/src/experimental/weak-params/WeakParams.ql index 0c6d9db5644..21f9e7bc6ce 100644 --- a/ruby/ql/src/experimental/weak-params/WeakParams.ql +++ b/ruby/ql/src/experimental/weak-params/WeakParams.ql @@ -9,7 +9,7 @@ * @tags security */ -import ruby +import codeql.ruby.AST import codeql.ruby.Concepts import codeql.ruby.DataFlow import codeql.ruby.TaintTracking diff --git a/ruby/ql/src/filters/ClassifyFiles.ql b/ruby/ql/src/filters/ClassifyFiles.ql index d194523e09d..3240d8a7868 100644 --- a/ruby/ql/src/filters/ClassifyFiles.ql +++ b/ruby/ql/src/filters/ClassifyFiles.ql @@ -8,7 +8,7 @@ * @id rb/file-classifier */ -import ruby +import codeql.ruby.AST import codeql.ruby.filters.GeneratedCode predicate classify(File f, string category) { diff --git a/ruby/ql/src/queries/analysis/Definitions.ql b/ruby/ql/src/queries/analysis/Definitions.ql index d2db9ed60d6..4bcd3696677 100644 --- a/ruby/ql/src/queries/analysis/Definitions.ql +++ b/ruby/ql/src/queries/analysis/Definitions.ql @@ -10,7 +10,7 @@ * - should `Foo.new` point to `Foo#initialize`? */ -import ruby +import codeql.ruby.AST import codeql.ruby.ast.internal.Module import codeql.ruby.dataflow.SSA diff --git a/ruby/ql/src/queries/diagnostics/ExtractionErrors.ql b/ruby/ql/src/queries/diagnostics/ExtractionErrors.ql index 5c55d984337..e428709a30a 100644 --- a/ruby/ql/src/queries/diagnostics/ExtractionErrors.ql +++ b/ruby/ql/src/queries/diagnostics/ExtractionErrors.ql @@ -5,7 +5,7 @@ * @id rb/diagnostics/extraction-errors */ -import ruby +import codeql.ruby.AST import codeql.ruby.Diagnostics /** Gets the SARIF severity to associate an error. */ diff --git a/ruby/ql/src/queries/diagnostics/SuccessfullyExtractedFiles.ql b/ruby/ql/src/queries/diagnostics/SuccessfullyExtractedFiles.ql index 74f95763d8a..f93d109b004 100644 --- a/ruby/ql/src/queries/diagnostics/SuccessfullyExtractedFiles.ql +++ b/ruby/ql/src/queries/diagnostics/SuccessfullyExtractedFiles.ql @@ -6,7 +6,7 @@ * @id rb/diagnostics/successfully-extracted-files */ -import ruby +import codeql.ruby.AST import codeql.ruby.Diagnostics from File f diff --git a/ruby/ql/src/queries/metrics/FLines.ql b/ruby/ql/src/queries/metrics/FLines.ql index 97c319fbf73..e55427e967a 100644 --- a/ruby/ql/src/queries/metrics/FLines.ql +++ b/ruby/ql/src/queries/metrics/FLines.ql @@ -6,7 +6,7 @@ * @id rb/lines-per-file */ -import ruby +import codeql.ruby.AST from RubyFile f, int n where n = f.getNumberOfLines() diff --git a/ruby/ql/src/queries/metrics/FLinesOfCode.ql b/ruby/ql/src/queries/metrics/FLinesOfCode.ql index 0c1d15960cc..7c18cf8e14e 100644 --- a/ruby/ql/src/queries/metrics/FLinesOfCode.ql +++ b/ruby/ql/src/queries/metrics/FLinesOfCode.ql @@ -7,7 +7,7 @@ * @id rb/lines-of-code-in-files */ -import ruby +import codeql.ruby.AST from RubyFile f, int n where n = f.getNumberOfLinesOfCode() diff --git a/ruby/ql/src/queries/metrics/FLinesOfComments.ql b/ruby/ql/src/queries/metrics/FLinesOfComments.ql index 8af882f13d1..f631152e995 100644 --- a/ruby/ql/src/queries/metrics/FLinesOfComments.ql +++ b/ruby/ql/src/queries/metrics/FLinesOfComments.ql @@ -6,7 +6,7 @@ * @id rb/lines-of-comments-in-files */ -import ruby +import codeql.ruby.AST from RubyFile f, int n where n = f.getNumberOfLinesOfComments() diff --git a/ruby/ql/src/queries/security/cwe-022/PathInjection.ql b/ruby/ql/src/queries/security/cwe-022/PathInjection.ql index d827c4781b6..58dad87fae4 100644 --- a/ruby/ql/src/queries/security/cwe-022/PathInjection.ql +++ b/ruby/ql/src/queries/security/cwe-022/PathInjection.ql @@ -15,7 +15,7 @@ * external/cwe/cwe-099 */ -import ruby +import codeql.ruby.AST import codeql.ruby.security.PathInjectionQuery import codeql.ruby.DataFlow import DataFlow::PathGraph diff --git a/ruby/ql/src/queries/security/cwe-078/CommandInjection.ql b/ruby/ql/src/queries/security/cwe-078/CommandInjection.ql index 9c7e3010093..e6fadb4a34f 100644 --- a/ruby/ql/src/queries/security/cwe-078/CommandInjection.ql +++ b/ruby/ql/src/queries/security/cwe-078/CommandInjection.ql @@ -13,7 +13,7 @@ * external/cwe/cwe-088 */ -import ruby +import codeql.ruby.AST import codeql.ruby.security.CommandInjectionQuery import DataFlow::PathGraph diff --git a/ruby/ql/src/queries/security/cwe-078/KernelOpen.ql b/ruby/ql/src/queries/security/cwe-078/KernelOpen.ql index 8842b95ca5c..f225128cf15 100644 --- a/ruby/ql/src/queries/security/cwe-078/KernelOpen.ql +++ b/ruby/ql/src/queries/security/cwe-078/KernelOpen.ql @@ -14,7 +14,7 @@ * external/cwe/cwe-073 */ -import ruby +import codeql.ruby.AST import codeql.ruby.ApiGraphs import codeql.ruby.frameworks.core.Kernel::Kernel import codeql.ruby.TaintTracking diff --git a/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql b/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql index db3cc85af95..e53db947e38 100644 --- a/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql +++ b/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql @@ -13,7 +13,7 @@ * external/cwe/cwe-116 */ -import ruby +import codeql.ruby.AST import codeql.ruby.security.ReflectedXSSQuery import DataFlow::PathGraph diff --git a/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql b/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql index 4061a7743ec..8630f2eb062 100644 --- a/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql +++ b/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql @@ -12,7 +12,7 @@ * external/cwe/cwe-116 */ -import ruby +import codeql.ruby.AST import codeql.ruby.security.StoredXSSQuery import DataFlow::PathGraph diff --git a/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql b/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql index b53c19da94d..fa7bc13402c 100644 --- a/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql +++ b/ruby/ql/src/queries/security/cwe-089/SqlInjection.ql @@ -11,7 +11,7 @@ * external/cwe/cwe-089 */ -import ruby +import codeql.ruby.AST import codeql.ruby.Concepts import codeql.ruby.DataFlow import codeql.ruby.dataflow.BarrierGuards diff --git a/ruby/ql/src/queries/security/cwe-094/CodeInjection.ql b/ruby/ql/src/queries/security/cwe-094/CodeInjection.ql index 4442f1c2ff6..1a23ea74aee 100644 --- a/ruby/ql/src/queries/security/cwe-094/CodeInjection.ql +++ b/ruby/ql/src/queries/security/cwe-094/CodeInjection.ql @@ -14,7 +14,7 @@ * external/cwe/cwe-116 */ -import ruby +import codeql.ruby.AST import codeql.ruby.security.CodeInjectionQuery import DataFlow::PathGraph diff --git a/ruby/ql/src/queries/security/cwe-116/IncompleteSanitization.ql b/ruby/ql/src/queries/security/cwe-116/IncompleteSanitization.ql index 836bcc7922c..f1f980dd1bd 100644 --- a/ruby/ql/src/queries/security/cwe-116/IncompleteSanitization.ql +++ b/ruby/ql/src/queries/security/cwe-116/IncompleteSanitization.ql @@ -14,7 +14,7 @@ * external/cwe/cwe-116 */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.controlflow.CfgNodes import codeql.ruby.frameworks.core.String diff --git a/ruby/ql/src/queries/security/cwe-117/LogInjection.ql b/ruby/ql/src/queries/security/cwe-117/LogInjection.ql index a3d53c3ab71..9149274dc67 100644 --- a/ruby/ql/src/queries/security/cwe-117/LogInjection.ql +++ b/ruby/ql/src/queries/security/cwe-117/LogInjection.ql @@ -11,7 +11,7 @@ * external/cwe/cwe-117 */ -import ruby +import codeql.ruby.AST import DataFlow::PathGraph import codeql.ruby.security.LogInjectionQuery diff --git a/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.ql b/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.ql index c71e1e8ce9c..06684017526 100644 --- a/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.ql +++ b/ruby/ql/src/queries/security/cwe-1333/RegExpInjection.ql @@ -15,7 +15,7 @@ * external/cwe/cwe-400 */ -import ruby +import codeql.ruby.AST import DataFlow::PathGraph import codeql.ruby.DataFlow import codeql.ruby.security.regexp.RegExpInjectionQuery diff --git a/ruby/ql/src/queries/security/cwe-134/TaintedFormatString.ql b/ruby/ql/src/queries/security/cwe-134/TaintedFormatString.ql index 9d9c9890fa3..3a6a2dcf5a0 100644 --- a/ruby/ql/src/queries/security/cwe-134/TaintedFormatString.ql +++ b/ruby/ql/src/queries/security/cwe-134/TaintedFormatString.ql @@ -10,7 +10,7 @@ * external/cwe/cwe-134 */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.security.TaintedFormatStringQuery import DataFlow::PathGraph diff --git a/ruby/ql/src/queries/security/cwe-295/RequestWithoutValidation.ql b/ruby/ql/src/queries/security/cwe-295/RequestWithoutValidation.ql index 137bfc94163..87c50c75dbc 100644 --- a/ruby/ql/src/queries/security/cwe-295/RequestWithoutValidation.ql +++ b/ruby/ql/src/queries/security/cwe-295/RequestWithoutValidation.ql @@ -11,7 +11,7 @@ * external/cwe/cwe-295 */ -import ruby +import codeql.ruby.AST import codeql.ruby.Concepts import codeql.ruby.DataFlow diff --git a/ruby/ql/src/queries/security/cwe-300/InsecureDependencyResolution.ql b/ruby/ql/src/queries/security/cwe-300/InsecureDependencyResolution.ql index 0687717951c..b3e0808f8d3 100644 --- a/ruby/ql/src/queries/security/cwe-300/InsecureDependencyResolution.ql +++ b/ruby/ql/src/queries/security/cwe-300/InsecureDependencyResolution.ql @@ -14,7 +14,7 @@ * external/cwe/cwe-829 */ -import ruby +import codeql.ruby.AST import codeql.ruby.security.InsecureDependencyQuery from Expr url, string msg diff --git a/ruby/ql/src/queries/security/cwe-312/CleartextLogging.ql b/ruby/ql/src/queries/security/cwe-312/CleartextLogging.ql index 1edea199d1b..b3a0848337a 100644 --- a/ruby/ql/src/queries/security/cwe-312/CleartextLogging.ql +++ b/ruby/ql/src/queries/security/cwe-312/CleartextLogging.ql @@ -13,7 +13,7 @@ * external/cwe/cwe-532 */ -import ruby +import codeql.ruby.AST import codeql.ruby.security.CleartextLoggingQuery import codeql.ruby.DataFlow import DataFlow::PathGraph diff --git a/ruby/ql/src/queries/security/cwe-312/CleartextStorage.ql b/ruby/ql/src/queries/security/cwe-312/CleartextStorage.ql index 3b91d1060e4..cae034c76bc 100644 --- a/ruby/ql/src/queries/security/cwe-312/CleartextStorage.ql +++ b/ruby/ql/src/queries/security/cwe-312/CleartextStorage.ql @@ -13,7 +13,7 @@ * external/cwe/cwe-532 */ -import ruby +import codeql.ruby.AST import codeql.ruby.security.CleartextStorageQuery import codeql.ruby.security.CleartextStorageCustomizations::CleartextStorage import codeql.ruby.DataFlow diff --git a/ruby/ql/src/queries/security/cwe-327/BrokenCryptoAlgorithm.ql b/ruby/ql/src/queries/security/cwe-327/BrokenCryptoAlgorithm.ql index dac7a50f24a..30d76cf894c 100644 --- a/ruby/ql/src/queries/security/cwe-327/BrokenCryptoAlgorithm.ql +++ b/ruby/ql/src/queries/security/cwe-327/BrokenCryptoAlgorithm.ql @@ -10,7 +10,7 @@ * external/cwe/cwe-327 */ -import ruby +import codeql.ruby.AST import codeql.ruby.Concepts from Cryptography::CryptographicOperation operation, string msgPrefix diff --git a/ruby/ql/src/queries/security/cwe-352/CSRFProtectionDisabled.ql b/ruby/ql/src/queries/security/cwe-352/CSRFProtectionDisabled.ql index 7871b0c7be5..41845e0de0f 100644 --- a/ruby/ql/src/queries/security/cwe-352/CSRFProtectionDisabled.ql +++ b/ruby/ql/src/queries/security/cwe-352/CSRFProtectionDisabled.ql @@ -11,7 +11,7 @@ * external/cwe/cwe-352 */ -import ruby +import codeql.ruby.AST import codeql.ruby.Concepts from CsrfProtectionSetting s diff --git a/ruby/ql/src/queries/security/cwe-502/UnsafeDeserialization.ql b/ruby/ql/src/queries/security/cwe-502/UnsafeDeserialization.ql index 725efb9e221..207c9daeded 100644 --- a/ruby/ql/src/queries/security/cwe-502/UnsafeDeserialization.ql +++ b/ruby/ql/src/queries/security/cwe-502/UnsafeDeserialization.ql @@ -11,7 +11,7 @@ * external/cwe/cwe-502 */ -import ruby +import codeql.ruby.AST import DataFlow::PathGraph import codeql.ruby.DataFlow import codeql.ruby.security.UnsafeDeserializationQuery diff --git a/ruby/ql/src/queries/security/cwe-601/UrlRedirect.ql b/ruby/ql/src/queries/security/cwe-601/UrlRedirect.ql index a35ad5e590a..8c55e133ef7 100644 --- a/ruby/ql/src/queries/security/cwe-601/UrlRedirect.ql +++ b/ruby/ql/src/queries/security/cwe-601/UrlRedirect.ql @@ -12,7 +12,7 @@ * @precision high */ -import ruby +import codeql.ruby.AST import codeql.ruby.security.UrlRedirectQuery import codeql.ruby.DataFlow::DataFlow::PathGraph diff --git a/ruby/ql/src/queries/security/cwe-611/Xxe.ql b/ruby/ql/src/queries/security/cwe-611/Xxe.ql index 6da1560954d..9327e4e204d 100644 --- a/ruby/ql/src/queries/security/cwe-611/Xxe.ql +++ b/ruby/ql/src/queries/security/cwe-611/Xxe.ql @@ -13,7 +13,7 @@ * external/cwe/cwe-827 */ -import ruby +import codeql.ruby.AST import codeql.ruby.dataflow.RemoteFlowSources import codeql.ruby.TaintTracking import codeql.ruby.Concepts diff --git a/ruby/ql/src/queries/security/cwe-732/WeakCookieConfiguration.ql b/ruby/ql/src/queries/security/cwe-732/WeakCookieConfiguration.ql index cd8d2dc036a..8e9e6a4cf73 100644 --- a/ruby/ql/src/queries/security/cwe-732/WeakCookieConfiguration.ql +++ b/ruby/ql/src/queries/security/cwe-732/WeakCookieConfiguration.ql @@ -11,7 +11,7 @@ * @precision high */ -import ruby +import codeql.ruby.AST import codeql.ruby.Concepts import codeql.ruby.Frameworks diff --git a/ruby/ql/src/queries/security/cwe-732/WeakFilePermissions.ql b/ruby/ql/src/queries/security/cwe-732/WeakFilePermissions.ql index 25b2b31ff34..88b65b6438f 100644 --- a/ruby/ql/src/queries/security/cwe-732/WeakFilePermissions.ql +++ b/ruby/ql/src/queries/security/cwe-732/WeakFilePermissions.ql @@ -10,7 +10,7 @@ * @precision low */ -import ruby +import codeql.ruby.AST import codeql.ruby.Concepts import codeql.ruby.DataFlow import DataFlow::PathGraph diff --git a/ruby/ql/src/queries/security/cwe-798/HardcodedCredentials.ql b/ruby/ql/src/queries/security/cwe-798/HardcodedCredentials.ql index 37974f9c424..2a3e83ef578 100644 --- a/ruby/ql/src/queries/security/cwe-798/HardcodedCredentials.ql +++ b/ruby/ql/src/queries/security/cwe-798/HardcodedCredentials.ql @@ -12,7 +12,7 @@ * external/cwe/cwe-798 */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import DataFlow::PathGraph import codeql.ruby.TaintTracking diff --git a/ruby/ql/src/queries/security/cwe-829/InsecureDownload.ql b/ruby/ql/src/queries/security/cwe-829/InsecureDownload.ql index 9f8bd298ce0..b5f2610ae2e 100644 --- a/ruby/ql/src/queries/security/cwe-829/InsecureDownload.ql +++ b/ruby/ql/src/queries/security/cwe-829/InsecureDownload.ql @@ -11,7 +11,7 @@ * external/cwe/cwe-829 */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.security.InsecureDownloadQuery import DataFlow::PathGraph diff --git a/ruby/ql/src/queries/security/cwe-912/HttpToFileAccess.ql b/ruby/ql/src/queries/security/cwe-912/HttpToFileAccess.ql index cb3f3a0ce60..8535afe2683 100644 --- a/ruby/ql/src/queries/security/cwe-912/HttpToFileAccess.ql +++ b/ruby/ql/src/queries/security/cwe-912/HttpToFileAccess.ql @@ -11,7 +11,7 @@ * external/cwe/cwe-434 */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.DataFlow::DataFlow::PathGraph import codeql.ruby.security.HttpToFileAccessQuery diff --git a/ruby/ql/src/queries/security/cwe-918/ServerSideRequestForgery.ql b/ruby/ql/src/queries/security/cwe-918/ServerSideRequestForgery.ql index e7cffed85f2..55af202d140 100644 --- a/ruby/ql/src/queries/security/cwe-918/ServerSideRequestForgery.ql +++ b/ruby/ql/src/queries/security/cwe-918/ServerSideRequestForgery.ql @@ -10,7 +10,7 @@ * external/cwe/cwe-918 */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.security.ServerSideRequestForgeryQuery import DataFlow::PathGraph diff --git a/ruby/ql/src/queries/summary/LinesOfCode.ql b/ruby/ql/src/queries/summary/LinesOfCode.ql index f727cf504d9..74994d77347 100644 --- a/ruby/ql/src/queries/summary/LinesOfCode.ql +++ b/ruby/ql/src/queries/summary/LinesOfCode.ql @@ -10,6 +10,6 @@ * lines-of-code */ -import ruby +import codeql.ruby.AST select sum(RubyFile f | exists(f.getRelativePath()) | f.getNumberOfLinesOfCode()) diff --git a/ruby/ql/src/queries/summary/LinesOfUserCode.ql b/ruby/ql/src/queries/summary/LinesOfUserCode.ql index 19f4f46fb8d..b7380277748 100644 --- a/ruby/ql/src/queries/summary/LinesOfUserCode.ql +++ b/ruby/ql/src/queries/summary/LinesOfUserCode.ql @@ -8,7 +8,7 @@ * @tags summary */ -import ruby +import codeql.ruby.AST select sum(RubyFile f | f.fromSource() and diff --git a/ruby/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql b/ruby/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql index 1a68d2c57e6..f801ec01c8f 100644 --- a/ruby/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql +++ b/ruby/ql/src/queries/summary/NumberOfFilesExtractedWithErrors.ql @@ -7,7 +7,7 @@ * @tags summary */ -import ruby +import codeql.ruby.AST import codeql.ruby.Diagnostics select count(File f | diff --git a/ruby/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql b/ruby/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql index 356989935e1..79ca413f826 100644 --- a/ruby/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql +++ b/ruby/ql/src/queries/summary/NumberOfSuccessfullyExtractedFiles.ql @@ -7,7 +7,7 @@ * @tags summary */ -import ruby +import codeql.ruby.AST import codeql.ruby.Diagnostics select count(File f | diff --git a/ruby/ql/src/queries/variables/DeadStoreOfLocal.ql b/ruby/ql/src/queries/variables/DeadStoreOfLocal.ql index 5ce06a0c182..3f0070b8939 100644 --- a/ruby/ql/src/queries/variables/DeadStoreOfLocal.ql +++ b/ruby/ql/src/queries/variables/DeadStoreOfLocal.ql @@ -10,7 +10,7 @@ * @precision low */ -import ruby +import codeql.ruby.AST import codeql.ruby.dataflow.SSA class RelevantLocalVariableWriteAccess extends LocalVariableWriteAccess { diff --git a/ruby/ql/src/queries/variables/UninitializedLocal.ql b/ruby/ql/src/queries/variables/UninitializedLocal.ql index ef134eddd70..df8a275431a 100644 --- a/ruby/ql/src/queries/variables/UninitializedLocal.ql +++ b/ruby/ql/src/queries/variables/UninitializedLocal.ql @@ -10,7 +10,7 @@ * @precision low */ -import ruby +import codeql.ruby.AST import codeql.ruby.dataflow.SSA class RelevantLocalVariableReadAccess extends LocalVariableReadAccess { diff --git a/ruby/ql/src/queries/variables/UnusedParameter.ql b/ruby/ql/src/queries/variables/UnusedParameter.ql index 381d2c77a33..76585356b54 100644 --- a/ruby/ql/src/queries/variables/UnusedParameter.ql +++ b/ruby/ql/src/queries/variables/UnusedParameter.ql @@ -10,7 +10,7 @@ * @precision low */ -import ruby +import codeql.ruby.AST import codeql.ruby.dataflow.SSA class RelevantParameterVariable extends LocalVariable { diff --git a/ruby/ql/test/TestUtilities/InlineExpectationsTestPrivate.qll b/ruby/ql/test/TestUtilities/InlineExpectationsTestPrivate.qll index 8906bf1dc39..dee27d1acdc 100644 --- a/ruby/ql/test/TestUtilities/InlineExpectationsTestPrivate.qll +++ b/ruby/ql/test/TestUtilities/InlineExpectationsTestPrivate.qll @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import codeql.ruby.ast.internal.TreeSitter /** diff --git a/ruby/ql/test/TestUtilities/InlineFlowTest.qll b/ruby/ql/test/TestUtilities/InlineFlowTest.qll index 1ebb130ef38..735e21f1bca 100644 --- a/ruby/ql/test/TestUtilities/InlineFlowTest.qll +++ b/ruby/ql/test/TestUtilities/InlineFlowTest.qll @@ -3,7 +3,7 @@ * * Example for a test.ql: * ```ql - * import ruby + * *import codeql.ruby.AST * import TestUtilities.InlineFlowTest * import PathGraph * @@ -33,7 +33,7 @@ * If you need more fine-grained tuning, consider implementing a test using `InlineExpectationsTest`. */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.TaintTracking import TestUtilities.InlineExpectationsTest diff --git a/ruby/ql/test/library-tests/ast/ValueText.ql b/ruby/ql/test/library-tests/ast/ValueText.ql index 0ae8bec7b0d..83d5bd3288c 100644 --- a/ruby/ql/test/library-tests/ast/ValueText.ql +++ b/ruby/ql/test/library-tests/ast/ValueText.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import codeql.ruby.controlflow.CfgNodes query predicate exprValue(Expr e, ConstantValue v, string t) { diff --git a/ruby/ql/test/library-tests/ast/calls/arguments.ql b/ruby/ql/test/library-tests/ast/calls/arguments.ql index abe4ffa4933..af1c433b457 100644 --- a/ruby/ql/test/library-tests/ast/calls/arguments.ql +++ b/ruby/ql/test/library-tests/ast/calls/arguments.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate blockArguments(BlockArgument a, Expr e) { e = a.getValue() } diff --git a/ruby/ql/test/library-tests/ast/calls/calls.ql b/ruby/ql/test/library-tests/ast/calls/calls.ql index 93bef27efb4..17926eace91 100644 --- a/ruby/ql/test/library-tests/ast/calls/calls.ql +++ b/ruby/ql/test/library-tests/ast/calls/calls.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST private string getMethodName(Call c) { result = c.(MethodCall).getMethodName() diff --git a/ruby/ql/test/library-tests/ast/constants/constants.ql b/ruby/ql/test/library-tests/ast/constants/constants.ql index 37140a957a3..27829cc4b7b 100644 --- a/ruby/ql/test/library-tests/ast/constants/constants.ql +++ b/ruby/ql/test/library-tests/ast/constants/constants.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import codeql.ruby.ast.internal.Module as M import codeql.ruby.ast.internal.Constant diff --git a/ruby/ql/test/library-tests/ast/control/CaseExpr.ql b/ruby/ql/test/library-tests/ast/control/CaseExpr.ql index 78f55c3f9a4..09a64e767e7 100644 --- a/ruby/ql/test/library-tests/ast/control/CaseExpr.ql +++ b/ruby/ql/test/library-tests/ast/control/CaseExpr.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate caseValues(CaseExpr c, Expr value) { value = c.getValue() } diff --git a/ruby/ql/test/library-tests/ast/control/ConditionalExpr.ql b/ruby/ql/test/library-tests/ast/control/ConditionalExpr.ql index bd0e5fbe623..60a979dbc6d 100644 --- a/ruby/ql/test/library-tests/ast/control/ConditionalExpr.ql +++ b/ruby/ql/test/library-tests/ast/control/ConditionalExpr.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate conditionalExprs( ConditionalExpr e, string pClass, Expr cond, Expr branch, boolean branchCond diff --git a/ruby/ql/test/library-tests/ast/control/ControlExpr.ql b/ruby/ql/test/library-tests/ast/control/ControlExpr.ql index ad802180efb..204cc60805d 100644 --- a/ruby/ql/test/library-tests/ast/control/ControlExpr.ql +++ b/ruby/ql/test/library-tests/ast/control/ControlExpr.ql @@ -1,3 +1,3 @@ -import ruby +import codeql.ruby.AST query predicate controlExprs(ControlExpr c, string pClass) { pClass = c.getAPrimaryQlClass() } diff --git a/ruby/ql/test/library-tests/ast/control/Loop.ql b/ruby/ql/test/library-tests/ast/control/Loop.ql index ff3d846c4bd..243fbd60c67 100644 --- a/ruby/ql/test/library-tests/ast/control/Loop.ql +++ b/ruby/ql/test/library-tests/ast/control/Loop.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate loops(Loop l, string lClass, Expr body, string bodyClass) { l.getBody() = body and lClass = l.getAPrimaryQlClass() and bodyClass = body.getAPrimaryQlClass() diff --git a/ruby/ql/test/library-tests/ast/erb/Erb.ql b/ruby/ql/test/library-tests/ast/erb/Erb.ql index afdc1f2b70e..dc7e3c4f0a7 100644 --- a/ruby/ql/test/library-tests/ast/erb/Erb.ql +++ b/ruby/ql/test/library-tests/ast/erb/Erb.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate erbFiles(ErbFile f) { any() } diff --git a/ruby/ql/test/library-tests/ast/escape_sequences/EscapeSequences.ql b/ruby/ql/test/library-tests/ast/escape_sequences/EscapeSequences.ql index 7064bd93b02..aaafd891420 100644 --- a/ruby/ql/test/library-tests/ast/escape_sequences/EscapeSequences.ql +++ b/ruby/ql/test/library-tests/ast/escape_sequences/EscapeSequences.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate stringEscapeSequenceComponents( StringEscapeSequenceComponent c, string raw, string unescaped diff --git a/ruby/ql/test/library-tests/ast/gems/test.ql b/ruby/ql/test/library-tests/ast/gems/test.ql index 0d7277ed6bd..6e0f0c20c93 100644 --- a/ruby/ql/test/library-tests/ast/gems/test.ql +++ b/ruby/ql/test/library-tests/ast/gems/test.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST // Just enough to test that we extracted the Gemfile and the .gemspec file. select any(Call c) diff --git a/ruby/ql/test/library-tests/ast/literals/literals.ql b/ruby/ql/test/library-tests/ast/literals/literals.ql index be2c6e68cb8..36e368c0519 100644 --- a/ruby/ql/test/library-tests/ast/literals/literals.ql +++ b/ruby/ql/test/library-tests/ast/literals/literals.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate allLiterals(Literal l, string pClass, string valueText) { pClass = l.getAPrimaryQlClass() and diff --git a/ruby/ql/test/library-tests/ast/misc/misc.ql b/ruby/ql/test/library-tests/ast/misc/misc.ql index 06445b07ca5..725a3dbff7a 100644 --- a/ruby/ql/test/library-tests/ast/misc/misc.ql +++ b/ruby/ql/test/library-tests/ast/misc/misc.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST private string getValueText(MethodName m) { result = m.getConstantValue().getStringlikeValue() diff --git a/ruby/ql/test/library-tests/ast/modules/classes.ql b/ruby/ql/test/library-tests/ast/modules/classes.ql index a4b392a32cb..0fe75d9d260 100644 --- a/ruby/ql/test/library-tests/ast/modules/classes.ql +++ b/ruby/ql/test/library-tests/ast/modules/classes.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate classes(ClassDeclaration c, string pClass, string name) { pClass = c.getAPrimaryQlClass() and name = c.getName() diff --git a/ruby/ql/test/library-tests/ast/modules/module_base.ql b/ruby/ql/test/library-tests/ast/modules/module_base.ql index e95faa62969..45448dc17f7 100644 --- a/ruby/ql/test/library-tests/ast/modules/module_base.ql +++ b/ruby/ql/test/library-tests/ast/modules/module_base.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate moduleBases(ModuleBase mb, string pClass) { pClass = mb.getAPrimaryQlClass() } diff --git a/ruby/ql/test/library-tests/ast/modules/modules.ql b/ruby/ql/test/library-tests/ast/modules/modules.ql index 9ed9c7b4fa2..9120b1fd45a 100644 --- a/ruby/ql/test/library-tests/ast/modules/modules.ql +++ b/ruby/ql/test/library-tests/ast/modules/modules.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate modules(ModuleDeclaration m, string pClass, string name) { pClass = m.getAPrimaryQlClass() and name = m.getName() diff --git a/ruby/ql/test/library-tests/ast/modules/singleton_classes.ql b/ruby/ql/test/library-tests/ast/modules/singleton_classes.ql index d02dd8cb68c..62eb29d9ede 100644 --- a/ruby/ql/test/library-tests/ast/modules/singleton_classes.ql +++ b/ruby/ql/test/library-tests/ast/modules/singleton_classes.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate singletonClasses(SingletonClass sc, string pClass, Expr value) { pClass = sc.getAPrimaryQlClass() and value = sc.getValue() diff --git a/ruby/ql/test/library-tests/ast/modules/toplevel.ql b/ruby/ql/test/library-tests/ast/modules/toplevel.ql index 90afb185ff6..856e3b333c7 100644 --- a/ruby/ql/test/library-tests/ast/modules/toplevel.ql +++ b/ruby/ql/test/library-tests/ast/modules/toplevel.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate toplevel(Toplevel m, string pClass) { pClass = m.getAPrimaryQlClass() } diff --git a/ruby/ql/test/library-tests/ast/operations/assignment.ql b/ruby/ql/test/library-tests/ast/operations/assignment.ql index 3ff3b3f7684..bc80c60c4ce 100644 --- a/ruby/ql/test/library-tests/ast/operations/assignment.ql +++ b/ruby/ql/test/library-tests/ast/operations/assignment.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate assignments(Assignment a, string operator, Expr left, Expr right, string pClass) { operator = a.getOperator() and diff --git a/ruby/ql/test/library-tests/ast/operations/binary.ql b/ruby/ql/test/library-tests/ast/operations/binary.ql index a2900adca95..54ba23275f6 100644 --- a/ruby/ql/test/library-tests/ast/operations/binary.ql +++ b/ruby/ql/test/library-tests/ast/operations/binary.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate binaryOperations( BinaryOperation o, string operator, Expr left, Expr right, string pClass diff --git a/ruby/ql/test/library-tests/ast/operations/operation.ql b/ruby/ql/test/library-tests/ast/operations/operation.ql index 2a1db9fd3df..9a7e41ed3b6 100644 --- a/ruby/ql/test/library-tests/ast/operations/operation.ql +++ b/ruby/ql/test/library-tests/ast/operations/operation.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST from Operation o, string operator, Expr operand, string pClass where diff --git a/ruby/ql/test/library-tests/ast/operations/unary.ql b/ruby/ql/test/library-tests/ast/operations/unary.ql index f94e1def2d6..c4d7dfc4234 100644 --- a/ruby/ql/test/library-tests/ast/operations/unary.ql +++ b/ruby/ql/test/library-tests/ast/operations/unary.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query predicate unaryOperations(UnaryOperation o, string operator, Expr operand, string pClass) { operator = o.getOperator() and diff --git a/ruby/ql/test/library-tests/ast/params/params.ql b/ruby/ql/test/library-tests/ast/params/params.ql index 68c22636a2c..74f331370c5 100644 --- a/ruby/ql/test/library-tests/ast/params/params.ql +++ b/ruby/ql/test/library-tests/ast/params/params.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST //////////////////////////////////////////////////////////////////////////////// // Query predicates for various types of parameter diff --git a/ruby/ql/test/library-tests/concepts/CryptographicOperation.ql b/ruby/ql/test/library-tests/concepts/CryptographicOperation.ql index 00e35e12ac7..a9efedadbba 100644 --- a/ruby/ql/test/library-tests/concepts/CryptographicOperation.ql +++ b/ruby/ql/test/library-tests/concepts/CryptographicOperation.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import codeql.ruby.Concepts import TestUtilities.InlineExpectationsTest diff --git a/ruby/ql/test/library-tests/dataflow/api-graphs/use.ql b/ruby/ql/test/library-tests/dataflow/api-graphs/use.ql index f1c93158c42..3385d286e9b 100644 --- a/ruby/ql/test/library-tests/dataflow/api-graphs/use.ql +++ b/ruby/ql/test/library-tests/dataflow/api-graphs/use.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import TestUtilities.InlineExpectationsTest import codeql.ruby.ApiGraphs diff --git a/ruby/ql/test/library-tests/dataflow/array-flow/array-flow.ql b/ruby/ql/test/library-tests/dataflow/array-flow/array-flow.ql index 4e812d32daa..0c4597b8f07 100644 --- a/ruby/ql/test/library-tests/dataflow/array-flow/array-flow.ql +++ b/ruby/ql/test/library-tests/dataflow/array-flow/array-flow.ql @@ -2,7 +2,7 @@ * @kind path-problem */ -import ruby +import codeql.ruby.AST import TestUtilities.InlineFlowTest import PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/call-sensitivity/call-sensitivity.ql b/ruby/ql/test/library-tests/dataflow/call-sensitivity/call-sensitivity.ql index fc212a8e4a0..7da3d6c695d 100644 --- a/ruby/ql/test/library-tests/dataflow/call-sensitivity/call-sensitivity.ql +++ b/ruby/ql/test/library-tests/dataflow/call-sensitivity/call-sensitivity.ql @@ -2,7 +2,7 @@ * @kind path-problem */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import TestUtilities.InlineFlowTest import DataFlow::PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/global/Flow.ql b/ruby/ql/test/library-tests/dataflow/global/Flow.ql index 00449a7ac5f..33825f765c2 100644 --- a/ruby/ql/test/library-tests/dataflow/global/Flow.ql +++ b/ruby/ql/test/library-tests/dataflow/global/Flow.ql @@ -2,7 +2,7 @@ * @kind path-problem */ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow private import TestUtilities.InlineFlowTest import DataFlow::PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.ql b/ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.ql index 842d591a3e5..bb1b611d7fc 100644 --- a/ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.ql +++ b/ruby/ql/test/library-tests/dataflow/hash-flow/hash-flow.ql @@ -2,7 +2,7 @@ * @kind path-problem */ -import ruby +import codeql.ruby.AST import TestUtilities.InlineFlowTest import PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/local/DataflowStep.ql b/ruby/ql/test/library-tests/dataflow/local/DataflowStep.ql index 872625f39a7..5770735b006 100644 --- a/ruby/ql/test/library-tests/dataflow/local/DataflowStep.ql +++ b/ruby/ql/test/library-tests/dataflow/local/DataflowStep.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow from DataFlow::Node pred, DataFlow::Node succ diff --git a/ruby/ql/test/library-tests/dataflow/local/Nodes.ql b/ruby/ql/test/library-tests/dataflow/local/Nodes.ql index 23476a4a195..2f89f667625 100644 --- a/ruby/ql/test/library-tests/dataflow/local/Nodes.ql +++ b/ruby/ql/test/library-tests/dataflow/local/Nodes.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import codeql.ruby.dataflow.internal.DataFlowPrivate import codeql.ruby.dataflow.internal.DataFlowDispatch diff --git a/ruby/ql/test/library-tests/dataflow/local/TaintflowStep.ql b/ruby/ql/test/library-tests/dataflow/local/TaintflowStep.ql index 592c2b4211a..4f6740c7e17 100644 --- a/ruby/ql/test/library-tests/dataflow/local/TaintflowStep.ql +++ b/ruby/ql/test/library-tests/dataflow/local/TaintflowStep.ql @@ -2,7 +2,7 @@ * @kind path-problem */ -import ruby +import codeql.ruby.AST import TestUtilities.InlineFlowTest import PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/params/params-flow.ql b/ruby/ql/test/library-tests/dataflow/params/params-flow.ql index 842d591a3e5..bb1b611d7fc 100644 --- a/ruby/ql/test/library-tests/dataflow/params/params-flow.ql +++ b/ruby/ql/test/library-tests/dataflow/params/params-flow.ql @@ -2,7 +2,7 @@ * @kind path-problem */ -import ruby +import codeql.ruby.AST import TestUtilities.InlineFlowTest import PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/pathname-flow/pathame-flow.ql b/ruby/ql/test/library-tests/dataflow/pathname-flow/pathame-flow.ql index 4e812d32daa..0c4597b8f07 100644 --- a/ruby/ql/test/library-tests/dataflow/pathname-flow/pathame-flow.ql +++ b/ruby/ql/test/library-tests/dataflow/pathname-flow/pathame-flow.ql @@ -2,7 +2,7 @@ * @kind path-problem */ -import ruby +import codeql.ruby.AST import TestUtilities.InlineFlowTest import PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/string-flow/string-flow.ql b/ruby/ql/test/library-tests/dataflow/string-flow/string-flow.ql index 4e812d32daa..0c4597b8f07 100644 --- a/ruby/ql/test/library-tests/dataflow/string-flow/string-flow.ql +++ b/ruby/ql/test/library-tests/dataflow/string-flow/string-flow.ql @@ -2,7 +2,7 @@ * @kind path-problem */ -import ruby +import codeql.ruby.AST import TestUtilities.InlineFlowTest import PathGraph diff --git a/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ql b/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ql index 023ba452851..e682c120ca5 100644 --- a/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ql +++ b/ruby/ql/test/library-tests/dataflow/summaries/Summaries.ql @@ -2,7 +2,7 @@ * @kind path-problem */ -import ruby +import codeql.ruby.AST import codeql.ruby.dataflow.FlowSummary import codeql.ruby.TaintTracking import codeql.ruby.dataflow.internal.FlowSummaryImpl diff --git a/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.ql b/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.ql index 1d568a8e3a1..f8911840ba8 100644 --- a/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.ql +++ b/ruby/ql/test/library-tests/dataflow/type-tracker/TypeTracker.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.typetracking.TypeTracker diff --git a/ruby/ql/test/library-tests/frameworks/ActionController.ql b/ruby/ql/test/library-tests/frameworks/ActionController.ql index 3a6d2a7a6f3..302a64cb14d 100644 --- a/ruby/ql/test/library-tests/frameworks/ActionController.ql +++ b/ruby/ql/test/library-tests/frameworks/ActionController.ql @@ -1,4 +1,4 @@ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.frameworks.ActionController private import codeql.ruby.frameworks.ActionView diff --git a/ruby/ql/test/library-tests/frameworks/ActionDispatch.ql b/ruby/ql/test/library-tests/frameworks/ActionDispatch.ql index f2f65f58523..5f25c62f32e 100644 --- a/ruby/ql/test/library-tests/frameworks/ActionDispatch.ql +++ b/ruby/ql/test/library-tests/frameworks/ActionDispatch.ql @@ -1,4 +1,4 @@ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.frameworks.ActionDispatch private import codeql.ruby.frameworks.ActionController private import codeql.ruby.ApiGraphs diff --git a/ruby/ql/test/library-tests/frameworks/PosixSpawn.ql b/ruby/ql/test/library-tests/frameworks/PosixSpawn.ql index 994f0d162f0..00639b879a0 100644 --- a/ruby/ql/test/library-tests/frameworks/PosixSpawn.ql +++ b/ruby/ql/test/library-tests/frameworks/PosixSpawn.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import codeql.ruby.frameworks.PosixSpawn import codeql.ruby.DataFlow diff --git a/ruby/ql/test/library-tests/frameworks/active_resource/ActiveResource.ql b/ruby/ql/test/library-tests/frameworks/active_resource/ActiveResource.ql index 18ae5ac9301..1f2fd1efcf1 100644 --- a/ruby/ql/test/library-tests/frameworks/active_resource/ActiveResource.ql +++ b/ruby/ql/test/library-tests/frameworks/active_resource/ActiveResource.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import codeql.ruby.frameworks.ActiveResource diff --git a/ruby/ql/test/library-tests/frameworks/active_support/ActiveSupportDataFlow.ql b/ruby/ql/test/library-tests/frameworks/active_support/ActiveSupportDataFlow.ql index 4e812d32daa..0c4597b8f07 100644 --- a/ruby/ql/test/library-tests/frameworks/active_support/ActiveSupportDataFlow.ql +++ b/ruby/ql/test/library-tests/frameworks/active_support/ActiveSupportDataFlow.ql @@ -2,7 +2,7 @@ * @kind path-problem */ -import ruby +import codeql.ruby.AST import TestUtilities.InlineFlowTest import PathGraph diff --git a/ruby/ql/test/library-tests/frameworks/archive/Archive.ql b/ruby/ql/test/library-tests/frameworks/archive/Archive.ql index 0cc4962fc0d..d5af3f89a04 100644 --- a/ruby/ql/test/library-tests/frameworks/archive/Archive.ql +++ b/ruby/ql/test/library-tests/frameworks/archive/Archive.ql @@ -1,4 +1,4 @@ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.frameworks.Archive query predicate rubyZipFileOpens(RubyZip::RubyZipFileOpen f) { any() } diff --git a/ruby/ql/test/library-tests/frameworks/arel/Arel.ql b/ruby/ql/test/library-tests/frameworks/arel/Arel.ql index 197a710803e..01d7b5a5d1c 100644 --- a/ruby/ql/test/library-tests/frameworks/arel/Arel.ql +++ b/ruby/ql/test/library-tests/frameworks/arel/Arel.ql @@ -3,7 +3,7 @@ */ import codeql.ruby.frameworks.Arel -import ruby +import codeql.ruby.AST import TestUtilities.InlineFlowTest from DataFlow::PathNode source, DataFlow::PathNode sink, DefaultTaintFlowConf conf diff --git a/ruby/ql/test/library-tests/frameworks/files/Files.ql b/ruby/ql/test/library-tests/frameworks/files/Files.ql index 7c43e54a9bb..59d6aa30582 100644 --- a/ruby/ql/test/library-tests/frameworks/files/Files.ql +++ b/ruby/ql/test/library-tests/frameworks/files/Files.ql @@ -1,4 +1,4 @@ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.frameworks.Files private import codeql.ruby.frameworks.core.IO private import codeql.ruby.Concepts diff --git a/ruby/ql/test/library-tests/frameworks/pathname/Pathname.ql b/ruby/ql/test/library-tests/frameworks/pathname/Pathname.ql index 71150ae5376..534bdd0674e 100644 --- a/ruby/ql/test/library-tests/frameworks/pathname/Pathname.ql +++ b/ruby/ql/test/library-tests/frameworks/pathname/Pathname.ql @@ -1,4 +1,4 @@ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.Concepts private import codeql.ruby.DataFlow private import codeql.ruby.frameworks.stdlib.Pathname diff --git a/ruby/ql/test/library-tests/frameworks/railties/Railties.ql b/ruby/ql/test/library-tests/frameworks/railties/Railties.ql index 4dee50abcd5..4090b5a3111 100644 --- a/ruby/ql/test/library-tests/frameworks/railties/Railties.ql +++ b/ruby/ql/test/library-tests/frameworks/railties/Railties.ql @@ -1,4 +1,4 @@ -private import ruby +private import codeql.ruby.AST private import codeql.ruby.Concepts private import codeql.ruby.frameworks.Railties private import codeql.ruby.DataFlow diff --git a/ruby/ql/test/library-tests/modules/ancestors.ql b/ruby/ql/test/library-tests/modules/ancestors.ql index 02a7d6745ed..89f1c9ca256 100644 --- a/ruby/ql/test/library-tests/modules/ancestors.ql +++ b/ruby/ql/test/library-tests/modules/ancestors.ql @@ -3,7 +3,7 @@ * @id rb/test/ancestors */ -import ruby +import codeql.ruby.AST query predicate nodes(Module node, string key, string value) { key = "semmle.label" and value = node.toString() diff --git a/ruby/ql/test/library-tests/modules/callgraph.ql b/ruby/ql/test/library-tests/modules/callgraph.ql index 63588b3ed82..d274800fe71 100644 --- a/ruby/ql/test/library-tests/modules/callgraph.ql +++ b/ruby/ql/test/library-tests/modules/callgraph.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST query Callable getTarget(Call call) { result = call.getATarget() } diff --git a/ruby/ql/test/library-tests/modules/methods.ql b/ruby/ql/test/library-tests/modules/methods.ql index 6442dfb9e51..a0847de1fb8 100644 --- a/ruby/ql/test/library-tests/modules/methods.ql +++ b/ruby/ql/test/library-tests/modules/methods.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import codeql.ruby.ast.internal.Module as M query MethodBase getMethod(Module m, string name) { diff --git a/ruby/ql/test/library-tests/modules/modules.ql b/ruby/ql/test/library-tests/modules/modules.ql index 792ace8ecd8..af5c3574294 100644 --- a/ruby/ql/test/library-tests/modules/modules.ql +++ b/ruby/ql/test/library-tests/modules/modules.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST private import codeql.ruby.ast.internal.Module as Internal query Module getModule() { any() } diff --git a/ruby/ql/test/library-tests/modules/superclasses.ql b/ruby/ql/test/library-tests/modules/superclasses.ql index 39cdb552f64..e8f4fd02704 100644 --- a/ruby/ql/test/library-tests/modules/superclasses.ql +++ b/ruby/ql/test/library-tests/modules/superclasses.ql @@ -3,7 +3,7 @@ * @id rb/test/supertypes */ -import ruby +import codeql.ruby.AST query predicate nodes(Module node, string key, string value) { key = "semmle.label" and value = node.toString() diff --git a/ruby/ql/test/library-tests/security/CryptoAlgorithms.ql b/ruby/ql/test/library-tests/security/CryptoAlgorithms.ql index 4a3e4fe4b2f..c4c42532d89 100644 --- a/ruby/ql/test/library-tests/security/CryptoAlgorithms.ql +++ b/ruby/ql/test/library-tests/security/CryptoAlgorithms.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import codeql.ruby.security.CryptoAlgorithms query predicate weakHashingAlgorithms(HashingAlgorithm ha) { ha.isWeak() } diff --git a/ruby/ql/test/library-tests/security/OpenSSL.ql b/ruby/ql/test/library-tests/security/OpenSSL.ql index 6a303f76c7b..eb8b179d5ea 100644 --- a/ruby/ql/test/library-tests/security/OpenSSL.ql +++ b/ruby/ql/test/library-tests/security/OpenSSL.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import codeql.ruby.security.OpenSSL query predicate weakOpenSslCipherAlgorithms(OpenSslCipher c) { c.isWeak() } diff --git a/ruby/ql/test/query-tests/experimental/improper-memoization/ImproperMemoization.ql b/ruby/ql/test/query-tests/experimental/improper-memoization/ImproperMemoization.ql index 79f24d87eba..b43e207449b 100644 --- a/ruby/ql/test/query-tests/experimental/improper-memoization/ImproperMemoization.ql +++ b/ruby/ql/test/query-tests/experimental/improper-memoization/ImproperMemoization.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import TestUtilities.InlineExpectationsTest import codeql.ruby.security.ImproperMemoizationQuery diff --git a/ruby/ql/test/query-tests/security/cwe-116/IncompleteMultiCharacterSanitization/IncompleteMultiCharacterSanitization.ql b/ruby/ql/test/query-tests/security/cwe-116/IncompleteMultiCharacterSanitization/IncompleteMultiCharacterSanitization.ql index 1c72a499b7e..f635cdc6036 100644 --- a/ruby/ql/test/query-tests/security/cwe-116/IncompleteMultiCharacterSanitization/IncompleteMultiCharacterSanitization.ql +++ b/ruby/ql/test/query-tests/security/cwe-116/IncompleteMultiCharacterSanitization/IncompleteMultiCharacterSanitization.ql @@ -2,7 +2,7 @@ * @kind problem */ -import ruby +import codeql.ruby.AST import codeql.ruby.regexp.RegExpTreeView as RETV import codeql.ruby.DataFlow import codeql.ruby.security.IncompleteMultiCharacterSanitizationQuery as Query diff --git a/ruby/ql/test/query-tests/security/cwe-300/InsecureDependency.ql b/ruby/ql/test/query-tests/security/cwe-300/InsecureDependency.ql index d1438c3dd8c..120905d88da 100644 --- a/ruby/ql/test/query-tests/security/cwe-300/InsecureDependency.ql +++ b/ruby/ql/test/query-tests/security/cwe-300/InsecureDependency.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import TestUtilities.InlineExpectationsTest import codeql.ruby.security.InsecureDependencyQuery diff --git a/ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.ql b/ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.ql index 7cb1a154453..8690a0ec120 100644 --- a/ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.ql +++ b/ruby/ql/test/query-tests/security/cwe-829/InsecureDownload.ql @@ -1,4 +1,4 @@ -import ruby +import codeql.ruby.AST import codeql.ruby.DataFlow import PathGraph import TestUtilities.InlineFlowTest