Remove unneeded code

atorralba · atorralba · commit 48acff9262eb · 2022-01-14T10:32:00.000+01:00
diff --git a/java/ql/lib/semmle/code/java/security/ImplicitPendingIntents.qll b/java/ql/lib/semmle/code/java/security/ImplicitPendingIntents.qll
@@ -40,38 +40,6 @@ private class PendingIntentSentSinkModels extends SinkModelCsv {
   }
 }
 
-// TODO: Remove when https://github.com/github/codeql/pull/6397 gets merged
-private class DefaultIntentRedirectionSinkModel extends SinkModelCsv {
-  override predicate row(string row) {
-    row =
-      [
-        "android.app;Activity;true;bindService;;;Argument[0];intent-start",
-        "android.app;Activity;true;bindServiceAsUser;;;Argument[0];intent-start",
-        "android.app;Activity;true;startActivityAsCaller;;;Argument[0];intent-start",
-        "android.app;Activity;true;startActivityForResult;(Intent,int);;Argument[0];intent-start",
-        "android.app;Activity;true;startActivityForResult;(Intent,int,Bundle);;Argument[0];intent-start",
-        "android.app;Activity;true;startActivityForResult;(String,Intent,int,Bundle);;Argument[1];intent-start",
-        "android.app;Activity;true;startActivityForResultAsUser;;;Argument[0];intent-start",
-        "android.content;Context;true;startActivities;;;Argument[0];intent-start",
-        "android.content;Context;true;startActivity;;;Argument[0];intent-start",
-        "android.content;Context;true;startActivityAsUser;;;Argument[0];intent-start",
-        "android.content;Context;true;startActivityFromChild;;;Argument[1];intent-start",
-        "android.content;Context;true;startActivityFromFragment;;;Argument[1];intent-start",
-        "android.content;Context;true;startActivityIfNeeded;;;Argument[0];intent-start",
-        "android.content;Context;true;startForegroundService;;;Argument[0];intent-start",
-        "android.content;Context;true;startService;;;Argument[0];intent-start",
-        "android.content;Context;true;startServiceAsUser;;;Argument[0];intent-start",
-        "android.content;Context;true;sendBroadcast;;;Argument[0];intent-start",
-        "android.content;Context;true;sendBroadcastAsUser;;;Argument[0];intent-start",
-        "android.content;Context;true;sendBroadcastWithMultiplePermissions;;;Argument[0];intent-start",
-        "android.content;Context;true;sendStickyBroadcast;;;Argument[0];intent-start",
-        "android.content;Context;true;sendStickyBroadcastAsUser;;;Argument[0];intent-start",
-        "android.content;Context;true;sendStickyOrderedBroadcast;;;Argument[0];intent-start",
-        "android.content;Context;true;sendStickyOrderedBroadcastAsUser;;;Argument[0];intent-start"
-      ]
-  }
-}
-
 // TODO: Remove when https://github.com/github/codeql/pull/6823 gets merged
 private class NotificationBuildersSummaryModels extends SummaryModelCsv {
   override predicate row(string row) {
diff --git a/java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll b/java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll
@@ -36,11 +36,7 @@ class ImplicitPendingIntentStartConf extends TaintTracking::Configuration {
     super.allowImplicitRead(node, c)
     or
     this.isSink(node) and
-    (
-      allowIntentExtrasImplicitRead(node, c) or
-      c.(DataFlow::SyntheticFieldContent).getField() =
-        ["android.app.Notification.action", "androidx.slice.Slice.action"]
-    )
+    allowIntentExtrasImplicitRead(node, c)
     or
     this.isAdditionalTaintStep(node, _) and
     c.(DataFlow::FieldContent).getType() instanceof PendingIntent
