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

Java: Deprecate isBarrierEdge.

Browse Source
This commit is contained in:
Anders Schack-Mulligen
2019-07-26 13:16:19 +02:00
parent d3c5644229
commit 7c30c1a01c
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/ql/src/Security/CWE/CWE-190/ArithmeticWithExtremeValues.ql
View File

@@ -40,11 +40,9 @@ class ExtremeSourceFlowConfig extends DataFlow::Configuration {
override predicate isSink(DataFlow::Node sink) { sink(_, sink.asExpr()) }
override predicate isBarrierEdge(DataFlow::Node node1, DataFlow::Node node2) {
isSource(node1) and isSource(node2)
override predicate isBarrier(DataFlow::Node n) {
n.getType() instanceof BooleanType or isSource(n)
}
override predicate isBarrier(DataFlow::Node n) { n.getType() instanceof BooleanType }
}
predicate sink(ArithExpr exp, VarAccess use) {

12
java/ql/src/semmle/code/java/dataflow/TaintTracking.qll
View File

@@ -63,10 +63,10 @@ module TaintTracking {
node.asExpr() instanceof ValidatedVariableAccess
}
/** Holds if the edge from `node1` to `node2` is a taint sanitizer. */
predicate isSanitizerEdge(DataFlow::Node node1, DataFlow::Node node2) { none() }
/** DEPRECATED: override `isSanitizer` instead. */
deprecated predicate isSanitizerEdge(DataFlow::Node node1, DataFlow::Node node2) { none() }
final override predicate isBarrierEdge(DataFlow::Node node1, DataFlow::Node node2) {
deprecated final override predicate isBarrierEdge(DataFlow::Node node1, DataFlow::Node node2) {
isSanitizerEdge(node1, node2)
}
@@ -135,10 +135,10 @@ module TaintTracking {
node.asExpr() instanceof ValidatedVariableAccess
}
/** Holds if the edge from `node1` to `node2` is a taint sanitizer. */
predicate isSanitizerEdge(DataFlow::Node node1, DataFlow::Node node2) { none() }
/** DEPRECATED: override `isSanitizer` instead. */
deprecated predicate isSanitizerEdge(DataFlow::Node node1, DataFlow::Node node2) { none() }
final override predicate isBarrierEdge(DataFlow::Node node1, DataFlow::Node node2) {
deprecated final override predicate isBarrierEdge(DataFlow::Node node1, DataFlow::Node node2) {
isSanitizerEdge(node1, node2)
}

5
java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll
View File

@@ -57,8 +57,8 @@ abstract class Configuration extends string {
/** Holds if data flow through `node` is prohibited. */
predicate isBarrier(Node node) { none() }
/** Holds if data flow from `node1` to `node2` is prohibited. */
predicate isBarrierEdge(Node node1, Node node2) { none() }
/** DEPRECATED: override `isBarrier` instead. */
deprecated predicate isBarrierEdge(Node node1, Node node2) { none() }
/**
* Holds if the additional flow step from `node1` to `node2` must be taken
@@ -136,7 +136,6 @@ private predicate isAdditionalFlowStep(
*/
private predicate localFlowStep(Node node1, Node node2, Configuration config) {
localFlowStep(node1, node2) and
not config.isBarrierEdge(node1, node2) and
not outBarrier(node1, config) and
not inBarrier(node2, config) and
not fullBarrier(node1, config) and