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

Merge pull request #3278 from tausbn/python-fix-warnings

Browse Source 
Python: Fix remaining deprecation warnings.
This commit is contained in:
Rasmus Wriedt Larsen
2020-04-22 11:33:16 +02:00
committed by GitHub
parent 1b88c97688 2fad5e8e32
commit 1ecfa2eb55
2 changed files with 6 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/ql/src/Resources/FileOpen.qll
View File

@@ -79,7 +79,7 @@ predicate def_is_open(EssaDefinition def, ControlFlowNode open) {
passes_open_files(refinement) passes_open_files(refinement)
) )
or or
exists(PyNodeRefinement refinement | refinement = def | exists(EssaNodeRefinement refinement | refinement = def |
not closes_file(def) and not closes_file(def) and
not wraps_file(refinement.getDefiningNode(), refinement.getInput()) and not wraps_file(refinement.getDefiningNode(), refinement.getInput()) and
var_is_open(refinement.getInput(), open) var_is_open(refinement.getInput(), open)

51
python/ql/src/semmle/python/dataflow/TaintTracking.qll
View File

@@ -131,15 +131,6 @@ abstract class TaintKind extends string {
edgeLabel = "custom taint flow step for " + this edgeLabel = "custom taint flow step for " + this
} }
/**
* DEPRECATED -- Use `TaintFlow.additionalFlowStepVar(EssaVariable fromvar, EssaVariable tovar, TaintKind kind)` instead.
*
* Holds if this kind of taint passes from variable `fromvar` to variable `tovar`
* This predicate is present for completeness. It is unlikely that any `TaintKind`
* implementation will ever need to override it.
*/
deprecated predicate additionalFlowStepVar(EssaVariable fromvar, EssaVariable tovar) { none() }
/** /**
* Holds if this kind of taint "taints" `expr`. * Holds if this kind of taint "taints" `expr`.
*/ */
@@ -155,7 +146,7 @@ abstract class TaintKind extends string {
* For example, if this were a kind of string taint * For example, if this were a kind of string taint
* the `result` would be `theStrType()`. * the `result` would be `theStrType()`.
*/ */
ClassValue getType() { result.(ClassObjectInternal).getSource() = this.getClass() } ClassValue getType() { none() }
/** /**
* Gets the boolean values (may be one, neither, or both) that * Gets the boolean values (may be one, neither, or both) that
@@ -180,7 +171,10 @@ abstract class TaintKind extends string {
TaintKind getTaintForIteration() { none() } TaintKind getTaintForIteration() { none() }
predicate flowStep(DataFlow::Node fromnode, DataFlow::Node tonode, string edgeLabel) { predicate flowStep(DataFlow::Node fromnode, DataFlow::Node tonode, string edgeLabel) {
this.additionalFlowStepVar(fromnode.asVariable(), tonode.asVariable()) and exists(DataFlowExtension::DataFlowVariable v |
v = fromnode.asVariable() and
v.getASuccessorVariable() = tonode.asVariable()
) and
edgeLabel = "custom taint variable step" edgeLabel = "custom taint variable step"
} }
} }
@@ -355,41 +349,6 @@ abstract class Sanitizer extends string {
predicate sanitizingDefinition(TaintKind taint, EssaDefinition def) { none() } predicate sanitizingDefinition(TaintKind taint, EssaDefinition def) { none() }
} }
/**
* DEPRECATED -- Use DataFlowExtension instead.
* An extension to taint-flow. For adding library or framework specific flows.
* Examples include flow from a request to untrusted part of that request or
* from a socket to data from that socket.
*/
abstract deprecated class TaintFlow extends string {
bindingset[this]
TaintFlow() { any() }
/**
* Holds if `fromnode` being tainted with `fromkind` will result in `tonode` being tainted with `tokind`.
* Extensions to `TaintFlow` should override this to provide additional taint steps.
*/
predicate additionalFlowStep(
ControlFlowNode fromnode, TaintKind fromkind, ControlFlowNode tonode, TaintKind tokind
) {
none()
}
/**
* Holds if the given `kind` of taint passes from variable `fromvar` to variable `tovar`.
* This predicate is present for completeness. Most `TaintFlow` implementations will not need to override it.
*/
predicate additionalFlowStepVar(EssaVariable fromvar, EssaVariable tovar, TaintKind kind) {
none()
}
/**
* Holds if the given `kind` of taint cannot pass from variable `fromvar` to variable `tovar`.
* This predicate is present for completeness. Most `TaintFlow` implementations will not need to override it.
*/
predicate prunedFlowStepVar(EssaVariable fromvar, EssaVariable tovar, TaintKind kind) { none() }
}
/** /**
* A source of taintedness. * A source of taintedness.
* Users of the taint tracking library should override this * Users of the taint tracking library should override this