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

[22024] Improve OpenSSL lifecycle handling (backport #5384) #5405

Merged
merged 3 commits into from
Nov 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 14, 2024

Description

This PR fixes a crash in OpenSSL provoked when the atexit callback from openssl is triggered upon process destruction, making it to trigger a SIGSEV on an already released OpenSSL resource.

In addition, OpenSSL is now a Meyers singleton attached to RTPSDomainImpl.

In accordance with the best practices using OpenSSL and its documentation:

  • Initialization is done through OpenSSL_init_crypto (available in all versions along with the OPENSSL_INIT_NO_ATEXIT option) that makes atexit not being registered.
  • If atexit is not registered, user has to explicitly call OpenSSL_cleanup() (also, supported across versions).

@Mergifyio backport 3.1.x 3.0.x 2.14.x 2.10.x

Contributor Checklist

  • Commit messages follow the project guidelines.

  • The code follows the style guidelines of this project.

  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • Any new/modified methods have been properly documented using Doxygen.

  • Any new configuration API has an equivalent XML API (with the corresponding XSD extension)

  • Changes are backport compatible: they do NOT break ABI nor change library core behavior.

  • Changes are API compatible.

  • N/A New feature has been added to the versions.md file (if applicable).

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • If this is a critical bug fix, backports to the critical-only supported branches have been requested.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #5384 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Nov 14, 2024
Copy link
Contributor Author

mergify bot commented Nov 14, 2024

Cherry-pick of 44310c4 has failed:

On branch mergify/bp/mergify/bp/2.14.x/pr-5386/pr-5384
Your branch is up to date with 'origin/mergify/bp/2.14.x/pr-5386'.

You are currently cherry-picking commit 44310c4f8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/rtps/security/SecurityManager.cpp
	modified:   src/cpp/security/OpenSSLInit.hpp
	modified:   test/blackbox/common/BlackboxTestsSecurity.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/RTPSDomainImpl.hpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Nov 14, 2024
14 tasks
@MiguelCompany MiguelCompany added this to the v2.14.4 milestone Nov 14, 2024
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL November 15, 2024 07:09
@Mario-DL Mario-DL removed the conflicts Backport PR wich git cherry pick failed label Nov 15, 2024
@Mario-DL Mario-DL requested review from Mario-DL and removed request for Mario-DL November 15, 2024 07:10
@github-actions github-actions bot added the ci-pending PR which CI is running label Nov 15, 2024
@Mario-DL
Copy link
Member

Base automatically changed from mergify/bp/2.14.x/pr-5386 to 2.14.x November 19, 2024 09:17
Mario-DL and others added 2 commits November 19, 2024 10:22
* Refs #22024: Add BB test

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #22024: Make OpenSSLInit Mayers singleton

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #22024: Fix: Do not register atexit in OPenSSL. Instead, Comply with OpenSSL initialization and destruction.

Signed-off-by: Mario Dominguez <[email protected]>

* Refs #22024: Do not reference OpenSSLInit if security features are no present

Signed-off-by: Mario Dominguez <[email protected]>

---------

Signed-off-by: Mario Dominguez <[email protected]>
(cherry picked from commit 44310c4)

# Conflicts:
#	src/cpp/rtps/RTPSDomainImpl.hpp
Signed-off-by: Mario Dominguez <[email protected]>
src/cpp/security/OpenSSLInit.hpp Outdated Show resolved Hide resolved
Signed-off-by: Mario Dominguez <[email protected]>
@Mario-DL Mario-DL force-pushed the mergify/bp/mergify/bp/2.14.x/pr-5386/pr-5384 branch from 1a1f29c to 8777127 Compare November 19, 2024 09:32
Copy link
Member

@Mario-DL Mario-DL left a comment

Choose a reason for hiding this comment

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

LGTM, failed tests are unrelated with the changes. Failing the same in nighties

@MiguelCompany MiguelCompany merged commit 725e8ab into 2.14.x Nov 20, 2024
13 of 18 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/mergify/bp/2.14.x/pr-5386/pr-5384 branch November 20, 2024 07:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants