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

Fix path sanitation for absolute Windows paths. #10097

Merged
merged 3 commits into from
Feb 9, 2025
Merged

Fix path sanitation for absolute Windows paths. #10097

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76d329a
Fix path sanitation for absolute Windows paths.
tailoric Feb 5, 2025
8db4615
Fix format with black
tailoric Feb 5, 2025
1fa8e2d
Fix indentation and check if it is a windows path
tailoric Feb 5, 2025
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
10 changes: 8 additions & 2 deletions discord/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

import argparse
import sys
from pathlib import Path
from pathlib import Path, PurePath, PureWindowsPath

import discord
import importlib.metadata
Expand Down Expand Up @@ -225,8 +225,14 @@ def to_path(parser: argparse.ArgumentParser, name: str, *, replace_spaces: bool
)
if len(name) <= 4 and name.upper() in forbidden:
parser.error('invalid directory name given, use a different one')
path = PurePath(name)
if isinstance(path, PureWindowsPath) and path.drive:
drive, rest = path.parts[0], path.parts[1:]
transformed = tuple(map(lambda p: p.translate(_translation_table), rest))
name = drive + '\\'.join(transformed)

name = name.translate(_translation_table)
else:
name = name.translate(_translation_table)
if replace_spaces:
name = name.replace(' ', '-')
return Path(name)
Expand Down
Loading