Skip to content

MINIFICPP-1692 - TLSSocket hangs when no more data is available#1218

Closed
adamdebreceni wants to merge 8 commits intoapache:mainfrom
adamdebreceni:MINIFICPP-1693
Closed

MINIFICPP-1692 - TLSSocket hangs when no more data is available#1218
adamdebreceni wants to merge 8 commits intoapache:mainfrom
adamdebreceni:MINIFICPP-1693

Conversation

@adamdebreceni
Copy link
Contributor

Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.

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 MINIFICPP-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?

For code changes:

  • 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?
  • If applicable, have you updated the NOTICE file?

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 results for build issues and submit an update to your PR as soon as possible.

@adamdebreceni adamdebreceni changed the title MINIFICPP-1693 - TLSSocket hangs when no more data is available MINIFICPP-1692 - TLSSocket hangs when no more data is available Nov 30, 2021
@adamdebreceni
Copy link
Contributor Author

I am trying to whip up some tests for this fix

LogTestController::getInstance().setTrace<minifi::io::TLSServerSocket>();
LogTestController::getInstance().setTrace<minifi::io::TLSContext>();

auto server = std::make_unique<SimpleSSLTestServer>(TLSv1_2_server_method(), 0, key_dir);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to use the TSLServerSocket but couldn't trigger the observed behavior to verify the fix, so I factored out the SimpleSSLTestServer and used that one instead, now the test should fail when the fix is reverted but pass otherwise

Copy link
Member

@martinzink martinzink left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, kudos for the test 👍

Copy link
Member

@szaszm szaszm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for going back on my vote, but I found this issue while doing my pre-merge tests.

@szaszm szaszm closed this in 0553df4 Dec 1, 2021
@szaszm
Copy link
Member

szaszm commented Dec 1, 2021

Forgot to repost a +1, but the change resolved the test issue, so I merged the PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants