Apply suggestions from code review

Co-authored-by: Rasmus Wriedt Larsen <[email protected]>

Author: yoff

python/ql/lib/modeling/ModelEditor.qll

@@ -75,16 +75,16 @@ abstract class Endpoint instanceof Scope {
    * Gets a string representation of the parameters of this endpoint.
    *
    * The string follows a specific format:
-   * - Positional parameters are listed in order, separated by commas.
-   * - Keyword parameters are listed in order, separated by commas, each followed by a colon.
+   * - Normal  parameters(where arguments can be passed as either positional or keyword) are listed in order, separated by commas.
+   * - Keyword-only parameters are listed in order, separated by commas, each followed by a colon.
    * - In the future, positional-only parameters will be listed in order, separated by commas, each followed by a slash.
    */
   abstract string getParameters();
 
   /**
    * Gets a boolean that is true iff this endpoint is supported by existing modeling.
    *
-   * The check only takes Models ss Data extension models into account.
+   * The check only takes Models as Data extension models into account.
    */
   abstract boolean getSupportedStatus();
 

python/ql/lib/modeling/Util.qll

@@ -38,14 +38,9 @@ string computeScopePath(Scope scope) {
     result = scope.(Module).getName()
   else
     //recursive cases
-    if scope instanceof Class
+    if scope instanceof Class or scope instanceof Function
     then
-      result = computeScopePath(scope.(Class).getEnclosingScope()) + "." + scope.(Class).getName()
-    else
-      if scope instanceof Function
-      then
-        result =
-          computeScopePath(scope.(Function).getEnclosingScope()) + "." + scope.(Function).getName()
+      result = computeScopePath(scope.getEnclosingScope()) + "." + scope.getName()
       else result = "unknown: " + scope.toString()
 }
 
@@ -72,19 +67,17 @@ module FindModel<modelSig/2 model> {
    */
   bindingset[path, member]
   string possibleMemberPathPrefix(string path, string member) {
-    // functionName must be a substring of path
     exists(int index | index = path.indexOf(["Member", "Method"] + "[" + member + "]") |
       result = path.prefix(index)
     )
   }
 
   /**
-   * Holds if `(type,path)` evaluates to the given entity, when evalauted from a client of the current library.
+   * Holds if `(type,path)` identifies `scope`.
    */
   bindingset[type, path]
   predicate pathToScope(Scope scope, string type, string path) {
-    scope.getLocation().getFile() instanceof RelevantFile and
-    scope.isPublic() and // only public methods are modeled
+    scope instanceof Endpoint
     computeScopePath(scope) =
       type.replaceAll("!", "") + "." +
         path.replaceAll("Member[", "").replaceAll("]", "").replaceAll("Instance.", "") +

python/ql/test/modelling/FrameworkModeEndpoints.ext.yml

@@ -17,4 +17,4 @@ extensions:
       pack: codeql/python-all
       extensible: typeModel
     data:
-      - ["MyPackage.Foo.C2!","MyPackage","Member[Foo].Member[C3].Member[get_C2_instance].ReturnValue"]
+      - ["MyPackage.Foo.C2","MyPackage","Member[Foo].Member[C3].Member[get_C2_instance].ReturnValue"]