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

release-23.2.12-rc: util: don't panic on IPv6 entries in cidr mapping #131237

Merged

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Sep 23, 2024

Backport 2/2 commits from #131221 on behalf of @andrewbaptist.

/cc @cockroachdb/release


Previously the code would encounter an index out of bounds if the cidr mapping file had a cidr length greater than 32 bits. This could only happen with IPv6 addresses. Note that if there any invalid mappings the code will display the error in the logs but won't process any of the file.

The code already handled mapping lookups for IPv6, but these code changes also make that more explicit.

Epic: none
Informs: #130814

Release note: None


Release justification: Prevents a panic in newly introduced cidr code if the URL has malformed content.

Previously the code would encounter an index out of bounds if the cidr
mapping file had a cidr length greater than 32 bits. This could only
happen with IPv6 addresses. Note that if there any invalid mappings the
code will display the error in the logs but won't process any of the
file.

The code already handled mapping lookups for IPv6, but these code
changes also make that more explicit.

Epic: none
Informs: #130814

Release note: None
We don't use the WrapTLS method and it is better to remove it and if we
need it in the future bring it back.

Epic: none

Release note: None
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2.12-rc-131221 branch from 0af6b22 to 7af2609 Compare September 23, 2024 18:43
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Sep 23, 2024
Copy link
Author

blathers-crl bot commented Sep 23, 2024

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label Sep 23, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@andrewbaptist andrewbaptist merged commit c3ddfa7 into release-23.2.12-rc Sep 23, 2024
5 of 6 checks passed
@andrewbaptist andrewbaptist deleted the blathers/backport-release-23.2.12-rc-131221 branch September 23, 2024 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants