hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-05-21 06:37:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Automodel: Include all candidates, even manually modelled ones.

Browse Source
This commit is contained in:
Max Schaefer
2024-05-08 16:40:32 +01:00
parent 799c380e5f
commit 362a1fe609
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll
View File

@@ -413,14 +413,7 @@ predicate isCandidate(
) and
any(ApplicationModeMetadataExtractor meta)
.hasMetadata(endpoint, package, type, subtypes, name, signature, input, output, isVarargs,
alreadyAiModeled, extensibleType) and
// If a node is already modeled in MaD, we don't include it as a candidate. Otherwise, we might include it as a
// candidate for query A, but the model will label it as a sink for one of the sink types of query B, for which it's
// already a known sink. This would result in overlap between our detected sinks and the pre-existing modeling. We
// assume that, if a sink has already been modeled in a MaD model, then it doesn't belong to any additional sink
// types, and we don't need to reexamine it.
alreadyAiModeled.matches(["", "%ai-%"]) and
AutomodelJavaUtil::includeAutomodelCandidate(package, type, name, signature)
alreadyAiModeled, extensibleType)
}
/**

9
java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll
View File

@@ -350,14 +350,7 @@ predicate isCandidate(
) and
any(FrameworkModeMetadataExtractor meta)
.hasMetadata(endpoint, package, type, subtypes, name, signature, input, output, parameterName,
alreadyAiModeled, extensibleType) and
// If a node is already modeled in MaD, we don't include it as a candidate. Otherwise, we might include it as a
// candidate for query A, but the model will label it as a sink for one of the sink types of query B, for which it's
// already a known sink. This would result in overlap between our detected sinks and the pre-existing modeling. We
// assume that, if a sink has already been modeled in a MaD model, then it doesn't belong to any additional sink
// types, and we don't need to reexamine it.
alreadyAiModeled.matches(["", "%ai-%"]) and
AutomodelJavaUtil::includeAutomodelCandidate(package, type, name, signature)
alreadyAiModeled, extensibleType)
}
/**