Skip to content
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

NIFI-7913 Set Enabled TLS Protocols on ListenSMTP #4599

Closed
wants to merge 2 commits into from

Conversation

exceptionfactory
Copy link
Contributor

Description of PR

NIFI-7913 Adds getEnabledProtocols to TlsConfiguration and updates ListenSMTP to call SSLSocket.setEnabledProtocols() when configured with SSL Context Service. The getEnabledProtocols() implementation in StandardTlsConfiguration supports the generic values of SSL and TLS as well as specified TLS protocol versions. The getEnabledProtocols() implementation returns legacy TLS 1.0 and TLS 1.1 only when the configured protocol property is set to SSL. Otherwise the implementation returns either the specific protocol version configured, or the secure supported protocol versions based on the running JVM version. ListenSMTP unit tests updated to include expected exceptions for misaligned TLS protocol version.

Based on this implementation, ListenSMTP configured with StandardRestrictedSSLContextService will work as follows:

Java 8

  • TLS Protocol set to TLS enables TLSv1.2

Java 11

  • TLS Protocol set to TLS enables TLSv1.2 and TLSv1.3

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there a JIRA ticket associated with this PR? Is it referenced
    in the commit message?

  • Does your PR title start with NIFI-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.

  • Has your PR been rebased against the latest commit within the target branch (typically main)?

  • Is your initial contribution a single, squashed commit? Additional commits in response to PR reviewer feedback should be made on this branch and pushed to allow change tracking. Do not squash or use --force when pushing to allow for clean monitoring of changes.

For code changes:

  • Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi folder?
  • Have you written or updated unit tests to verify your changes?
  • Have you verified that the full build is successful on JDK 8?
  • Have you verified that the full build is successful on JDK 11?
  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-assembly?
  • If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-assembly?
  • If adding new Properties, have you added .displayName in addition to .name (programmatic access) for each of the new properties?

For documentation related changes:

  • Have you ensured that format looks appropriate for the output in which it is rendered?

Note:

Please ensure that once the PR is submitted, you check GitHub Actions CI for build issues and submit an update to your PR as soon as possible.

… ListenSMTP to set enabled protocols on SSL Sockets
@thenatog
Copy link
Contributor

thenatog commented Dec 8, 2020

Will review

@thenatog
Copy link
Contributor

thenatog commented Dec 9, 2020

Spent a while testing this out. I found that your change appears to work - it will follow the context service's setting for the protocol restriction (setting 1.3 only, or setting TLS allowed 1.2 and 1.3).

I found a small security issue I will disclose separately.

@thenatog thenatog closed this in 7bff64b Dec 10, 2020
driesva pushed a commit to driesva/nifi that referenced this pull request Mar 19, 2021
… ListenSMTP to set enabled protocols on SSL Sockets

NIFI-7913 Changed order of supported protocols to match existing comments in SSLContextService

This closes apache#4599

Signed-off-by: Nathan Gough <thenatog@gmail.com>
krisztina-zsihovszki pushed a commit to krisztina-zsihovszki/nifi that referenced this pull request Jun 28, 2022
… ListenSMTP to set enabled protocols on SSL Sockets

NIFI-7913 Changed order of supported protocols to match existing comments in SSLContextService

This closes apache#4599

Signed-off-by: Nathan Gough <thenatog@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants