Skip to content

Commit 7af1e96

Browse files
aschackmullaschackmull
authored
Merge pull request #14032 from aschackmull/java/mad-nestednames
Java: Use nested names in MaD signatures.
2 parents 6b58d11 + ebe3f61 commit 7af1e96

27 files changed

+405
-369
lines changed

‎java/ql/lib/change-notes/2023-08-23-mad-nestednames.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
category: minorAnalysis
3+
---
4+
* Fixed the MaD signature specifications to use proper nested type names.

‎java/ql/lib/ext/android.app.model.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ extensions:
3535
- ["android.app", "NotificationManager", True, "notifyAsPackage", "(String,String,int,Notification)", "", "Argument[3]", "pending-intents", "manual"]
3636
- ["android.app", "NotificationManager", True, "notifyAsUser", "(String,int,Notification,UserHandle)", "", "Argument[2]", "pending-intents", "manual"]
3737
- ["android.app", "PendingIntent", False, "send", "(Context,int,Intent)", "", "Argument[2]", "pending-intents", "manual"]
38-
- ["android.app", "PendingIntent", False, "send", "(Context,int,Intent,OnFinished,Handler)", "", "Argument[2]", "pending-intents", "manual"]
39-
- ["android.app", "PendingIntent", False, "send", "(Context,int,Intent,OnFinished,Handler,String)", "", "Argument[2]", "pending-intents", "manual"]
40-
- ["android.app", "PendingIntent", False, "send", "(Context,int,Intent,OnFinished,Handler,String,Bundle)", "", "Argument[2]", "pending-intents", "manual"]
38+
- ["android.app", "PendingIntent", False, "send", "(Context,int,Intent,PendingIntent$OnFinished,Handler)", "", "Argument[2]", "pending-intents", "manual"]
39+
- ["android.app", "PendingIntent", False, "send", "(Context,int,Intent,PendingIntent$OnFinished,Handler,String)", "", "Argument[2]", "pending-intents", "manual"]
40+
- ["android.app", "PendingIntent", False, "send", "(Context,int,Intent,PendingIntent$OnFinished,Handler,String,Bundle)", "", "Argument[2]", "pending-intents", "manual"]
4141
- addsTo:
4242
pack: codeql/java-all
4343
extensible: summaryModel
4444
data:
4545
- ["android.app", "Notification$Action", True, "Action", "(int,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
4646
- ["android.app", "Notification$Action", True, "getExtras", "", "", "Argument[this].SyntheticField[android.content.Intent.extras]", "ReturnValue", "value", "manual"]
47-
- ["android.app", "Notification$Action$Builder", True, "Builder", "(Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
47+
- ["android.app", "Notification$Action$Builder", True, "Builder", "(Notification$Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
4848
- ["android.app", "Notification$Action$Builder", True, "Builder", "(Icon,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
4949
- ["android.app", "Notification$Action$Builder", True, "Builder", "(int,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
5050
- ["android.app", "Notification$Action$Builder", True, "addExtras", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
@@ -59,19 +59,19 @@ extensions:
5959
- ["android.app", "Notification$Action$Builder", True, "setAuthenticationRequired", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
6060
- ["android.app", "Notification$Action$Builder", True, "setContextual", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
6161
- ["android.app", "Notification$Action$Builder", True, "setSemanticAction", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
62-
- ["android.app", "Notification$BigPictureStyle", True, "BigPictureStyle", "(Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
62+
- ["android.app", "Notification$BigPictureStyle", True, "BigPictureStyle", "(Notification$Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
6363
- ["android.app", "Notification$BigPictureStyle", True, "bigLargeIcon", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
6464
- ["android.app", "Notification$BigPictureStyle", True, "bigPicture", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
6565
- ["android.app", "Notification$BigPictureStyle", True, "setBigContentTitle", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
6666
- ["android.app", "Notification$BigPictureStyle", True, "setContentDescription", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
6767
- ["android.app", "Notification$BigPictureStyle", True, "setSummaryText", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
6868
- ["android.app", "Notification$BigPictureStyle", True, "showBigPictureWhenCollapsed", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
69-
- ["android.app", "Notification$BigTextStyle", True, "BigTextStyle", "(Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
69+
- ["android.app", "Notification$BigTextStyle", True, "BigTextStyle", "(Notification$Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
7070
- ["android.app", "Notification$BigTextStyle", True, "bigText", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
7171
- ["android.app", "Notification$BigTextStyle", True, "setBigContentTitle", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
7272
- ["android.app", "Notification$BigTextStyle", True, "setSummaryText", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
7373
- ["android.app", "Notification$Builder", True, "addAction", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
74-
- ["android.app", "Notification$Builder", True, "addAction", "(Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
74+
- ["android.app", "Notification$Builder", True, "addAction", "(Notification$Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
7575
- ["android.app", "Notification$Builder", True, "addAction", "(int,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
7676
- ["android.app", "Notification$Builder", True, "addExtras", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
7777
- ["android.app", "Notification$Builder", True, "addExtras", "", "", "Argument[0].MapKey", "Argument[this].SyntheticField[android.content.Intent.extras].MapKey", "value", "manual"]
@@ -137,11 +137,11 @@ extensions:
137137
- ["android.app", "Notification$Builder", True, "setVibrate", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
138138
- ["android.app", "Notification$Builder", True, "setVisibility", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
139139
- ["android.app", "Notification$Builder", True, "setWhen", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
140-
- ["android.app", "Notification$InboxStyle", True, "InboxStyle", "(Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
140+
- ["android.app", "Notification$InboxStyle", True, "InboxStyle", "(Notification$Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
141141
- ["android.app", "Notification$InboxStyle", True, "addLine", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
142142
- ["android.app", "Notification$InboxStyle", True, "setBigContentTitle", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
143143
- ["android.app", "Notification$InboxStyle", True, "setSummaryText", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
144-
- ["android.app", "Notification$MediaStyle", True, "MediaStyle", "(Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
144+
- ["android.app", "Notification$MediaStyle", True, "MediaStyle", "(Notification$Builder)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
145145
- ["android.app", "Notification$MediaStyle", True, "setMediaSession", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
146146
- ["android.app", "Notification$MediaStyle", True, "setShowActionsInCompactView", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
147147
- ["android.app", "Notification$Style", True, "build", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]

‎java/ql/lib/ext/android.database.sqlite.model.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ extensions:
2222
- ["android.database.sqlite", "SQLiteDatabase", False, "query", "(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[2]", "sql-injection", "manual"]
2323
- ["android.database.sqlite", "SQLiteDatabase", False, "query", "(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[3]", "sql-injection", "manual"]
2424
- ["android.database.sqlite", "SQLiteDatabase", False, "query", "(boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[5..8]", "sql-injection", "manual"]
25-
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[2]", "sql-injection", "manual"]
26-
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[3]", "sql-injection", "manual"]
27-
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[4]", "sql-injection", "manual"]
28-
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[6..9]", "sql-injection", "manual"]
29-
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[2]", "sql-injection", "manual"]
30-
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[3]", "sql-injection", "manual"]
31-
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[4]", "sql-injection", "manual"]
32-
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[6..9]", "sql-injection", "manual"]
25+
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[2]", "sql-injection", "manual"]
26+
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[3]", "sql-injection", "manual"]
27+
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[4]", "sql-injection", "manual"]
28+
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String)", "", "Argument[6..9]", "sql-injection", "manual"]
29+
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[2]", "sql-injection", "manual"]
30+
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[3]", "sql-injection", "manual"]
31+
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[4]", "sql-injection", "manual"]
32+
- ["android.database.sqlite", "SQLiteDatabase", False, "queryWithFactory", "(SQLiteDatabase$CursorFactory,boolean,String,String[],String,String[],String,String,String,String,CancellationSignal)", "", "Argument[6..9]", "sql-injection", "manual"]
3333
- ["android.database.sqlite", "SQLiteDatabase", False, "rawQuery", "(String,String[])", "", "Argument[0]", "sql-injection", "manual"]
3434
- ["android.database.sqlite", "SQLiteDatabase", False, "rawQuery", "(String,String[],CancellationSignal)", "", "Argument[0]", "sql-injection", "manual"]
35-
- ["android.database.sqlite", "SQLiteDatabase", False, "rawQueryWithFactory", "(CursorFactory,String,String[],String)", "", "Argument[1]", "sql-injection", "manual"]
36-
- ["android.database.sqlite", "SQLiteDatabase", False, "rawQueryWithFactory", "(CursorFactory,String,String[],String,CancellationSignal)", "", "Argument[1]", "sql-injection", "manual"]
35+
- ["android.database.sqlite", "SQLiteDatabase", False, "rawQueryWithFactory", "(SQLiteDatabase$CursorFactory,String,String[],String)", "", "Argument[1]", "sql-injection", "manual"]
36+
- ["android.database.sqlite", "SQLiteDatabase", False, "rawQueryWithFactory", "(SQLiteDatabase$CursorFactory,String,String[],String,CancellationSignal)", "", "Argument[1]", "sql-injection", "manual"]
3737
- ["android.database.sqlite", "SQLiteDatabase", False, "update", "(String,ContentValues,String,String[])", "", "Argument[0]", "sql-injection", "manual"]
3838
- ["android.database.sqlite", "SQLiteDatabase", False, "update", "(String,ContentValues,String,String[])", "", "Argument[2]", "sql-injection", "manual"]
3939
- ["android.database.sqlite", "SQLiteDatabase", False, "updateWithOnConflict", "(String,ContentValues,String,String[],int)", "", "Argument[0]", "sql-injection", "manual"]

‎java/ql/lib/ext/androidx.core.app.model.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extensions:
1616
- ["androidx.core.app", "NotificationCompat$Action", True, "Action", "(IconCompat,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
1717
- ["androidx.core.app", "NotificationCompat$Action", True, "Action", "(int,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
1818
- ["androidx.core.app", "NotificationCompat$Action", True, "getExtras", "", "", "Argument[this].SyntheticField[android.content.Intent.extras]", "ReturnValue", "value", "manual"]
19-
- ["androidx.core.app", "NotificationCompat$Action$Builder", True, "Builder", "(Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
19+
- ["androidx.core.app", "NotificationCompat$Action$Builder", True, "Builder", "(NotificationCompat$Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
2020
- ["androidx.core.app", "NotificationCompat$Action$Builder", True, "Builder", "(IconCompat,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
2121
- ["androidx.core.app", "NotificationCompat$Action$Builder", True, "Builder", "(int,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
2222
- ["androidx.core.app", "NotificationCompat$Action$Builder", True, "addExtras", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
@@ -41,7 +41,7 @@ extensions:
4141
- ["androidx.core.app", "NotificationCompat$BigTextStyle", True, "setBigContentTitle", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
4242
- ["androidx.core.app", "NotificationCompat$BigTextStyle", True, "setSummaryText", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
4343
- ["androidx.core.app", "NotificationCompat$Builder", True, "addAction", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
44-
- ["androidx.core.app", "NotificationCompat$Builder", True, "addAction", "(Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
44+
- ["androidx.core.app", "NotificationCompat$Builder", True, "addAction", "(NotificationCompat$Action)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
4545
- ["androidx.core.app", "NotificationCompat$Builder", True, "addAction", "(int,CharSequence,PendingIntent)", "", "Argument[2]", "Argument[this]", "taint", "manual"]
4646
- ["androidx.core.app", "NotificationCompat$Builder", True, "addExtras", "", "", "Argument[this]", "ReturnValue", "value", "manual"]
4747
- ["androidx.core.app", "NotificationCompat$Builder", True, "addExtras", "", "", "Argument[0].MapKey", "Argument[this].SyntheticField[android.content.Intent.extras].MapKey", "value", "manual"]

0 commit comments

Comments
 (0)