Abbreviate isSink

smowton · smowton · commit 333130b2a487 · 2022-02-25T17:33:07.000Z
diff --git a/java/ql/src/experimental/Security/CWE/CWE-208/TimingAttackAgainstHeader.ql b/java/ql/src/experimental/Security/CWE/CWE-208/TimingAttackAgainstHeader.ql
@@ -28,12 +28,6 @@ private predicate isNonConstantEqualsCallArgument(Expr e) {
     e = [call.getQualifier(), call.getAnArgument()]
 }
 
-
-class NonConstantTimeComparisonSink extends DataFlow::Node {
-  NonConstantTimeComparisonSink() {
-      isNonConstantEqualsCallArgument(this.asExpr())
-  }    
-} 
 class ClientSuppliedIpTokenCheck extends DataFlow::Node {
   ClientSuppliedIpTokenCheck() {
     exists(MethodAccess ma |
@@ -52,7 +46,7 @@ class NonConstantTimeComparisonConfig extends TaintTracking::Configuration {
 
   override predicate isSource(DataFlow::Node source) { source instanceof ClientSuppliedIpTokenCheck }
 
-  override predicate isSink(DataFlow::Node sink) { sink instanceof NonConstantTimeComparisonSink }
+  override predicate isSink(DataFlow::Node sink) { isNonConstantEqualsCallArgument(sink.asExpr()) }
 }
 
 from DataFlow::PathNode source, DataFlow::PathNode sink, NonConstantTimeComparisonConfig conf
