hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-17 01:03:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Go: Update remaining inline expectation tests to use the paramterized module

Browse Source
This commit is contained in:
Jeroen Ketema
2023-06-15 16:43:48 +02:00
parent 890a67d2ee
commit d6d21e3928
6 changed files with 72 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go/ql/test/library-tests/semmle/go/frameworks/ElazarlGoproxy/test.expected
View File

@@ -0,0 +1,2 @@
failures
testFailures

46
go/ql/test/library-tests/semmle/go/frameworks/ElazarlGoproxy/test.ql
View File

@@ -1,12 +1,10 @@
import go
import TestUtilities.InlineExpectationsTest
class UntrustedFlowSourceTest extends InlineExpectationsTest {
UntrustedFlowSourceTest() { this = "untrustedflowsource" }
module UntrustedFlowSourceTest implements TestSig {
string getARelevantTag() { result = "untrustedflowsource" }
override string getARelevantTag() { result = "untrustedflowsource" }
override predicate hasActualResult(Location location, string element, string tag, string value) {
predicate hasActualResult(Location location, string element, string tag, string value) {
tag = "untrustedflowsource" and
value = element and
exists(UntrustedFlowSource src | value = "\"" + src.toString() + "\"" |
@@ -16,12 +14,10 @@ class UntrustedFlowSourceTest extends InlineExpectationsTest {
}
}
class HeaderWriteTest extends InlineExpectationsTest {
HeaderWriteTest() { this = "headerwrite" }
module HeaderWriteTest implements TestSig {
string getARelevantTag() { result = "headerwrite" }
override string getARelevantTag() { result = "headerwrite" }
override predicate hasActualResult(Location location, string element, string tag, string value) {
predicate hasActualResult(Location location, string element, string tag, string value) {
tag = "headerwrite" and
exists(Http::HeaderWrite hw, string name, string val | element = hw.toString() |
hw.definesHeader(name, val) and
@@ -32,12 +28,10 @@ class HeaderWriteTest extends InlineExpectationsTest {
}
}
class LoggerTest extends InlineExpectationsTest {
LoggerTest() { this = "LoggerTest" }
module LoggerTest implements TestSig {
string getARelevantTag() { result = "logger" }
override string getARelevantTag() { result = "logger" }
override predicate hasActualResult(Location location, string element, string tag, string value) {
predicate hasActualResult(Location location, string element, string tag, string value) {
exists(LoggerCall log |
log.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
@@ -48,32 +42,32 @@ class LoggerTest extends InlineExpectationsTest {
}
}
class Config extends TaintTracking::Configuration {
Config() { this = "goproxy config" }
override predicate isSource(DataFlow::Node n) {
module Config implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node n) {
n = any(DataFlow::CallNode c | c.getCalleeName().matches("tainted%")).getResult()
}
override predicate isSink(DataFlow::Node n) {
predicate isSink(DataFlow::Node n) {
n = any(DataFlow::CallNode cn | cn.getTarget().getName() = "sink").getAnArgument()
}
}
class TaintFlow extends InlineExpectationsTest {
TaintFlow() { this = "goproxy flow" }
module Flow = TaintTracking::Global<Config>;
override string getARelevantTag() { result = "taintflow" }
module TaintFlow implements TestSig {
string getARelevantTag() { result = "taintflow" }
override predicate hasActualResult(Location location, string element, string tag, string value) {
predicate hasActualResult(Location location, string element, string tag, string value) {
tag = "taintflow" and
value = "" and
element = "" and
exists(Config c, DataFlow::Node toNode |
exists(DataFlow::Node toNode |
toNode
.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
c.hasFlowTo(toNode)
Flow::flowTo(toNode)
)
}
}
import MakeTest<MergeTests4<UntrustedFlowSourceTest, HeaderWriteTest, LoggerTest, TaintFlow>>

2
go/ql/test/library-tests/semmle/go/frameworks/SQL/QueryString.expected
View File

@@ -0,0 +1,2 @@
failures
testFailures

38
go/ql/test/library-tests/semmle/go/frameworks/SQL/QueryString.ql
View File

@@ -1,12 +1,10 @@
import go
import TestUtilities.InlineExpectationsTest
class SqlTest extends InlineExpectationsTest {
SqlTest() { this = "SQLTest" }
module SqlTest implements TestSig {
string getARelevantTag() { result = "query" }
override string getARelevantTag() { result = "query" }
override predicate hasActualResult(Location location, string element, string tag, string value) {
predicate hasActualResult(Location location, string element, string tag, string value) {
tag = "query" and
exists(SQL::Query q, SQL::QueryString qs | qs = q.getAQueryString() |
q.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
@@ -17,12 +15,10 @@ class SqlTest extends InlineExpectationsTest {
}
}
class QueryString extends InlineExpectationsTest {
QueryString() { this = "QueryString no Query" }
module QueryString implements TestSig {
string getARelevantTag() { result = "querystring" }
override string getARelevantTag() { result = "querystring" }
override predicate hasActualResult(Location location, string element, string tag, string value) {
predicate hasActualResult(Location location, string element, string tag, string value) {
tag = "querystring" and
element = "" and
exists(SQL::QueryString qs | not exists(SQL::Query q | qs = q.getAQueryString()) |
@@ -33,30 +29,30 @@ class QueryString extends InlineExpectationsTest {
}
}
class Config extends TaintTracking::Configuration {
Config() { this = "pg-orm config" }
module Config implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node n) { n.asExpr() instanceof StringLit }
override predicate isSource(DataFlow::Node n) { n.asExpr() instanceof StringLit }
override predicate isSink(DataFlow::Node n) {
predicate isSink(DataFlow::Node n) {
n = any(DataFlow::CallNode cn | cn.getTarget().getName() = "sink").getAnArgument()
}
}
class TaintFlow extends InlineExpectationsTest {
TaintFlow() { this = "pg-orm flow" }
module Flow = TaintTracking::Global<Config>;
override string getARelevantTag() { result = "flowfrom" }
module TaintFlow implements TestSig {
string getARelevantTag() { result = "flowfrom" }
override predicate hasActualResult(Location location, string element, string tag, string value) {
predicate hasActualResult(Location location, string element, string tag, string value) {
tag = "flowfrom" and
element = "" and
exists(Config c, DataFlow::Node fromNode, DataFlow::Node toNode |
exists(DataFlow::Node fromNode, DataFlow::Node toNode |
toNode
.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
c.hasFlow(fromNode, toNode) and
Flow::flow(fromNode, toNode) and
value = fromNode.asExpr().(StringLit).getValue()
)
}
}
import MakeTest<MergeTests3<SqlTest, QueryString, TaintFlow>>

2
go/ql/test/library-tests/semmle/go/frameworks/Yaml/tests.expected
View File

@@ -0,0 +1,2 @@
failures
testFailures

63
go/ql/test/library-tests/semmle/go/frameworks/Yaml/tests.ql
View File

@@ -11,32 +11,29 @@ DataFlow::CallNode getAYamlCall() {
isYamlFunction(result.getACalleeIncludingExternals().asFunction())
}
class TaintTransitsFunctionConfig extends TaintTracking::Configuration {
TaintTransitsFunctionConfig() { this = "TaintTransitsFunctionConfig" }
predicate isSourceSinkPair(DataFlow::Node inNode, DataFlow::Node outNode) {
exists(DataFlow::CallNode cn | cn = getAYamlCall() |
inNode = [cn.getAnArgument(), cn.getReceiver()] and
(
outNode.(DataFlow::PostUpdateNode).getPreUpdateNode() =
[cn.getAnArgument(), cn.getReceiver()]
or
outNode = cn.getAResult()
)
predicate isSourceSinkPair(DataFlow::Node inNode, DataFlow::Node outNode) {
exists(DataFlow::CallNode cn | cn = getAYamlCall() |
inNode = [cn.getAnArgument(), cn.getReceiver()] and
(
outNode.(DataFlow::PostUpdateNode).getPreUpdateNode() = [cn.getAnArgument(), cn.getReceiver()]
or
outNode = cn.getAResult()
)
}
override predicate isSource(DataFlow::Node n) { this.isSourceSinkPair(n, _) }
override predicate isSink(DataFlow::Node n) { this.isSourceSinkPair(_, n) }
)
}
class TaintFunctionModelTest extends InlineExpectationsTest {
TaintFunctionModelTest() { this = "TaintFunctionModelTest" }
module TaintTransitsFunctionConfig implements DataFlow::ConfigSig {
predicate isSource(DataFlow::Node n) { isSourceSinkPair(n, _) }
override string getARelevantTag() { result = "ttfnmodelstep" }
predicate isSink(DataFlow::Node n) { isSourceSinkPair(_, n) }
}
override predicate hasActualResult(Location location, string element, string tag, string value) {
module TaintTransitsFunctionFlow = TaintTracking::Global<TaintTransitsFunctionConfig>;
module TaintFunctionModelTest implements TestSig {
string getARelevantTag() { result = "ttfnmodelstep" }
predicate hasActualResult(Location location, string element, string tag, string value) {
tag = "ttfnmodelstep" and
(
exists(TaintTracking::FunctionModel model, DataFlow::CallNode call | call = model.getACall() |
@@ -46,9 +43,9 @@ class TaintFunctionModelTest extends InlineExpectationsTest {
value = "\"" + model.getAnInputNode(call) + " -> " + model.getAnOutputNode(call) + "\""
)
or
exists(TaintTransitsFunctionConfig config, DataFlow::Node arg, DataFlow::Node output |
config.hasFlow(arg, output) and
config.isSourceSinkPair(arg, output) and
exists(DataFlow::Node arg, DataFlow::Node output |
TaintTransitsFunctionFlow::flow(arg, output) and
isSourceSinkPair(arg, output) and
arg.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
location.getStartColumn(), location.getEndLine(), location.getEndColumn()) and
element = arg.toString() and
@@ -58,12 +55,10 @@ class TaintFunctionModelTest extends InlineExpectationsTest {
}
}
class MarshalerTest extends InlineExpectationsTest {
MarshalerTest() { this = "MarshalerTest" }
module MarshalerTest implements TestSig {
string getARelevantTag() { result = "marshaler" }
override string getARelevantTag() { result = "marshaler" }
override predicate hasActualResult(Location location, string element, string tag, string value) {
predicate hasActualResult(Location location, string element, string tag, string value) {
tag = "marshaler" and
exists(MarshalingFunction m, DataFlow::CallNode call | call = m.getACall() |
call.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
@@ -76,12 +71,10 @@ class MarshalerTest extends InlineExpectationsTest {
}
}
class UnmarshalerTest extends InlineExpectationsTest {
UnmarshalerTest() { this = "UnmarshalerTest" }
module UnmarshalerTest implements TestSig {
string getARelevantTag() { result = "unmarshaler" }
override string getARelevantTag() { result = "unmarshaler" }
override predicate hasActualResult(Location location, string element, string tag, string value) {
predicate hasActualResult(Location location, string element, string tag, string value) {
tag = "unmarshaler" and
exists(UnmarshalingFunction m, DataFlow::CallNode call | call = m.getACall() |
call.hasLocationInfo(location.getFile().getAbsolutePath(), location.getStartLine(),
@@ -93,3 +86,5 @@ class UnmarshalerTest extends InlineExpectationsTest {
)
}
}
import MakeTest<MergeTests3<TaintFunctionModelTest, MarshalerTest, UnmarshalerTest>>