Add nio http transport to security plugin#32018
Merged
Tim-Brooks merged 7 commits intoelastic:masterfrom Jul 13, 2018
Merged
Conversation
Collaborator
|
Pinging @elastic/es-security |
jaymode
approved these changes
Jul 13, 2018
Member
jaymode
left a comment
There was a problem hiding this comment.
I left a couple of minor thing but otherwise LGTM
| ServerTransportFilter.extractClientCertificates(logger, threadContext, handler.engine(), nettyChannel); | ||
| SSLEngine sslEngine = SSLEngineUtils.getSSLEngine(httpChannel); | ||
|
|
||
| ServerTransportFilter.extractClientCertificates(logger, threadContext, sslEngine, httpChannel); |
Member
There was a problem hiding this comment.
can we move extractClientCertificates into SSLEngineUtils and just have a single method call here?
|
|
||
| import javax.net.ssl.SSLEngine; | ||
|
|
||
| public class SSLEngineUtils { |
Member
There was a problem hiding this comment.
add a private constructor so no one instantiates this class
| import static org.elasticsearch.xpack.core.security.transport.SSLExceptionHelper.isNotSslRecordException; | ||
| import static org.elasticsearch.xpack.core.security.transport.SSLExceptionHelper.isReceivedCertificateUnknownException; | ||
|
|
||
| public class SecurityHttpExceptionHandler implements BiConsumer<HttpChannel, Exception> { |
|
|
||
| import java.util.function.Predicate; | ||
|
|
||
| public class NioIPFilter implements Predicate<NioSocketChannel> { |
Contributor
Author
|
@jaymode Can you confirm those were the changes you wanted in regard to |
Member
|
@tbrooks8 that was exactly what I was looking for 👍 |
Member
|
Looks like this broke the Kibana CI, which builds from source. I expect we will also see this with the release manager tonight as well. https://kibana-ci.elastic.co/job/elastic+kibana+master+multijob-x-pack/563/console |
Tim-Brooks
added a commit
to Tim-Brooks/elasticsearch
that referenced
this pull request
Jul 14, 2018
The build was broken due to some issues with the merging of elastic#32018. A method that was public went private before the PR was merged. That did not cause a merge conflict (so the PR was merged successfully). But it did cause the build to fail.
Tim-Brooks
added a commit
that referenced
this pull request
Jul 14, 2018
The build was broken due to some issues with the merging of #32018. A method that was public went private before the PR was merged. That did not cause a merge conflict (so the PR was merged successfully). But it did cause the build to fail.
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
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.
This is related to #27260. It adds the SecurityNioHttpServerTransport
to the security plugin. It randomly uses the nio http transport in
security integration tests.