Fix bodyLengthMissmatch error handling
#490
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
dnadoba
force-pushed
the
dn-body-length-missmatch
branch
from
df9b524 to
e097940
Compare
fabianfett
reviewed
Nov 24, 2021
| let metadata = RequestFramingMetadata(connectionClose: false, body: .fixedSize(0)) | ||
| XCTAssertEqual(state.startRequest(head: requestHead, metadata: metadata), .sendRequestHead(requestHead, startBody: false)) | ||
|
|
||
| XCTAssertEqual(state.errorHappened(ArbitraryError()), .failRequest(ArbitraryError(), .close)) |
There was a problem hiding this comment.
The error is not included in the Equatable conformance. To make sure you will need to unwrap the enum with a guard and make the error equatable.
There was a problem hiding this comment.
okay... but we have 18 places where we need to fix this.
There was a problem hiding this comment.
doing it correctly here is a start ;)
There was a problem hiding this comment.
fixed all of them :)
because `HTTPRequestStateMachine.Action` Equatable conformance ignores the error completly
dnadoba
commented
Nov 24, 2021
| guard case .failRequest(let error, .close) = state.requestCancelled() else { | ||
| return XCTFail("unexpected action") | ||
| } | ||
| XCTAssertEqual(error as? HTTPClientError, .cancelled) |
There was a problem hiding this comment.
Previously we checked for .remoteConnectionClosed but that was probably wrong and I think we actually wanted to check for .cancel.
This reverts commit 3a6a256.
fabianfett
approved these changes
Nov 24, 2021
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.
Motivation
If we detect that a user tries to write more bytes as initially specified, we fail the request with a
HTTPClientError. bodyLengthMissmatch. However, we forgot to update our internal state that the request is failed. One way this manifests is that subsequent errors are also propagated through the stack but should be silently ignored because the request is already failed.In addition, two compound cases in the switch statement inside of
errorHappened(_:)had a where clause which did only apply to the last case but should have applied to each compound cases. This affects thebodyLengthMissmatcherror handling but also all error handling because errors were sometimes treated asNIOSSLError.uncleanShutdowneven if they were something completely different.Changes
.bodyLengthMissmatcherrorNIOSSLError.uncleanShutdown