Convert TLS connection adapter to connection middleware #11109
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
jkotalik
commented
Jun 11, 2019
jkotalik
commented
Jun 11, 2019
davidfowl
reviewed
Jun 11, 2019
src/Servers/Kestrel/Core/src/Internal/HttpsConnectionMiddleware.cs
Outdated
Show resolved
Hide resolved
davidfowl
reviewed
Jun 11, 2019
src/Servers/Kestrel/Core/src/Internal/HttpsConnectionMiddleware.cs
Outdated
Show resolved
Hide resolved
davidfowl
reviewed
Jun 11, 2019
src/Servers/Kestrel/Core/src/Internal/HttpsConnectionMiddleware.cs
Outdated
Show resolved
Hide resolved
halter73
previously approved these changes
Jun 11, 2019
|
@aspnet/build thoughts? |
|
Can you open an issue on https://github.com/dotnet/core-eng/? Looks like an outage or error within Helix
|
halter73
reviewed
Jun 13, 2019
davidfowl
force-pushed
the
jkotalik/connectionMiddleware
branch
from
cc695ae to
90a4b81
Compare
halter73
reviewed
Jun 19, 2019
| @@ -69,33 +71,58 @@ public HttpsConnectionAdapter(HttpsConnectionAdapterOptions options, ILoggerFact | |||
| } | |||
|
|
|||
| _options = options; | |||
| _logger = loggerFactory?.CreateLogger<HttpsConnectionAdapter>() ?? (ILogger)NullLogger.Instance; | |||
| _logger = loggerFactory?.CreateLogger<HttpsConnectionMiddleware>(); | |||
| } | |||
halter73
reviewed
Jun 19, 2019
| { | ||
| SslStream sslStream; | ||
| bool certificateRequired; | ||
| var feature = new Core.Internal.TlsConnectionFeature(); | ||
| context.Features.Set<ITlsConnectionFeature>(feature); | ||
| context.Features.Set<ITlsHandshakeFeature>(feature); | ||
|
|
||
| // TODO: Handle the cases where this can be null |
There was a problem hiding this comment.
I'll tackle them across the code base in a separate PR.
There was a problem hiding this comment.
I'm aware there are TODO comments in Kestrel. That one was checked in five years ago when Kestrel was still a test server. I bet you could find a bunch more recent examples than that, but I don't really see the point. I'm glad you don't plan to just leave this there though.
halter73
reviewed
Jun 19, 2019
| minimumSegmentSize: memoryPoolFeature.MemoryPool.GetMinimumSegmentSize() | ||
| ); | ||
|
|
||
| // TODO: eventually make SslDuplexStream : Stream, IDuplexPipe to avoid RawStream allocation and pipe allocations |
There was a problem hiding this comment.
This TODO on the other hand is fine. This seems like a fair bit of work.
halter73
approved these changes
Jun 19, 2019
|
/azp run AspNetCore-ci |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
This comment was made automatically. If there is a problem contact [email protected]. I've triaged the above build. I've created/commented on the following issue(s) |
jkotalik
commented
Jun 20, 2019
| @@ -215,64 +215,90 @@ private HttpConnectionContext CreateDerivedContext(IDuplexPipe transport) | |||
|
|
|||
| private void StopProcessingNextRequest() | |||
| { | |||
| ProtocolSelectionState previousState; | |||
There was a problem hiding this comment.
Do we still need these changes?
jkotalik
commented
Jun 20, 2019
|
I'm going to go ahead and merge this. I'm OOF friday so I'd like to be able to revert if something is failing due to this change. |
ghost
deleted the
amcasey
added
area-networking
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.
Handles part of #4623
Pretty much is a direct port of aspnet/KestrelHttpServer#2849 to 3.0. Honestly confused why we didn't merge it before, things overall looked good with it.
Follow up:
Drafting to write some follow-up questions to make sure design wise everything looks good.