Skip to content

Update URL_RE and COMBINED_RE to handle ports in package_repository definitions #22

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

Closed
desrod wants to merge 1 commit into from
+3 −3
Closed

Update URL_RE and COMBINED_RE to handle ports in package_repository definitions #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/maasservicelayer/models/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ class PackageRepoUrl(str):
"""

PPA_RE = r"^ppa:[a-z0-9\-]{3,32}/[a-z0-9]{1}[a-z0-9\.\-\+]+$"
URL_RE = r"^https?:\/\/\w[\w\-]+(\.[\w\-]+)+(\/([\w\-_%.#?=&+])+)*\/?$"
COMBINED_RE = re.compile(rf"{PPA_RE}|{URL_RE}")
URL_RE = r"^https?:\/\/(?:(?:\w[\w\-]*\.)+[\w\-]+|\d{1,3}(?:\.\d{1,3}){3})(?:\:\d{1,5})?(\/([\w\-_%.#?=&+])+)*\/?$"
COMBINED_RE = re.compile(rf"^(?:{PPA_RE}|{URL_RE})$")

def __new__(cls, content):
content = cls.validate(content)
Expand All @@ -91,7 +91,7 @@ def __get_validators__(cls):

@classmethod
def validate(cls, value: str) -> str:
match = re.fullmatch(cls.COMBINED_RE, value)
match = re.match(cls.COMBINED_RE, value)
if match is None:
raise ValueError("Value is not a valid PPA URL.")
return value