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

JS: rename getNamespaceId to getClosureNamespace

Browse Source
This commit is contained in:
Asger F
2019-02-11 16:10:47 +00:00
parent 5502627242
commit 8d78731ff0
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
javascript/ql/src/semmle/javascript/Closure.qll
View File

@@ -38,9 +38,7 @@ module Closure {
Expr getAnArgument() { result = getArgument(_) }
}
abstract private class GoogNamespaceRef extends ExprOrStmt {
abstract string getNamespaceId();
}
abstract private class GoogNamespaceRef extends ExprOrStmt { abstract string getClosureNamespace(); }
/**
* A call to `goog.provide`.
@@ -49,7 +47,7 @@ module Closure {
GoogProvide() { getFunctionName() = "provide" }
/** Gets the identifier of the namespace created by this call. */
override string getNamespaceId() { result = getArgument(0).getStringValue() }
override string getClosureNamespace() { result = getArgument(0).getStringValue() }
}
/**
@@ -59,7 +57,7 @@ module Closure {
GoogRequire() { getFunctionName() = "require" }
/** Gets the identifier of the namespace imported by this call. */
override string getNamespaceId() { result = getArgument(0).getStringValue() }
override string getClosureNamespace() { result = getArgument(0).getStringValue() }
}
private class GoogRequireImport extends GoogRequire, Import {
@@ -80,7 +78,7 @@ module Closure {
}
/** Gets the identifier of the namespace imported by this call. */
override string getNamespaceId() { result = getArgument(0).getStringValue() }
override string getClosureNamespace() { result = getArgument(0).getStringValue() }
}
/**
@@ -97,12 +95,12 @@ module Closure {
/**
* Gets the namespace of this module.
*/
string getNamespaceId() { result = getModuleDeclaration().getNamespaceId() }
string getClosureNamespace() { result = getModuleDeclaration().getClosureNamespace() }
override Module getAnImportedModule() {
exists(GoogRequireImport imprt |
imprt.getEnclosingModule() = this and
result.(ClosureModule).getNamespaceId() = imprt.getNamespaceId()
result.(ClosureModule).getClosureNamespace() = imprt.getClosureNamespace()
)
}
@@ -146,11 +144,11 @@ module Closure {
/** Gets the identifier of a namespace required by this module. */
string getARequiredNamespace() {
result = getAChildStmt().(ExprStmt).getExpr().(GoogRequire).getNamespaceId()
result = getAChildStmt().(ExprStmt).getExpr().(GoogRequire).getClosureNamespace()
}
/** Gets the identifer of a namespace provided by this module. */
string getAProvidedNamespace() { result = getAChildStmt().(GoogProvide).getNamespaceId() }
string getAProvidedNamespace() { result = getAChildStmt().(GoogProvide).getClosureNamespace() }
}
/**
@@ -158,7 +156,7 @@ module Closure {
*/
pragma[noinline]
predicate isLibraryNamespacePath(string name) {
exists(string namespace | namespace = any(GoogNamespaceRef provide).getNamespaceId() |
exists(string namespace | namespace = any(GoogNamespaceRef provide).getClosureNamespace() |
name = namespace.substring(0, namespace.indexOf("."))
or
name = namespace
@@ -187,7 +185,7 @@ module Closure {
result = getWrittenLibraryAccessPath(write)
)
or
result = node.asExpr().(GoogRequire).getNamespaceId()
result = node.asExpr().(GoogRequire).getClosureNamespace()
}
/**

2
javascript/ql/src/semmle/javascript/dataflow/internal/InterModuleTypeInference.qll
View File

@@ -371,7 +371,7 @@ private class AnalyzedClosureGlobalAccessPath extends AnalyzedNode, AnalyzedProp
override predicate reads(AbstractValue base, string propName) {
exists(Closure::ClosureModule mod |
mod.getNamespaceId() = accessPath and
mod.getClosureNamespace() = accessPath and
base = TAbstractModuleObject(mod) and
propName = "exports"
)