Skip to content

fix: block joined short unsafe clone options #2162

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
Byron wants to merge 1 commit into from
Closed

fix: block joined short unsafe clone options #2162

Show file tree
Hide file tree
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
fix: block joined short unsafe options (GHSA-v396-v7q4-x2qj)
  • Loading branch information
@codex @Byron
codex authored and Byron committed Jun 17, 2026
commit 2568f2b77ec2bc9a5edc979a1a55d67b1fdc75cc
5 changes: 4 additions & 1 deletion git/cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,10 @@ def _canonicalize_option_name(cls, option: str) -> str:
option_tokens = option_name.split(None, 1)
if not option_tokens:
return ""
return dashify(option_tokens[0])
option_token = option_tokens[0]
if option.startswith("-") and not option.startswith("--") and len(option_token) > 1:
option_token = option_token[:1]
return dashify(option_token)

@classmethod
def check_unsafe_options(cls, options: List[str], unsafe_options: List[str]) -> None:
Expand Down
4 changes: 4 additions & 0 deletions test/test_clone.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,10 @@ def test_clone_unsafe_options(self, rw_repo):
unsafe_options = [
f"--upload-pack='touch {tmp_file}'",
f"-u 'touch {tmp_file}'",
f"-u{tmp_file}",
"--config=protocol.ext.allow=always",
"-c protocol.ext.allow=always",
"-cprotocol.ext.allow=always",
]
for unsafe_option in unsafe_options:
with self.assertRaises(UnsafeOptionError):
Expand Down Expand Up @@ -207,8 +209,10 @@ def test_clone_from_unsafe_options(self, rw_repo):
unsafe_options = [
f"--upload-pack='touch {tmp_file}'",
f"-u 'touch {tmp_file}'",
f"-u{tmp_file}",
"--config=protocol.ext.allow=always",
"-c protocol.ext.allow=always",
"-cprotocol.ext.allow=always",
]
for unsafe_option in unsafe_options:
with self.assertRaises(UnsafeOptionError):
Expand Down
2 changes: 2 additions & 0 deletions test/test_git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ def test_check_unsafe_options_normalizes_kwargs(self):
(["exec"], ["--exec"]),
(["u"], ["-u"]),
(["c"], ["-c"]),
(["-u/tmp/helper"], ["-u"]),
(["-cprotocol.ext.allow=always"], ["-c"]),
(["--upload-pack=/tmp/helper"], ["--upload-pack"]),
(["--config core.filemode=false"], ["--config"]),
]
Expand Down
Loading