-
Notifications
You must be signed in to change notification settings - Fork 125
add support for redirect limits #113
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.
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
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
939aa2b
add support for redirect limits
artemredkin fca5971
Merge branch 'master' into redirect_limits
artemredkin b437111
add tests on linux
artemredkin 99096c5
review fix: guard instead of if
artemredkin b3ffde6
review fixes
artemredkin bbad11f
review fix: make redirect state be part for request
artemredkin 8b0e613
review fix: add a separate error for redirect cycles
artemredkin aa843de
Update Sources/AsyncHTTPClient/HTTPClient.swift
artemredkin 7e2edf8
review fixes
artemredkin 5209dc3
rewrite backpressure test
artemredkin cf2d4d6
fix formatting
artemredkin 86cf7d8
Merge branch 'master' into redirect_limits
artemredkin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -131,7 +131,7 @@ class HTTPClientTests: XCTestCase { | |
let httpBin = HTTPBin(ssl: false) | ||
let httpsBin = HTTPBin(ssl: true) | ||
let httpClient = HTTPClient(eventLoopGroupProvider: .createNew, | ||
configuration: HTTPClient.Configuration(certificateVerification: .none, followRedirects: true)) | ||
configuration: HTTPClient.Configuration(certificateVerification: .none, redirectConfiguration: .follow(max: 10, allowCycles: true))) | ||
|
||
defer { | ||
XCTAssertNoThrow(try httpClient.syncShutdown()) | ||
|
@@ -149,7 +149,7 @@ class HTTPClientTests: XCTestCase { | |
func testHttpHostRedirect() throws { | ||
let httpBin = HTTPBin(ssl: false) | ||
let httpClient = HTTPClient(eventLoopGroupProvider: .createNew, | ||
configuration: HTTPClient.Configuration(certificateVerification: .none, followRedirects: true)) | ||
configuration: HTTPClient.Configuration(certificateVerification: .none, redirectConfiguration: .follow(max: 10, allowCycles: true))) | ||
|
||
defer { | ||
XCTAssertNoThrow(try httpClient.syncShutdown()) | ||
|
@@ -526,7 +526,7 @@ class HTTPClientTests: XCTestCase { | |
let httpBin = HTTPBin() | ||
let eventLoopGroup = MultiThreadedEventLoopGroup(numberOfThreads: 5) | ||
let httpClient = HTTPClient(eventLoopGroupProvider: .shared(eventLoopGroup), | ||
configuration: HTTPClient.Configuration(followRedirects: true)) | ||
configuration: HTTPClient.Configuration(redirectConfiguration: .follow(max: 10, allowCycles: true))) | ||
defer { | ||
XCTAssertNoThrow(try httpClient.syncShutdown()) | ||
XCTAssertNoThrow(try eventLoopGroup.syncShutdownGracefully()) | ||
|
@@ -568,6 +568,7 @@ class HTTPClientTests: XCTestCase { | |
func testDecompression() throws { | ||
let httpBin = HTTPBin(compress: true) | ||
let httpClient = HTTPClient(eventLoopGroupProvider: .createNew, configuration: .init(decompression: .enabled(limit: .none))) | ||
|
||
defer { | ||
XCTAssertNoThrow(try httpClient.syncShutdown()) | ||
XCTAssertNoThrow(try httpBin.shutdown()) | ||
|
@@ -603,6 +604,7 @@ class HTTPClientTests: XCTestCase { | |
func testDecompressionLimit() throws { | ||
let httpBin = HTTPBin(compress: true) | ||
let httpClient = HTTPClient(eventLoopGroupProvider: .createNew, configuration: .init(decompression: .enabled(limit: .ratio(10)))) | ||
|
||
defer { | ||
XCTAssertNoThrow(try httpClient.syncShutdown()) | ||
XCTAssertNoThrow(try httpBin.shutdown()) | ||
|
@@ -626,4 +628,34 @@ class HTTPClientTests: XCTestCase { | |
XCTFail("Unexptected error: \(error)") | ||
} | ||
} | ||
|
||
func testLoopDetectionRedirectLimit() throws { | ||
let httpBin = HTTPBin(ssl: true) | ||
let httpClient = HTTPClient(eventLoopGroupProvider: .createNew, | ||
configuration: HTTPClient.Configuration(certificateVerification: .none, redirectConfiguration: .follow(max: 5, allowCycles: false))) | ||
|
||
defer { | ||
XCTAssertNoThrow(try httpClient.syncShutdown()) | ||
XCTAssertNoThrow(try httpBin.shutdown()) | ||
} | ||
|
||
XCTAssertThrowsError(try httpClient.get(url: "https://localhost:\(httpBin.port)/redirect/infinite1").wait(), "Should fail with redirect limit") { error in | ||
XCTAssertEqual(error as! HTTPClientError, HTTPClientError.redirectCycleDetected) | ||
} | ||
} | ||
|
||
func testCountRedirectLimit() throws { | ||
let httpBin = HTTPBin(ssl: true) | ||
let httpClient = HTTPClient(eventLoopGroupProvider: .createNew, | ||
configuration: HTTPClient.Configuration(certificateVerification: .none, redirectConfiguration: .follow(max: 5, allowCycles: true))) | ||
|
||
defer { | ||
XCTAssertNoThrow(try httpClient.syncShutdown()) | ||
XCTAssertNoThrow(try httpBin.shutdown()) | ||
} | ||
|
||
XCTAssertThrowsError(try httpClient.get(url: "https://localhost:\(httpBin.port)/redirect/infinite1").wait(), "Should fail with redirect limit") { error in | ||
XCTAssertEqual(error as! HTTPClientError, HTTPClientError.redirectLimitReached) | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do we want to test case insensitive loops? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. do you mean when schema and path are capitalised differently? |
||
} |
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.
Uh oh!
There was an error while loading. Please reload this page.