LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
security: tighten readable/regular file checks in CLI tools
Dylan M. Taylorac2d7623e3dc
diff --git a/docs/showcase/run.py b/docs/showcase/run.pyindex 6b680e9f2..bb80e0c1c 100644--- a/docs/showcase/run.py+++ b/docs/showcase/run.py@@ -5,10 +5,15 @@ from pathlib import Pathdef _jsonl_path(arg):- """Resolve the CLI file argument; require an existing regular file."""+ """Resolve the CLI file argument; require an existing readable regular file."""path = Path(arg).resolve()if not path.is_file():sys.exit(f"not a readable file: {arg}")+ try:+ with path.open("rb"):+ pass+ except OSError:+ sys.exit(f"not a readable file: {arg}")return pathdef call(method, params):diff --git a/tools/spectral_camera_table.py b/tools/spectral_camera_table.pyindex 0e6fef7df..188f6ba4c 100644--- a/tools/spectral_camera_table.py+++ b/tools/spectral_camera_table.py@@ -35,6 +35,8 @@ def _out_path(arg):path = Path(arg).resolve()if not path.parent.is_dir():sys.exit(f"output directory does not exist: {arg}")+ if path.exists() and not path.is_file():+ sys.exit(f"output path is not a regular file: {arg}")return str(path)WL = np.arange(380, 781, 5)