change RouteSetup to a DataFlow::Node

This commit is contained in:
Erik Krogh Kristensen
2022-03-30 14:17:01 +02:00
committed by erik-krogh
parent d98028be1a
commit 9cb7522bc1
30 changed files with 124 additions and 120 deletions

View File

@@ -16,7 +16,7 @@ class RouteHandlerAndSetupPoI extends ActivePoI {
RouteHandlerAndSetupPoI() { this = "RouteHandlerAndSetupPoI" }
override predicate is(Node l0, Node l1, string t1) {
l1.asExpr().(Express::RouteSetup).getARouteHandler() = l0 and t1 = "setup"
l1.(Express::RouteSetup).getARouteHandler() = l0 and t1 = "setup"
}
}
@@ -24,9 +24,9 @@ class RouteSetupAndRouterAndRouteHandlerPoI extends ActivePoI {
RouteSetupAndRouterAndRouteHandlerPoI() { this = "RouteSetupAndRouterAndRouteHandlerPoI" }
override predicate is(Node l0, Node l1, string t1, Node l2, string t2) {
l0.asExpr().(Express::RouteSetup).getRouter().flow() = l1 and
l0.(Express::RouteSetup).getRouter().flow() = l1 and
t1 = "router" and
l0.asExpr().(Express::RouteSetup).getARouteHandler() = l2 and
l0.(Express::RouteSetup).getARouteHandler() = l2 and
t2 = "routehandler"
}
}

View File

