Skip to content

Commit 48acff9

Browse files
committed
Remove unneeded code
1 parent 9e3594f commit 48acff9

File tree

2 files changed

+1
-37
lines changed

2 files changed

+1
-37
lines changed

java/ql/lib/semmle/code/java/security/ImplicitPendingIntents.qll

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -40,38 +40,6 @@ private class PendingIntentSentSinkModels extends SinkModelCsv {
4040
}
4141
}
4242

43-
// TODO: Remove when https://github.com/github/codeql/pull/6397 gets merged
44-
private class DefaultIntentRedirectionSinkModel extends SinkModelCsv {
45-
override predicate row(string row) {
46-
row =
47-
[
48-
"android.app;Activity;true;bindService;;;Argument[0];intent-start",
49-
"android.app;Activity;true;bindServiceAsUser;;;Argument[0];intent-start",
50-
"android.app;Activity;true;startActivityAsCaller;;;Argument[0];intent-start",
51-
"android.app;Activity;true;startActivityForResult;(Intent,int);;Argument[0];intent-start",
52-
"android.app;Activity;true;startActivityForResult;(Intent,int,Bundle);;Argument[0];intent-start",
53-
"android.app;Activity;true;startActivityForResult;(String,Intent,int,Bundle);;Argument[1];intent-start",
54-
"android.app;Activity;true;startActivityForResultAsUser;;;Argument[0];intent-start",
55-
"android.content;Context;true;startActivities;;;Argument[0];intent-start",
56-
"android.content;Context;true;startActivity;;;Argument[0];intent-start",
57-
"android.content;Context;true;startActivityAsUser;;;Argument[0];intent-start",
58-
"android.content;Context;true;startActivityFromChild;;;Argument[1];intent-start",
59-
"android.content;Context;true;startActivityFromFragment;;;Argument[1];intent-start",
60-
"android.content;Context;true;startActivityIfNeeded;;;Argument[0];intent-start",
61-
"android.content;Context;true;startForegroundService;;;Argument[0];intent-start",
62-
"android.content;Context;true;startService;;;Argument[0];intent-start",
63-
"android.content;Context;true;startServiceAsUser;;;Argument[0];intent-start",
64-
"android.content;Context;true;sendBroadcast;;;Argument[0];intent-start",
65-
"android.content;Context;true;sendBroadcastAsUser;;;Argument[0];intent-start",
66-
"android.content;Context;true;sendBroadcastWithMultiplePermissions;;;Argument[0];intent-start",
67-
"android.content;Context;true;sendStickyBroadcast;;;Argument[0];intent-start",
68-
"android.content;Context;true;sendStickyBroadcastAsUser;;;Argument[0];intent-start",
69-
"android.content;Context;true;sendStickyOrderedBroadcast;;;Argument[0];intent-start",
70-
"android.content;Context;true;sendStickyOrderedBroadcastAsUser;;;Argument[0];intent-start"
71-
]
72-
}
73-
}
74-
7543
// TODO: Remove when https://github.com/github/codeql/pull/6823 gets merged
7644
private class NotificationBuildersSummaryModels extends SummaryModelCsv {
7745
override predicate row(string row) {

java/ql/lib/semmle/code/java/security/ImplicitPendingIntentsQuery.qll

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,7 @@ class ImplicitPendingIntentStartConf extends TaintTracking::Configuration {
3636
super.allowImplicitRead(node, c)
3737
or
3838
this.isSink(node) and
39-
(
40-
allowIntentExtrasImplicitRead(node, c) or
41-
c.(DataFlow::SyntheticFieldContent).getField() =
42-
["android.app.Notification.action", "androidx.slice.Slice.action"]
43-
)
39+
allowIntentExtrasImplicitRead(node, c)
4440
or
4541
this.isAdditionalTaintStep(node, _) and
4642
c.(DataFlow::FieldContent).getType() instanceof PendingIntent

0 commit comments

Comments
 (0)