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.

Sign up for GitHub

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

Jump to bottom

[21638] Be less strict with parameter lengths #5225

Merged
merged 8 commits into from
Sep 19, 2024
Merged

[21638] Be less strict with parameter lengths #5225

merged 8 commits into from
Sep 19, 2024

Conversation

MiguelCompany
Copy link
Member

@MiguelCompany MiguelCompany commented Sep 11, 2024 •
edited by JesusPoderoso
Loading

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.

@MiguelCompany MiguelCompany added this to the v3.0.2 milestone Sep 11, 2024
@richiware richiware self-requested a review September 19, 2024 07:32
@github-actions github-actions bot added the ci-pending PR which CI is running label Sep 19, 2024
richiware
richiware previously approved these changes Sep 19, 2024
View reviewed changes
@MiguelCompany
Refs #21537. Add regression test for interoperability issue.
cd0dee0 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #21537. Add regression test for big parameters.
9f11689 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #21537. Fix builtin deserialization length checks.
1a2a8c9 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #21537. Special cases in test.
ba76466 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #21537. Extend test to full non-custom range.
b66dd9a 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #21537. Extend parameter size to 64K.
64b1a02 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #21537. Uncrustify.
8828dc5 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany
Refs #21638. Fix windows warning.
8115cfa 
Signed-off-by: Miguel Company <[email protected]>
@MiguelCompany MiguelCompany merged commit 7b111f9 into master Sep 19, 2024
17 checks passed
@MiguelCompany MiguelCompany deleted the bugfix/21537 branch September 19, 2024 16:19
@MiguelCompany
Copy link
Member Author

MiguelCompany commented Sep 20, 2024 •
edited
Loading

@Mergifyio backport 2.14.x 2.10.x

@mergify Mergify
Copy link
Contributor

mergify bot commented Sep 20, 2024 •
edited
Loading

backport 2.14.x 2.10.x

✅ Backports have been created

@eProsima eProsima deleted a comment from mergify bot Sep 20, 2024
mergify bot pushed a commit that referenced this pull request Sep 20, 2024
@MiguelCompany @mergify
Be less strict with parameter lengths (#5225)
bc8c216 
* Refs #21537. Add regression test for interoperability issue.

Signed-off-by: Miguel Company <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

* Refs #21537. Fix builtin deserialization length checks.

Signed-off-by: Miguel Company <[email protected]>

* Refs #21537. Special cases in test.

Signed-off-by: Miguel Company <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

* Refs #21537. Uncrustify.

Signed-off-by: Miguel Company <[email protected]>

* Refs #21638. Fix windows warning.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 7b111f9)

# Conflicts:
#	src/cpp/fastdds/core/policy/ParameterSerializer.hpp
@mergify mergify bot mentioned this pull request Sep 20, 2024
Open
11 tasks
mergify bot pushed a commit that referenced this pull request Sep 20, 2024
@MiguelCompany @mergify
Be less strict with parameter lengths (#5225)
bd7d15b 
* Refs #21537. Add regression test for interoperability issue.

Signed-off-by: Miguel Company <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

* Refs #21537. Fix builtin deserialization length checks.

Signed-off-by: Miguel Company <[email protected]>

* Refs #21537. Special cases in test.

Signed-off-by: Miguel Company <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

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

Signed-off-by: Miguel Company <[email protected]>

* Refs #21537. Uncrustify.

Signed-off-by: Miguel Company <[email protected]>

* Refs #21638. Fix windows warning.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 7b111f9)

# Conflicts:
#	src/cpp/fastdds/core/policy/ParameterSerializer.hpp
#	test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp
@mergify mergify bot mentioned this pull request Sep 20, 2024
Open
11 tasks
@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels Sep 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richiware richiware richiware approved these changes

Assignees
No one assigned
Labels
ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.
Projects
None yet
Milestone
v3.0.2
Development

Successfully merging this pull request may close these issues.
3 participants
@MiguelCompany @richiware @JesusPoderoso