Skip to content

Commit 8e52483

Browse files
owen-mcowen-mc
committed
Add df-manual models in manually modeled classes
1 parent 2bd0883 commit 8e52483

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

‎java/ql/lib/ext/java.io.model.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,13 @@ extensions:
7878
- ["java.io", "File", True, "getCanonicalFile", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
7979
- ["java.io", "File", True, "getCanonicalPath", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
8080
- ["java.io", "File", True, "getName", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
81+
- ["java.io", "File", True, "getParent", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
8182
- ["java.io", "File", True, "getParentFile", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
8283
- ["java.io", "File", True, "getPath", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
8384
- ["java.io", "File", True, "toPath", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
8485
- ["java.io", "File", True, "toString", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
8586
- ["java.io", "File", True, "toURI", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
87+
- ["java.io", "File", True, "toURL", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
8688
- ["java.io", "FilterOutputStream", True, "FilterOutputStream", "(OutputStream)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
8789
- ["java.io", "InputStream", True, "read", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
8890
- ["java.io", "InputStream", True, "read", "(byte[])", "", "Argument[this]", "Argument[0]", "taint", "manual"]

‎java/ql/lib/ext/java.lang.model.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ extensions:
114114
- ["java.lang", "String", False, "indent", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
115115
- ["java.lang", "String", False, "intern", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
116116
- ["java.lang", "String", False, "join", "", "", "Argument[0..1]", "ReturnValue", "taint", "manual"]
117+
- ["java.lang", "String", False, "lines", "()", "", "Argument[this]", "ReturnValue.Element", "taint", "df-generated"]
117118
- ["java.lang", "String", False, "repeat", "(int)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
118119
- ["java.lang", "String", False, "replace", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
119120
- ["java.lang", "String", False, "replace", "", "", "Argument[1]", "ReturnValue", "taint", "manual"]
@@ -239,14 +240,14 @@ extensions:
239240
- ["java.lang", "Thread", "interrupt", "()", "summary", "manual"]
240241
- ["java.lang", "Thread", "sleep", "(long)", "summary", "manual"]
241242
- ["java.lang", "Thread", "start", "()", "summary", "manual"]
242-
- ["java.lang", "Throwable", "addSuppressed", "(Throwable)", "summary", "manual"]
243-
- ["java.lang", "Throwable", "fillInStackTrace", "()", "summary", "manual"]
244-
- ["java.lang", "Throwable", "getStackTrace", "()", "summary", "manual"]
245-
- ["java.lang", "Throwable", "getSuppressed", "()", "summary", "manual"]
246-
- ["java.lang", "Throwable", "printStackTrace", "()", "summary", "manual"]
247-
- ["java.lang", "Throwable", "printStackTrace", "(PrintStream)", "summary", "manual"]
248-
- ["java.lang", "Throwable", "printStackTrace", "(PrintWriter)", "summary", "manual"]
249-
- ["java.lang", "Throwable", "setStackTrace", "(StackTraceElement[])", "summary", "manual"]
243+
- ["java.lang", "Throwable", "addSuppressed", "(Throwable)", "summary", "df-manual"]
244+
- ["java.lang", "Throwable", "fillInStackTrace", "()", "summary", "df-manual"]
245+
- ["java.lang", "Throwable", "getStackTrace", "()", "summary", "df-manual"]
246+
- ["java.lang", "Throwable", "getSuppressed", "()", "summary", "df-manual"]
247+
- ["java.lang", "Throwable", "printStackTrace", "()", "summary", "df-manual"]
248+
- ["java.lang", "Throwable", "printStackTrace", "(PrintStream)", "summary", "df-manual"]
249+
- ["java.lang", "Throwable", "printStackTrace", "(PrintWriter)", "summary", "df-manual"]
250+
- ["java.lang", "Throwable", "setStackTrace", "(StackTraceElement[])", "summary", "df-manual"]
250251
# The below APIs have numeric flow and are currently being stored as neutral models.
251252
# These may be changed to summary models with kinds "value-numeric" and "taint-numeric" (or similar) in the future.
252253
- ["java.lang", "Double", "doubleToLongBits", "(double)", "summary", "manual"] # taint-numeric

‎java/ql/lib/ext/java.util.model.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,15 @@ extensions:
5858
- ["java.util", "Collection", True, "toArray", "", "", "Argument[this].Element", "Argument[0].ArrayElement", "value", "manual"]
5959
- ["java.util", "Collection", True, "toArray", "", "", "Argument[this].Element", "ReturnValue.ArrayElement", "value", "manual"]
6060
- ["java.util", "Collections", False, "addAll", "(Collection,Object[])", "", "Argument[1].ArrayElement", "Argument[0].Element", "value", "manual"]
61+
- ["java.util", "Collections", False, "asLifoQueue", "(Deque)", "", "Argument[0].Element", "ReturnValue.Element", "value", "df-manual"]
6162
- ["java.util", "Collections", False, "checkedCollection", "(Collection,Class)", "", "Argument[0].Element", "ReturnValue.Element", "value", "manual"]
6263
- ["java.util", "Collections", False, "checkedList", "(List,Class)", "", "Argument[0].Element", "ReturnValue.Element", "value", "manual"]
6364
- ["java.util", "Collections", False, "checkedMap", "(Map,Class,Class)", "", "Argument[0].MapKey", "ReturnValue.MapKey", "value", "manual"]
6465
- ["java.util", "Collections", False, "checkedMap", "(Map,Class,Class)", "", "Argument[0].MapValue", "ReturnValue.MapValue", "value", "manual"]
6566
- ["java.util", "Collections", False, "checkedNavigableMap", "(NavigableMap,Class,Class)", "", "Argument[0].MapKey", "ReturnValue.MapKey", "value", "manual"]
6667
- ["java.util", "Collections", False, "checkedNavigableMap", "(NavigableMap,Class,Class)", "", "Argument[0].MapValue", "ReturnValue.MapValue", "value", "manual"]
6768
- ["java.util", "Collections", False, "checkedNavigableSet", "(NavigableSet,Class)", "", "Argument[0].Element", "ReturnValue.Element", "value", "manual"]
69+
- ["java.util", "Collections", False, "checkedQueue", "(Queue,Class)", "", "Argument[0].Element", "ReturnValue.Element", "value", "df-manual"]
6870
- ["java.util", "Collections", False, "checkedSet", "(Set,Class)", "", "Argument[0].Element", "ReturnValue.Element", "value", "manual"]
6971
- ["java.util", "Collections", False, "checkedSortedMap", "(SortedMap,Class,Class)", "", "Argument[0].MapKey", "ReturnValue.MapKey", "value", "manual"]
7072
- ["java.util", "Collections", False, "checkedSortedMap", "(SortedMap,Class,Class)", "", "Argument[0].MapValue", "ReturnValue.MapValue", "value", "manual"]
@@ -309,6 +311,9 @@ extensions:
309311
- ["java.util", "Queue", True, "poll", "()", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
310312
- ["java.util", "Queue", True, "remove", "()", "", "Argument[this].Element", "ReturnValue", "value", "manual"]
311313
- ["java.util", "ResourceBundle", True, "getString", "(String)", "", "Argument[this].MapValue", "ReturnValue", "value", "manual"]
314+
- ["java.util", "Scanner", True, "findAll", "(Pattern)", "", "Argument[this]", "ReturnValue.Element", "taint", "df-manual"]
315+
- ["java.util", "Scanner", True, "findAll", "(String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
316+
- ["java.util", "Scanner", True, "match", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
312317
- ["java.util", "Scanner", True, "Scanner", "", "", "Argument[0]", "Argument[this]", "taint", "manual"]
313318
- ["java.util", "Scanner", True, "findInLine", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
314319
- ["java.util", "Scanner", True, "findWithinHorizon", "", "", "Argument[this]", "ReturnValue", "taint", "manual"]
@@ -428,6 +433,8 @@ extensions:
428433
- ["java.util", "Collections", "emptyList", "()", "summary", "manual"]
429434
- ["java.util", "Collections", "emptyMap", "()", "summary", "manual"]
430435
- ["java.util", "Collections", "emptySet", "()", "summary", "manual"]
436+
- ["java.util", "Collections", "newSetFromMap", "", "summary", "df-manual"]
437+
- ["java.util", "Collections", "reverseOrder", "", "summary", "df-manual"]
431438
- ["java.util", "Collections", "sort", "", "summary", "manual"]
432439
- ["java.util", "Enumeration", "hasMoreElements", "()", "summary", "manual"]
433440
- ["java.util", "EnumSet", "allOf", "(Class)", "summary", "df-manual"]
@@ -520,6 +527,11 @@ extensions:
520527
- ["java.util", "Optional", "isPresent", "()", "summary", "manual"]
521528
- ["java.util", "Random", "nextInt", "(int)", "summary", "manual"]
522529
- ["java.util", "ResourceBundle", "getBundle", "", "summary", "df-manual"]
530+
- ["java.util", "Scanner", "delimiter", "()", "summary", "df-generated"]
531+
- ["java.util", "Scanner", "hasNext", "(Pattern)", "summary", "df-generated"]
532+
- ["java.util", "Scanner", "hasNext", "(String)", "summary", "df-generated"]
533+
- ["java.util", "Scanner", "ioException", "()", "summary", "df-generated"]
534+
- ["java.util", "Scanner", "locale", "()", "summary", "df-generated"]
523535
- ["java.util", "Set", "contains", "(Object)", "summary", "manual"]
524536
- ["java.util", "Set", "isEmpty", "()", "summary", "manual"]
525537
- ["java.util", "Set", "size", "()", "summary", "manual"]

0 commit comments

Comments
 (0)