Safe URL encoding #38
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kwasniew
commented
May 15, 2023
| @@ -41,19 +41,6 @@ final class PollerTests: XCTestCase { | |||
| XCTAssertEqual(poller.etag, "W/\"7c-GUwjw43L+nPpd9TY5PHtsXJueiM\"") | |||
| } | |||
|
|
|||
| func testStartCompletesWithUrlError() { | |||
There was a problem hiding this comment.
this scenario is impossible now
kwasniew
commented
May 15, 2023
| @@ -40,19 +40,22 @@ public class UnleashClientBase { | |||
| var metrics: Metrics | |||
|
|
|||
| public init(unleashUrl: String, clientKey: String, refreshInterval: Int = 15, metricsInterval: Int = 30, disableMetrics: Bool = false, appName: String = "unleash-swift-client", environment: String? = nil, poller: Poller? = nil, metrics: Metrics? = nil) { | |||
| guard let url = URL(string: unleashUrl), url.scheme != nil else { | |||
There was a problem hiding this comment.
make sure URL passed to the client is correct so that we eliminate impossible URLs down the line
kwasniew
commented
May 15, 2023
| return unleashUrl + "?" + params.joined(separator: "&") | ||
| func formatURL(context: [String: String]) -> URL? { | ||
| var components = URLComponents(url: unleashUrl, resolvingAgainstBaseURL: false) | ||
| components?.queryItems = context.map { key, value in |
There was a problem hiding this comment.
safe URL manipulation instead of string concatenation. No matter what strings we put into context the URL is always correctly escaped
thomasheartman
approved these changes
May 15, 2023
|
@thomasheartman Actually I deliberately left the public API of the Unleash client as string and we turn it into a URL in the very first step, failing otherwise. API of the poller changes but it's used internally. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the changes
Important files
Discussion points