rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change make_path_safe to allow single dot relative imports, but no dots anywhere else. Added new unit tests for this.

Browse source
This commit is contained in:
Beth Probert 2026-03-06 14:07:07 +00:00
parent 713df248ff
commit e5429d6cda
2 changed files with 37 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tests/unit_tests/test_utilities.py
View file

@ -79,8 +79,30 @@ def test_make_path_safe_trailing_in_components():
assert make_path_safe("path /to. /file ") == "path/to/file"
assert make_path_safe("path./to /file.") == "path/to/file"
# Allow dots at the start of the path
# As this is common for hidden files on POSIX and relative paths
# And is the configuration in the manual and simulation config
# json files.
assert make_path_safe("./path/to/file") == "./path/to/file"
assert make_path_safe("./path./to /file.") == "./path/to/file"
assert make_path_safe("./openflexure/data/") == "./openflexure/data/"
def test_make_path_safe_separators():
"""Test that separators are preserved and components sanitised."""
assert make_path_safe("a/b\\c") == "a/b\\c"
assert make_path_safe("a./b /c.") == "a/b/c"
def test_make_path_safe_relative():
"""Test that relative path components are preserved.
We only allow relative paths with one dot, and at the beginning of the path,
to avoid issues with paths like "file./file" or "file../file
"""
assert make_path_safe("./openflexure/data/") == "./openflexure/data/"
assert make_path_safe("../openflexure/data/") == "_/openflexure/data/"
assert make_path_safe("path/./to/file") == "path/_/to/file"
assert make_path_safe("path/../to/file") == "path/_/to/file"
assert make_path_safe(".") == "_"
assert make_path_safe("..") == "_"