Skip to content

Fix two remaining Windows untrusted search path cases #1792

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

Merged
merged 16 commits into from
Jan 10, 2024
Merged

Fix two remaining Windows untrusted search path cases #1792

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1c65efb
Show "not from cwd" test is broken for shell=True
EliahKagan Dec 15, 2023
2b47933
Correct the "not from cwd" test and add more cases
EliahKagan Dec 15, 2023
c1f6c17
Use SystemRoot instead of WINDIR, to fix tox
EliahKagan Dec 15, 2023
06bd2c7
Omit CWD in executable search even when shell=True
EliahKagan Dec 15, 2023
7da9c3b
Refactor "not from cwd" test for readability
EliahKagan Dec 15, 2023
865c6e8
Further expand "not from cwd" test re: cmd.exe
EliahKagan Dec 15, 2023
d2506c7
Make Git.execute a bit simpler and very slightly more robust
EliahKagan Dec 15, 2023
61b4dda
Start on test_hook_uses_shell_not_from_cwd
EliahKagan Dec 15, 2023
66ff4c1
Omit CWD in search for bash.exe to run hooks on Windows
EliahKagan Dec 17, 2023
7751436
Extract venv management from test_installation
EliahKagan Dec 18, 2023
a42ea0a
Cover absent/no-distro bash.exe in hooks "not from cwd" test
EliahKagan Dec 18, 2023
f44524a
Avoid spurious "location may have moved" on Windows
EliahKagan Dec 19, 2023
15ebb25
Clarify comment in test_hook_uses_shell_not_from_cwd
EliahKagan Dec 19, 2023
c551e91
Extract shared logic for using Popen safely on Windows
EliahKagan Dec 20, 2023
3eb7c2a
Move safer_popen from git.util to git.cmd
EliahKagan Dec 21, 2023
1f3caa3
Further clarify comment in test_hook_uses_shell_not_from_cwd
EliahKagan Dec 25, 2023
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
Prev Previous commit
Next Next commit
Use SystemRoot instead of WINDIR, to fix tox 
In most cases they will be the same, but WINDIR may be absent (or
have a different value?) in rare cases.

The practical reason it matters in GitPython's tests is that tox
automatically passes SystemRoot through to environments on Windows.
  • Loading branch information
@EliahKagan
EliahKagan committed Dec 26, 2023
commit c1f6c17182d59b9098aeac272dba79d912c5fa42
2 changes: 1 addition & 1 deletion test/test_git.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def test_it_executes_git_not_from_cwd(self, rw_dir, case):
if os.name == "nt":
# Copy an actual binary executable that is not git. (On Windows, running
# "hostname" only displays the hostname, it never tries to change it.)
other_exe_path = os.path.join(os.getenv("WINDIR"), "system32", "hostname.exe")
other_exe_path = os.path.join(os.environ["SystemRoot"], "system32", "hostname.exe")
impostor_path = os.path.join(rw_dir, "git.exe")
shutil.copy(other_exe_path, impostor_path)
else:
Expand Down