@@ -1,6 +1,6 @@
import javascript
query predicate test_RouteSetup(Express::RouteSetup rs, Expr res0, boolean isUseCall) {
query predicate test_RouteSetup(Express::RouteSetup rs, DataFlow::Node res0, boolean isUseCall) {
(if rs.isUseCall() then isUseCall = true else isUseCall = false) and
res0 = rs.getServer()
}

View File

@@ -1,3 +1,5 @@
import javascript
query predicate test_RouteSetup_getServer(Express::RouteSetup rs, Expr res) { res = rs.getServer() }
query predicate test_RouteSetup_getServer(Express::RouteSetup rs, DataFlow::Node res) {
res = rs.getServer()
}

View File

@@ -4,7 +4,7 @@ query predicate test_RouteSetup_handlesSameRequestMethodAs(
Express::RouteSetup rs, Express::RouteSetup rs2
) {
rs.handlesSameRequestMethodAs(rs2) and
rs.getLocation().getStartLine() < rs2.getLocation().getStartLine() and
rs.getLocation().getFile().getBaseName() = "csurf-example.js" and
rs2.getLocation().getFile().getBaseName() = "csurf-example.js"
rs.asExpr().getLocation().getStartLine() < rs2.asExpr().getLocation().getStartLine() and
rs.asExpr().getLocation().getFile().getBaseName() = "csurf-example.js" and
rs2.asExpr().getLocation().getFile().getBaseName() = "csurf-example.js"
}

View File

@@ -1,7 +1,7 @@
import javascript
query predicate test_StandardRouteHandler(
Express::StandardRouteHandler rh, Expr res0, SimpleParameter res1, SimpleParameter res2
Express::StandardRouteHandler rh, DataFlow::Node res0, SimpleParameter res1, SimpleParameter res2
) {
res0 = rh.getServer() and res1 = rh.getRequestParameter() and res2 = rh.getResponseParameter()
}

View File

@@ -1,5 +1,7 @@
import javascript
query predicate test_HeaderDefinition_getNameExpr(HTTP::ExplicitHeaderDefinition hd, Expr res) {
hd.getRouteHandler() instanceof NodeJSLib::RouteHandler and res = hd.getNameExpr()
query predicate test_HeaderDefinition_getNameExpr(
HTTP::ExplicitHeaderDefinition hd, DataFlow::Node res
) {
hd.getRouteHandler() instanceof NodeJSLib::RouteHandler and res = hd.getNameNode()
}

View File

@@ -1,3 +1,5 @@
import javascript
query predicate test_RouteHandler(NodeJSLib::RouteHandler rh, Expr res) { res = rh.getServer() }
query predicate test_RouteHandler(NodeJSLib::RouteHandler rh, DataFlow::Node res) {
res = rh.getServer()
}

View File

@@ -1,3 +1,5 @@
import javascript
query predicate test_RouteSetup_getServer(NodeJSLib::RouteSetup r, Expr res) { res = r.getServer() }
query predicate test_RouteSetup_getServer(NodeJSLib::RouteSetup r, DataFlow::Node res) {
res = r.getServer()
}

View File

@@ -26,7 +26,9 @@ query predicate test_HeaderDefinition(HTTP::HeaderDefinition hd, Connect::RouteH
rh = hd.getRouteHandler()
}
query predicate test_RouteSetup_getServer(Connect::RouteSetup rs, Expr res) { res = rs.getServer() }
query predicate test_RouteSetup_getServer(Connect::RouteSetup rs, DataFlow::Node res) {
res = rs.getServer()
}
query predicate test_HeaderDefinition_getAHeaderName(HTTP::HeaderDefinition hd, string res) {
hd.getRouteHandler() instanceof Connect::RouteHandler and res = hd.getAHeaderName()
@@ -42,7 +44,9 @@ query predicate test_RouteSetup_getARouteHandler(Connect::RouteSetup r, DataFlow
res = r.getARouteHandler()
}
query predicate test_RouteHandler(Connect::RouteHandler rh, Expr res) { res = rh.getServer() }
query predicate test_RouteHandler(Connect::RouteHandler rh, DataFlow::Node res) {
res = rh.getServer()
}
query predicate test_RequestExpr(HTTP::RequestExpr e, HTTP::RouteHandler res) {
res = e.getRouteHandler()

View File

@@ -1,3 +1,5 @@
import javascript
query predicate test_RouteHandler(Fastify::RouteHandler rh, Expr res) { res = rh.getServer() }
query predicate test_RouteHandler(Fastify::RouteHandler rh, DataFlow::Node res) {
res = rh.getServer()
}

View File

@@ -1,3 +1,5 @@
import javascript
query predicate test_RouteSetup_getServer(Fastify::RouteSetup rs, Expr res) { res = rs.getServer() }
query predicate test_RouteSetup_getServer(Fastify::RouteSetup rs, DataFlow::Node res) {
res = rs.getServer()
}

View File

@@ -1,3 +1,5 @@
import javascript
query predicate test_RouteHandler(Hapi::RouteHandler rh, Expr res) { res = rh.getServer() }
query predicate test_RouteHandler(Hapi::RouteHandler rh, DataFlow::Node res) {
res = rh.getServer()
}

View File

@@ -1,3 +1,5 @@
import javascript
query predicate test_RouteSetup_getServer(Hapi::RouteSetup rs, Expr res) { res = rs.getServer() }
query predicate test_RouteSetup_getServer(Hapi::RouteSetup rs, DataFlow::Node res) {
res = rs.getServer()
}

View File

@@ -1,3 +1,3 @@
import javascript
query predicate test_RouteHandler(Koa::RouteHandler rh, Expr res) { res = rh.getServer() }
query predicate test_RouteHandler(Koa::RouteHandler rh, DataFlow::Node res) { res = rh.getServer() }

View File

@@ -1,3 +1,5 @@
import javascript
query predicate test_RouteSetup_getServer(Koa::RouteSetup rs, Expr res) { res = rs.getServer() }
query predicate test_RouteSetup_getServer(Koa::RouteSetup rs, DataFlow::Node res) {
res = rs.getServer()
}

View File

@@ -1,3 +1,5 @@
import javascript
query predicate test_RouteHandler(Restify::RouteHandler rh, Expr res) { res = rh.getServer() }
query predicate test_RouteHandler(Restify::RouteHandler rh, DataFlow::Node res) {
res = rh.getServer()
}

View File

@@ -1,3 +1,5 @@
import javascript
query predicate test_RouteSetup_getServer(Restify::RouteSetup rs, Expr res) { res = rs.getServer() }
query predicate test_RouteSetup_getServer(Restify::RouteSetup rs, DataFlow::Node res) {
res = rs.getServer()
}