hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-30 11:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mass-rename MethodAccess -> MethodCall

Browse Source
This commit is contained in:
Chris Smowton
2023-10-24 10:30:26 +01:00
committed by GitHub
parent a10731c591
commit f552a15aae
404 changed files with 1147 additions and 1138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/ql/test/library-tests/dataflow/call-sensitivity/flow.ql
View File

@@ -10,7 +10,7 @@ module Config implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node src) { src.asExpr() instanceof ClassInstanceExpr }
predicate isSink(DataFlow::Node sink) {
exists(MethodAccess ma |
exists(MethodCall ma |
ma.getMethod().hasName("sink") and
ma.getAnArgument() = sink.asExpr()
)

6
java/ql/test/library-tests/dataflow/callback-dispatch/test.ql
View File

@@ -3,10 +3,10 @@ import semmle.code.java.dataflow.DataFlow
import TestUtilities.InlineExpectationsTest
module Config implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node n) { n.asExpr().(MethodAccess).getMethod().hasName("source") }
predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().hasName("source") }
predicate isSink(DataFlow::Node n) {
exists(MethodAccess ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
exists(MethodCall ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
}
}
@@ -20,7 +20,7 @@ module HasFlowTest implements TestSig {
exists(DataFlow::Node src, DataFlow::Node sink | Flow::flow(src, sink) |
sink.getLocation() = location and
element = sink.toString() and
value = src.asExpr().(MethodAccess).getAnArgument().toString()
value = src.asExpr().(MethodCall).getAnArgument().toString()
)
}
}

4
java/ql/test/library-tests/dataflow/collections/flow.ql
View File

