Skip to content

fix(security): drop shell=True from subprocess invocations #1340

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
reddraconi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(security): drop shell=True from subprocess invocations #1340

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
19 changes: 8 additions & 11 deletions src/tagstudio/core/library/refresh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,16 @@ def __get_dir_list(self, library_dir: Path, ignore_patterns: list[str]) -> list[
pattern_file.write("\n".join(ignore_patterns))

result = silent_run(
" ".join(
[
"rg",
"--files",
"--follow",
"--hidden",
"--ignore-file",
f'"{str(compiled_ignore_path)}"',
]
),
[
"rg",
"--files",
"--follow",
"--hidden",
"--ignore-file",
str(compiled_ignore_path),
],
cwd=library_dir,
capture_output=True,
shell=True,
encoding="UTF-8",
)
compiled_ignore_path.unlink()
Expand Down
26 changes: 6 additions & 20 deletions src/tagstudio/qt/utils/file_opener.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Licensed under the GPL-3.0 License.
# Created for TagStudio: https://github.com/CyanVoxel/TagStudio

import os
import shutil
import subprocess
import sys
Expand Down Expand Up @@ -40,39 +41,24 @@ def open_file(path: str | Path, file_manager: bool = False, windows_start_comman
if sys.platform == "win32":
normpath = str(Path(path).resolve())
if file_manager:
command_name = "explorer"
command_arg = f'/select,"{normpath}"'

# For some reason, if the args are passed in a list, this will error when the
# path has spaces, even while surrounded in double quotes.
# /select, takes the path as a single comma-joined argument.
silent_popen(
command_name + command_arg,
shell=True,
["explorer", f"/select,{normpath}"],
close_fds=True,
creationflags=subprocess.CREATE_NEW_PROCESS_GROUP
| subprocess.CREATE_BREAKAWAY_FROM_JOB,
)
else:
if windows_start_command:
command_name = "start"
# First parameter is for title, NOT filepath
command_args = ["", normpath]
# First "" is the start-command title slot, not the filepath.
subprocess.Popen(
[command_name] + command_args,
shell=True,
["cmd", "/c", "start", "", normpath],
close_fds=True,
creationflags=subprocess.CREATE_NEW_PROCESS_GROUP
| subprocess.CREATE_BREAKAWAY_FROM_JOB,
)
else:
command = f'"{normpath}"'
silent_popen(
command,
shell=True,
close_fds=True,
creationflags=subprocess.CREATE_NEW_PROCESS_GROUP
| subprocess.CREATE_BREAKAWAY_FROM_JOB,
)
os.startfile(normpath)
else:
if sys.platform == "darwin":
command_name = "open"
Expand Down