Java: Convert SpringWebRequestGetMethod to CSV based flow source

tamasvajk · tamasvajk · commit b05a9043b54e · 2021-03-09T11:41:32.000+01:00
diff --git a/java/ql/src/semmle/code/java/dataflow/ExternalFlow.qll b/java/ql/src/semmle/code/java/dataflow/ExternalFlow.qll
@@ -119,7 +119,17 @@ private predicate sourceModelCsv(string row) {
       "javax.servlet.http;HttpServletRequest;false;getPathInfo;();;ReturnValue;remote",
       "javax.servlet.http;HttpServletRequest;false;getRequestURI;();;ReturnValue;remote",
       "javax.servlet.http;HttpServletRequest;false;getRequestURL;();;ReturnValue;remote",
-      "javax.servlet.http;HttpServletRequest;false;getRemoteUser;();;ReturnValue;remote"
+      "javax.servlet.http;HttpServletRequest;false;getRemoteUser;();;ReturnValue;remote",
+      // SpringWebRequestGetMethod
+      "org.springframework.web.context.request;WebRequest;false;getDescription;;;ReturnValue;remote",
+      "org.springframework.web.context.request;WebRequest;false;getHeader;;;ReturnValue;remote",
+      "org.springframework.web.context.request;WebRequest;false;getHeaderNames;;;ReturnValue;remote",
+      "org.springframework.web.context.request;WebRequest;false;getHeaderValues;;;ReturnValue;remote",
+      "org.springframework.web.context.request;WebRequest;false;getParameter;;;ReturnValue;remote",
+      "org.springframework.web.context.request;WebRequest;false;getParameterMap;;;ReturnValue;remote",
+      "org.springframework.web.context.request;WebRequest;false;getParameterNames;;;ReturnValue;remote",
+      "org.springframework.web.context.request;WebRequest;false;getParameterValues;;;ReturnValue;remote"
+      // TODO consider org.springframework.web.context.request.WebRequest.getRemoteUser
     ]
 }
 
diff --git a/java/ql/src/semmle/code/java/dataflow/FlowSources.qll b/java/ql/src/semmle/code/java/dataflow/FlowSources.qll
@@ -215,7 +215,6 @@ class DatabaseInput extends LocalUserInput {
 private class RemoteTaintedMethod extends Method {
   RemoteTaintedMethod() {
     this instanceof PlayRequestGetMethod or
-    this instanceof SpringWebRequestGetMethod or
     this instanceof SpringRestTemplateResponseEntityMethod or
     this instanceof ServletRequestGetBodyMethod or
     this instanceof CookieGetValueMethod or
@@ -239,22 +238,6 @@ private class PlayRequestGetMethod extends Method {
   }
 }
 
-private class SpringWebRequestGetMethod extends Method {
-  SpringWebRequestGetMethod() {
-    exists(SpringWebRequest swr | this = swr.getAMethod() |
-      this.hasName("getDescription") or
-      this.hasName("getHeader") or
-      this.hasName("getHeaderNames") or
-      this.hasName("getHeaderValues") or
-      this.hasName("getParameter") or
-      this.hasName("getParameterMap") or
-      this.hasName("getParameterNames") or
-      this.hasName("getParameterValues")
-      // TODO consider getRemoteUser
-    )
-  }
-}
-
 /** A method that reads from the environment, such as `System.getProperty` or `System.getenv`. */
 class EnvReadMethod extends Method {
   EnvReadMethod() {
