Merge pull request #17952 from michaelnebel/java/movemodels

Java: Move non-experimental models out of the experimental folder.
github · Nov 11, 2024 · 425b1b1 · 425b1b1
2 parents d6ef8c3 + 404ca27
commit 425b1b1
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 59 deletions.
diff --git a/java/ql/lib/ext/experimental/java.nio.model.yml b/java/ql/lib/ext/experimental/java.nio.model.yml
diff --git a/java/ql/lib/ext/experimental/java.util.zip.model.yml b/java/ql/lib/ext/experimental/java.util.zip.model.yml
diff --git a/java/ql/lib/ext/experimental/org.apache.shiro.authc.model.yml b/java/ql/lib/ext/experimental/org.apache.shiro.authc.model.yml
diff --git a/java/ql/lib/ext/experimental/s3-transfer-manager.model.yml b/java/ql/lib/ext/experimental/s3-transfer-manager.model.yml
diff --git a/java/ql/lib/ext/experimental/spring-core.model.yml b/java/ql/lib/ext/experimental/spring-core.model.yml
diff --git a/java/ql/lib/ext/java.nio.model.yml b/java/ql/lib/ext/java.nio.model.yml
@@ -1,4 +1,12 @@
 extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["java.nio.file", "FileSystems", True, "getFileSystem", "(URI)", "", "Argument[0]", "path-injection", "manual"]
+      - ["java.nio.channels", "AsynchronousFileChannel", True, "open", "(Path,OpenOption[])", "", "Argument[0]", "path-injection", "manual"]
+      - ["java.nio.channels", "AsynchronousFileChannel", True, "open", "(Path,Set,ExecutorService,FileAttribute[])", "", "Argument[0]", "path-injection", "manual"]
+
   - addsTo:
       pack: codeql/java-all
       extensible: summaryModel

diff --git a/java/ql/lib/ext/java.util.zip.model.yml b/java/ql/lib/ext/java.util.zip.model.yml
@@ -25,3 +25,4 @@ extensions:
       extensible: sinkModel
     data:
       - ["java.util.zip", "ZipOutputStream", True, "putNextEntry", "(ZipEntry)", "", "Argument[0]", "file-content-store", "ai-manual"]
+      - ["java.util.zip", "ZipFile", True, "ZipFile", "(String)", "", "Argument[0]", "path-injection", "manual"]
diff --git a/java/ql/lib/ext/experimental/zip4j.model.yml → java/ql/lib/ext/net.lingala.zip4j.model.yml b/java/ql/lib/ext/experimental/zip4j.model.yml → java/ql/lib/ext/net.lingala.zip4j.model.yml
diff --git a/java/ql/lib/ext/org.apache.shiro.authc.model.yml b/java/ql/lib/ext/org.apache.shiro.authc.model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sourceModel
+    data:
+      - ["org.apache.shiro.authc", "AuthenticationToken", True, "getCredentials", "()", "", "ReturnValue", "remote", "manual"]
diff --git a/java/ql/lib/ext/org.springframework.core.io.model.yml b/java/ql/lib/ext/org.springframework.core.io.model.yml
@@ -6,6 +6,28 @@ extensions:
       - ["org.springframework.core.io", "Resource", True, "createRelative", "(String)", "", "Argument[0]", "path-injection", "manual"]
       - ["org.springframework.core.io", "ResourceLoader", True, "getResource", "(String)", "", "Argument[0]", "path-injection", "ai-manual"]
       - ["org.springframework.core.io", "ResourceLoader", True, "getResource", "(String)", "", "Argument[0]", "request-forgery", "manual"]
+      - ["org.springframework.core.io", "FileSystemResource", True, "FileSystemResource", "(FileSystem,String)", "", "Argument[1]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "FileSystemResource", True, "FileSystemResource", "(File)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "FileSystemResource", True, "FileSystemResource", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "FileSystemResource", True, "FileSystemResource", "(String)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "FileUrlResource", True, "FileUrlResource", "(String)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "FileUrlResource", True, "FileUrlResource", "(URL)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "PathResource", True, "PathResource", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "PathResource", True, "PathResource", "(String)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "PathResource", True, "PathResource", "(URI)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "UrlResource", True, "UrlResource", "(String,String,String)", "", "Argument[1]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "UrlResource", True, "UrlResource", "(String,String)", "", "Argument[1]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "UrlResource", True, "UrlResource", "(String)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "UrlResource", True, "UrlResource", "(URI)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.core.io", "UrlResource", True, "UrlResource", "(URL)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.util", "FileSystemUtils", True, "copyRecursively", "(Path,Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.util", "FileSystemUtils", True, "copyRecursively", "(Path,Path)", "", "Argument[1]", "path-injection", "manual"]
+      - ["org.springframework.util", "FileSystemUtils", True, "deleteRecursively", "(File)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.util", "FileSystemUtils", True, "deleteRecursively", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.util", "ResourceUtils", True, "getFile", "(String)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.util", "FileCopyUtils", True, "copyToByteArray", "(File)", "", "Argument[0]", "path-injection", "manual"]
+      - ["org.springframework.util", "FileSystemUtils", True, "copyRecursively", "(File,File)", "", "Argument[0]", "path-injection", "manual"]
+
   - addsTo:
       pack: codeql/java-all
       extensible: summaryModel

diff --git a/java/ql/lib/ext/software.amazon.awssdk.transfer.s3.model.model.yml b/java/ql/lib/ext/software.amazon.awssdk.transfer.s3.model.model.yml
@@ -0,0 +1,13 @@
+extensions:
+  - addsTo:
+      pack: codeql/java-all
+      extensible: sinkModel
+    data:
+      - ["software.amazon.awssdk.transfer.s3.model", "ResumableFileUpload", True, "serializeToFile", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["software.amazon.awssdk.transfer.s3.model", "DownloadFileRequest$Builder", True, "destination", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["software.amazon.awssdk.transfer.s3.model", "UploadFileRequest$Builder", True, "source", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["software.amazon.awssdk.transfer.s3.model", "DownloadDirectoryRequest$Builder", True, "destination", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["software.amazon.awssdk.transfer.s3.model", "ResumableFileDownload", True, "fromFile", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["software.amazon.awssdk.transfer.s3.model", "ResumableFileDownload", True, "serializeToFile", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["software.amazon.awssdk.transfer.s3.model", "ResumableFileUpload", True, "fromFile", "(Path)", "", "Argument[0]", "path-injection", "manual"]
+      - ["software.amazon.awssdk.transfer.s3.model", "UploadDirectoryRequest$Builder", True, "source", "(Path)", "", "Argument[0]", "path-injection", "manual"]