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

[20439] Expose Authentication Handshake Properties (backport #4435) #4487

Merged
merged 2 commits into from
Mar 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 1, 2024

This is an automatic backport of pull request #4435 done by Mergify.
Cherry-pick of da58d84 has failed:

On branch mergify/bp/2.10.x/pr-4435
Your branch is up to date with 'origin/2.10.x'.

You are currently cherry-picking commit da58d84ae.
  (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:   include/fastdds/rtps/attributes/PropertyPolicy.h
	modified:   include/fastdds/rtps/common/Property.h
	modified:   src/cpp/rtps/attributes/PropertyPolicy.cpp
	modified:   src/cpp/rtps/security/SecurityManager.cpp
	modified:   test/blackbox/CMakeLists.txt
	modified:   test/blackbox/api/fastrtps_deprecated/PubSubReader.hpp
	modified:   test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp
	new file:   test/blackbox/auth_handshake_props_profile.xml
	modified:   test/blackbox/common/BlackboxTestsSecurity.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/security/SecurityManager.h
	both modified:   versions.md

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 commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

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

mergify bot commented Mar 1, 2024

Cherry-pick of da58d84 has failed:

On branch mergify/bp/2.10.x/pr-4435
Your branch is up to date with 'origin/2.10.x'.

You are currently cherry-picking commit da58d84ae.
  (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:   include/fastdds/rtps/attributes/PropertyPolicy.h
	modified:   include/fastdds/rtps/common/Property.h
	modified:   src/cpp/rtps/attributes/PropertyPolicy.cpp
	modified:   src/cpp/rtps/security/SecurityManager.cpp
	modified:   test/blackbox/CMakeLists.txt
	modified:   test/blackbox/api/fastrtps_deprecated/PubSubReader.hpp
	modified:   test/blackbox/api/fastrtps_deprecated/PubSubWriter.hpp
	new file:   test/blackbox/auth_handshake_props_profile.xml
	modified:   test/blackbox/common/BlackboxTestsSecurity.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/security/SecurityManager.h
	both modified:   versions.md

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

@JesusPoderoso JesusPoderoso added this to the v2.10.4 milestone Mar 1, 2024
@MiguelCompany
Copy link
Member

@Mario-DL Would you mind looking at the conflicts here?

* Refs #20439: Blackbox tests

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20439: Add new get_property() api method in PropertyPolicy

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20439: Add new PropertyParser module in Property.h

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20439: Integrate AuthenticationHandshakeProperties in Security Manager

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20439: Linter

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20439: Fix elapsed time test comparison

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20439: versions.md

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20439: Review suggestions

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20439: Make ints size explicit. Leave it as 32 to cover all the range of stoi()

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@Mario-DL Mario-DL added ci-pending PR which CI is running and removed conflicts Backport PR wich git cherry pick failed labels Mar 6, 2024
MiguelCompany
MiguelCompany previously approved these changes Mar 6, 2024
Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
@MiguelCompany
Copy link
Member

@richiprosima Please test this

@MiguelCompany MiguelCompany merged commit 5da69bc into 2.10.x Mar 11, 2024
9 of 16 checks passed
@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-4435 branch March 11, 2024 13:18
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.

3 participants