Skip to content

Swift: Correct a couple of FilePath models. #14682

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

Merged
merged 3 commits into from
Nov 6, 2023
Merged

Swift: Correct a couple of FilePath models. #14682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0619192
Swift: Correct a couple of FilePath models.
geoffw0 Nov 3, 2023
55ec27f
Merge branch 'main' into filepathclosure
geoffw0 Nov 3, 2023
426bdc0
Swift: Add test cases. Before the changes, we don't catch the cases f…
geoffw0 Nov 6, 2023
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
6 changes: 4 additions & 2 deletions swift/ql/lib/codeql/swift/frameworks/StandardLibrary/FilePath.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ private class FilePathSummaries extends SummaryModelCsv {
";FilePath;true;init(root:_:);;;Argument[0..1];ReturnValue;taint",
";FilePath;true;init(root:components:);;;Argument[0..1];ReturnValue;taint",
";FilePath;true;encode(to:);;;Argument[-1];Argument[0];taint",
";FilePath;true;withCString(_:);;;Argument[-1];Argument[0].Parameter[0];taint",
";FilePath;true;withPlatformString(_:);;;Argument[-1];Argument[0].Parameter[0];taint",
";FilePath;true;withCString(_:);;;Argument[-1];Argument[0].Parameter[0].CollectionElement;taint",
";FilePath;true;withCString(_:);;;Argument[0].ReturnValue;ReturnValue;taint",
";FilePath;true;withPlatformString(_:);;;Argument[-1];Argument[0].Parameter[0].CollectionElement;taint",
";FilePath;true;withPlatformString(_:);;;Argument[0].ReturnValue;ReturnValue;taint",
";FilePath;true;append(_:);;;Argument[0];Argument[-1];taint",
";FilePath;true;appending(_:);;;Argument[-1..0];ReturnValue;taint",
";FilePath;true;lexicallyNormalized();;;Argument[-1];ReturnValue;taint",
Expand Down
30 changes: 21 additions & 9 deletions swift/ql/test/library-tests/dataflow/taint/libraries/files.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ func sourceString() -> String { return "" }
func sourceCCharArray() -> [CChar] { return [] }
func sourceCString() -> UnsafePointer<CChar> { return (nil as UnsafePointer<CChar>?)! }
func sourceDecoder() -> Decoder { return (nil as Decoder?)! }

func sink(filePath: FilePath) { }
func sink(string: String) { }
func sink(component: FilePath.Component) { }
func sink(root: FilePath.Root) { }
func sink(componentView: FilePath.ComponentView) { }
func sink(encoder: Encoder) { }
func sink<T>(ptr: UnsafePointer<T>) { }
func sink<T>(arg: T) { }

func test_files(e1: Encoder) {
// --- FilePath.Root, FilePath.Component ---
Expand Down Expand Up @@ -148,39 +148,51 @@ func test_files(e1: Encoder) {
sink(filePath: tainted.lexicallyResolving(clean)!) // $ tainted=133
sink(filePath: clean.lexicallyResolving(tainted)!) // $ tainted=133

let _ = clean.withCString({
let result1 = clean.withCString({
ptr in
sink(ptr: ptr)
sink(arg: ptr[0])
return sourceString()
})
let _ = tainted.withCString({
sink(string: result1) // $ tainted=155
let result2 = tainted.withCString({
ptr in
sink(ptr: ptr) // $ tainted=133
sink(arg: ptr[0]) // $ tainted=133
return ""
})
sink(string: result2)

let _ = clean.withPlatformString({
let result3 = clean.withPlatformString({
ptr in
sink(ptr: ptr)
sink(arg: ptr[0])
sink(string: String(platformString: ptr))
sink(string: String(validatingPlatformString: ptr)!)
return sourceString()
})
let _ = tainted.withPlatformString({
sink(string: result3) // $ tainted=172
let result4 = tainted.withPlatformString({
ptr in
sink(ptr: ptr) // $ tainted=133
sink(arg: ptr[0]) // $ tainted=133
sink(string: String(platformString: ptr)) // $ tainted=133
sink(string: String(validatingPlatformString: ptr)!) // $ tainted=133
return ""
})
sink(string: result4)

var fp1 = FilePath("")
sink(filePath: fp1)
fp1.append(sourceString())
sink(filePath: fp1) // $ tainted=175
sink(filePath: fp1) // $ tainted=187
fp1.append("")
sink(filePath: fp1) // $ tainted=175
sink(filePath: fp1) // $ tainted=187

sink(filePath: clean.appending(""))
sink(filePath: clean.appending(sourceString())) // $ tainted=181
sink(filePath: clean.appending(sourceString())) // $ tainted=193
sink(filePath: tainted.appending("")) // $ tainted=133
sink(filePath: tainted.appending(sourceString())) // $ tainted=133 tainted=183
sink(filePath: tainted.appending(sourceString())) // $ tainted=133 tainted=195

// --- FilePath member variables ---

Expand Down