PS: Regenerate models.

Author: MathiasVP

powershell/misc/typemodelgen.py

@@ -2,16 +2,25 @@
 from pathlib import Path
 import sys
 import os
+import re
 from collections import defaultdict
 
 
 def fixup(t):
     """Sometimes the docs specify a type that doesn't align with what
     PowerShell reports. This function fixes up those types so that it aligns with PowerShell.
     """
-    if t.startswith("System.ReadOnlySpan<"):
-        return "System.String"
-    return t
+    if t.startswith("system.readonlyspan<"):
+        return "system.string"
+    # A regular expression that matches strings like a.b.c<T, U, W>
+    # and replacee it with a.b.c
+    return re.sub(r"<.*>", "", t)
+
+def skipQualifier(name):
+    """Removes the qualifier from the name."""
+    # A regular expression that matches strings like a.b.c and returns c
+    # and replaces it with c
+    return re.sub(r".*\.", "", name)
 
 
 def isStatic(member):
@@ -88,11 +97,18 @@ def generateTypeModels(arg):
 
             thisType = root.attrib["FullName"]
 
-            if "`" in file_path.stem or "+" in file_path.stem:
-                continue  # Skip generics (and nested types?) for now
+            parentName = file_path.parent.name
+            # Remove `and + in parentName
+            parentName = parentName.replace("`", "").replace("+", "")
+
+            # Remove ` in file_path.stem
+            # and + in file_path.stem
+            if thisType == "":
+                print("Error: Empty type name")
+                continue
 
-            folderName = "generated/" + file_path.parent.name.replace(".", "")
-            filename = folderName + "/typemodel.yml"
+            folderName = "generated/" + parentName
+            filename = folderName + ".typemodel.yml"
             s = set()
             for elem in root.findall(".//Members/Member"):
                 name = elem.attrib["MemberName"]
@@ -136,7 +152,7 @@ def generateTypeModels(arg):
                     continue  # Don't generate type summaries for void methods
 
                 s.add(
-                    f'    - ["{fixup(returnType.lower())}", "{thisType.lower() + staticMarker}", "{startSelectorMarker}[{name.lower()}]{endSelectorMarker}"]\n'
+                    f'    - ["{fixup(returnType.lower())}", "{fixup(thisType.lower()) + staticMarker}", "{startSelectorMarker}[{skipQualifier(fixup(name.lower()))}]{endSelectorMarker}"]\n'
                 )
 
             summaries[filename].update(s)
@@ -153,7 +169,7 @@ def writeModels():
         if len(s) == 0:
             continue
         os.makedirs(os.path.dirname(filename), exist_ok=True)
-        with open(filename, "x") as file:
+        with open(filename, "w") as file:
             file.write("# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.\n")
             file.write("extensions:\n")
             file.write("  - addsTo:\n")

powershell/ql/lib/qlpack.yml

@@ -16,4 +16,6 @@ dependencies:
 dataExtensions:
   - semmle/code/powershell/frameworks/**/model.yml
   - semmle/code/powershell/frameworks/**/*.model.yml
+  - semmle/code/powershell/frameworks/**/typemodel.yml
+  - semmle/code/powershell/frameworks/**/*.typemodel.yml
 warnOnImplicitThis: true

powershell/ql/lib/semmle/code/powershell/Frameworks.qll

@@ -2,6 +2,6 @@
  * Helper file that imports all framework modeling.
  */
 
-import semmle.code.powershell.frameworks.SystemManagementAutomationRunspaces.Runspaces
-import semmle.code.powershell.frameworks.SystemManagementAutomationPowerShell.PowerShell
-import semmle.code.powershell.frameworks.SystemManagementAutomationEngineIntrinsics.EngineIntrinsics
+import semmle.code.powershell.frameworks.Runspaces
+import semmle.code.powershell.frameworks.PowerShell
+import semmle.code.powershell.frameworks.EngineIntrinsics

powershell/ql/lib/semmle/code/powershell/frameworks/Accessibility/model.yml

@@ -5,8 +5,8 @@ private import semmle.code.powershell.dataflow.internal.DataFlowPublic as DataFl
 module EngineIntrinsics {
   private class EngineIntrinsicsGlobalEntry extends ModelInput::TypeModel {
     override DataFlow::Node getASource(string type) {
-      type = "System.Management.Automation.EngineIntrinsics" and
-      result.asExpr().getExpr().(VarReadAccess).getVariable().matchesName("ExecutionContext")
+      type = "system.management.automation.engineintrinsics" and
+      result.asExpr().getExpr().(VarReadAccess).getVariable().matchesName("executioncontext")
     }
   }
 }