Skip to content

fix parsing url strings with brackets #423

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
Vkt0r merged 4 commits into from
Jul 15, 2019
Merged

fix parsing url strings with brackets #423

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
28b56f0
fix for URLComponents returning nil
nejcvivod Jul 11, 2019
e89aec1
add unit test for change to parser
nejcvivod Jul 11, 2019
3c3663b
update changelog & fix invalid test
nejcvivod Jul 15, 2019
83bcc7a
update changelog + remove IOSafetyTests
nejcvivod Jul 15, 2019
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
Next Next commit
fix for URLComponents returning nil 
* when path contains 'weird' characters (`[]`) URLComponents won't parse it, so the path will be nil
  * escaping the string with `urlQueryAllowed` character set fixes this issue
  • Loading branch information
@nejcvivod
nejcvivod committed Jul 11, 2019
commit 28b56f05f710b37a04deef8df7bc6fe2954657b9
3 changes: 2 additions & 1 deletion XCode/Sources/HttpParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ public class HttpParser {
}
let request = HttpRequest()
request.method = statusLineTokens[0]
let urlComponents = URLComponents(string: statusLineTokens[1])
let encodedPath = statusLineTokens[1].addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? statusLineTokens[1]
let urlComponents = URLComponents(string: encodedPath)
request.path = urlComponents?.path ?? ""
request.queryParams = urlComponents?.queryItems?.map { ($0.name, $0.value ?? "") } ?? []
request.headers = try readHeaders(socket)
Expand Down