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

Add check for neighborhood node being top-level enclosing function

Browse Source
This commit is contained in:
Anna Railton
2021-11-18 11:58:31 +00:00
committed by annarailton
parent c7f96928dc
commit 05460f6444
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/CodeToFeatures.qll
View File

@@ -49,6 +49,8 @@ module Raw {
AstNode getParentNode() { result = TAstNode(rawNode.getParent()) } AstNode getParentNode() { result = TAstNode(rawNode.getParent()) }
raw::ASTNode getNode() { result = rawNode }
raw::StmtContainer getContainer() { result = rawNode.getContainer() } raw::StmtContainer getContainer() { result = rawNode.getContainer() }
/** /**

14
javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/EndpointFeatures.qll
View File

@@ -184,7 +184,10 @@ module NeighborhoodBodies {
* in the subtree. * in the subtree.
*/ */
Raw::AstNode getNeighborhoodAstNode(Raw::AstNode node) { Raw::AstNode getNeighborhoodAstNode(Raw::AstNode node) {
if getNumDescendents(node.getParentNode()) > maxNumDescendants() if
// `node` will always have a parent as we start at and endpoint
node.getParentNode() = getOutermostEnclosingFunction(node) or
getNumDescendents(node.getParentNode()) > maxNumDescendants()
then result = node then result = node
else result = getNeighborhoodAstNode(node.getParentNode()) else result = getNeighborhoodAstNode(node.getParentNode())
} }
@@ -192,6 +195,15 @@ module NeighborhoodBodies {
/** Count number of descendants of an AST node */ /** Count number of descendants of an AST node */
int getNumDescendents(Raw::AstNode node) { result = count(node.getAChildNode*()) } int getNumDescendents(Raw::AstNode node) { result = count(node.getAChildNode*()) }
private ASTNode getContainer(ASTNode node) {
result = node.getContainer()
}
/** Return the AST node that is outermost enclosing function (as an AST Node) */
Raw::AstNode getOutermostEnclosingFunction(Raw::AstNode node) {
result = Raw::astNode(getContainer*(node.getNode())) and result.getContainer() instanceof TopLevel
}
/** /**
* Holds if `childNode` is an AST node under `rootNode` and `token` is a node attribute associated * Holds if `childNode` is an AST node under `rootNode` and `token` is a node attribute associated
* with `childNode`. Note that only AST leaves have node attributes. * with `childNode`. Note that only AST leaves have node attributes.