Java: update url-redirect sink kind to url-redirection

Jami Cogswell · Jami Cogswell · commit 55be2e5b6766 · 2023-05-31T15:49:06.000-04:00
diff --git a/java/ql/lib/ext/jakarta.ws.rs.core.model.yml b/java/ql/lib/ext/jakarta.ws.rs.core.model.yml
@@ -3,8 +3,8 @@ extensions:
       pack: codeql/java-all
       extensible: sinkModel
     data:
-      - ["jakarta.ws.rs.core", "Response", True, "seeOther", "", "", "Argument[0]", "url-redirect", "manual"]
-      - ["jakarta.ws.rs.core", "Response", True, "temporaryRedirect", "", "", "Argument[0]", "url-redirect", "manual"]
+      - ["jakarta.ws.rs.core", "Response", True, "seeOther", "", "", "Argument[0]", "url-redirection", "manual"]
+      - ["jakarta.ws.rs.core", "Response", True, "temporaryRedirect", "", "", "Argument[0]", "url-redirection", "manual"]
   - addsTo:
       pack: codeql/java-all
       extensible: summaryModel
diff --git a/java/ql/lib/ext/javax.ws.rs.core.model.yml b/java/ql/lib/ext/javax.ws.rs.core.model.yml
@@ -3,8 +3,8 @@ extensions:
       pack: codeql/java-all
       extensible: sinkModel
     data:
-      - ["javax.ws.rs.core", "Response", True, "seeOther", "", "", "Argument[0]", "url-redirect", "manual"]
-      - ["javax.ws.rs.core", "Response", True, "temporaryRedirect", "", "", "Argument[0]", "url-redirect", "manual"]
+      - ["javax.ws.rs.core", "Response", True, "seeOther", "", "", "Argument[0]", "url-redirection", "manual"]
+      - ["javax.ws.rs.core", "Response", True, "temporaryRedirect", "", "", "Argument[0]", "url-redirection", "manual"]
       - ["javax.ws.rs.core", "ResponseBuilder", False, "header", "", "", "Argument[1]", "header-splitting", "manual"]
   - addsTo:
       pack: codeql/java-all
diff --git a/java/ql/lib/ext/org.geogebra.web.full.main.model.yml b/java/ql/lib/ext/org.geogebra.web.full.main.model.yml
@@ -4,4 +4,4 @@ extensions:
       pack: codeql/java-all
       extensible: sinkModel
     data:
-      - ["org.geogebra.web.full.main", "FileManager", True, "open", "(String,String)", "", "Argument[0]", "url-redirect", "ai-manual"]
+      - ["org.geogebra.web.full.main", "FileManager", True, "open", "(String,String)", "", "Argument[0]", "url-redirection", "ai-manual"]
diff --git a/java/ql/lib/ext/org.kohsuke.stapler.model.yml b/java/ql/lib/ext/org.kohsuke.stapler.model.yml
@@ -3,5 +3,5 @@ extensions:
       pack: codeql/java-all
       extensible: sinkModel
     data:
-      - ["org.kohsuke.stapler", "HttpResponses", True, "redirectTo", "(String)", "", "Argument[0]", "url-redirect", "ai-manual"]
+      - ["org.kohsuke.stapler", "HttpResponses", True, "redirectTo", "(String)", "", "Argument[0]", "url-redirection", "ai-manual"]
       - ["org.kohsuke.stapler", "HttpResponses", True, "staticResource", "(URL)", "", "Argument[0]", "open-url", "ai-manual"]
diff --git a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
@@ -276,7 +276,7 @@ module ModelValidation {
         [
           "open-url", "jndi-injection", "ldap", "sql-injection", "jdbc-url", "logging", "mvel",
           "xpath", "groovy", "xss", "ognl-injection", "intent-start", "pending-intent-sent",
-          "url-redirect", "create-file", "read-file", "write-file", "set-hostname-verifier",
+          "url-redirection", "create-file", "read-file", "write-file", "set-hostname-verifier",
           "header-splitting", "information-leak", "xslt", "jexl", "bean-validation", "ssti",
           "fragment-injection", "command-injection"
         ] and
diff --git a/java/ql/lib/semmle/code/java/security/UrlRedirect.qll b/java/ql/lib/semmle/code/java/security/UrlRedirect.qll
@@ -12,7 +12,7 @@ abstract class UrlRedirectSink extends DataFlow::Node { }
 
 /** A default sink represeting methods susceptible to URL redirection attacks. */
 private class DefaultUrlRedirectSink extends UrlRedirectSink {
-  DefaultUrlRedirectSink() { sinkNode(this, "url-redirect") }
+  DefaultUrlRedirectSink() { sinkNode(this, "url-redirection") }
 }
 
 /** A Servlet URL redirection sink. */

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ module ModelValidation {`
`276`	`276`	`[`
`277`	`277`	`"open-url", "jndi-injection", "ldap", "sql-injection", "jdbc-url", "logging", "mvel",`
`278`	`278`	`"xpath", "groovy", "xss", "ognl-injection", "intent-start", "pending-intent-sent",`
`279`		`- "url-redirect", "create-file", "read-file", "write-file", "set-hostname-verifier",`
	`279`	`+ "url-redirection", "create-file", "read-file", "write-file", "set-hostname-verifier",`
`280`	`280`	`"header-splitting", "information-leak", "xslt", "jexl", "bean-validation", "ssti",`
`281`	`281`	`"fragment-injection", "command-injection"`
`282`	`282`	`] and`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ abstract class UrlRedirectSink extends DataFlow::Node { }`
`12`	`12`
`13`	`13`	`/** A default sink represeting methods susceptible to URL redirection attacks. */`
`14`	`14`	`private class DefaultUrlRedirectSink extends UrlRedirectSink {`
`15`		`- DefaultUrlRedirectSink() { sinkNode(this, "url-redirect") }`
	`15`	`+ DefaultUrlRedirectSink() { sinkNode(this, "url-redirection") }`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`/** A Servlet URL redirection sink. */`