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

[21638] Be less strict with parameter lengths (backport #5225) #5247

Open
wants to merge 2 commits into
base: 2.14.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2024

Description

Interoperability checks with Intercom DDS surfaced an issue in the deserializer for builtin topics.
The deserializer expects the parameters in the parameter list to be exactly the expected length.
Debug showed that Intercom DDS is sending a reliability parameter longer than expected, and their DATA(r) and DATA(w) messages were discarded due to a deserialization error.

This PR:

  • Adds a regression test that deserializes a DATA(p), a DATA(w), and a DATA(r) captured from Intercom DDS
  • Adds another test that deserializes builtin data messages with a big (64K) parameter, checking the whole non-custom range of IDs
  • Fixes the length checks in the builtin deserializer to only fail if the incoming length is lower than required.

@Mergifyio backport 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

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

  • N/A: 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.
  • N/A 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 #5225 done by [Mergify](https://mergify.com).

* Refs #21537. Add regression test for interoperability issue.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #21537. Add regression test for big parameters.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #21537. Fix builtin deserialization length checks.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #21537. Special cases in test.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #21537. Extend test to full non-custom range.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #21537. Extend parameter size to 64K.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #21537. Uncrustify.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #21638. Fix windows warning.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit 7b111f9)

# Conflicts:
#	src/cpp/fastdds/core/policy/ParameterSerializer.hpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Sep 20, 2024
Copy link
Contributor Author

mergify bot commented Sep 20, 2024

Cherry-pick of 7b111f9 has failed:

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

You are currently cherry-picking commit 7b111f911.
  (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/fastdds/core/policy/QosPoliciesSerializer.hpp
	modified:   test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/fastdds/core/policy/ParameterSerializer.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

@MiguelCompany MiguelCompany added this to the v2.14.4 milestone Sep 20, 2024
Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso JesusPoderoso removed the conflicts Backport PR wich git cherry pick failed label Sep 23, 2024
@github-actions github-actions bot added the ci-pending PR which CI is running label Sep 23, 2024
Copy link
Contributor

@JesusPoderoso JesusPoderoso left a comment

Choose a reason for hiding this comment

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

LGTM with green CI

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