hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 18:25:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5460 from erik-krogh/forgery-2

Browse Source 
Approved by asgerf
This commit is contained in:
CodeQL CI
2021-04-13 03:57:04 -07:00
committed by GitHub
parent 3cfd30ef6f cd57e61f65
commit 646639bc73
1 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
javascript/ql/src/semmle/javascript/ApiGraphs.qll
View File

@@ -313,7 +313,7 @@ module API {
module Node {
/** Gets a node whose type has the given qualified name. */
Node ofType(string moduleName, string exportedName) {
result = Impl::MkHasUnderlyingType(moduleName, exportedName).(Node).getInstance()
result = Impl::MkTypeUse(moduleName, exportedName).(Node).getInstance()
}
}
@@ -374,15 +374,13 @@ module API {
exists(SSA::implicitInit([nm.getModuleVariable(), nm.getExportsVariable()]))
)
)
or
m = any(CanonicalName n | isDefined(n)).getExternalModuleName()
} or
MkModuleImport(string m) {
imports(_, m)
or
m = any(CanonicalName n | isUsed(n)).getExternalModuleName()
or
any(TypeAnnotation n).hasQualifiedName(m, _)
or
any(Type t).hasUnderlyingType(m, _)
} or
MkClassInstance(DataFlow::ClassNode cls) { cls = trackDefNode(_) and hasSemantics(cls) } or
MkAsyncFuncResult(DataFlow::FunctionNode f) {
@@ -390,11 +388,8 @@ module API {
} or
MkDef(DataFlow::Node nd) { rhs(_, _, nd) } or
MkUse(DataFlow::Node nd) { use(_, _, nd) } or
/**
* A TypeScript type, identified by name of the type-annotation.
* This API node is exclusively used by `API::Node::ofType`.
*/
MkHasUnderlyingType(string moduleName, string exportName) {
/** A use of a TypeScript type. */
MkTypeUse(string moduleName, string exportName) {
any(TypeAnnotation n).hasQualifiedName(moduleName, exportName)
or
any(Type t).hasUnderlyingType(moduleName, exportName)
@@ -408,7 +403,7 @@ module API {
class TNonModuleDef =
MkModuleExport or MkClassInstance or MkAsyncFuncResult or MkDef or MkSyntheticCallbackArg;
class TUse = MkModuleUse or MkModuleImport or MkUse or MkHasUnderlyingType;
class TUse = MkModuleUse or MkModuleImport or MkUse or MkTypeUse;
private predicate hasSemantics(DataFlow::Node nd) { not nd.getTopLevel().isExterns() }
@@ -431,20 +426,6 @@ module API {
)
}
private predicate isUsed(CanonicalName n) {
exists(n.(TypeName).getAnAccess()) or
exists(n.(Namespace).getAnAccess())
}
private predicate isDefined(CanonicalName n) {
exists(ASTNode def |
def = n.(TypeName).getADefinition() or
def = n.(Namespace).getADefinition()
|
not def.isAmbient()
)
}
/**
* Holds if `rhs` is the right-hand side of a definition of a node that should have an
* incoming edge from `base` labeled `lbl` in the API graph.
@@ -600,7 +581,7 @@ module API {
)
or
exists(string moduleName, string exportName |
base = MkHasUnderlyingType(moduleName, exportName) and
base = MkTypeUse(moduleName, exportName) and
lbl = Label::instance() and
ref.(DataFlow::SourceNode).hasUnderlyingType(moduleName, exportName)
)
@@ -839,7 +820,7 @@ module API {
exists(string moduleName, string exportName |
pred = MkModuleImport(moduleName) and
lbl = Label::member(exportName) and
succ = MkHasUnderlyingType(moduleName, exportName)
succ = MkTypeUse(moduleName, exportName)
)
or
exists(DataFlow::Node nd, DataFlow::FunctionNode f |