diff --git a/cpp/ql/lib/semmle/code/cpp/Field.qll b/cpp/ql/lib/semmle/code/cpp/Field.qll index 5ed5e8e4b4b..362569708a4 100644 --- a/cpp/ql/lib/semmle/code/cpp/Field.qll +++ b/cpp/ql/lib/semmle/code/cpp/Field.qll @@ -4,7 +4,6 @@ import semmle.code.cpp.Variable import semmle.code.cpp.Enum -import semmle.code.cpp.exprs.Access /** * A C structure member or C++ non-static member variable. For example the diff --git a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll index e4f562af582..c9e790d9077 100644 --- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll +++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll @@ -1802,5 +1802,3 @@ module SimpleRangeAnalysisInternal { defMightOverflowNegatively(def, v) and result = varMaxVal(v) } } - -private import SimpleRangeAnalysisInternal diff --git a/cpp/ql/lib/semmle/code/cpp/security/BufferWrite.qll b/cpp/ql/lib/semmle/code/cpp/security/BufferWrite.qll index a980de9785d..0c430d301c1 100644 --- a/cpp/ql/lib/semmle/code/cpp/security/BufferWrite.qll +++ b/cpp/ql/lib/semmle/code/cpp/security/BufferWrite.qll @@ -6,7 +6,6 @@ */ import cpp -import semmle.code.cpp.commons.Alloc import semmle.code.cpp.commons.Buffer import semmle.code.cpp.commons.Scanf import semmle.code.cpp.models.implementations.Strcat diff --git a/cpp/ql/src/Likely Bugs/Leap Year/Adding365DaysPerYear.ql b/cpp/ql/src/Likely Bugs/Leap Year/Adding365DaysPerYear.ql index 7171185a11c..31a8b660964 100644 --- a/cpp/ql/src/Likely Bugs/Leap Year/Adding365DaysPerYear.ql +++ b/cpp/ql/src/Likely Bugs/Leap Year/Adding365DaysPerYear.ql @@ -13,7 +13,6 @@ import cpp import LeapYear -import semmle.code.cpp.dataflow.DataFlow from Expr source, Expr sink, PossibleYearArithmeticOperationCheckConfiguration config where config.hasFlow(DataFlow::exprNode(source), DataFlow::exprNode(sink)) diff --git a/cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.ql b/cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.ql index d6d0a55d148..0d8aa227d22 100644 --- a/cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.ql +++ b/cpp/ql/src/Likely Bugs/Memory Management/NtohlArrayNoBound.ql @@ -10,7 +10,6 @@ import cpp import NtohlArrayNoBound -import semmle.code.cpp.dataflow.DataFlow from NetworkToBufferSizeConfiguration bufConfig, DataFlow::Node source, DataFlow::Node sink where bufConfig.hasFlow(source, sink) diff --git a/cpp/ql/src/Security/CWE/CWE-120/OverrunWrite.ql b/cpp/ql/src/Security/CWE/CWE-120/OverrunWrite.ql index e60f8d8b452..438e87a501a 100644 --- a/cpp/ql/src/Security/CWE/CWE-120/OverrunWrite.ql +++ b/cpp/ql/src/Security/CWE/CWE-120/OverrunWrite.ql @@ -15,7 +15,6 @@ */ import semmle.code.cpp.security.BufferWrite -import semmle.code.cpp.commons.Alloc /* * See CWE-120/UnboundedWrite.ql for a summary of CWE-120 alert cases. diff --git a/cpp/ql/src/Security/CWE/CWE-120/VeryLikelyOverrunWrite.ql b/cpp/ql/src/Security/CWE/CWE-120/VeryLikelyOverrunWrite.ql index 352314f7f13..bf2cf765b59 100644 --- a/cpp/ql/src/Security/CWE/CWE-120/VeryLikelyOverrunWrite.ql +++ b/cpp/ql/src/Security/CWE/CWE-120/VeryLikelyOverrunWrite.ql @@ -15,7 +15,6 @@ */ import semmle.code.cpp.security.BufferWrite -import semmle.code.cpp.commons.Alloc /* * See CWE-120/UnboundedWrite.ql for a summary of CWE-120 alert cases. diff --git a/cpp/ql/src/experimental/Security/CWE/CWE-266/IncorrectPrivilegeAssignment.ql b/cpp/ql/src/experimental/Security/CWE/CWE-266/IncorrectPrivilegeAssignment.ql index 22e42d39147..8411d0ba2e2 100644 --- a/cpp/ql/src/experimental/Security/CWE/CWE-266/IncorrectPrivilegeAssignment.ql +++ b/cpp/ql/src/experimental/Security/CWE/CWE-266/IncorrectPrivilegeAssignment.ql @@ -16,7 +16,6 @@ */ import cpp -import semmle.code.cpp.exprs.BitwiseOperation import semmle.code.cpp.valuenumbering.GlobalValueNumbering /** diff --git a/cpp/ql/test/library-tests/dataflow/fields/ir-path-flow.ql b/cpp/ql/test/library-tests/dataflow/fields/ir-path-flow.ql index 5f39dd19737..b918417cd66 100644 --- a/cpp/ql/test/library-tests/dataflow/fields/ir-path-flow.ql +++ b/cpp/ql/test/library-tests/dataflow/fields/ir-path-flow.ql @@ -4,7 +4,6 @@ import semmle.code.cpp.ir.dataflow.DataFlow import IRConfiguration -import cpp import DataFlow::PathGraph from DataFlow::PathNode src, DataFlow::PathNode sink, IRConf conf diff --git a/cpp/ql/test/library-tests/dataflow/fields/path-flow.ql b/cpp/ql/test/library-tests/dataflow/fields/path-flow.ql index b1aeadfbb60..7456e114712 100644 --- a/cpp/ql/test/library-tests/dataflow/fields/path-flow.ql +++ b/cpp/ql/test/library-tests/dataflow/fields/path-flow.ql @@ -4,7 +4,6 @@ import semmle.code.cpp.dataflow.DataFlow import ASTConfiguration -import cpp import DataFlow::PathGraph from DataFlow::PathNode src, DataFlow::PathNode sink, AstConf conf diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplSpecific.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplSpecific.qll index 2f07de27afd..a929e23a942 100644 --- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplSpecific.qll +++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplSpecific.qll @@ -3,7 +3,6 @@ private import csharp private import AssignableDefinitions private import SsaImpl as SsaImpl -private import semmle.code.csharp.dataflow.SSA class BasicBlock = ControlFlow::BasicBlock; diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/Call.qll b/csharp/ql/lib/semmle/code/csharp/exprs/Call.qll index a4c4ab1b670..dff1aafa0d2 100644 --- a/csharp/ql/lib/semmle/code/csharp/exprs/Call.qll +++ b/csharp/ql/lib/semmle/code/csharp/exprs/Call.qll @@ -5,7 +5,6 @@ */ import Expr -import semmle.code.csharp.Callable import semmle.code.csharp.dataflow.CallContext as CallContext private import semmle.code.csharp.dataflow.internal.DelegateDataFlow private import semmle.code.csharp.dataflow.internal.DataFlowDispatch diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/Creation.qll b/csharp/ql/lib/semmle/code/csharp/exprs/Creation.qll index 79dc36fd48d..b999dfbc0e7 100644 --- a/csharp/ql/lib/semmle/code/csharp/exprs/Creation.qll +++ b/csharp/ql/lib/semmle/code/csharp/exprs/Creation.qll @@ -3,7 +3,6 @@ */ import Expr -import semmle.code.csharp.Callable private import semmle.code.csharp.frameworks.system.linq.Expressions private import semmle.code.csharp.TypeRef diff --git a/csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll b/csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll index 1a869f2458c..bbed4062a97 100644 --- a/csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll +++ b/csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll @@ -15,7 +15,6 @@ import Dynamic import Literal import LogicalOperation import semmle.code.csharp.controlflow.ControlFlowElement -import semmle.code.csharp.Callable import semmle.code.csharp.Location import semmle.code.csharp.Stmt import semmle.code.csharp.Type diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll index 6b6b49e3a60..744632c5f76 100644 --- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll +++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll @@ -5,7 +5,6 @@ import csharp private import semmle.code.csharp.dataflow.flowsources.Remote -private import semmle.code.csharp.dataflow.TaintTracking private import semmle.code.csharp.frameworks.System private import semmle.code.csharp.dataflow.FlowSummary diff --git a/csharp/ql/src/Likely Bugs/ICryptoTransform.qll b/csharp/ql/src/Likely Bugs/ICryptoTransform.qll index c3997f25c9f..574dd1e69af 100644 --- a/csharp/ql/src/Likely Bugs/ICryptoTransform.qll +++ b/csharp/ql/src/Likely Bugs/ICryptoTransform.qll @@ -1,5 +1,4 @@ import csharp -import semmle.code.csharp.dataflow.DataFlow class ImplementsICryptoTransform extends Class { ImplementsICryptoTransform() { diff --git a/csharp/ql/src/Likely Bugs/LeapYear/UnsafeYearConstruction.ql b/csharp/ql/src/Likely Bugs/LeapYear/UnsafeYearConstruction.ql index 6dab3dfcfab..fe0c5707742 100644 --- a/csharp/ql/src/Likely Bugs/LeapYear/UnsafeYearConstruction.ql +++ b/csharp/ql/src/Likely Bugs/LeapYear/UnsafeYearConstruction.ql @@ -11,7 +11,6 @@ import csharp import DataFlow::PathGraph -import semmle.code.csharp.dataflow.TaintTracking class UnsafeYearCreationFromArithmeticConfiguration extends TaintTracking::Configuration { UnsafeYearCreationFromArithmeticConfiguration() { diff --git a/csharp/ql/src/Likely Bugs/ParallelSink.qll b/csharp/ql/src/Likely Bugs/ParallelSink.qll index 0b2cac08152..ee807b6d95e 100644 --- a/csharp/ql/src/Likely Bugs/ParallelSink.qll +++ b/csharp/ql/src/Likely Bugs/ParallelSink.qll @@ -1,5 +1,4 @@ import csharp -import semmle.code.csharp.dataflow.DataFlow abstract class ParallelSink extends DataFlow::Node { } diff --git a/csharp/ql/src/Likely Bugs/ThreadUnsafeICryptoTransformLambda.ql b/csharp/ql/src/Likely Bugs/ThreadUnsafeICryptoTransformLambda.ql index 7787a1bd622..9ed4963169f 100644 --- a/csharp/ql/src/Likely Bugs/ThreadUnsafeICryptoTransformLambda.ql +++ b/csharp/ql/src/Likely Bugs/ThreadUnsafeICryptoTransformLambda.ql @@ -15,7 +15,6 @@ */ import csharp -import semmle.code.csharp.dataflow.DataFlow import ParallelSink import ICryptoTransform diff --git a/csharp/ql/src/Security Features/CWE-020/UntrustedDataToExternalAPI.ql b/csharp/ql/src/Security Features/CWE-020/UntrustedDataToExternalAPI.ql index aaf18f7f312..01faeb6ba75 100644 --- a/csharp/ql/src/Security Features/CWE-020/UntrustedDataToExternalAPI.ql +++ b/csharp/ql/src/Security Features/CWE-020/UntrustedDataToExternalAPI.ql @@ -10,7 +10,6 @@ */ import csharp -import semmle.code.csharp.dataflow.TaintTracking import semmle.code.csharp.security.dataflow.ExternalAPIsQuery import DataFlow::PathGraph diff --git a/csharp/ql/src/Security Features/CWE-134/UncontrolledFormatString.ql b/csharp/ql/src/Security Features/CWE-134/UncontrolledFormatString.ql index d079c4f9ac9..f2b0918e1e5 100644 --- a/csharp/ql/src/Security Features/CWE-134/UncontrolledFormatString.ql +++ b/csharp/ql/src/Security Features/CWE-134/UncontrolledFormatString.ql @@ -14,7 +14,6 @@ import csharp import semmle.code.csharp.security.dataflow.flowsources.Remote import semmle.code.csharp.security.dataflow.flowsources.Local -import semmle.code.csharp.dataflow.TaintTracking import semmle.code.csharp.frameworks.Format import DataFlow::PathGraph diff --git a/csharp/ql/src/Security Features/CWE-248/MissingASPNETGlobalErrorHandler.ql b/csharp/ql/src/Security Features/CWE-248/MissingASPNETGlobalErrorHandler.ql index 1e7a9a4ddb1..f37d4c497de 100644 --- a/csharp/ql/src/Security Features/CWE-248/MissingASPNETGlobalErrorHandler.ql +++ b/csharp/ql/src/Security Features/CWE-248/MissingASPNETGlobalErrorHandler.ql @@ -14,7 +14,6 @@ import csharp import semmle.code.asp.WebConfig -import semmle.code.csharp.XML class Application_Error extends Method { Application_Error() { diff --git a/csharp/ql/src/Telemetry/ExternalApi.qll b/csharp/ql/src/Telemetry/ExternalApi.qll index 5ad5bab7784..4190b11188e 100644 --- a/csharp/ql/src/Telemetry/ExternalApi.qll +++ b/csharp/ql/src/Telemetry/ExternalApi.qll @@ -2,13 +2,11 @@ private import csharp private import semmle.code.csharp.dispatch.Dispatch -private import semmle.code.csharp.dataflow.DataFlow private import semmle.code.csharp.dataflow.ExternalFlow private import semmle.code.csharp.dataflow.FlowSummary private import semmle.code.csharp.dataflow.internal.DataFlowImplCommon as DataFlowImplCommon private import semmle.code.csharp.dataflow.internal.DataFlowPrivate private import semmle.code.csharp.dataflow.internal.DataFlowDispatch as DataFlowDispatch -private import semmle.code.csharp.dataflow.TaintTracking private import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate private import semmle.code.csharp.security.dataflow.flowsources.Remote diff --git a/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql b/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql index 5a10f091b29..edcbf425497 100644 --- a/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql +++ b/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql @@ -10,7 +10,6 @@ import csharp import semmle.code.csharp.dataflow.DataFlow2 -import semmle.code.csharp.dataflow.TaintTracking import semmle.code.csharp.dataflow.TaintTracking2 import DataFlow::PathGraph diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll index 032026e7969..db6bd5c24e5 100644 --- a/csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll +++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll @@ -13,7 +13,6 @@ private import TranslatedExpr private import TranslatedStmt private import desugar.Foreach private import TranslatedFunction -private import experimental.ir.Util private import experimental.ir.internal.IRCSharpLanguage as Language TranslatedElement getInstructionTranslatedElement(Instruction instruction) { diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCall.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCall.qll index a2c6a708c72..e131a26be65 100644 --- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCall.qll +++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCall.qll @@ -5,7 +5,6 @@ private import InstructionTag private import TranslatedElement private import TranslatedExpr private import TranslatedInitialization -private import experimental.ir.Util private import experimental.ir.implementation.raw.internal.common.TranslatedCallBase private import experimental.ir.internal.IRCSharpLanguage as Language diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll index d44b2f453f1..7fc54f80b80 100644 --- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll +++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll @@ -10,7 +10,6 @@ private import TranslatedCondition private import TranslatedFunction private import TranslatedStmt private import IRConstruction -private import experimental.ir.Util private import experimental.ir.internal.IRCSharpLanguage as Language private import desugar.Foreach private import desugar.Delegate diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll index a3327d6775c..c4ad2428202 100644 --- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll +++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll @@ -16,7 +16,6 @@ private import common.TranslatedExprBase private import desugar.Delegate private import desugar.internal.TranslatedCompilerGeneratedCall import TranslatedCall -private import experimental.ir.Util private import experimental.ir.internal.IRCSharpLanguage as Language /** diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll index 3df60c9f80d..d5b287ddbde 100644 --- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll +++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll @@ -11,7 +11,6 @@ private import InstructionTag private import TranslatedElement private import TranslatedExpr private import TranslatedFunction -private import experimental.ir.Util private import IRInternal private import desugar.Delegate diff --git a/csharp/ql/src/experimental/ir/implementation/raw/internal/common/TranslatedCallBase.qll b/csharp/ql/src/experimental/ir/implementation/raw/internal/common/TranslatedCallBase.qll index a870ed02648..f14a420cfeb 100644 --- a/csharp/ql/src/experimental/ir/implementation/raw/internal/common/TranslatedCallBase.qll +++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/common/TranslatedCallBase.qll @@ -9,7 +9,6 @@ private import experimental.ir.implementation.internal.OperandTag private import experimental.ir.implementation.raw.internal.InstructionTag private import experimental.ir.implementation.raw.internal.TranslatedElement private import experimental.ir.implementation.raw.internal.TranslatedExpr -private import experimental.ir.Util private import experimental.ir.internal.CSharpType private import experimental.ir.internal.IRCSharpLanguage as Language private import TranslatedExprBase diff --git a/csharp/ql/test/TestUtilities/InlineExpectationsTestPrivate.qll b/csharp/ql/test/TestUtilities/InlineExpectationsTestPrivate.qll index 3df85cc0fd6..4f3c3f6bef5 100644 --- a/csharp/ql/test/TestUtilities/InlineExpectationsTestPrivate.qll +++ b/csharp/ql/test/TestUtilities/InlineExpectationsTestPrivate.qll @@ -1,5 +1,4 @@ import csharp -import semmle.code.csharp.Comments /** * A class representing line comments in C# used by the InlineExpectations core code diff --git a/csharp/ql/test/library-tests/cil/dataflow/TaintTracking.ql b/csharp/ql/test/library-tests/cil/dataflow/TaintTracking.ql index 5879865ac85..4a6397d2bbf 100644 --- a/csharp/ql/test/library-tests/cil/dataflow/TaintTracking.ql +++ b/csharp/ql/test/library-tests/cil/dataflow/TaintTracking.ql @@ -1,5 +1,4 @@ import csharp -import semmle.code.csharp.dataflow.TaintTracking // Test that all the copies of the taint tracking library can be imported // simultaneously without errors. import semmle.code.csharp.dataflow.TaintTracking2 diff --git a/csharp/ql/test/library-tests/commons/Disposal/DisposedVariables.ql b/csharp/ql/test/library-tests/commons/Disposal/DisposedVariables.ql index 5a6abf3fb11..4013d84e21b 100644 --- a/csharp/ql/test/library-tests/commons/Disposal/DisposedVariables.ql +++ b/csharp/ql/test/library-tests/commons/Disposal/DisposedVariables.ql @@ -1,5 +1,4 @@ import semmle.code.csharp.commons.Disposal -import csharp from Variable v where diff --git a/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.ql b/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.ql index ed293efc2ba..897085a92e2 100644 --- a/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.ql +++ b/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.ql @@ -1,5 +1,4 @@ import csharp -import semmle.code.csharp.dataflow.TaintTracking from DataFlow::Node pred, DataFlow::Node succ where diff --git a/csharp/ql/test/library-tests/csharp7/TaintReaches.ql b/csharp/ql/test/library-tests/csharp7/TaintReaches.ql index ff8664cae3a..77846ff6ab4 100644 --- a/csharp/ql/test/library-tests/csharp7/TaintReaches.ql +++ b/csharp/ql/test/library-tests/csharp7/TaintReaches.ql @@ -1,5 +1,4 @@ import csharp -import semmle.code.csharp.dataflow.TaintTracking from StringLiteral l, DataFlow::Node n where TaintTracking::localTaintStep+(DataFlow::exprNode(l), n) diff --git a/csharp/ql/test/library-tests/frameworks/JsonNET/Json.ql b/csharp/ql/test/library-tests/frameworks/JsonNET/Json.ql index 81067f76838..5615e5873e8 100644 --- a/csharp/ql/test/library-tests/frameworks/JsonNET/Json.ql +++ b/csharp/ql/test/library-tests/frameworks/JsonNET/Json.ql @@ -1,5 +1,4 @@ import csharp -import semmle.code.csharp.dataflow.TaintTracking class Configuration extends TaintTracking::Configuration { Configuration() { this = "Json.NET test" } diff --git a/csharp/ql/test/library-tests/frameworks/NHibernate/DataFlow.ql b/csharp/ql/test/library-tests/frameworks/NHibernate/DataFlow.ql index ab97e1494ff..655a0ef2856 100644 --- a/csharp/ql/test/library-tests/frameworks/NHibernate/DataFlow.ql +++ b/csharp/ql/test/library-tests/frameworks/NHibernate/DataFlow.ql @@ -1,5 +1,4 @@ import csharp -import semmle.code.csharp.dataflow.TaintTracking class MyConfiguration extends TaintTracking::Configuration { MyConfiguration() { this = "MyConfiguration" } diff --git a/java/ql/lib/semmle/code/java/Javadoc.qll b/java/ql/lib/semmle/code/java/Javadoc.qll index 8f7b1dbf580..044ed17f476 100755 --- a/java/ql/lib/semmle/code/java/Javadoc.qll +++ b/java/ql/lib/semmle/code/java/Javadoc.qll @@ -3,7 +3,6 @@ */ import semmle.code.Location -import Element /** A Javadoc parent is an element whose child can be some Javadoc documentation. */ class JavadocParent extends @javadocParent, Top { diff --git a/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll b/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll index 5f1ed3438b5..3fae0f0b4d2 100644 --- a/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll +++ b/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll @@ -4,7 +4,6 @@ import java import Dominance -import semmle.code.java.ControlFlowGraph /** * A control-flow node that represents the start of a basic block. diff --git a/java/ql/lib/semmle/code/java/controlflow/Dominance.qll b/java/ql/lib/semmle/code/java/controlflow/Dominance.qll index cbc16022d25..a1263ce3f0e 100644 --- a/java/ql/lib/semmle/code/java/controlflow/Dominance.qll +++ b/java/ql/lib/semmle/code/java/controlflow/Dominance.qll @@ -3,7 +3,6 @@ */ import java -private import semmle.code.java.ControlFlowGraph /* * Predicates for basic-block-level dominance. diff --git a/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll b/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll index d90e96e7898..66818814773 100644 --- a/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll +++ b/java/ql/lib/semmle/code/java/dataflow/FlowSources.qll @@ -27,7 +27,6 @@ import semmle.code.java.frameworks.Guice import semmle.code.java.frameworks.struts.StrutsActions import semmle.code.java.frameworks.Thrift import semmle.code.java.frameworks.javaee.jsf.JSFRenderer -private import semmle.code.java.dataflow.ExternalFlow /** A data flow source of remote user input. */ abstract class RemoteFlowSource extends DataFlow::Node { diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll index b1422e89552..739e2032ff5 100644 --- a/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll +++ b/java/ql/lib/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll @@ -15,7 +15,6 @@ private import semmle.code.java.dataflow.FlowSources private import semmle.code.java.dataflow.internal.DataFlowPrivate import semmle.code.java.dataflow.FlowSteps private import FlowSummaryImpl as FlowSummaryImpl -private import semmle.code.java.frameworks.JaxWS /** * Holds if taint can flow from `src` to `sink` in zero or more diff --git a/java/ql/lib/semmle/code/java/deadcode/DeadEnumConstant.qll b/java/ql/lib/semmle/code/java/deadcode/DeadEnumConstant.qll index 17c8e09eabb..506da3803f7 100644 --- a/java/ql/lib/semmle/code/java/deadcode/DeadEnumConstant.qll +++ b/java/ql/lib/semmle/code/java/deadcode/DeadEnumConstant.qll @@ -1,5 +1,4 @@ import java -import semmle.code.java.JDKAnnotations /** * Direct flow of values (i.e. object references) through expressions. diff --git a/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll index 027e2392252..168b14c360f 100644 --- a/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll +++ b/java/ql/lib/semmle/code/java/deadcode/EntryPoints.qll @@ -9,7 +9,6 @@ import semmle.code.java.deadcode.WebEntryPoints import semmle.code.java.frameworks.javaee.JavaServerFaces import semmle.code.java.frameworks.JAXB import semmle.code.java.frameworks.JaxWS -import semmle.code.java.JMX import semmle.code.java.Reflection import semmle.code.java.frameworks.JavaxAnnotations import semmle.code.java.frameworks.Selenium diff --git a/java/ql/lib/semmle/code/java/deadcode/TestEntryPoints.qll b/java/ql/lib/semmle/code/java/deadcode/TestEntryPoints.qll index 2d8b28e4de9..0355f194e54 100644 --- a/java/ql/lib/semmle/code/java/deadcode/TestEntryPoints.qll +++ b/java/ql/lib/semmle/code/java/deadcode/TestEntryPoints.qll @@ -3,7 +3,6 @@ import semmle.code.java.deadcode.DeadCode import semmle.code.java.frameworks.Cucumber import semmle.code.java.deadcode.frameworks.FitNesseEntryPoints import semmle.code.java.frameworks.Mockito -import semmle.code.java.UnitTests /** * A test method, suite, or an associated setup/teardown method. diff --git a/java/ql/lib/semmle/code/java/frameworks/ApacheLdap.qll b/java/ql/lib/semmle/code/java/frameworks/ApacheLdap.qll index a1cf6376bdf..8bcba2f044e 100644 --- a/java/ql/lib/semmle/code/java/frameworks/ApacheLdap.qll +++ b/java/ql/lib/semmle/code/java/frameworks/ApacheLdap.qll @@ -3,8 +3,6 @@ */ import java -import semmle.code.java.Type -import semmle.code.java.Member /*--- Types ---*/ /** The interface `org.apache.directory.ldap.client.api.LdapConnection`. */ diff --git a/java/ql/lib/semmle/code/java/frameworks/Jndi.qll b/java/ql/lib/semmle/code/java/frameworks/Jndi.qll index 9294c0c97c7..b52a280e964 100644 --- a/java/ql/lib/semmle/code/java/frameworks/Jndi.qll +++ b/java/ql/lib/semmle/code/java/frameworks/Jndi.qll @@ -3,8 +3,6 @@ */ import java -import semmle.code.java.Type -import semmle.code.java.Member /*--- Types ---*/ /** The interface `javax.naming.Context`. */ diff --git a/java/ql/lib/semmle/code/java/frameworks/SpringLdap.qll b/java/ql/lib/semmle/code/java/frameworks/SpringLdap.qll index 2db8435c22c..da40caf3744 100644 --- a/java/ql/lib/semmle/code/java/frameworks/SpringLdap.qll +++ b/java/ql/lib/semmle/code/java/frameworks/SpringLdap.qll @@ -3,8 +3,6 @@ */ import java -import semmle.code.java.Type -import semmle.code.java.Member /*--- Types ---*/ /** The class `org.springframework.ldap.core.LdapTemplate`. */ diff --git a/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll b/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll index 2bac6eb5ce2..dfa7fd6286a 100644 --- a/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll +++ b/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll @@ -3,8 +3,6 @@ */ import java -import semmle.code.java.Type -import semmle.code.java.Member /*--- Types ---*/ /** The interface `com.unboundid.ldap.sdk.ReadOnlySearchRequest`. */ diff --git a/java/ql/lib/semmle/code/java/frameworks/android/SQLite.qll b/java/ql/lib/semmle/code/java/frameworks/android/SQLite.qll index fac70e45f63..bce23155bdb 100644 --- a/java/ql/lib/semmle/code/java/frameworks/android/SQLite.qll +++ b/java/ql/lib/semmle/code/java/frameworks/android/SQLite.qll @@ -3,7 +3,6 @@ import java import Android import semmle.code.java.dataflow.FlowSteps -import semmle.code.java.dataflow.ExternalFlow /** * The class `android.database.sqlite.SQLiteDatabase`. diff --git a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll index 77285d98175..5f628b19a51 100644 --- a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll +++ b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll @@ -1,5 +1,4 @@ import java -import semmle.code.xml.XML /** * Holds if any struts XML files are included in this snapshot. diff --git a/java/ql/lib/semmle/code/java/metrics/MetricPackage.qll b/java/ql/lib/semmle/code/java/metrics/MetricPackage.qll index eafdd57dd8a..751357fc978 100755 --- a/java/ql/lib/semmle/code/java/metrics/MetricPackage.qll +++ b/java/ql/lib/semmle/code/java/metrics/MetricPackage.qll @@ -5,7 +5,6 @@ import semmle.code.java.Package import MetricElement import MetricRefType -import semmle.code.java.Dependency import MetricCallable /** This class provides access to metrics information for packages. */ diff --git a/java/ql/lib/semmle/code/java/security/InsecureBasicAuthQuery.qll b/java/ql/lib/semmle/code/java/security/InsecureBasicAuthQuery.qll index 941aaafe580..2ecf21bde2d 100644 --- a/java/ql/lib/semmle/code/java/security/InsecureBasicAuthQuery.qll +++ b/java/ql/lib/semmle/code/java/security/InsecureBasicAuthQuery.qll @@ -3,7 +3,6 @@ import java import semmle.code.java.security.HttpsUrls import semmle.code.java.security.InsecureBasicAuth -import semmle.code.java.dataflow.TaintTracking /** * A taint tracking configuration for the Basic authentication scheme diff --git a/java/ql/lib/semmle/code/java/security/ResponseSplitting.qll b/java/ql/lib/semmle/code/java/security/ResponseSplitting.qll index 70af02efc6d..15ae46ce15c 100644 --- a/java/ql/lib/semmle/code/java/security/ResponseSplitting.qll +++ b/java/ql/lib/semmle/code/java/security/ResponseSplitting.qll @@ -3,8 +3,6 @@ import java import semmle.code.java.dataflow.DataFlow import semmle.code.java.dataflow.FlowSources -import semmle.code.java.frameworks.Servlets -import semmle.code.java.frameworks.JaxWS private import semmle.code.java.dataflow.ExternalFlow /** A sink that is vulnerable to an HTTP header splitting attack. */ diff --git a/java/ql/src/Advisory/Declarations/NonPrivateField.ql b/java/ql/src/Advisory/Declarations/NonPrivateField.ql index 60e49003586..30b18ec53fd 100644 --- a/java/ql/src/Advisory/Declarations/NonPrivateField.ql +++ b/java/ql/src/Advisory/Declarations/NonPrivateField.ql @@ -10,7 +10,6 @@ */ import java -import semmle.code.java.JDKAnnotations class NonConstantSourceField extends Field { NonConstantSourceField() { diff --git a/java/ql/src/Likely Bugs/Serialization/NonSerializableField.ql b/java/ql/src/Likely Bugs/Serialization/NonSerializableField.ql index 0b594c0a78f..131a5747f49 100644 --- a/java/ql/src/Likely Bugs/Serialization/NonSerializableField.ql +++ b/java/ql/src/Likely Bugs/Serialization/NonSerializableField.ql @@ -12,7 +12,6 @@ */ import java -import semmle.code.java.JDKAnnotations import semmle.code.java.Collections import semmle.code.java.Maps import semmle.code.java.frameworks.javaee.ejb.EJB diff --git a/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql b/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql index 7d831f9cb3f..1bf54abb89f 100644 --- a/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql +++ b/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql @@ -12,7 +12,6 @@ */ import java -import semmle.code.java.JDKAnnotations predicate isSerializable(RefType t) { t.getAnAncestor() instanceof TypeSerializable } diff --git a/java/ql/src/Telemetry/SupportedExternalSinks.ql b/java/ql/src/Telemetry/SupportedExternalSinks.ql index 760a14cb722..e4323632819 100644 --- a/java/ql/src/Telemetry/SupportedExternalSinks.ql +++ b/java/ql/src/Telemetry/SupportedExternalSinks.ql @@ -8,7 +8,6 @@ import java import ExternalApi -import semmle.code.java.GeneratedFiles from ExternalApi api, int usages where diff --git a/java/ql/src/Telemetry/SupportedExternalSources.ql b/java/ql/src/Telemetry/SupportedExternalSources.ql index 4b1bc2a6595..552e16256e4 100644 --- a/java/ql/src/Telemetry/SupportedExternalSources.ql +++ b/java/ql/src/Telemetry/SupportedExternalSources.ql @@ -8,7 +8,6 @@ import java import ExternalApi -import semmle.code.java.GeneratedFiles from ExternalApi api, int usages where diff --git a/java/ql/src/Telemetry/SupportedExternalTaint.ql b/java/ql/src/Telemetry/SupportedExternalTaint.ql index 17f1a33bcc6..f605c597a6d 100644 --- a/java/ql/src/Telemetry/SupportedExternalTaint.ql +++ b/java/ql/src/Telemetry/SupportedExternalTaint.ql @@ -8,7 +8,6 @@ import java import ExternalApi -import semmle.code.java.GeneratedFiles from ExternalApi api, int usages where diff --git a/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql b/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql index f01c59b2a13..294a7260bd9 100644 --- a/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql +++ b/java/ql/src/Telemetry/UnsupportedExternalAPIs.ql @@ -8,7 +8,6 @@ import java import ExternalApi -import semmle.code.java.GeneratedFiles from ExternalApi api, int usages where diff --git a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql index 2d1e605c426..c908e0bf59a 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql +++ b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjection.ql @@ -15,7 +15,6 @@ import java import DataFlow::PathGraph import MyBatisCommonLib import MyBatisAnnotationSqlInjectionLib -import semmle.code.java.dataflow.FlowSources private class MyBatisAnnotationSqlInjectionConfiguration extends TaintTracking::Configuration { MyBatisAnnotationSqlInjectionConfiguration() { this = "MyBatis annotation sql injection" } diff --git a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjectionLib.qll b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjectionLib.qll index a48440426ae..6827f32b5f6 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjectionLib.qll +++ b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisAnnotationSqlInjectionLib.qll @@ -4,8 +4,6 @@ import java import MyBatisCommonLib -import semmle.code.java.dataflow.FlowSources -import semmle.code.java.frameworks.Properties /** An argument of a MyBatis annotated method. */ class MyBatisAnnotatedMethodCallArgument extends DataFlow::Node { diff --git a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll index b7f01ce06cd..f8209718455 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll +++ b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisCommonLib.qll @@ -6,7 +6,6 @@ import java import semmle.code.xml.MyBatisMapperXML import semmle.code.java.dataflow.FlowSources import semmle.code.java.frameworks.MyBatis -import semmle.code.java.frameworks.Properties private predicate propertiesKey(DataFlow::Node prop, string key) { exists(MethodAccess m | diff --git a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql index 9aeb95ea94a..5004d4fe651 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql +++ b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjection.ql @@ -15,8 +15,6 @@ import java import DataFlow::PathGraph import MyBatisCommonLib import MyBatisMapperXmlSqlInjectionLib -import semmle.code.xml.MyBatisMapperXML -import semmle.code.java.dataflow.FlowSources private class MyBatisMapperXmlSqlInjectionConfiguration extends TaintTracking::Configuration { MyBatisMapperXmlSqlInjectionConfiguration() { this = "MyBatis mapper xml sql injection" } diff --git a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjectionLib.qll b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjectionLib.qll index b059ce91eef..26b6c038d01 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjectionLib.qll +++ b/java/ql/src/experimental/Security/CWE/CWE-089/MyBatisMapperXmlSqlInjectionLib.qll @@ -5,7 +5,6 @@ import java import semmle.code.xml.MyBatisMapperXML import semmle.code.java.dataflow.FlowSources -import semmle.code.java.frameworks.Properties /** A sink for MyBatis Mapper method call an argument. */ class MyBatisMapperMethodCallAnArgument extends DataFlow::Node { diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/BeanShellInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-094/BeanShellInjection.ql index b8301d4f977..34101b7c54c 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-094/BeanShellInjection.ql +++ b/java/ql/src/experimental/Security/CWE/CWE-094/BeanShellInjection.ql @@ -12,7 +12,6 @@ import java import BeanShellInjection -import semmle.code.java.dataflow.FlowSources import DataFlow::PathGraph class BeanShellInjectionConfig extends TaintTracking::Configuration { diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/JShellInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-094/JShellInjection.ql index 451dff79444..c122f6f6429 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-094/JShellInjection.ql +++ b/java/ql/src/experimental/Security/CWE/CWE-094/JShellInjection.ql @@ -12,7 +12,6 @@ import java import JShellInjection -import semmle.code.java.dataflow.FlowSources import DataFlow::PathGraph class JShellInjectionConfiguration extends TaintTracking::Configuration { diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/JakartaExpressionInjectionLib.qll b/java/ql/src/experimental/Security/CWE/CWE-094/JakartaExpressionInjectionLib.qll index b65d2067b6a..cc56feabf6c 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-094/JakartaExpressionInjectionLib.qll +++ b/java/ql/src/experimental/Security/CWE/CWE-094/JakartaExpressionInjectionLib.qll @@ -1,6 +1,5 @@ import java import FlowUtils -import semmle.code.java.dataflow.FlowSources import semmle.code.java.dataflow.TaintTracking /** diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/JythonInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-094/JythonInjection.ql index a3dc6e6c39a..e8975a960ab 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-094/JythonInjection.ql +++ b/java/ql/src/experimental/Security/CWE/CWE-094/JythonInjection.ql @@ -13,7 +13,6 @@ import java import semmle.code.java.dataflow.FlowSources -import semmle.code.java.frameworks.spring.SpringController import DataFlow::PathGraph /** The class `org.python.util.PythonInterpreter`. */ diff --git a/java/ql/src/experimental/Security/CWE/CWE-200/AndroidFileIntentSource.qll b/java/ql/src/experimental/Security/CWE/CWE-200/AndroidFileIntentSource.qll index 36f73bbac01..92f93412c8b 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-200/AndroidFileIntentSource.qll +++ b/java/ql/src/experimental/Security/CWE/CWE-200/AndroidFileIntentSource.qll @@ -3,7 +3,6 @@ import java import semmle.code.java.dataflow.FlowSources import semmle.code.java.dataflow.TaintTracking2 -import semmle.code.java.frameworks.android.Android /** The `startActivityForResult` method of Android's `Activity` class. */ class StartActivityForResultMethod extends Method { diff --git a/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql b/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql index c5a6c36d6a6..ec2ca6a4d54 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql +++ b/java/ql/src/experimental/Security/CWE/CWE-346/UnvalidatedCors.ql @@ -11,7 +11,6 @@ import java import semmle.code.java.dataflow.FlowSources -import semmle.code.java.frameworks.Servlets import semmle.code.java.dataflow.TaintTracking import semmle.code.java.dataflow.TaintTracking2 import DataFlow::PathGraph diff --git a/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjection.ql b/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjection.ql index 71ee842f162..43f4d76dcaf 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjection.ql +++ b/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjection.ql @@ -12,7 +12,6 @@ import java import JsonpInjectionLib -import semmle.code.java.dataflow.FlowSources import semmle.code.java.deadcode.WebEntryPoints import DataFlow::PathGraph diff --git a/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjectionLib.qll b/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjectionLib.qll index bb16099ddc3..c5a268c81e3 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjectionLib.qll +++ b/java/ql/src/experimental/Security/CWE/CWE-352/JsonpInjectionLib.qll @@ -2,10 +2,7 @@ import java import DataFlow import JsonStringLib import semmle.code.java.security.XSS -import semmle.code.java.dataflow.DataFlow import semmle.code.java.dataflow.DataFlow3 -import semmle.code.java.dataflow.FlowSources -import semmle.code.java.frameworks.spring.SpringController /** * A method that is called to handle an HTTP GET request. diff --git a/java/ql/src/experimental/Security/CWE/CWE-470/UnsafeReflection.ql b/java/ql/src/experimental/Security/CWE/CWE-470/UnsafeReflection.ql index ca29a5544d3..c440dc12081 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-470/UnsafeReflection.ql +++ b/java/ql/src/experimental/Security/CWE/CWE-470/UnsafeReflection.ql @@ -14,7 +14,6 @@ import java import DataFlow import UnsafeReflectionLib import semmle.code.java.dataflow.DataFlow -import semmle.code.java.dataflow.FlowSources import DataFlow::PathGraph private class ContainsSanitizer extends DataFlow::BarrierGuard { diff --git a/java/ql/src/experimental/Security/CWE/CWE-489/EJBMain.ql b/java/ql/src/experimental/Security/CWE/CWE-489/EJBMain.ql index fe69f2d9cea..825258c0ccc 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-489/EJBMain.ql +++ b/java/ql/src/experimental/Security/CWE/CWE-489/EJBMain.ql @@ -10,7 +10,6 @@ */ import java -import semmle.code.java.J2EE import TestLib /** The `main` method in an Enterprise Java Bean. */ diff --git a/java/ql/src/experimental/Security/CWE/CWE-600/UncaughtServletException.ql b/java/ql/src/experimental/Security/CWE/CWE-600/UncaughtServletException.ql index 809c5e5e17d..c307ec5b4d6 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-600/UncaughtServletException.ql +++ b/java/ql/src/experimental/Security/CWE/CWE-600/UncaughtServletException.ql @@ -15,7 +15,6 @@ import java import semmle.code.java.dataflow.FlowSources import semmle.code.java.dataflow.TaintTracking -import semmle.code.java.frameworks.Servlets import semmle.code.xml.WebXML import DataFlow::PathGraph diff --git a/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql b/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql index b15d7948801..977f500dff0 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql +++ b/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.ql @@ -12,7 +12,6 @@ import java import SpringUrlRedirect -import semmle.code.java.dataflow.FlowSources import DataFlow::PathGraph private class StartsWithSanitizer extends DataFlow::BarrierGuard { diff --git a/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.qll b/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.qll index 3791573eb9d..557be08873c 100644 --- a/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.qll +++ b/java/ql/src/experimental/Security/CWE/CWE-601/SpringUrlRedirect.qll @@ -3,7 +3,6 @@ import DataFlow import semmle.code.java.dataflow.FlowSources import semmle.code.java.dataflow.DataFlow2 import semmle.code.java.dataflow.TaintTracking -import semmle.code.java.frameworks.spring.SpringController /** * A concatenate expression using the string `redirect:` or `ajaxredirect:` or `forward:` on the left. diff --git a/java/ql/src/experimental/semmle/code/java/frameworks/CredentialsInPropertiesFile.qll b/java/ql/src/experimental/semmle/code/java/frameworks/CredentialsInPropertiesFile.qll index 1190e13a9a1..101b2de28e4 100644 --- a/java/ql/src/experimental/semmle/code/java/frameworks/CredentialsInPropertiesFile.qll +++ b/java/ql/src/experimental/semmle/code/java/frameworks/CredentialsInPropertiesFile.qll @@ -5,7 +5,6 @@ import java import semmle.code.configfiles.ConfigFiles import semmle.code.java.dataflow.FlowSources -import semmle.code.java.frameworks.Properties private string possibleSecretName() { result = diff --git a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/NosqlInjectionATM.qll b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/NosqlInjectionATM.qll index 2d5b2a58510..2f84c558f3a 100644 --- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/NosqlInjectionATM.qll +++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/NosqlInjectionATM.qll @@ -7,7 +7,6 @@ import javascript private import semmle.javascript.heuristics.SyntacticHeuristics private import semmle.javascript.security.dataflow.NosqlInjectionCustomizations -private import semmle.javascript.security.TaintedObject import AdaptiveThreatModeling private import CoreKnowledge as CoreKnowledge private import StandardEndpointFilters as StandardEndpointFilters diff --git a/javascript/ql/lib/Expressions/ExprHasNoEffect.qll b/javascript/ql/lib/Expressions/ExprHasNoEffect.qll index 691424f3b71..1c6649c5ad5 100644 --- a/javascript/ql/lib/Expressions/ExprHasNoEffect.qll +++ b/javascript/ql/lib/Expressions/ExprHasNoEffect.qll @@ -4,7 +4,6 @@ import javascript import DOMProperties -import semmle.javascript.frameworks.xUnit /** * Holds if `e` appears in a syntactic context where its value is discarded. diff --git a/javascript/ql/lib/semmle/javascript/frameworks/NoSQL.qll b/javascript/ql/lib/semmle/javascript/frameworks/NoSQL.qll index 6889161696f..844a9e813cd 100644 --- a/javascript/ql/lib/semmle/javascript/frameworks/NoSQL.qll +++ b/javascript/ql/lib/semmle/javascript/frameworks/NoSQL.qll @@ -3,7 +3,6 @@ */ import javascript -import semmle.javascript.Promises /** Provices classes for modelling NoSQL query sinks. */ module NoSql { diff --git a/javascript/ql/lib/semmle/javascript/frameworks/SQL.qll b/javascript/ql/lib/semmle/javascript/frameworks/SQL.qll index c598b5422e9..03c78c2561f 100644 --- a/javascript/ql/lib/semmle/javascript/frameworks/SQL.qll +++ b/javascript/ql/lib/semmle/javascript/frameworks/SQL.qll @@ -3,7 +3,6 @@ */ import javascript -import semmle.javascript.Promises module SQL { /** A string-valued expression that is interpreted as a SQL command. */ diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Testing.qll b/javascript/ql/lib/semmle/javascript/frameworks/Testing.qll index d5483cf61e0..6923d59124f 100644 --- a/javascript/ql/lib/semmle/javascript/frameworks/Testing.qll +++ b/javascript/ql/lib/semmle/javascript/frameworks/Testing.qll @@ -3,7 +3,6 @@ */ import javascript -import semmle.javascript.frameworks.xUnit import semmle.javascript.frameworks.TestingCustomizations /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/BrokenCryptoAlgorithmCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/BrokenCryptoAlgorithmCustomizations.qll index 6ddae65e64f..58858d79886 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/BrokenCryptoAlgorithmCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/BrokenCryptoAlgorithmCustomizations.qll @@ -6,7 +6,6 @@ import javascript private import semmle.javascript.security.SensitiveActions -private import semmle.javascript.frameworks.CryptoLibraries module BrokenCryptoAlgorithm { /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirect.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirect.qll index bdf4b5c1274..744646e168c 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirect.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirect.qll @@ -1,7 +1,6 @@ /** DEPRECATED. Import `ClientSideUrlRedirectQuery` instead. */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources import UrlConcatenation private import ClientSideUrlRedirectQuery as ClientSideUrlRedirectQuery // ignore-query-import diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll index ecd870aec80..e643387c5e4 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll @@ -5,7 +5,6 @@ */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources module ClientSideUrlRedirect { /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectQuery.qll index d9566b03313..c16d448bff6 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectQuery.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectQuery.qll @@ -8,7 +8,6 @@ */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources import UrlConcatenation import ClientSideUrlRedirectCustomizations::ClientSideUrlRedirect diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll index 2bd7692af00..f0f6b17dce0 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll @@ -5,7 +5,6 @@ */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources module CommandInjection { /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypass.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypass.qll index 9e786db7cfa..e28dc5e34f1 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypass.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypass.qll @@ -1,7 +1,6 @@ /** DEPRECATED. Import `DifferentKindsComparisonBypassQuery` instead. */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources private import DifferentKindsComparisonBypassQuery as DifferentKindsComparisonBypassQuery // ignore-query-import /** DEPRECATED. Import `DifferentKindsComparisonBypassQuery` instead. */ diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypassCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypassCustomizations.qll index dde3b60b456..bfb30cc2c99 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypassCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypassCustomizations.qll @@ -5,7 +5,6 @@ */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources module DifferentKindsComparisonBypass { /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypassQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypassQuery.qll index d3639b98a01..9a7e55f11fd 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypassQuery.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypassQuery.qll @@ -9,7 +9,6 @@ */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources import DifferentKindsComparisonBypassCustomizations::DifferentKindsComparisonBypass /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/FileAccessToHttpCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/FileAccessToHttpCustomizations.qll index b6712229ccd..8fac31ddf54 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/FileAccessToHttpCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/FileAccessToHttpCustomizations.qll @@ -5,7 +5,6 @@ */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources module FileAccessToHttp { /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/HttpToFileAccessSpecific.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/HttpToFileAccessSpecific.qll index f0f40f54ecf..a7b6cca1360 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/HttpToFileAccessSpecific.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/HttpToFileAccessSpecific.qll @@ -3,7 +3,6 @@ */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources private import HttpToFileAccessCustomizations::HttpToFileAccess /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/IncompleteHtmlAttributeSanitizationCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/IncompleteHtmlAttributeSanitizationCustomizations.qll index 7512b4ab799..9ee5d115064 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/IncompleteHtmlAttributeSanitizationCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/IncompleteHtmlAttributeSanitizationCustomizations.qll @@ -5,7 +5,6 @@ */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources import semmle.javascript.security.IncompleteBlacklistSanitizer module IncompleteHtmlAttributeSanitization { diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionCustomizations.qll index 92fce24b333..9ba5964c2e5 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionCustomizations.qll @@ -5,7 +5,6 @@ */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources module IndirectCommandInjection { /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/InsufficientPasswordHashCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/InsufficientPasswordHashCustomizations.qll index 82ffe21e131..6ffcb7fa527 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/InsufficientPasswordHashCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/InsufficientPasswordHashCustomizations.qll @@ -6,7 +6,6 @@ import javascript private import semmle.javascript.security.SensitiveActions -private import semmle.javascript.frameworks.CryptoLibraries module InsufficientPasswordHash { /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/TypeConfusionThroughParameterTamperingCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/TypeConfusionThroughParameterTamperingCustomizations.qll index 3364b704dc1..3cdc81c66ee 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/TypeConfusionThroughParameterTamperingCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/TypeConfusionThroughParameterTamperingCustomizations.qll @@ -5,7 +5,6 @@ */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources private import semmle.javascript.dataflow.InferredTypes module TypeConfusionThroughParameterTampering { diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserialization.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserialization.qll index d3695f42f78..4b1fd4b58ea 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserialization.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserialization.qll @@ -1,7 +1,6 @@ /** DEPRECATED. Import `UnsafeDeserializationQuery` instead. */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources private import UnsafeDeserializationQuery as UnsafeDeserializationQuery // ignore-query-import /** DEPRECATED. Import `UnsafeDeserializationQuery` instead. */ diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationCustomizations.qll index 26988e6a84c..995e7e14411 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationCustomizations.qll @@ -5,7 +5,6 @@ */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources module UnsafeDeserialization { /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationQuery.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationQuery.qll index 66e55852fb0..f8afff17b3a 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationQuery.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationQuery.qll @@ -7,7 +7,6 @@ */ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources import UnsafeDeserializationCustomizations::UnsafeDeserialization /** diff --git a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeShellCommandConstructionCustomizations.qll b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeShellCommandConstructionCustomizations.qll index 2e0d284768b..f46570b7434 100644 --- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeShellCommandConstructionCustomizations.qll +++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeShellCommandConstructionCustomizations.qll @@ -5,7 +5,6 @@ */ import javascript -private import semmle.javascript.security.dataflow.RemoteFlowSources private import semmle.javascript.PackageExports as Exports private import semmle.javascript.dataflow.InferredTypes diff --git a/javascript/ql/src/Security/CWE-915/PrototypePollutingMergeCall.ql b/javascript/ql/src/Security/CWE-915/PrototypePollutingMergeCall.ql index e3cebbc3f7c..f0c29282257 100644 --- a/javascript/ql/src/Security/CWE-915/PrototypePollutingMergeCall.ql +++ b/javascript/ql/src/Security/CWE-915/PrototypePollutingMergeCall.ql @@ -20,7 +20,6 @@ import javascript import semmle.javascript.security.dataflow.PrototypePollutionQuery import DataFlow::PathGraph -import semmle.javascript.dependencies.Dependencies from Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink, string moduleName, diff --git a/javascript/ql/test/library-tests/CryptoLibraries/CryptographicKey.ql b/javascript/ql/test/library-tests/CryptoLibraries/CryptographicKey.ql index 48b1856db22..04e0b05519c 100644 --- a/javascript/ql/test/library-tests/CryptoLibraries/CryptographicKey.ql +++ b/javascript/ql/test/library-tests/CryptoLibraries/CryptographicKey.ql @@ -1,5 +1,4 @@ import javascript -import semmle.javascript.frameworks.CryptoLibraries from CryptographicKey key select key diff --git a/javascript/ql/test/library-tests/CryptoLibraries/CryptographicOperation.ql b/javascript/ql/test/library-tests/CryptoLibraries/CryptographicOperation.ql index 12e36eaa322..d085113b9c7 100644 --- a/javascript/ql/test/library-tests/CryptoLibraries/CryptographicOperation.ql +++ b/javascript/ql/test/library-tests/CryptoLibraries/CryptographicOperation.ql @@ -1,5 +1,4 @@ import javascript -import semmle.javascript.frameworks.CryptoLibraries from CryptographicOperation operation select operation, operation.getAlgorithm().getName(), operation.getInput() diff --git a/javascript/ql/test/library-tests/TaintBarriers/ExampleConfiguration.qll b/javascript/ql/test/library-tests/TaintBarriers/ExampleConfiguration.qll index d5a8f0bc156..f730dd81891 100644 --- a/javascript/ql/test/library-tests/TaintBarriers/ExampleConfiguration.qll +++ b/javascript/ql/test/library-tests/TaintBarriers/ExampleConfiguration.qll @@ -1,5 +1,4 @@ import javascript -import semmle.javascript.security.dataflow.RemoteFlowSources class ExampleConfiguration extends TaintTracking::Configuration { ExampleConfiguration() { this = "ExampleConfiguration" } diff --git a/python/ql/lib/semmle/python/Module.qll b/python/ql/lib/semmle/python/Module.qll index 68a0e945b5e..87116a1d98b 100644 --- a/python/ql/lib/semmle/python/Module.qll +++ b/python/ql/lib/semmle/python/Module.qll @@ -1,5 +1,4 @@ import python -private import semmle.python.objects.ObjectAPI private import semmle.python.objects.Modules private import semmle.python.internal.CachedStages diff --git a/python/ql/lib/semmle/python/dataflow/old/StateTracking.qll b/python/ql/lib/semmle/python/dataflow/old/StateTracking.qll index d302ea5c1ba..71ca8fd0b20 100644 --- a/python/ql/lib/semmle/python/dataflow/old/StateTracking.qll +++ b/python/ql/lib/semmle/python/dataflow/old/StateTracking.qll @@ -9,7 +9,6 @@ */ import python -private import semmle.python.pointsto.Base private import semmle.python.pointsto.PointsTo private import semmle.python.pointsto.PointsToContext private import semmle.python.objects.ObjectInternal diff --git a/python/ql/lib/semmle/python/essa/SsaDefinitions.qll b/python/ql/lib/semmle/python/essa/SsaDefinitions.qll index ed7b4ae4462..810afc3179a 100644 --- a/python/ql/lib/semmle/python/essa/SsaDefinitions.qll +++ b/python/ql/lib/semmle/python/essa/SsaDefinitions.qll @@ -4,7 +4,6 @@ */ import python -private import semmle.python.pointsto.Base private import semmle.python.internal.CachedStages cached diff --git a/python/ql/lib/semmle/python/frameworks/Requests.qll b/python/ql/lib/semmle/python/frameworks/Requests.qll index c8e8192419a..1cbfaeb6683 100644 --- a/python/ql/lib/semmle/python/frameworks/Requests.qll +++ b/python/ql/lib/semmle/python/frameworks/Requests.qll @@ -9,7 +9,6 @@ private import python private import semmle.python.Concepts private import semmle.python.ApiGraphs -private import semmle.python.dataflow.new.DataFlow private import semmle.python.dataflow.new.TaintTracking private import semmle.python.frameworks.internal.InstanceTaintStepsHelper private import semmle.python.frameworks.Stdlib diff --git a/python/ql/lib/semmle/python/types/FunctionObject.qll b/python/ql/lib/semmle/python/types/FunctionObject.qll index ec05ba6a3c1..e3475e8589e 100644 --- a/python/ql/lib/semmle/python/types/FunctionObject.qll +++ b/python/ql/lib/semmle/python/types/FunctionObject.qll @@ -3,7 +3,6 @@ import semmle.python.types.Exceptions private import semmle.python.pointsto.PointsTo private import semmle.python.objects.Callables private import semmle.python.libraries.Zope -private import semmle.python.pointsto.Base private import semmle.python.objects.ObjectInternal private import semmle.python.types.Builtins diff --git a/python/ql/lib/semmle/python/types/Object.qll b/python/ql/lib/semmle/python/types/Object.qll index ebfbae5cc71..e0d252929f9 100644 --- a/python/ql/lib/semmle/python/types/Object.qll +++ b/python/ql/lib/semmle/python/types/Object.qll @@ -1,5 +1,4 @@ import python -private import semmle.python.objects.ObjectAPI private import semmle.python.objects.ObjectInternal private import semmle.python.types.Builtins private import semmle.python.internal.CachedStages diff --git a/python/ql/lib/semmle/python/web/falcon/Request.qll b/python/ql/lib/semmle/python/web/falcon/Request.qll index 894c38ec835..ac4c92f3ad0 100644 --- a/python/ql/lib/semmle/python/web/falcon/Request.qll +++ b/python/ql/lib/semmle/python/web/falcon/Request.qll @@ -2,7 +2,6 @@ import python import semmle.python.dataflow.TaintTracking import semmle.python.web.Http import semmle.python.web.falcon.General -import semmle.python.security.strings.External /** https://falcon.readthedocs.io/en/stable/api/request_and_response.html */ deprecated class FalconRequest extends TaintKind { diff --git a/python/ql/lib/semmle/python/web/falcon/Response.qll b/python/ql/lib/semmle/python/web/falcon/Response.qll index d1b9336b62c..ae5562b6432 100644 --- a/python/ql/lib/semmle/python/web/falcon/Response.qll +++ b/python/ql/lib/semmle/python/web/falcon/Response.qll @@ -2,7 +2,6 @@ import python import semmle.python.dataflow.TaintTracking import semmle.python.web.Http import semmle.python.web.falcon.General -import semmle.python.security.strings.External /** https://falcon.readthedocs.io/en/stable/api/request_and_response.html */ deprecated class FalconResponse extends TaintKind { diff --git a/python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql b/python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql index 68542bbc243..e3101e7f6c0 100644 --- a/python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql +++ b/python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql @@ -11,7 +11,6 @@ */ import python -import semmle.python.SelfAttribute import Equality predicate class_stores_to_attribute(ClassValue cls, SelfAttributeStore store, string name) { diff --git a/python/ql/src/Classes/MaybeUndefinedClassAttribute.ql b/python/ql/src/Classes/MaybeUndefinedClassAttribute.ql index 70934185831..ef360d95ec7 100644 --- a/python/ql/src/Classes/MaybeUndefinedClassAttribute.ql +++ b/python/ql/src/Classes/MaybeUndefinedClassAttribute.ql @@ -11,7 +11,6 @@ */ import python -import semmle.python.SelfAttribute import ClassAttributes predicate guarded_by_other_attribute(SelfAttributeRead a, CheckClass c) { diff --git a/python/ql/src/Classes/UndefinedClassAttribute.ql b/python/ql/src/Classes/UndefinedClassAttribute.ql index ad66ecd1316..7e5717b792d 100644 --- a/python/ql/src/Classes/UndefinedClassAttribute.ql +++ b/python/ql/src/Classes/UndefinedClassAttribute.ql @@ -11,7 +11,6 @@ */ import python -import semmle.python.SelfAttribute import ClassAttributes predicate undefined_class_attribute(SelfAttributeRead a, CheckClass c, int line, string name) { diff --git a/python/ql/src/Resources/FileOpen.qll b/python/ql/src/Resources/FileOpen.qll index 41cb27cc1e2..8fc45306353 100644 --- a/python/ql/src/Resources/FileOpen.qll +++ b/python/ql/src/Resources/FileOpen.qll @@ -1,7 +1,6 @@ /** Contains predicates concerning when and where files are opened and closed. */ import python -import semmle.python.GuardedControlFlow import semmle.python.pointsto.Filters /** Holds if `open` is a call that returns a newly opened file */ diff --git a/python/ql/src/experimental/Security/CWE-348/ClientSuppliedIpUsedInSecurityCheckLib.qll b/python/ql/src/experimental/Security/CWE-348/ClientSuppliedIpUsedInSecurityCheckLib.qll index 97e9bbfd457..21e602e5d34 100644 --- a/python/ql/src/experimental/Security/CWE-348/ClientSuppliedIpUsedInSecurityCheckLib.qll +++ b/python/ql/src/experimental/Security/CWE-348/ClientSuppliedIpUsedInSecurityCheckLib.qll @@ -1,7 +1,6 @@ private import python private import semmle.python.Concepts private import semmle.python.ApiGraphs -private import semmle.python.dataflow.new.DataFlow private import semmle.python.dataflow.new.RemoteFlowSources /** diff --git a/python/ql/test/library-tests/PointsTo/comparisons/PointsTo.ql b/python/ql/test/library-tests/PointsTo/comparisons/PointsTo.ql index 00d2b448c78..61f802a2ea5 100644 --- a/python/ql/test/library-tests/PointsTo/comparisons/PointsTo.ql +++ b/python/ql/test/library-tests/PointsTo/comparisons/PointsTo.ql @@ -1,5 +1,4 @@ import python -import semmle.python.objects.ObjectAPI from int line, ControlFlowNode f, Value v where diff --git a/python/ql/test/library-tests/PointsTo/inheritance/Declares.ql b/python/ql/test/library-tests/PointsTo/inheritance/Declares.ql index be4d9ef5711..a2c762be860 100644 --- a/python/ql/test/library-tests/PointsTo/inheritance/Declares.ql +++ b/python/ql/test/library-tests/PointsTo/inheritance/Declares.ql @@ -1,5 +1,4 @@ import python -import semmle.python.pointsto.Base from ClassObject cls, string name where class_declares_attribute(cls, name) diff --git a/python/ql/test/library-tests/PointsTo/new/ClassMethod.ql b/python/ql/test/library-tests/PointsTo/new/ClassMethod.ql index 5810cb22d8e..17f73420e05 100644 --- a/python/ql/test/library-tests/PointsTo/new/ClassMethod.ql +++ b/python/ql/test/library-tests/PointsTo/new/ClassMethod.ql @@ -1,5 +1,4 @@ import python -import semmle.python.types.Descriptors import Util from ClassMethodObject cm, CallNode call diff --git a/python/ql/test/library-tests/PointsTo/new/PointsToMissing.ql b/python/ql/test/library-tests/PointsTo/new/PointsToMissing.ql index cac31b95572..9e744591df2 100644 --- a/python/ql/test/library-tests/PointsTo/new/PointsToMissing.ql +++ b/python/ql/test/library-tests/PointsTo/new/PointsToMissing.ql @@ -1,7 +1,6 @@ import python import Util import semmle.python.pointsto.PointsTo -import semmle.python.objects.ObjectInternal /* This test should return _no_ results. */ predicate relevant_node(ControlFlowNode n) { diff --git a/python/ql/test/library-tests/PointsTo/new/PointsToUnknown.ql b/python/ql/test/library-tests/PointsTo/new/PointsToUnknown.ql index 27ebf200ee2..cb91e18dafe 100644 --- a/python/ql/test/library-tests/PointsTo/new/PointsToUnknown.ql +++ b/python/ql/test/library-tests/PointsTo/new/PointsToUnknown.ql @@ -1,7 +1,6 @@ import python import Util import semmle.python.pointsto.PointsTo -import semmle.python.objects.ObjectInternal from ControlFlowNode f, ControlFlowNode x where PointsTo::pointsTo(f, _, ObjectInternal::unknown(), x) diff --git a/python/ql/test/library-tests/attributes/SelfAttribute.ql b/python/ql/test/library-tests/attributes/SelfAttribute.ql index b99843fee79..66993121241 100644 --- a/python/ql/test/library-tests/attributes/SelfAttribute.ql +++ b/python/ql/test/library-tests/attributes/SelfAttribute.ql @@ -1,5 +1,4 @@ import python -import semmle.python.SelfAttribute from SelfAttributeRead sa, int line, string g, string l where diff --git a/python/ql/test/library-tests/descriptors/Methods.ql b/python/ql/test/library-tests/descriptors/Methods.ql index b112bfd1d4b..3761ec5f7b5 100644 --- a/python/ql/test/library-tests/descriptors/Methods.ql +++ b/python/ql/test/library-tests/descriptors/Methods.ql @@ -1,5 +1,4 @@ import python -import semmle.python.types.Descriptors int lineof(Object o) { result = o.getOrigin().getLocation().getStartLine() } diff --git a/python/ql/test/library-tests/descriptors/Properties.ql b/python/ql/test/library-tests/descriptors/Properties.ql index 598c6d36c3b..29f9e2577a0 100644 --- a/python/ql/test/library-tests/descriptors/Properties.ql +++ b/python/ql/test/library-tests/descriptors/Properties.ql @@ -1,5 +1,4 @@ import python -import semmle.python.types.Descriptors from PropertyValue p, string method_name, FunctionValue method where diff --git a/python/ql/test/library-tests/security/command-execution/CommandSinks.ql b/python/ql/test/library-tests/security/command-execution/CommandSinks.ql index e5ac6502127..797b527d568 100644 --- a/python/ql/test/library-tests/security/command-execution/CommandSinks.ql +++ b/python/ql/test/library-tests/security/command-execution/CommandSinks.ql @@ -1,6 +1,5 @@ import python import semmle.python.security.injection.Command -import semmle.python.security.strings.Untrusted from CommandSink sink, TaintKind kind where sink.sinks(kind) diff --git a/python/ql/test/library-tests/web/django/SqlInjectionSinks.ql b/python/ql/test/library-tests/web/django/SqlInjectionSinks.ql index bd9f4c22fc8..b12dd8ea041 100644 --- a/python/ql/test/library-tests/web/django/SqlInjectionSinks.ql +++ b/python/ql/test/library-tests/web/django/SqlInjectionSinks.ql @@ -2,7 +2,6 @@ import python import semmle.python.security.injection.Sql import semmle.python.web.django.Db import semmle.python.web.django.Model -import semmle.python.security.strings.Untrusted from SqlInjectionSink sink, TaintKind kind where sink.sinks(kind) diff --git a/ql/ql/src/ide-contextual-queries/localDefinitions.ql b/ql/ql/src/ide-contextual-queries/localDefinitions.ql index ab7364f8101..83b3017b8b7 100644 --- a/ql/ql/src/ide-contextual-queries/localDefinitions.ql +++ b/ql/ql/src/ide-contextual-queries/localDefinitions.ql @@ -9,7 +9,6 @@ import ql import Definitions -import codeql.IDEContextual external string selectedSourceFile(); diff --git a/ql/ql/src/ide-contextual-queries/localReferences.ql b/ql/ql/src/ide-contextual-queries/localReferences.ql index b637f9aa35c..a798f608853 100644 --- a/ql/ql/src/ide-contextual-queries/localReferences.ql +++ b/ql/ql/src/ide-contextual-queries/localReferences.ql @@ -9,7 +9,6 @@ import ql import Definitions -import codeql.IDEContextual external string selectedSourceFile(); diff --git a/ruby/ql/lib/codeql/ruby/ast/Expr.qll b/ruby/ql/lib/codeql/ruby/ast/Expr.qll index 49554f4fdb9..c02535885b6 100644 --- a/ruby/ql/lib/codeql/ruby/ast/Expr.qll +++ b/ruby/ql/lib/codeql/ruby/ast/Expr.qll @@ -1,6 +1,5 @@ private import codeql.ruby.AST private import codeql.ruby.CFG -private import codeql.ruby.ast.Constant private import internal.AST private import internal.Constant private import internal.Expr diff --git a/ruby/ql/lib/codeql/ruby/ast/Module.qll b/ruby/ql/lib/codeql/ruby/ast/Module.qll index 8ac85668481..f4edb762269 100644 --- a/ruby/ql/lib/codeql/ruby/ast/Module.qll +++ b/ruby/ql/lib/codeql/ruby/ast/Module.qll @@ -1,5 +1,4 @@ private import codeql.ruby.AST -private import codeql.ruby.ast.Constant private import internal.AST private import internal.Module private import internal.TreeSitter diff --git a/ruby/ql/lib/codeql/ruby/ast/Pattern.qll b/ruby/ql/lib/codeql/ruby/ast/Pattern.qll index 6dc3a3f085e..884e286c0fa 100644 --- a/ruby/ql/lib/codeql/ruby/ast/Pattern.qll +++ b/ruby/ql/lib/codeql/ruby/ast/Pattern.qll @@ -1,5 +1,4 @@ private import codeql.ruby.AST -private import codeql.Locations private import internal.AST private import internal.Pattern private import internal.TreeSitter diff --git a/ruby/ql/lib/codeql/ruby/ast/Variable.qll b/ruby/ql/lib/codeql/ruby/ast/Variable.qll index a426e07a988..36bc0cbe36c 100644 --- a/ruby/ql/lib/codeql/ruby/ast/Variable.qll +++ b/ruby/ql/lib/codeql/ruby/ast/Variable.qll @@ -1,7 +1,6 @@ /** Provides classes for modeling program variables. */ private import codeql.ruby.AST -private import codeql.Locations private import internal.AST private import internal.TreeSitter private import internal.Variable diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll index e01bc6ab7c2..b26dfc88bef 100644 --- a/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll +++ b/ruby/ql/lib/codeql/ruby/ast/internal/Module.qll @@ -1,11 +1,5 @@ private import codeql.Locations private import codeql.ruby.AST -private import codeql.ruby.ast.Call -private import codeql.ruby.ast.Constant -private import codeql.ruby.ast.Expr -private import codeql.ruby.ast.Module -private import codeql.ruby.ast.Operation -private import codeql.ruby.ast.Scope // Names of built-in modules and classes private string builtin() { diff --git a/ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll b/ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll index 375a91f5a7e..e8e601e911b 100644 --- a/ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll +++ b/ruby/ql/lib/codeql/ruby/ast/internal/Scope.qll @@ -1,6 +1,5 @@ private import TreeSitter private import codeql.ruby.AST -private import codeql.ruby.ast.Scope private import codeql.ruby.ast.internal.AST private import codeql.ruby.ast.internal.Parameter private import codeql.ruby.ast.internal.Variable diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplSpecific.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplSpecific.qll index 2cda4fa0a32..0e8af2a3f35 100644 --- a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplSpecific.qll +++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImplSpecific.qll @@ -2,8 +2,6 @@ private import SsaImpl as SsaImpl private import codeql.ruby.AST -private import codeql.ruby.ast.Parameter -private import codeql.ruby.ast.Variable private import codeql.ruby.controlflow.BasicBlocks as BasicBlocks private import codeql.ruby.controlflow.ControlFlowGraph diff --git a/ruby/ql/lib/codeql/ruby/security/ConditionalBypassCustomizations.qll b/ruby/ql/lib/codeql/ruby/security/ConditionalBypassCustomizations.qll index dc3c0be09c1..da51c1fe600 100644 --- a/ruby/ql/lib/codeql/ruby/security/ConditionalBypassCustomizations.qll +++ b/ruby/ql/lib/codeql/ruby/security/ConditionalBypassCustomizations.qll @@ -5,7 +5,6 @@ private import codeql.ruby.CFG private import codeql.ruby.DataFlow -private import codeql.ruby.controlflow.BasicBlocks private import codeql.ruby.dataflow.RemoteFlowSources private import codeql.ruby.security.SensitiveActions diff --git a/ruby/ql/src/ide-contextual-queries/localReferences.ql b/ruby/ql/src/ide-contextual-queries/localReferences.ql index 8e39377ec42..96e2ae929c2 100644 --- a/ruby/ql/src/ide-contextual-queries/localReferences.ql +++ b/ruby/ql/src/ide-contextual-queries/localReferences.ql @@ -9,7 +9,6 @@ import codeql.IDEContextual import codeql.ruby.AST -import codeql.ruby.ast.Variable external string selectedSourceFile(); diff --git a/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql b/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql index c66fec03340..818dee88fe6 100644 --- a/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql +++ b/ruby/ql/src/queries/security/cwe-079/ReflectedXSS.ql @@ -15,7 +15,6 @@ import ruby import codeql.ruby.security.ReflectedXSSQuery -import codeql.ruby.DataFlow import DataFlow::PathGraph from ReflectedXss::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink diff --git a/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql b/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql index dd58b0000c9..0ff8236dee7 100644 --- a/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql +++ b/ruby/ql/src/queries/security/cwe-079/StoredXSS.ql @@ -14,7 +14,6 @@ import ruby import codeql.ruby.security.StoredXSSQuery -import codeql.ruby.DataFlow import DataFlow::PathGraph from StoredXss::Configuration config, DataFlow::PathNode source, DataFlow::PathNode sink diff --git a/ruby/ql/test/library-tests/variables/ssa.ql b/ruby/ql/test/library-tests/variables/ssa.ql index df2f9cd91e5..26f3d5f8c0d 100644 --- a/ruby/ql/test/library-tests/variables/ssa.ql +++ b/ruby/ql/test/library-tests/variables/ssa.ql @@ -1,6 +1,5 @@ import codeql.ruby.AST import codeql.ruby.CFG -import codeql.ruby.ast.Variable import codeql.ruby.dataflow.SSA query predicate definition(Ssa::Definition def, Variable v) { def.getSourceVariable() = v } diff --git a/ruby/ql/test/library-tests/variables/varaccess.ql b/ruby/ql/test/library-tests/variables/varaccess.ql index 18cc26c1d24..94363c9c532 100644 --- a/ruby/ql/test/library-tests/variables/varaccess.ql +++ b/ruby/ql/test/library-tests/variables/varaccess.ql @@ -1,5 +1,4 @@ import codeql.ruby.AST -import codeql.ruby.ast.Variable query predicate variableAccess(VariableAccess access, Variable variable, Scope scope) { variable = access.getVariable() and