Make predicate name clearer

JarLob · JarLob · commit 94065764d509 · 2023-04-14T01:05:21.000+02:00
diff --git a/javascript/ql/src/Security/CWE-094/ExpressionInjection.ql b/javascript/ql/src/Security/CWE-094/ExpressionInjection.ql
@@ -104,11 +104,11 @@ private predicate isExternalUserControlledWorkflowRun(string context) {
 }
 
 /**
- * Holds if the env variable name in `${{ env.name }}`
- * is where the external user controlled value was assigned to.
+ * Holds if environment name in the `injection` (in a form of `env.name`)
+ * is tainted by the `context` (in a form of `github.event.xxx.xxx`).
  */
 bindingset[injection]
-predicate isEnvTainted(string injection, string context) {
+predicate isEnvInterpolationTainted(string injection, string context) {
   exists(Actions::Env env, string envName, YamlString envValue |
     envValue = env.lookup(envName) and
     Actions::getEnvName(injection) = envName and
@@ -125,7 +125,7 @@ predicate isRunInjectable(Actions::Run run, string injection, string context) {
   (
     injection = context
     or
-    isEnvTainted(injection, context)
+    isEnvInterpolationTainted(injection, context)
   )
 }
 
@@ -142,7 +142,7 @@ predicate isScriptInjectable(Actions::Script script, string injection, string co
     (
       injection = context
       or
-      isEnvTainted(injection, context)
+      isEnvInterpolationTainted(injection, context)
     )
   )
 }

Original file line number	Diff line number	Diff line change
`@@ -104,11 +104,11 @@ private predicate isExternalUserControlledWorkflowRun(string context) {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`/**`
`107`		- * Holds if the env variable name in `${{ env.name }}`
`108`		`- * is where the external user controlled value was assigned to.`
	`107`	+ * Holds if environment name in the `injection` (in a form of `env.name`)
	`108`	+ * is tainted by the `context` (in a form of `github.event.xxx.xxx`).
`109`	`109`	`*/`
`110`	`110`	`bindingset[injection]`
`111`		`-predicate isEnvTainted(string injection, string context) {`
	`111`	`+predicate isEnvInterpolationTainted(string injection, string context) {`
`112`	`112`	`exists(Actions::Env env, string envName, YamlString envValue \|`
`113`	`113`	`envValue = env.lookup(envName) and`
`114`	`114`	`Actions::getEnvName(injection) = envName and`
`@@ -125,7 +125,7 @@ predicate isRunInjectable(Actions::Run run, string injection, string context) {`
`125`	`125`	`(`
`126`	`126`	`injection = context`
`127`	`127`	`or`
`128`		`- isEnvTainted(injection, context)`
	`128`	`+ isEnvInterpolationTainted(injection, context)`
`129`	`129`	`)`
`130`	`130`	`}`
`131`	`131`
`@@ -142,7 +142,7 @@ predicate isScriptInjectable(Actions::Script script, string injection, string co`
`142`	`142`	`(`
`143`	`143`	`injection = context`
`144`	`144`	`or`
`145`		`- isEnvTainted(injection, context)`
	`145`	`+ isEnvInterpolationTainted(injection, context)`
`146`	`146`	`)`
`147`	`147`	`)`
`148`	`148`	`}`