hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-21 03:06:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

C#/Java: Address comments on re-exposing functionality.

Browse Source
This commit is contained in:
Michael Nebel
2022-03-28 15:05:03 +02:00
parent 1710b66003
commit 9b7691a5fc
4 changed files with 12 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
java/ql/src/utils/model-generator/internal/CaptureModelsSpecific.qll
View File

@@ -4,18 +4,18 @@
import java
import semmle.code.java.dataflow.TaintTracking
private import semmle.code.java.dataflow.ExternalFlow as Ef
private import semmle.code.java.dataflow.internal.DataFlowImplCommon as Dfic
private import semmle.code.java.dataflow.internal.DataFlowNodes
private import semmle.code.java.dataflow.internal.DataFlowPrivate
private import semmle.code.java.dataflow.InstanceAccess
private import ModelGeneratorUtils
import semmle.code.java.dataflow.ExternalFlow as ExternalFlow
import semmle.code.java.dataflow.internal.DataFlowImplCommon as DataFlowImplCommon
/**
* Gets the enclosing callable of `ret`.
*/
Callable returnNodeEnclosingCallable(Dfic::ReturnNodeExt ret) {
result = Dfic::getNodeEnclosingCallable(ret).asCallable()
Callable returnNodeEnclosingCallable(DataFlowImplCommon::ReturnNodeExt ret) {
result = DataFlowImplCommon::getNodeEnclosingCallable(ret).asCallable()
}
/**
@@ -66,17 +66,3 @@ string asInputArgument(DataFlow::Node source) {
*/
bindingset[kind]
predicate isRelevantSinkKind(string kind) { not kind = "logging" }
module DataFlowImplCommon {
predicate store = Dfic::store/4;
class ReturnNodeExt = Dfic::ReturnNodeExt;
class TypedContent = Dfic::TypedContent;
}
module ExternalFlow {
predicate sourceNode = Ef::sourceNode/2;
predicate sinkNode = Ef::sinkNode/2;
}

10
java/ql/src/utils/model-generator/internal/ModelGeneratorUtilsSpecific.qll
View File

@@ -1,9 +1,9 @@
import java
import semmle.code.java.dataflow.DataFlow
private import semmle.code.java.dataflow.internal.DataFlowPrivate as Dfp
private import semmle.code.java.dataflow.ExternalFlow
private import semmle.code.java.dataflow.internal.ContainerFlow
private import semmle.code.java.dataflow.internal.DataFlowImplCommon
import semmle.code.java.dataflow.internal.DataFlowPrivate as DataFlowPrivate
private Method superImpl(Method m) {
result = m.getAnOverride() and
@@ -157,11 +157,3 @@ string returnNodeAsOutput(ReturnNodeExt node) {
result = "Argument[-1]" and pos = -1
)
}
module DataFlowPrivate {
predicate containerContent = Dfp::containerContent/1;
predicate readStep = Dfp::readStep/3;
predicate storeStep = Dfp::storeStep/3;
}