Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swift: Update models for better Swift 6 compatibility. #17891

Merged
merged 5 commits into from
Nov 5, 2024
Merged

Swift: Update models for better Swift 6 compatibility. #17891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f0f739
Swift: Update dropFirst / dropLast / reversed models for Swift 6.
geoffw0 Nov 1, 2024
be12649
Swift: Update joined models for Swift 6.
geoffw0 Nov 1, 2024
954fbc4
Swift: Update prefix / suffix models for Swift 6.
geoffw0 Nov 1, 2024
f3ea75d
Swift: Further modelling updates / gap filling that doesn't seem to a…
geoffw0 Nov 1, 2024
24c4e87
Swift: Fix stray [].
geoffw0 Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Collection.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,35 @@ private class CollectionSummaries extends SummaryModelCsv {
row =
[
";Collection;true;prefix(_:);;;Argument[-1];ReturnValue;taint",
";Collection;true;prefix(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";Collection;true;prefix(through:);;;Argument[-1];ReturnValue;taint",
";Collection;true;prefix(through:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";Collection;true;prefix(upTo:);;;Argument[-1];ReturnValue;taint",
";Collection;true;prefix(upTo:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";Collection;true;prefix(while:);;;Argument[-1];ReturnValue;taint",
";Collection;true;prefix(while:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";Collection;true;suffix(_:);;;Argument[-1];ReturnValue;taint",
";Collection;true;suffix(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";Collection;true;suffix(from:);;;Argument[-1];ReturnValue;taint",
";Collection;true;suffix(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";Collection;true;dropFirst(_:);;;Argument[-1];ReturnValue;taint",
";Collection;true;dropFirst(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";Collection;true;dropLast(_:);;;Argument[-1];ReturnValue;taint",
";Collection;true;dropLast(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";Collection;true;flatMap(_:);;;Argument[-1];ReturnValue;taint",
";Collection;true;flatMap(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";Collection;true;map(_:);;;Argument[-1];ReturnValue;taint",
";Collection;true;map(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";Collection;true;split(maxSplits:omittingEmptySubsequences:whereSeparator:);;;Argument[-1];ReturnValue;taint",
";Collection;true;split(separator:maxSplits:omittingEmptySubsequences:);;;Argument[-1];ReturnValue;taint",
";Collection;true;removeFirst();;;Argument[-1];ReturnValue;taint",
";Collection;true;popFirst();;;Argument[-1];ReturnValue;taint",
";Collection;true;randomElement();;;Argument[-1].CollectionElement;ReturnValue.OptionalSome;value",
";Collection;true;randomElement(using:);;;Argument[-1].CollectionElement;ReturnValue.OptionalSome;value",
";Collection;true;trimmingPrefix(_:);;;Argument[-1];ReturnValue;taint",
";Collection;true;trimmingPrefix(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";Collection;true;trimmingPrefix(while:);;;Argument[-1];ReturnValue;taint",
";Collection;true;trimmingPrefix(while:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";RangeReplaceableCollection;true;init(_:);;;Argument[0];ReturnValue.CollectionElement;taint",
";RangeReplaceableCollection;true;init(_:);;;Argument[0].CollectionElement;ReturnValue.CollectionElement;value",
";RangeReplaceableCollection;true;init(repeating:count:);;;Argument[0];ReturnValue.CollectionElement;value",
Expand All @@ -38,9 +55,19 @@ private class CollectionSummaries extends SummaryModelCsv {
";RangeReplaceableCollection;true;insert(_:at:);;;Argument[0];Argument[-1];taint",
";RangeReplaceableCollection;true;replaceSubrange(_:with:);;;Argument[1];Argument[-1];taint",
";RangeReplaceableCollection;true;replaceSubrange(_:with:);;;Argument[1].CollectionElement;Argument[-1].CollectionElement;value",
";BidirectionalCollection;true;dropLast(_:);;;Argument[-1];ReturnValue;taint",
";BidirectionalCollection;true;dropLast(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";BidirectionalCollection;true;joined(separator:);;;Argument[-1..0];ReturnValue;taint",
";BidirectionalCollection;true;joined(separator:);;;Argument[-1].CollectionElement;ReturnValue;taint",
";BidirectionalCollection;true;joined(separator:);;;Argument[-1].CollectionElement.CollectionElement;ReturnValue.CollectionElement;value",
";BidirectionalCollection;true;last(where:);;;Argument[-1];ReturnValue;taint",
";BidirectionalCollection;true;popLast();;;Argument[-1];ReturnValue;taint",
";BidirectionalCollection;true;reversed();;;Argument[-1];ReturnValue;taint",
";BidirectionalCollection;true;reversed();;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";BidirectionalCollection;true;suffix(_:);;;Argument[-1];ReturnValue;taint",
";BidirectionalCollection;true;suffix(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";BidirectionalCollection;true;suffix(from:);;;Argument[-1];ReturnValue;taint",
";BidirectionalCollection;true;suffix(_:);;;Argument[-1].CollectionElement;ReturnValue.CollectionElement;value",
";MutableCollection;true;withContiguousMutableStorageIfAvailable(_:);;;Argument[-1];Argument[0].Parameter[0].CollectionElement;taint",
";MutableCollection;true;withContiguousMutableStorageIfAvailable(_:);;;Argument[-1].CollectionElement;Argument[0].Parameter[0].CollectionElement;value",
";MutableCollection;true;withContiguousMutableStorageIfAvailable(_:);;;Argument[0].Parameter[0].CollectionElement;Argument[-1].CollectionElement;value",
Expand Down
1 change: 1 addition & 0 deletions swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Sequence.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ private class SequenceSummaries extends SummaryModelCsv {
";Sequence;true;joined();;;Argument[-1].CollectionElement.CollectionElement;ReturnValue.CollectionElement;value",
";Sequence;true;joined(separator:);;;Argument[0..-1];ReturnValue;taint",
";Sequence;true;joined(separator:);;;Argument[-1].CollectionElement;ReturnValue;taint",
";Sequence;true;joined(separator:);;;Argument[-1].CollectionElement.CollectionElement;ReturnValue.CollectionElement;value",
";Sequence;true;first(where:);;;Argument[-1].CollectionElement;ReturnValue;value",
";Sequence;true;withContiguousStorageIfAvailable(_:);;;Argument[-1];Argument[0].Parameter[0].CollectionElement;taint",
";Sequence;true;withContiguousStorageIfAvailable(_:);;;Argument[-1].CollectionElement;Argument[0].Parameter[0].CollectionElement;value",
Expand Down
6 changes: 6 additions & 0 deletions swift/ql/lib/codeql/swift/frameworks/StandardLibrary/String.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,12 @@ private class StringFieldsInheritTaint extends TaintInheritingContent,
namedTypeDecl.getFullName() = "CustomDebugStringConvertible" and
fieldDecl.getName() = "debugDescription"
or
namedTypeDecl.getFullName() = "CustomTestStringConvertible" and
fieldDecl.getName() = "testDescription"
or
namedTypeDecl.getFullName() = "CustomURLRepresentationParameterConvertible" and
fieldDecl.getName() = "urlRepresentationParameter"
or
namedTypeDecl.getFullName() = "Substring" and
fieldDecl.getName() = "base"
) and
Expand Down
7 changes: 0 additions & 7 deletions swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
testFailures
| optionset.swift:60:49:61:1 | // $ tainted=60\n | Missing result: tainted=60 |
| optionset.swift:65:58:66:1 | // $ tainted=65\n | Missing result: tainted=65 |
| string.swift:237:35:238:1 | // $ tainted=217\n | Missing result: tainted=217 |
| string.swift:244:33:245:1 | // $ tainted=217\n | Missing result: tainted=217 |
| string.swift:270:40:271:1 | // $ tainted=217\n | Missing result: tainted=217 |
| string.swift:271:40:272:1 | // $ tainted=217\n | Missing result: tainted=217 |
| string.swift:272:42:273:1 | // $ tainted=217\n | Missing result: tainted=217 |
| string.swift:586:19:587:1 | // $ tainted=565\n | Missing result: tainted=565 |
| string.swift:587:27:588:1 | // $ tainted=565\n | Missing result: tainted=565 |
| string.swift:599:35:600:1 | // $ tainted=599\n | Missing result: tainted=599 |
| string.swift:605:30:606:1 | // $ tainted=605\n | Missing result: tainted=605 |
failures
Loading