Check that a relative name plus the zone's origin is not too long. #997
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This is a pretty basic change but I made it a PR for code review since I refactored some _validate_name code to remove duplication. The other thing I think is review-worthy is my decision to keep with the general API behavior of _validate_name() of raising KeyError when there are problems. Before this change it did this for all problems other than errors when converting a string to a name (probably that should have gone to KeyError too, but not worth fixing now). |
bwelling
reviewed
Oct 15, 2023
dns/zone.py
Outdated
| name = name.relativize(origin) | ||
| elif not relativize: | ||
| # We have a relative name in a non-relative zone, so derelativize. | ||
| name = name.derelativize(origin) |
There was a problem hiding this comment.
The new code below converts the NameTooLong into KeyError, but this code doesn't do that. Should it?
There was a problem hiding this comment.
It should. I pushed a corrected and even simpler bit of code.
Previously it was possible to add very long relative names to a relative zone which could never be rendered due to being too long for wire format. Now we check this as part of _validate_name(). This code also removes duplicated name validation code from Zone and Version, consolidating it into one helper function. Finally, we fix a few comments in get methods that have cut-and-paste typos from the find variant indicating they can raise KeyError when they cannot.
rthalley
force-pushed
the
check-long-relative
branch
from
a81f18d
to
3dd767a
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously it was possible to add very long relative names to a relative zone which could never be rendered due to being too long for wire format. Now we check this as part of _validate_name().
This code also removes duplicated name validation code from Zone and Version, consolidating it into one helper function.
Finally, we fix a few comments in get methods that have cut-and-paste typos from the find variant indicating they can raise KeyError when they cannot.