rename getASourceAccess to getAnAliasedSourceNode

erik-krogh · erik-krogh · commit 72114a48f523 · 2020-01-31T15:34:58.000+01:00
diff --git a/javascript/ql/src/Security/CWE-400/PrototypePollutionUtility.ql b/javascript/ql/src/Security/CWE-400/PrototypePollutionUtility.ql
@@ -53,7 +53,7 @@ abstract class EnumeratedPropName extends DataFlow::Node {
    * For example, gets `src[key]` in `for (var key in src) { src[key]; }`.
    */
   PropRead getASourceProp() {
-    result = AccessPath::getASourceAccess(getSourceObject()).getAPropertyRead() and
+    result = AccessPath::getAnAliasedSourceNode(getSourceObject()).getAPropertyRead() and
     result.getPropertyNameExpr().flow().getImmediatePredecessor*() = this
   }
 }
diff --git a/javascript/ql/src/semmle/javascript/GlobalAccessPaths.qll b/javascript/ql/src/semmle/javascript/GlobalAccessPaths.qll
@@ -416,7 +416,7 @@ module AccessPath {
   /**
    * Gets a SourceNode that is accessed using the same access path as the input. 
    */
-  DataFlow::SourceNode getASourceAccess(DataFlow::Node node) {
+  DataFlow::SourceNode getAnAliasedSourceNode(DataFlow::Node node) {
     exists(DataFlow::SourceNode root, string accessPath | 
       node = AccessPath::getAReferenceTo(root, accessPath) and 
       result = AccessPath::getAReferenceTo(root, accessPath)
diff --git a/javascript/ql/src/semmle/javascript/StringOps.qll b/javascript/ql/src/semmle/javascript/StringOps.qll
@@ -168,7 +168,7 @@ module StringOps {
         (call.getMethodName() = "substring" or call.getMethodName() = "substr" or call.getMethodName() = "slice") and
         call.getNumArgument() = 2 and
         (
-          AccessPath::getASourceAccess(substring).getAPropertyRead("length").flowsTo(call.getArgument(1))
+          AccessPath::getAnAliasedSourceNode(substring).getAPropertyRead("length").flowsTo(call.getArgument(1))
           or
           substring.getStringValue().length() = call.getArgument(1).asExpr().getIntValue()
         )

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ abstract class EnumeratedPropName extends DataFlow::Node {`
`53`	`53`	* For example, gets `src[key]` in `for (var key in src) { src[key]; }`.
`54`	`54`	`*/`
`55`	`55`	`PropRead getASourceProp() {`
`56`		`- result = AccessPath::getASourceAccess(getSourceObject()).getAPropertyRead() and`
	`56`	`+ result = AccessPath::getAnAliasedSourceNode(getSourceObject()).getAPropertyRead() and`
`57`	`57`	`result.getPropertyNameExpr().flow().getImmediatePredecessor*() = this`
`58`	`58`	`}`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ module StringOps {`
`168`	`168`	`(call.getMethodName() = "substring" or call.getMethodName() = "substr" or call.getMethodName() = "slice") and`
`169`	`169`	`call.getNumArgument() = 2 and`
`170`	`170`	`(`
`171`		`- AccessPath::getASourceAccess(substring).getAPropertyRead("length").flowsTo(call.getArgument(1))`
	`171`	`+ AccessPath::getAnAliasedSourceNode(substring).getAPropertyRead("length").flowsTo(call.getArgument(1))`
`172`	`172`	`or`
`173`	`173`	`substring.getStringValue().length() = call.getArgument(1).asExpr().getIntValue()`
`174`	`174`	`)`