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

Return Of The Regex #170

Closed
wants to merge 1 commit into from
Closed

Return Of The Regex #170

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
12 changes: 7 additions & 5 deletions tracker/advisory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,13 @@ def advisory_escape_html(advisory):


def advisory_extend_html(advisory, issues, package):
advisory = sub('({}) '.format(escape(package.pkgname)), '<a href="/package/{0}" rel="noopener">\\g<1></a> '.format(package.pkgname), advisory, flags=IGNORECASE)
advisory = sub(' ({})'.format(escape(package.pkgname)), ' <a href="/package/{0}" rel="noopener">\\g<1></a>'.format(package.pkgname), advisory, flags=IGNORECASE)
advisory = sub(';({})'.format(escape(package.pkgname)), ';<a href="/package/{0}" rel="noopener">\\g<1></a>'.format(package.pkgname), advisory, flags=IGNORECASE)
advisory = sub('"({})'.format(escape(package.pkgname)), '"<a href="/package/{0}" rel="noopener">\\g<1></a>'.format(package.pkgname), advisory, flags=IGNORECASE)
return advisory
escaped_name = escape(package.pkgname)
regex = '|'.join([
fr"(?<=[^\./])({escaped_name})(?=[\.])",
fr"(?<=[\.])({escaped_name})(?=[^\.])",
fr"(?<=[^\w>.\/])({escaped_name})(?=[^\w<.])"
])
return sub(regex, f'<a href="/package/{package.pkgname}" rel="noopener">\\1\\2\\3</a>', advisory, flags=IGNORECASE)


def advisory_extend_model_from_advisory_text(advisory):
Expand Down