Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3d2ce57

Browse files
michaelnebelmichaelnebel
committed
Java: Collapse all the specific code for summary, source and sink models into a single file.
1 parent 43c9f9d commit 3d2ce57

4 files changed

Lines changed: 29 additions & 38 deletions

File tree

‎java/ql/src/utils/model-generator/CaptureModels.qll‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
* and sink models of the Standard or a 3rd party library.
44
*/
55

6-
private import CaptureSummaryModelsSpecific
7-
private import CaptureSinkModelsSpecific
8-
private import CaptureSourceModelsSpecific
6+
private import CaptureModelsSpecific
97
private import ModelGeneratorUtils
108

119
/**

java/ql/src/utils/model-generator/CaptureSinkModelsSpecific.qll renamed to java/ql/src/utils/model-generator/CaptureModelsSpecific.qll

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,35 @@
1+
/**
2+
* Provides predicates related to capturing summary models of the Standard or a 3rd party library.
3+
*/
4+
15
import java
2-
import semmle.code.java.dataflow.TaintTracking
36
import semmle.code.java.dataflow.ExternalFlow
7+
import semmle.code.java.dataflow.TaintTracking
8+
import semmle.code.java.dataflow.internal.DataFlowImplCommon
9+
import semmle.code.java.dataflow.internal.DataFlowNodes
10+
import semmle.code.java.dataflow.internal.DataFlowPrivate
11+
import semmle.code.java.dataflow.InstanceAccess
412
import ModelGeneratorUtils
513

14+
/**
15+
* Gets the enclosing callable of `ret`.
16+
*/
17+
Callable returnNodeEnclosingCallable(ReturnNodeExt ret) {
18+
result = getNodeEnclosingCallable(ret).asCallable()
19+
}
20+
21+
/**
22+
* Holds if `node` is an own instance access.
23+
*/
24+
predicate isOwnInstanceAccessNode(ReturnNode node) {
25+
node.asExpr().(ThisAccess).isOwnInstanceAccess()
26+
}
27+
28+
/**
29+
* Gets the CSV string representation of the qualifier.
30+
*/
31+
string qualifierString() { result = "Argument[-1]" }
32+
633
class PropagateToSinkConfigurationSpecific extends TaintTracking::Configuration {
734
PropagateToSinkConfigurationSpecific() { this = "parameters or fields flowing into sinks" }
835

‎java/ql/src/utils/model-generator/CaptureSourceModelsSpecific.qll‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎java/ql/src/utils/model-generator/CaptureSummaryModelsSpecific.qll‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)