style: ruff/black autofix + misc updates #5
Merged
Conversation
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
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| Less accurate but more resilient for malformed HTML. | ||
| """ | ||
| # Remove script tags and their content | ||
| html = re.sub(r"<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>", "", html, flags=re.DOTALL | re.IGNORECASE) |
Check failure
Code scanning / CodeQL
Bad HTML filtering regexp High
Show autofix suggestion
Hide autofix suggestion
Copilot Autofix
AI about 1 month ago
To address the issue, we will replace the insecure regex with a more robust approach for removing <script> tags. Instead of relying on regex to parse HTML, which is inherently error-prone, we should use a proper HTML parser library like BeautifulSoup even in the fallback method. This is consistent with the recommendation to use well-tested libraries for HTML parsing and sanitization.
The changes will:
- Use
BeautifulSoupin the_canonicalize_fallbackmethod to safely remove<script>tags and their content. - Remove the regex-based logic for
<script>tag handling in the fallback method. - Ensure compatibility by continuing to normalize whitespace and decode HTML entities as before.
Suggested changeset
1
src/quarrycore/dedup/canonical.py
| @@ -21,7 +21,7 @@ | ||
|
|
||
| HAS_SELECTOLAX = True | ||
| except ImportError: | ||
| from bs4 import BeautifulSoup, Comment | ||
| from bs4 import BeautifulSoup, Comment # Already imported | ||
|
|
||
| HAS_SELECTOLAX = False | ||
|
|
||
| @@ -130,10 +130,11 @@ | ||
|
|
||
| Less accurate but more resilient for malformed HTML. | ||
| """ | ||
| # Remove script tags and their content | ||
| html = re.sub(r"<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>", "", html, flags=re.DOTALL | re.IGNORECASE) | ||
|
|
||
| # Remove style tags and their content | ||
| # Use BeautifulSoup to remove script tags and their content | ||
| soup = BeautifulSoup(html, "html.parser") | ||
| for script in soup.find_all("script"): | ||
| script.decompose() | ||
| html = str(soup) | ||
| html = re.sub(r"<style\b[^<]*(?:(?!<\/style>)<[^<]*)*<\/style>", "", html, flags=re.DOTALL | re.IGNORECASE) | ||
|
|
||
| # Remove HTML comments |
Copilot is powered by AI and may make mistakes. Always verify output.
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.
No description provided.