Skip to content

Commit fc8825c

Browse files
Revert "[universal]-fixing urllib3 vulnerability (devcontainers#1545)"
This reverts commit 8628491.
1 parent 27641b8 commit fc8825c

File tree

4 files changed

+10
-12
lines changed

4 files changed

+10
-12
lines changed

src/universal/.devcontainer/local-features/patch-conda/install.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,8 @@ sudo_if /opt/conda/bin/python3 -m pip install --upgrade pip
5454
# https://github.com/advisories/GHSA-h4gh-qq45-vh27
5555
update_python_package /opt/conda/bin/python3 cryptography "43.0.1"
5656

57-
update_conda_package pyopenssl "25.0.0"
58-
59-
# https://github.com/advisories/GHSA-pq67-6m6q-mj2v
60-
update_conda_package urllib3 "2.5.0"
57+
# https://github.com/advisories/GHSA-34jh-p97f-mpxf
58+
update_conda_package urllib3 "1.26.19"
6159

6260
# https://github.com/advisories/GHSA-9hjg-9r4m-mvj7
6361
update_conda_package requests "2.32.4"
@@ -66,4 +64,4 @@ update_conda_package requests "2.32.4"
6664
update_conda_package setuptools "78.1.1"
6765

6866
# https://github.com/advisories/GHSA-g7vv-2v7x-gj9p
69-
update_python_package /opt/conda/bin/python3 tqdm "4.66.3"
67+
update_python_package /opt/conda/bin/python3 tqdm "4.66.3"

src/universal/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ You can decide how often you want updates by referencing a [semantic version](ht
2828
For example:
2929

3030
- `mcr.microsoft.com/devcontainers/universal:4-noble`
31-
- `mcr.microsoft.com/devcontainers/universal:4.1-noble`
32-
- `mcr.microsoft.com/devcontainers/universal:4.1.0-noble`
31+
- `mcr.microsoft.com/devcontainers/universal:4.0-noble`
32+
- `mcr.microsoft.com/devcontainers/universal:4.0.0-noble`
3333

3434
See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/universal/tags/list).
3535

@@ -47,7 +47,7 @@ Access to the Anaconda repository is covered by the [Anaconda Terms of Service](
4747

4848
While the image itself works unmodified, you can also directly reference pre-built versions of `Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` to:
4949

50-
`mcr.microsoft.com/devcontainers/universal:4.1-linux`
50+
`mcr.microsoft.com/devcontainers/universal:4-linux`
5151

5252
Alternatively, you can use the contents of [.devcontainer](.devcontainer) to fully customize your container's contents or to build it for a container host architecture not supported by the image.
5353

src/universal/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "4.1.0",
2+
"version": "4.0.1",
33
"build": {
44
"latest": true,
55
"rootDistro": "debian",

src/universal/test-project/test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,13 @@ ls -la /home/codespace
186186
## Python - current
187187
checkPythonPackageVersion "python" "setuptools" "65.5.1"
188188
checkPythonPackageVersion "python" "requests" "2.31.0"
189-
checkPythonPackageVersion "python" "urllib3" "2.5.0"
189+
checkPythonPackageVersion "python" "urllib3" "2.0.7"
190190

191191
## Conda Python
192192
checkCondaPackageVersion "requests" "2.31.0"
193193
checkCondaPackageVersion "cryptography" "41.0.4"
194-
checkCondaPackageVersion "pyopenssl" "25.0.0"
195-
checkCondaPackageVersion "urllib3" "2.5.0"
194+
checkCondaPackageVersion "pyopenssl" "23.2.0"
195+
checkCondaPackageVersion "urllib3" "1.26.17"
196196

197197
## Test Conda
198198
check "conda-update-conda" bash -c "conda update -y conda"

0 commit comments

Comments
 (0)