Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

Commit

Permalink
[DCOS-44001] Fix GitHub Security Warnings (#2780)
Browse files Browse the repository at this point in the history
* Update cryptography and requests PyPi versions.

* Replace PyCrpto with PyCryptoDome. PyCrytoDome is intended to be a drop-in replacement for PyCrypto, and PyCrypto is dead according to this URL:pycrypto/pycrypto#253 (comment)

* Remove pycrypto-2.6.1 which has a security vulnerability.

* Update Dockerfile to use updated docker-commons-base image.

GitHub PR: #2784
was used as an intermediate step to generate the dcos-commons-base
image.

* Pull dcos-commons-base as tagged image as opposed to sha256.

* Use image SHA-256 hash instead of GIT-SHA for Dockerfile.base
  • Loading branch information
kaiwalyajoshi authored Nov 20, 2018
1 parent 14f0e07 commit 8cc95b7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# not be updating this dependency. See
# https://mesosphere.slack.com/archives/C4E91G0CX/p1541505296001800 for more
# background.
FROM mesosphere/dcos-commons-base@sha256:e9f67d72aa1431f4a15544981285f028decc7507538f8e5aa8b0888a94d820c0
FROM mesosphere/dcos-commons-base@sha256:076d1fdf4033ccd25fcedc3402a23cf017285672181d94e2f6fb11ace48c310e

ENV GO_VERSION=1.10.2
ENV PATH=$PATH:/usr/local/go/bin
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,6 @@ RUN apt-get update && \
zip && \
rm -rf /var/lib/apt/lists/* && \
java -version

#Remove pycrypto-2.6.1 due to https://nvd.nist.gov/vuln/detail/CVE-2018-6594
RUN apt-get remove -y python3-crypto
6 changes: 3 additions & 3 deletions frozen_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ cfgv==1.1.0
chardet==3.0.4
Click==7.0
colorama==0.3.9
cryptography==2.0.2
cryptography==2.3.1
dcos-shakedown==1.4.12
docopt==0.6.2
docutils==0.14
Expand Down Expand Up @@ -85,7 +85,7 @@ pyasn1==0.4.4
pyasn1-modules==0.2.2
pycodestyle==2.3.1
pycparser==2.19
pycrypto==2.6.1
pycryptodome==3.7.0
pyflakes==1.6.0
Pygments==2.2.0
pygobject==3.26.1
Expand All @@ -98,7 +98,7 @@ pytest-timeout==1.3.2
python-dateutil==2.7.3
pyxdg==0.25
PyYAML==3.13
requests==2.19.1
requests==2.20.0
requests-oauthlib==1.0.0
retrying==1.3.3
rsa==4.0
Expand Down

0 comments on commit 8cc95b7

Please sign in to comment.