Java: Rename returnsTaint to returnsTaintFrom

Author: joefarebrother

java/ql/src/semmle/code/java/dataflow/FlowSteps.qll

@@ -34,15 +34,15 @@ class AdditionalTaintStep extends Unit {
 /**
  * A method that preserves taint.
  *
- * Extend this class and override at least one of `returnsTaint` or `transfersTaint`
+ * Extend this class and override at least one of `returnsTaintFrom` or `transfersTaint`
  * to add additional taint steps through a method that should apply to all taint configurations.
  */
 abstract class TaintPreservingMethod extends Method {
   /**
    * Holds if this method returns tainted data when `arg` tainted.
    * `arg` is a parameter index, or is -1 to indicate the qualifier.
    */
-  predicate returnsTaint(int arg) { none() }
+  predicate returnsTaintFrom(int arg) { none() }
 
   /**
    * Holds if this method writes tainted data to `sink` when `src` is tainted.
@@ -61,7 +61,7 @@ private class StringTaintPreservingMethod extends TaintPreservingMethod {
               "trim"])
   }
 
-  override predicate returnsTaint(int arg) {
+  override predicate returnsTaintFrom(int arg) {
     arg = -1
     or
     this.hasName(["concat", "copyValueOf"]) and arg = 0

java/ql/src/semmle/code/java/dataflow/internal/TaintTrackingUtil.qll

@@ -378,7 +378,7 @@ private predicate taintPreservingQualifierToMethod(Method m) {
     )
   )
   or
-  m.(TaintPreservingMethod).returnsTaint(-1)
+  m.(TaintPreservingMethod).returnsTaintFrom(-1)
 }
 
 private class StringReplaceMethod extends TaintPreservingMethod {
@@ -391,7 +391,7 @@ private class StringReplaceMethod extends TaintPreservingMethod {
     )
   }
 
-  override predicate returnsTaint(int arg) { arg = 1 }
+  override predicate returnsTaintFrom(int arg) { arg = 1 }
 }
 
 private predicate unsafeEscape(MethodAccess ma) {
@@ -523,7 +523,7 @@ private predicate taintPreservingArgumentToMethod(Method method, int arg) {
   method.hasName("append") and
   arg = 0
   or
-  method.(TaintPreservingMethod).returnsTaint(arg)
+  method.(TaintPreservingMethod).returnsTaintFrom(arg)
 }
 
 /**
@@ -740,7 +740,7 @@ private class FormatterMethod extends TaintPreservingMethod {
     hasName(["format", "out", "toString"])
   }
 
-  override predicate returnsTaint(int arg) { arg = [-1 .. getNumberOfParameters()] }
+  override predicate returnsTaintFrom(int arg) { arg = [-1 .. getNumberOfParameters()] }
 
   override predicate transfersTaint(int src, int sink) {
     sink = -1 and

java/ql/src/semmle/code/java/frameworks/Guice.qll

@@ -38,5 +38,5 @@ class GuiceProvider extends Interface {
 private class OverridingGetMethod extends TaintPreservingMethod {
   OverridingGetMethod() { this = any(GuiceProvider gp).getAnOverridingGetMethod() }
 
-  override predicate returnsTaint(int arg) { arg = -1 }
+  override predicate returnsTaintFrom(int arg) { arg = -1 }
 }

java/ql/src/semmle/code/java/frameworks/Protobuf.qll

@@ -59,7 +59,7 @@ class ProtobufMessageLite extends Interface {
 private class TaintPreservingGetterMethod extends TaintPreservingMethod {
   TaintPreservingGetterMethod() { this = any(ProtobufMessageLite p).getAGetterMethod() }
 
-  override predicate returnsTaint(int arg) { arg = -1 }
+  override predicate returnsTaintFrom(int arg) { arg = -1 }
 }
 
 private class TaintPreservingParseFromMethod extends TaintPreservingMethod {
@@ -69,5 +69,5 @@ private class TaintPreservingParseFromMethod extends TaintPreservingMethod {
     exists(ProtobufMessageLite m | this = m.getAParseFromMethod())
   }
 
-  override predicate returnsTaint(int arg) { arg = 0 }
+  override predicate returnsTaintFrom(int arg) { arg = 0 }
 }

java/ql/src/semmle/code/java/frameworks/android/Intent.qll

@@ -40,5 +40,5 @@ class IntentGetExtraMethod extends Method, TaintPreservingMethod {
     getDeclaringType() instanceof TypeIntent
   }
 
-  override predicate returnsTaint(int arg) { arg = -1 }
+  override predicate returnsTaintFrom(int arg) { arg = -1 }
 }

java/ql/src/semmle/code/java/frameworks/android/SQLite.qll

@@ -253,7 +253,7 @@ private class QueryBuilderBuildMethod extends TaintPreservingMethod {
     argument != 3
   }
 
-  override predicate returnsTaint(int arg) { argument = arg }
+  override predicate returnsTaintFrom(int arg) { argument = arg }
 }
 
 private class QueryBuilderAppendMethod extends TaintPreservingMethod {
@@ -282,7 +282,7 @@ private class UnsafeAppendUtilMethod extends TaintPreservingMethod {
     this.hasName(["appendSelectionArgs", "concatenateWhere"])
   }
 
-  override predicate returnsTaint(int arg) { arg = [0 .. getNumberOfParameters()] }
+  override predicate returnsTaintFrom(int arg) { arg = [0 .. getNumberOfParameters()] }
 }
 
 private class TaintPreservingQueryMethod extends TaintPreservingMethod {
@@ -296,5 +296,5 @@ private class TaintPreservingQueryMethod extends TaintPreservingMethod {
     this.hasName("query")
   }
 
-  override predicate returnsTaint(int arg) { arg = 0 }
+  override predicate returnsTaintFrom(int arg) { arg = 0 }
 }

java/ql/src/semmle/code/java/frameworks/jackson/JacksonSerializability.qll

@@ -38,7 +38,7 @@ library class JacksonWriteValueMethod extends TaintPreservingMethod {
     getParameter(getNumberOfParameters() - 1).getType() instanceof TypeObject
   }
 
-  override predicate returnsTaint(int arg) {
+  override predicate returnsTaintFrom(int arg) {
     getNumberOfParameters() = 1 and
     arg = 0
   }