Use CSV models

atorralba · atorralba · commit 21b70a009e99 · 2021-10-18T11:07:58.000+02:00
diff --git a/java/ql/src/semmle/code/java/security/AndroidIntentRedirection.qll b/java/ql/src/semmle/code/java/security/AndroidIntentRedirection.qll
@@ -2,6 +2,7 @@
 
 import java
 private import semmle.code.java.dataflow.DataFlow
+private import semmle.code.java.dataflow.ExternalFlow
 private import semmle.code.java.frameworks.android.Intent
 
 /**
@@ -28,19 +29,5 @@ class IntentRedirectionAdditionalTaintStep extends Unit {
 
 /** Default sink for Intent redirection vulnerabilities. */
 private class DefaultIntentRedirectionSink extends IntentRedirectionSink {
-  DefaultIntentRedirectionSink() {
-    exists(MethodAccess ma, Method m |
-      ma.getMethod() = m and
-      this.asExpr() = ma.getAnArgument() and
-      (
-        this.asExpr().getType() instanceof TypeIntent
-        or
-        this.asExpr().getType().(Array).getComponentType() instanceof TypeIntent
-      )
-    |
-      m instanceof StartActivityMethod or
-      m instanceof StartServiceMethod or
-      m instanceof SendBroadcastMethod
-    )
-  }
+  DefaultIntentRedirectionSink() { sinkNode(this, "intent-start") }
 }
diff --git a/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.java b/java/ql/test/query-tests/security/CWE-940/AndroidIntentRedirectionTest.java
@@ -18,7 +18,6 @@ public void onCreate(Bundle savedInstanceState) {
             startActivityAsUser(intent, null); // $ hasAndroidIntentRedirection
             startActivityAsUser(intent, null, null); // $ hasAndroidIntentRedirection
             startActivityAsCaller(intent, null, false, 0); // $ hasAndroidIntentRedirection
-            startActivityAsUserFromFragment(null, intent, 0, null, null); // $ hasAndroidIntentRedirection
             startActivityForResult(intent, 0); // $ hasAndroidIntentRedirection
             startActivityForResult(intent, 0, null); // $ hasAndroidIntentRedirection
             startActivityForResult(null, intent, 0, null); // $ hasAndroidIntentRedirection
