-
Notifications
You must be signed in to change notification settings - Fork 614
[Python] - Fix for security vulnerability GHSA-r9hx-vwmv-q579 for setuptools-65.5.0 lib on python using python image #815
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.
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
samruddhikhandale
merged 9 commits into
devcontainers:main
from
gauravsaini04:setuptools_vulnerability_on_python3_10_fix_on_python_image
Feb 2, 2024
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
5e32193
[Python] - Fix for security vulnerability GHSA-r9hx-vwmv-q579 for set…
gauravsaini04 236d0b3
[Python] - Added one more test
gauravsaini04 cfd57c1
[Python] - Fix for security vulnerability GHSA-r9hx-vwmv-q579 for set…
gauravsaini04 725ef47
[Python] - Added one more test
gauravsaini04 3fdde5e
Changes as suggested by comments
gauravsaini04 1e6a03a
Merge remote-tracking branch 'origin/setuptools_vulnerability_on_pyth…
gauravsaini04 60af45f
Merge branch 'devcontainers:main' into setuptools_vulnerability_on_py…
gauravsaini04 aee4d8a
removed second line (L465) that removed a non existent dirrectory
gauravsaini04 43d9cf4
bump patch version & change code to pass failing tests
gauravsaini04 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| #!/bin/bash | ||
| set -e | ||
|
|
||
| # Optional: Import test library | ||
| source dev-container-features-test-lib | ||
|
|
||
| FAILED=() | ||
|
|
||
| echoStderr() | ||
| { | ||
| echo "$@" 1>&2 | ||
| } | ||
|
|
||
| check-version-ge() { | ||
| LABEL=$1 | ||
| CURRENT_VERSION=$2 | ||
| REQUIRED_VERSION=$3 | ||
| shift | ||
| echo -e "\n🧪 Testing $LABEL: '$CURRENT_VERSION' is >= '$REQUIRED_VERSION'" | ||
| local GREATER_VERSION=$((echo ${CURRENT_VERSION}; echo ${REQUIRED_VERSION}) | sort -V | tail -1) | ||
| if [ "${CURRENT_VERSION}" == "${GREATER_VERSION}" ]; then | ||
| echo "✅ Passed!" | ||
| return 0 | ||
| else | ||
| echoStderr "❌ $LABEL check failed." | ||
| FAILED+=("$LABEL") | ||
| return 1 | ||
| fi | ||
| } | ||
|
|
||
| checkPythonPackageVersion() | ||
| { | ||
| PACKAGE=$1 | ||
| REQUIRED_VERSION=$2 | ||
|
|
||
| current_version=$(python -c "import importlib.metadata; print(importlib.metadata.version('${PACKAGE}'))") | ||
| check-version-ge "${PACKAGE}-requirement" "${current_version}" "${REQUIRED_VERSION}" | ||
| } | ||
|
|
||
| checkPythonPackageVersion "setuptools" "65.5.1" | ||
|
|
||
| # Check that tools can execute - make sure something didn't get messed up in this scenario | ||
| check "autopep8" autopep8 --version | ||
| check "black" black --version | ||
| check "yapf" yapf --version | ||
| check "bandit" bandit --version | ||
| check "flake8" flake8 --version | ||
| check "mypy" mypy --version | ||
| check "pycodestyle" pycodestyle --version | ||
| check "pydocstyle" pydocstyle --version | ||
| check "pylint" pylint --version | ||
| check "pytest" pytest --version | ||
| check "setuptools" pip list | grep setuptools | ||
|
|
||
| # Check paths in settings | ||
| check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8" | ||
| check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black" | ||
| check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf" | ||
| check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit" | ||
| check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8" | ||
| check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy" | ||
| check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle" | ||
| check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" | ||
| check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" | ||
| check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" | ||
|
|
||
| checkVulnerableDir() | ||
| { | ||
| DIRECTORY=$1 | ||
| VERSION=$2 | ||
|
|
||
| if [[ -d $DIRECTORY ]] ; then | ||
| echoStderr "❌ check for vulnerable setuptools version failed for python ${VERSION}." | ||
| return 1 | ||
| else | ||
| echo "✅ Passed! Either the container does not have vulnerable version or vulnerable version specific directory got removed." | ||
| return 0 | ||
| fi | ||
| } | ||
|
|
||
| bash -c "echo -e -n '\n'"; | ||
| bash -c "echo -e 'Files/Folders related to setuptools :-'"; | ||
| bash -c "find / -name \"*setuptools*\";" | ||
|
gauravsaini04 marked this conversation as resolved.
|
||
|
|
||
| # only for 3.10 | ||
| checkVulnerableDir "/usr/local/py-utils/shared/lib/python3.10/site-packages/setuptools-65.5.0.dist-info" "3.10" | ||
|
|
||
| # Report result | ||
| reportResults | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
| # Optional: Import test library | ||
| source dev-container-features-test-lib | ||
|
|
||
| FAILED=() | ||
|
|
||
| echoStderr() | ||
| { | ||
| echo "$@" 1>&2 | ||
| } | ||
|
|
||
| check-version-ge() { | ||
| LABEL=$1 | ||
| CURRENT_VERSION=$2 | ||
| REQUIRED_VERSION=$3 | ||
| shift | ||
| echo -e "\n🧪 Testing $LABEL: '$CURRENT_VERSION' is >= '$REQUIRED_VERSION'" | ||
| local GREATER_VERSION=$((echo ${CURRENT_VERSION}; echo ${REQUIRED_VERSION}) | sort -V | tail -1) | ||
| if [ "${CURRENT_VERSION}" == "${GREATER_VERSION}" ]; then | ||
| echo "✅ Passed!" | ||
| return 0 | ||
| else | ||
| echoStderr "❌ $LABEL check failed." | ||
| FAILED+=("$LABEL") | ||
| return 1 | ||
| fi | ||
| } | ||
|
|
||
| checkPythonPackageVersion() | ||
| { | ||
| PACKAGE=$1 | ||
| REQUIRED_VERSION=$2 | ||
|
|
||
| current_version=$(python -c "import importlib.metadata; print(importlib.metadata.version('${PACKAGE}'))") | ||
| check-version-ge "${PACKAGE}-requirement" "${current_version}" "${REQUIRED_VERSION}" | ||
| } | ||
|
|
||
| checkPythonPackageVersion "setuptools" "65.5.1" | ||
|
|
||
| # Check that tools can execute - make sure something didn't get messed up in this scenario | ||
| check "autopep8" autopep8 --version | ||
| check "black" black --version | ||
| check "yapf" yapf --version | ||
| check "bandit" bandit --version | ||
| check "flake8" flake8 --version | ||
| check "mypy" mypy --version | ||
| check "pycodestyle" pycodestyle --version | ||
| check "pydocstyle" pydocstyle --version | ||
| check "pylint" pylint --version | ||
| check "pytest" pytest --version | ||
| check "setuptools" pip list | grep setuptools | ||
|
|
||
| # Check paths in settings | ||
| check "which autopep8" bash -c "which autopep8 | grep /usr/local/py-utils/bin/autopep8" | ||
| check "which black" bash -c "which black | grep /usr/local/py-utils/bin/black" | ||
| check "which yapf" bash -c "which yapf | grep /usr/local/py-utils/bin/yapf" | ||
| check "which bandit" bash -c "which bandit | grep /usr/local/py-utils/bin/bandit" | ||
| check "which flake8" bash -c "which flake8 | grep /usr/local/py-utils/bin/flake8" | ||
| check "which mypy" bash -c "which mypy | grep /usr/local/py-utils/bin/mypy" | ||
| check "which pycodestyle" bash -c "which pycodestyle | grep /usr/local/py-utils/bin/pycodestyle" | ||
| check "which pydocstyle" bash -c "which pydocstyle | grep /usr/local/py-utils/bin/pydocstyle" | ||
| check "which pylint" bash -c "which pylint | grep /usr/local/py-utils/bin/pylint" | ||
| check "which pytest" bash -c "which pytest | grep /usr/local/py-utils/bin/pytest" | ||
|
|
||
| checkVulnerableDir() | ||
| { | ||
| DIRECTORY=$1 | ||
| VERSION=$2 | ||
|
|
||
| if [[ -d $DIRECTORY ]] ; then | ||
| echoStderr "❌ check for vulnerable setuptools version failed for python ${VERSION}." | ||
| return 1 | ||
| else | ||
| echo "✅ Passed! Either the container does not have vulnerable version or vulnerable version specific directory got removed." | ||
| return 0 | ||
| fi | ||
| } | ||
|
|
||
| bash -c "echo -e -n '\n'"; | ||
| bash -c "echo -e 'Files/Folders related to setuptools :-'"; | ||
| bash -c "find / -name \"*setuptools*\";" | ||
|
|
||
| # only for 3.11 | ||
| checkVulnerableDir "/usr/local/py-utils/shared/lib/python3.11/site-packages/setuptools-65.5.0.dist-info" "3.11" | ||
|
|
||
| # Report result | ||
| reportResults |
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.