Update URL_RE and COMBINED_RE to handle ports in package_repository definitions#22
Closed
desrod wants to merge 1 commit intocanonical:masterfrom
Closed
Update URL_RE and COMBINED_RE to handle ports in package_repository definitions#22desrod wants to merge 1 commit intocanonical:masterfrom
desrod wants to merge 1 commit intocanonical:masterfrom
Conversation
… durable COMBVINED_RE parsing
|
Thank you for your PR! The code on GitHub is a mirror only and we don't merge PRs here. |
This file contains hidden or 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
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.
This small bit of change updates the validation in package repo definitions to accept host:port URLs used by non-defualt Ubuintu mirrors. I took two stabs at the regex, one with a much toothier approach which allowed IPv4 addresses vs. domain names, and a leaner approach.
Toothy: https://regex101.com/r/yxbxSB/1
Less-toothy: https://regex101.com/r/yxbxSB/2
This PR includes the former for pedantic completeness.
Before

After
This also anchors the COMBINED_RE so the whole value as passed in must match either the PPA form or the URL form. With explicit ^... $ on the combined pattern, match() becomes equivalent to fullmatch() and avoids relying on subpattern anchoring behavior.
See internal MM thread for context:
gr7kseaqyifpfqiyemxshyp4oc