Python: Enable auto-model BaseHttpRequestHandler

RasmusWL · RasmusWL · commit af6c5cceadc0 · 2023-12-08T11:27:50.000+01:00
diff --git a/python/ql/lib/semmle/python/frameworks/Stdlib.qll b/python/ql/lib/semmle/python/frameworks/Stdlib.qll
@@ -2014,7 +2014,7 @@ module StdlibPrivate {
    *  - https://docs.python.org/3.9/library/http.server.html#http.server.BaseHTTPRequestHandler
    *  - https://docs.python.org/2.7/library/basehttpserver.html#BaseHTTPServer.BaseHTTPRequestHandler
    */
-  private module HttpRequestHandler {
+  module BaseHttpRequestHandler {
     /** Gets a reference to the `BaseHttpRequestHandler` class or any subclass. */
     API::Node subclassRef() {
       result =
@@ -2028,6 +2028,9 @@ module StdlibPrivate {
           API::moduleImport("http").getMember("server").getMember("SimpleHTTPRequestHandler"),
           API::moduleImport("http").getMember("server").getMember("CGIHTTPRequestHandler"),
         ].getASubclass*()
+      or
+      result =
+        ModelOutput::getATypeNode("http.server.BaseHTTPRequestHandler~Subclass").getASubclass*()
     }
 
     /** A HttpRequestHandler class definition (most likely in project code). */
diff --git a/python/ql/src/meta/ClassHierarchy/Find.ql b/python/ql/src/meta/ClassHierarchy/Find.ql
@@ -75,6 +75,14 @@ class WSGIServer extends FindSubclassesSpec {
   }
 }
 
+class StdlibBaseHttpRequestHandler extends FindSubclassesSpec {
+  StdlibBaseHttpRequestHandler() { this = "http.server.BaseHTTPRequestHandler~Subclass" }
+
+  override API::Node getAlreadyModeledClass() {
+    result = StdlibPrivate::BaseHttpRequestHandler::subclassRef()
+  }
+}
+
 bindingset[fullyQualified]
 predicate fullyQualifiedToYamlFormat(string fullyQualified, string type2, string path) {
   exists(int firstDot | firstDot = fullyQualified.indexOf(".", 0, 0) |

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,14 @@ class WSGIServer extends FindSubclassesSpec {`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
	`78`	`+class StdlibBaseHttpRequestHandler extends FindSubclassesSpec {`
	`79`	`+ StdlibBaseHttpRequestHandler() { this = "http.server.BaseHTTPRequestHandler~Subclass" }`
	`80`	`+`
	`81`	`+ override API::Node getAlreadyModeledClass() {`
	`82`	`+ result = StdlibPrivate::BaseHttpRequestHandler::subclassRef()`
	`83`	`+ }`
	`84`	`+}`
	`85`	`+`
`78`	`86`	`bindingset[fullyQualified]`
`79`	`87`	`predicate fullyQualifiedToYamlFormat(string fullyQualified, string type2, string path) {`
`80`	`88`	`exists(int firstDot \| firstDot = fullyQualified.indexOf(".", 0, 0) \|`