Java: Move non-experimental models out of the experimental folder.

This commit is contained in:
Michael Nebel
2024-11-11 10:08:45 +01:00
parent e3662fa97f
commit 404ca27aec
11 changed files with 50 additions and 59 deletions

View File

@@ -1,8 +0,0 @@
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"]

View File

@@ -1,6 +0,0 @@
extensions:
- addsTo:
pack: codeql/java-all
extensible: sinkModel
data:
- ["java.util.zip","ZipFile",true,"ZipFile","(String)","","Argument[0]","path-injection","manual"]

View File

@@ -1,6 +0,0 @@
extensions:
- addsTo:
pack: codeql/java-all
extensible: sourceModel
data:
- ["org.apache.shiro.authc","AuthenticationToken",true,"getCredentials","()","","ReturnValue","remote","manual"]

View File

@@ -1,13 +0,0 @@
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"]

View File

@@ -1,26 +0,0 @@
extensions:
- addsTo:
pack: codeql/java-all
extensible: sinkModel
data:
- ["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"]

View File

@@ -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

View File

@@ -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"]

View File

@@ -0,0 +1,6 @@
extensions:
- addsTo:
pack: codeql/java-all
extensible: sourceModel
data:
- ["org.apache.shiro.authc", "AuthenticationToken", True, "getCredentials", "()", "", "ReturnValue", "remote", "manual"]

View File

@@ -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

View File

@@ -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"]