@@ -8,12 +8,12 @@ module Config implements DataFlow::ConfigSig {
or
src.asParameter().getCallable().hasName("taintSteps")
or
src.asExpr() = any(MethodAccess ma | ma.getMethod().hasName("source")).getAnArgument()
src.asExpr() = any(MethodCall ma | ma.getMethod().hasName("source")).getAnArgument()
)
}
predicate isSink(DataFlow::Node sink) {
exists(MethodAccess ma |
exists(MethodCall ma |
sink.asExpr() = ma.getAnArgument() and
ma.getMethod().hasName("sink")
or

2
java/ql/test/library-tests/dataflow/entrypoint-types/EntryPointTypesTest.ql
View File

@@ -12,7 +12,7 @@ module TaintFlowConfig implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node n) { n instanceof ThreatModelFlowSource }
predicate isSink(DataFlow::Node n) {
exists(MethodAccess ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
exists(MethodCall ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
}
}

2
java/ql/test/library-tests/dataflow/fields/flow.ql
View File

@@ -5,7 +5,7 @@ module Config implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node src) { src.asExpr() instanceof ClassInstanceExpr }
predicate isSink(DataFlow::Node sink) {
exists(MethodAccess ma |
exists(MethodCall ma |
ma.getMethod().hasName("sink") and
ma.getAnArgument() = sink.asExpr()
)

4
java/ql/test/library-tests/dataflow/inoutbarriers/test.ql
View File

@@ -3,12 +3,12 @@ import semmle.code.java.dataflow.DataFlow
import DataFlow
predicate src0(Node n) {
n.asExpr().(MethodAccess).getMethod().hasName("src") or
n.asExpr().(MethodCall).getMethod().hasName("src") or
n.asExpr().(FieldAccess).getField().hasName("fsrc")
}
predicate sink0(Node n) {
exists(MethodAccess sink |
exists(MethodCall sink |
sink.getMethod().hasName("sink") and
sink.getAnArgument() = n.asExpr()
)

6
java/ql/test/library-tests/dataflow/lambda/flow.ql
View File

@@ -5,14 +5,14 @@ module Config implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node src) {
src.asExpr().(VarAccess).getVariable().hasName("args")
or
src.asExpr().(MethodAccess).getMethod().hasName("source")
src.asExpr().(MethodCall).getMethod().hasName("source")
}
predicate isSink(DataFlow::Node sink) {
sink.asExpr().(Argument).getCall() =
any(MethodAccess ma |
any(MethodCall ma |
ma.getMethod().hasName("exec") and
ma.getQualifier().(MethodAccess).getMethod().hasName("getRuntime")
ma.getQualifier().(MethodCall).getMethod().hasName("getRuntime")
)
}
}

2
java/ql/test/library-tests/dataflow/local-additional-taint/localAdditionalTaintStep.ql
View File

@@ -27,7 +27,7 @@ where
) and
not summaryStep(src, sink)
or
exists(ArgumentNode arg, MethodAccess call, DataFlow::ParameterNode p, int i |
exists(ArgumentNode arg, MethodCall call, DataFlow::ParameterNode p, int i |
src = arg and
p.isParameterOf(any(DataFlowCallable c |
c.asCallable() = call.getMethod().getSourceDeclaration()

4
java/ql/test/library-tests/dataflow/local-flow/flow.ql
View File

@@ -3,11 +3,11 @@ import semmle.code.java.dataflow.DataFlow
module Config implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node src) {
src.asExpr().(MethodAccess).getMethod().hasName("source")
src.asExpr().(MethodCall).getMethod().hasName("source")
}
predicate isSink(DataFlow::Node sink) {
exists(MethodAccess ma |
exists(MethodCall ma |
sink.asExpr() = ma.getAnArgument() and
ma.getMethod().hasName("sink")
)

2
java/ql/test/library-tests/dataflow/partial/test.ql
View File

@@ -3,7 +3,7 @@ import semmle.code.java.dataflow.DataFlow
import DataFlow
module Config implements ConfigSig {
predicate isSource(Node n) { n.asExpr().(MethodAccess).getMethod().hasName("src") }
predicate isSource(Node n) { n.asExpr().(MethodCall).getMethod().hasName("src") }
predicate isSink(Node n) { n.asExpr().(Argument).getCall().getCallee().hasName("sink") }
}

2
java/ql/test/library-tests/dataflow/partial/testRev.ql
View File

@@ -3,7 +3,7 @@ import semmle.code.java.dataflow.DataFlow
import DataFlow
module Config implements ConfigSig {
predicate isSource(Node n) { n.asExpr().(MethodAccess).getMethod().hasName("src") }
predicate isSource(Node n) { n.asExpr().(MethodCall).getMethod().hasName("src") }
predicate isSink(Node n) { n.asExpr().(Argument).getCall().getCallee().hasName("sink") }
}

2
java/ql/test/library-tests/dataflow/records/test.ql
View File

@@ -2,7 +2,7 @@ import java
import semmle.code.java.dataflow.DataFlow
module Config implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node n) { n.asExpr().(MethodAccess).getMethod().hasName("source") }
predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().hasName("source") }
predicate isSink(DataFlow::Node n) { n.asExpr().(Argument).getCall().getCallee().hasName("sink") }
}

8
java/ql/test/library-tests/dataflow/state/test.ql
View File

@@ -4,7 +4,7 @@ import TestUtilities.InlineExpectationsTest
import DataFlow
predicate src(Node n, string s) {
exists(MethodAccess ma |
exists(MethodCall ma |
n.asExpr() = ma and
ma.getMethod().hasName("source") and
ma.getAnArgument().(StringLiteral).getValue() = s
@@ -12,7 +12,7 @@ predicate src(Node n, string s) {
}
predicate sink(Node n, string s) {
exists(MethodAccess ma |
exists(MethodCall ma |
ma.getMethod().hasName("sink") and
n.asExpr() = ma.getArgument(0) and
ma.getArgument(1).(StringLiteral).getValue() = s
@@ -20,7 +20,7 @@ predicate sink(Node n, string s) {
}
predicate bar(Node n, string s) {
exists(MethodAccess ma |
exists(MethodCall ma |
ma.getMethod().hasName("stateBarrier") and
n.asExpr() = ma.getArgument(0) and
ma.getArgument(1).(StringLiteral).getValue() = s
@@ -28,7 +28,7 @@ predicate bar(Node n, string s) {
}
predicate step(Node n1, Node n2, string s1, string s2) {
exists(MethodAccess ma |
exists(MethodCall ma |
ma.getMethod().hasName("step") and
n1.asExpr() = ma.getArgument(0) and
ma.getArgument(1).(StringLiteral).getValue() = s1 and

2
java/ql/test/library-tests/dataflow/switchexpr/switchexprflow.ql
View File

@@ -2,7 +2,7 @@ import java
import semmle.code.java.dataflow.DataFlow
module Config implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node n) { n.asExpr().(MethodAccess).getMethod().hasName("source") }
predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().hasName("source") }
predicate isSink(DataFlow::Node n) { any() }
}

2
java/ql/test/library-tests/dataflow/taint/test.ql
View File

@@ -2,7 +2,7 @@ import java
import semmle.code.java.dataflow.TaintTracking
module Config implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node n) { n.asExpr().(MethodAccess).getMethod().hasName("taint") }
predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().hasName("taint") }
predicate isSink(DataFlow::Node n) { n.asExpr().(Argument).getCall().getCallee().hasName("sink") }
}

4
java/ql/test/library-tests/dataflow/taintgettersetter/taintgettersetter.ql
View File

@@ -2,10 +2,10 @@ import java
import semmle.code.java.dataflow.DataFlow
module Config implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node n) { n.asExpr().(MethodAccess).getMethod().hasName("taint") }
predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().hasName("taint") }
predicate isSink(DataFlow::Node n) {
exists(MethodAccess sink |
exists(MethodCall sink |
sink.getAnArgument() = n.asExpr() and sink.getMethod().hasName("sink")
)
}

8
java/ql/test/library-tests/dataflow/taintreturn/taintreturn.ql
View File

@@ -2,7 +2,7 @@ import java
import semmle.code.java.dataflow.TaintTracking
predicate step(Expr e1, Expr e2) {
exists(MethodAccess ma |
exists(MethodCall ma |
ma.getMethod().hasName("step") and
ma = e2 and
ma.getQualifier() = e1
@@ -10,14 +10,14 @@ predicate step(Expr e1, Expr e2) {
}
predicate isSink0(Expr sink) {
exists(MethodAccess ma |
exists(MethodCall ma |
ma.getMethod().hasName("sink") and
ma.getAnArgument() = sink
)
}
module FirstConfig implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node n) { n.asExpr().(MethodAccess).getMethod().hasName("src") }
predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().hasName("src") }
predicate isSink(DataFlow::Node n) { any() }
@@ -29,7 +29,7 @@ module FirstConfig implements DataFlow::ConfigSig {
module FirstFlow = DataFlow::Global<FirstConfig>;
module SecondConfig implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node n) { n.asExpr().(MethodAccess).getMethod().hasName("src") }
predicate isSource(DataFlow::Node n) { n.asExpr().(MethodCall).getMethod().hasName("src") }
predicate isSink(DataFlow::Node n) { isSink0(n.asExpr()) }

2
java/ql/test/library-tests/dataflow/taintsources/local.ql
View File

@@ -7,7 +7,7 @@ class LocalSource extends DataFlow::Node instanceof UserInput {
}
predicate isTestSink(DataFlow::Node n) {
exists(MethodAccess ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
exists(MethodCall ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
}
module LocalValueConfig implements DataFlow::ConfigSig {

2
java/ql/test/library-tests/dataflow/taintsources/remote.ql
View File

@@ -3,7 +3,7 @@ import semmle.code.java.dataflow.FlowSources
import TestUtilities.InlineExpectationsTest
predicate isTestSink(DataFlow::Node n) {
exists(MethodAccess ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
exists(MethodCall ma | ma.getMethod().hasName("sink") | n.asExpr() = ma.getAnArgument())
}
module RemoteValueConfig implements DataFlow::ConfigSig {

6
java/ql/test/library-tests/dataflow/typepruning/test.ql
View File

@@ -3,16 +3,16 @@ import semmle.code.java.dataflow.DataFlow
import DataFlow
module Config implements DataFlow::ConfigSig {
predicate isSource(Node n) { n.asExpr().(MethodAccess).getMethod().hasName("source") }
predicate isSource(Node n) { n.asExpr().(MethodCall).getMethod().hasName("source") }
predicate isSink(Node n) {
exists(MethodAccess sink |
exists(MethodCall sink |
sink.getAnArgument() = n.asExpr() and sink.getMethod().hasName("sink")
)
}
predicate isAdditionalFlowStep(Node n1, Node n2) {
exists(MethodAccess ma |
exists(MethodCall ma |
ma.getMethod().hasName("customStep") and
ma.getAnArgument() = n1.asExpr() and
ma = n2.asExpr()