Merge pull request #949 from seriva/fix/CVE-2019-14864

Fix for cve-2019-14864 vulnerability and minor issues
hitachienergy · Feb 27, 2020 · 9914a5c · 9914a5c
2 parents 5fb63ad + 91bafa9
commit 9914a5c
Show file tree

Hide file tree

Showing 6 changed files with 579 additions and 217 deletions.
diff --git a/core/src/epicli/.devcontainer/requirements.txt b/core/src/epicli/.devcontainer/requirements.txt
@@ -1,5 +1,5 @@
 adal==1.2.2
-ansible==2.8.6
+ansible==2.8.8
 antlr4-python3-runtime==4.7.2
 applicationinsights==0.11.7
 argcomplete==1.10.0

diff --git a/core/src/epicli/cli/licenses.py b/core/src/epicli/cli/licenses.py
diff --git a/core/src/epicli/prepare-bds.bat b/core/src/epicli/prepare-bds.bat
@@ -6,3 +6,6 @@ set /p EPICLI_VERSION=<cli/version.txt.py
 pip download --no-clean --no-binary all -d %cd%/external/packages/ --build %cd%/external/ %cd%/dist/epicli-%EPICLI_VERSION%-py3-none-any.whl
 rmdir /Q /S %cd%\external\packages\
 rmdir /Q /S %cd%\external\epicli\
+rmdir /Q /S %cd%\external\build\
+rmdir /Q /S %cd%\external\dist\
+rmdir /Q /S %cd%\external\epicli.egg-info\
diff --git a/core/src/epicli/prepare-bds.sh b/core/src/epicli/prepare-bds.sh
@@ -6,3 +6,6 @@ read EPICLI_VERSION < cli/version.txt.py
 pip download --no-clean --no-binary all -d $PWD/external/packages/ --build $PWD/external/ $PWD/dist/epicli-$EPICLI_VERSION-py3-none-any.whl
 rm -rf $PWD/external/packages/
 rm -rf $PWD/external/epicli/
+rm -rf $PWD/external/build/
+rm -rf $PWD/external/dist/
+rm -rf $PWD/external/epicli.egg-info/
diff --git a/core/src/epicli/requirements.txt b/core/src/epicli/requirements.txt
diff --git a/core/src/epicli/setup.py b/core/src/epicli/setup.py
@@ -10,7 +10,7 @@
 with open('../../../LICENSE') as f:
     license = f.read()
 
-with open('requirements.txt') as f:
+with open('.devcontainer/requirements.txt') as f:
     requirements = f.read().splitlines()
 
 datadir = os.path.join('data')