Skip to content

fix: Prevent UnicodeDecodeError from non-UTF-8 git paths #751

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

Open
sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Prevent UnicodeDecodeError from non-UTF-8 git paths #751

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
18 changes: 9 additions & 9 deletions codecov_cli/helpers/versioning_systems.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def get_fallback_value(self, fallback_field: FallbackFieldEnum):
["git", "rev-parse", "HEAD^@"],
capture_output=True,
)
parents_hash = p.stdout.decode().strip().splitlines()
parents_hash = p.stdout.decode("utf-8", errors="surrogateescape").strip().splitlines()
if len(parents_hash) == 2:
# IFF the current commit is a merge commit it will have 2 parents
# We return the 2nd one - The commit that came from the branch merged into ours
Expand All @@ -104,14 +104,14 @@ def get_fallback_value(self, fallback_field: FallbackFieldEnum):
# so we get it's SHA and return that
p = subprocess.run(["git", "log", "-1", "--format=%H"], capture_output=True)
if p.stdout:
return p.stdout.decode().strip()
return p.stdout.decode("utf-8", errors="surrogateescape").strip()

if fallback_field == FallbackFieldEnum.branch:
p = subprocess.run(
["git", "rev-parse", "--abbrev-ref", "HEAD"], capture_output=True
)
if p.stdout:
branch_name = p.stdout.decode().strip()
branch_name = p.stdout.decode("utf-8", errors="surrogateescape").strip()
# branch_name will be 'HEAD' if we are in 'detached HEAD' state
return branch_name if branch_name != "HEAD" else None

Expand All @@ -123,7 +123,7 @@ def get_fallback_value(self, fallback_field: FallbackFieldEnum):
if not p.stdout:
return None

remotes = p.stdout.decode().strip().splitlines()
remotes = p.stdout.decode("utf-8", errors="surrogateescape").strip().splitlines()

remote_name = "origin" if "origin" in remotes else remotes[0]

Expand All @@ -133,7 +133,7 @@ def get_fallback_value(self, fallback_field: FallbackFieldEnum):
if not p.stdout:
return None

remote_url = p.stdout.decode().strip()
remote_url = p.stdout.decode("utf-8", errors="surrogateescape").strip()

return parse_slug(remote_url)

Expand All @@ -144,23 +144,23 @@ def get_fallback_value(self, fallback_field: FallbackFieldEnum):
if not p.stdout:
return None

remotes = p.stdout.decode().strip().splitlines()
remotes = p.stdout.decode("utf-8", errors="surrogateescape").strip().splitlines()
remote_name = "origin" if "origin" in remotes else remotes[0]
p = subprocess.run(
["git", "ls-remote", "--get-url", remote_name], capture_output=True
)
if not p.stdout:
return None

remote_url = p.stdout.decode().strip()
remote_url = p.stdout.decode("utf-8", errors="surrogateescape").strip()
return parse_git_service(remote_url)

return None

def get_network_root(self):
p = subprocess.run(["git", "rev-parse", "--show-toplevel"], capture_output=True)
if p.stdout:
return Path(p.stdout.decode().rstrip())
return Path(p.stdout.decode("utf-8", errors="surrogateescape").rstrip())
return None

def list_relevant_files(
Expand All @@ -174,7 +174,7 @@ def list_relevant_files(
if recurse_submodules:
cmd.append("--recurse-submodules")
res = subprocess.run(cmd, capture_output=True)
return res.stdout.decode().split("\0")
return res.stdout.decode("utf-8", errors="surrogateescape").split("\0")


class NoVersioningSystem(VersioningSystemInterface):
Expand Down
Loading