aiohttp improvements

Alvaro Muñoz · Alvaro Muñoz · commit f2cc2af2767f · 2023-07-12T17:19:56.000+02:00
diff --git a/python/ql/lib/change-notes/2023-07-12-aiohttp-improvements.md b/python/ql/lib/change-notes/2023-07-12-aiohttp-improvements.md
@@ -0,0 +1,2 @@
+lgtm,codescanning
+* Improvements of the `aiohttp` models including heuristic sources and new path manipulation and SSRF sinks.
diff --git a/python/ql/lib/semmle/python/frameworks/Aiohttp.qll b/python/ql/lib/semmle/python/frameworks/Aiohttp.qll
@@ -468,6 +468,30 @@ module AiohttpWebModel {
     override string getSourceType() { result = "aiohttp.web.Request" }
   }
 
+  /**
+   * Heuristic source that considers a method parameter with a type hint of `aiohttp.web.Request`
+   * as a parameter that will receive an `aiohttp.web.Request` instance when a request
+   * handler is invoked.
+   */
+  class AiohttpHeuristicRequestHandlerRequestParam extends Request::InstanceSource,
+    DataFlow::ParameterNode, RemoteFlowSource::Range
+  {
+    AiohttpHeuristicRequestHandlerRequestParam() {
+      exists(FunctionExpr fe, int i |
+        // the API::Node is the annotation (type hint), we need to get the annotated parameter
+        fe.getArgs().getAnnotation(i) =
+          API::moduleImport("aiohttp")
+              .getMember("web")
+              .getMember("Request")
+              .getAValueReachableFromSource()
+              .asExpr() and
+        fe.getInnerScope().getArg(i) = this.getParameter()
+      )
+    }
+
+    override string getSourceType() { result = "aiohttp web request parameter" }
+  }
+
   /**
    * A read of the `request` attribute on an instance of an aiohttp.web View class,
    * which is the request being processed currently.
@@ -505,7 +529,10 @@ module AiohttpWebModel {
     AiohttpWebResponseInstantiation() {
       this = apiNode.getACall() and
       (
-        apiNode = API::moduleImport("aiohttp").getMember("web").getMember("Response")
+        apiNode =
+          API::moduleImport("aiohttp")
+              .getMember("web")
+              .getMember(["FileResponse", "Response", "StreamResponse"])
         or
         exists(string httpExceptionClassName |
           httpExceptionClassName in [
@@ -545,6 +572,14 @@ module AiohttpWebModel {
 
     override DataFlow::Node getMimetypeOrContentTypeArg() {
       result = this.getArgByName("content_type")
+      or
+      exists(DataFlow::Node headers, Dict d |
+        headers = this.getArgByName("headers").getALocalSource()
+      |
+        headers.asExpr() = d and
+        d.getAKey().(StrConst).getText().toLowerCase() = "content-type" and
+        d.getAValue() = result.asExpr()
+      )
     }
 
     override string getMimetypeDefault() {
@@ -556,6 +591,17 @@ module AiohttpWebModel {
     }
   }
 
+  /**
+   * A call to the `aiohttp.web.FileResponse` constructor as a sink for Filesystem access.
+   */
+  class FileResponseCall extends FileSystemAccess::Range, DataFlow::CallCfgNode {
+    FileResponseCall() {
+      this = API::moduleImport("aiohttp").getMember("web").getMember("FileResponse").getACall()
+    }
+
+    override DataFlow::Node getAPathArgument() { result = this.getArg(0) }
+  }
+
   /** Gets an HTTP response instance. */
   private API::Node aiohttpResponseInstance() {
     result = any(AiohttpWebResponseInstantiation call).getApiNode().getReturn()
@@ -670,7 +716,7 @@ private module AiohttpClientModel {
       string methodName;
 
       OutgoingRequestCall() {
-        methodName in [Http::httpVerbLower(), "request"] and
+        methodName in [Http::httpVerbLower(), "request", "ws_connect"] and
         this = instance().getMember(methodName).getACall()
       }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+lgtm,codescanning`
	`2`	+* Improvements of the `aiohttp` models including heuristic sources and new path manipulation and SSRF sinks.