Do not allow to read tensor's external_data outside the model directory #4400
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jnovikov
changed the title
Signed-off-by: jnovikov <johnnovikov0@gmail.com>
Signed-off-by: jnovikov <johnnovikov0@gmail.com>
Signed-off-by: jnovikov <johnnovikov0@gmail.com>
Signed-off-by: jnovikov <johnnovikov0@gmail.com>
Signed-off-by: jnovikov <johnnovikov0@gmail.com>
Signed-off-by: jnovikov <johnnovikov0@gmail.com>
Signed-off-by: jnovikov <johnnovikov0@gmail.com>
jcwchen
added
run release CIs
jcwchen
reviewed
Aug 4, 2022
Signed-off-by: jnovikov <johnnovikov0@gmail.com>
Signed-off-by: jnovikov <johnnovikov0@gmail.com>
jcwchen
reviewed
Aug 8, 2022
jcwchen
approved these changes
Aug 9, 2022
gramalingam
approved these changes
Aug 9, 2022
Signed-off-by: jnovikov <johnnovikov0@gmail.com>
jcwchen
pushed a commit
to jcwchen/onnx
that referenced
this pull request
Sep 9, 2022
…ry (onnx#4400) * Not allow to read tensor external_data outside the model directory Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Fix formatting errors Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Disable segfaulty test Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Fix cpp tests Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Fix UB while removing ../ Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Fix clang-format Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Check for symlinks only on POSIX systems Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Add specific to Windows external_data test Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Change specific Windows external_data test decorator tofix mypy Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Remove unused pathlib Signed-off-by: jnovikov <johnnovikov0@gmail.com> Signed-off-by: jnovikov <johnnovikov0@gmail.com> Signed-off-by: Chun-Wei Chen <jacky82226@gmail.com>
This was referenced Sep 9, 2022
jcwchen
added a commit
that referenced
this pull request
Sep 14, 2022
) * Do not allow to read tensor's external_data outside the model directory (#4400) * Not allow to read tensor external_data outside the model directory Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Fix formatting errors Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Disable segfaulty test Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Fix cpp tests Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Fix UB while removing ../ Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Fix clang-format Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Check for symlinks only on POSIX systems Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Add specific to Windows external_data test Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Change specific Windows external_data test decorator tofix mypy Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Remove unused pathlib Signed-off-by: jnovikov <johnnovikov0@gmail.com> Signed-off-by: jnovikov <johnnovikov0@gmail.com> Signed-off-by: Chun-Wei Chen <jacky82226@gmail.com> * cherry pick #4470 Signed-off-by: Chun-Wei Chen <jacky82226@gmail.com> * resolve Windows CI issue: use fixed Python 3.10.5 Signed-off-by: Chun-Wei Chen <jacky82226@gmail.com> * fix flake8 Signed-off-by: Chun-Wei Chen <jacky82226@gmail.com> Signed-off-by: jnovikov <johnnovikov0@gmail.com> Signed-off-by: Chun-Wei Chen <jacky82226@gmail.com> Co-authored-by: Ivan Novikov <johnnovikov0@gmail.com>
broune
pushed a commit
to broune/onnx
that referenced
this pull request
May 6, 2023
…ry (onnx#4400) * Not allow to read tensor external_data outside the model directory Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Fix formatting errors Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Disable segfaulty test Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Fix cpp tests Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Fix UB while removing ../ Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Fix clang-format Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Check for symlinks only on POSIX systems Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Add specific to Windows external_data test Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Change specific Windows external_data test decorator tofix mypy Signed-off-by: jnovikov <johnnovikov0@gmail.com> * Remove unused pathlib Signed-off-by: jnovikov <johnnovikov0@gmail.com> Signed-off-by: jnovikov <johnnovikov0@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: jnovikov johnnovikov0@gmail.com
This PR fixes the vulnerability that allows to read tensor_data outside the model directory.
The logic behind the PR is to first normalize the relative_path inside the tensor and then check that path has no '../' suffix.
Normalization code is based on go-lang path.Clean() but simplified to work correctly with the relative_paths only.
Provided tests should cover most of the cases.
Please note that 'optimal' solution would be to use boost::filesystem or c++17 filesystem to get the absolute path file and resolve possible symlink problems, but AFAIK the project target is C++11 and the boost is not used at the project.
fixes #3991