-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
fix: 清洗远程文件消息段文件名 #8318
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.
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
Open
liuwanwan1
wants to merge
3
commits into
AstrBotDevs:master
Choose a base branch
from
liuwanwan1:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+61
−5
Open
fix: 清洗远程文件消息段文件名 #8318
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| from pathlib import Path | ||
|
|
||
| import pytest | ||
|
|
||
| from astrbot.core.message import components | ||
|
|
||
|
|
||
| @pytest.mark.asyncio | ||
| async def test_file_component_download_sanitizes_remote_name(monkeypatch, tmp_path): | ||
| temp_dir = tmp_path / "temp" | ||
| downloaded_paths: list[Path] = [] | ||
|
|
||
| async def fake_download_file(url: str, path: str) -> None: | ||
| target = Path(path) | ||
| assert url == "https://example.com/report" | ||
| assert target.parent == temp_dir | ||
| assert target.parent.exists() | ||
| assert "\x00" not in target.name | ||
| assert "/" not in target.name | ||
| assert "\\" not in target.name | ||
| assert not any(char in target.name for char in ':*?"<>|') | ||
| target.write_bytes(b"payload") | ||
| downloaded_paths.append(target) | ||
|
|
||
| monkeypatch.setattr(components, "download_file", fake_download_file) | ||
| monkeypatch.setattr(components, "get_astrbot_temp_path", lambda: str(temp_dir)) | ||
|
|
||
| component = components.File( | ||
| name='..\\nested/evil\\report:*?"<>|\x00.pdf', | ||
| url="https://example.com/report", | ||
| ) | ||
|
|
||
| path = Path(await component.get_file()) | ||
|
|
||
| assert path.parent == temp_dir | ||
| assert path.exists() | ||
| assert path.name.startswith("fileseg_report________") | ||
| assert path.suffix == ".pdf" | ||
| assert downloaded_paths == [path] |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The _sanitize_file_component_name function correctly handles path traversal by extracting the basename and removing null bytes. However, it does not account for other characters that are invalid in filenames on certain operating systems, particularly Windows (e.g., :, *, ?, ", <, >, |). If a remote filename contains these characters, the subsequent download_file call will fail with an OSError on Windows. Consider replacing these characters with an underscore or removing them to ensure cross-platform compatibility. Additionally, as this is new functionality for handling file components, please ensure it is accompanied by unit tests.
References