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

Updates PyYAML to 5.4.1 #82

Merged
merged 3 commits into from Mar 22, 2021
Merged

Updates PyYAML to 5.4.1 #82

merged 3 commits into from Mar 22, 2021

Conversation

emkll
Copy link
Contributor

@emkll emkll commented Mar 2, 2021

Closes freedomofpress/securedrop-builder#219

This should be reviewed/merged in conjunction with the changes in freedomofpress/securedrop-builder#220 (The build CI target will fail until that PR is merged)

Based on the description of CVE-2020-14343:

A vulnerability was discovered in the PyYAML library in versions before 5.4, where it is susceptible to arbitrary code execution when it processes untrusted YAML files through the full_load method or with the FullLoader loader. Applications that use the library to process untrusted input may be vulnerable to this flaw. This flaw allows an attacker to execute arbitrary code on the system by abusing the python/object/new constructor. This flaw is due to an incomplete fix for CVE-2020-1747. See CVE-2020-14343.

We don't use full_load of the FullLoader (we only use it to load the configuration via safe_load) in production, so we shouldn't be vulnerable here. While we should update the version to match the ones use in dev, the changes here will not warrant a proxy release (we can release these updated wheels as part of a future release)

@sssoleileraaa
Copy link
Contributor

kicking ci

sssoleileraaa
sssoleileraaa previously approved these changes Mar 16, 2021
Copy link
Contributor

@sssoleileraaa sssoleileraaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm - can be merged once ci passes

@@ -77,3 +77,15 @@ workflows:
jobs:
- test-buster
- build-buster

nightly:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

b-e-a-utiful

@@ -3,7 +3,7 @@ chardet==3.0.4 --hash=sha256:e5cf39014befb85add77118fdc946f0a3387df7840235ba5d20
furl==2.0.0 --hash=sha256:9f50360f6e4a0f1d0a35fb4997878e7186a73331f0fde5f6fc9b1bb9f006e6cc
idna==2.7 --hash=sha256:a967a752dba5492be34f30f8633cee512d2ec923fe3a2e201d87353b540d2955
orderedmultidict==1.0 --hash=sha256:f6022beda2b3387c61e6eb7e0e1e3e2832fd9f55f3f64d4b4b226eea7487327f
pyyaml==5.3.1 --hash=sha256:ff021f812a5dbaeb10678462952bb447bf6b322ab54923f5591811056a827c15
pyyaml==5.4.1 --hash=sha256:c2ab2737721fe6f5545fa830312fe7b77e74932c8bbd780a17a3d7df2ff65f99
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️

# via
# -r dev-requirements.in
# flake8
pyyaml==5.4.1 \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like you were able to catch em all: https://pypi.org/project/PyYAML/#files

@sssoleileraaa
Copy link
Contributor

CI failing:

Missing sha256sum for package: #
make: *** [Makefile:5: securedrop-proxy] Error 1

@sssoleileraaa sssoleileraaa dismissed their stale review March 16, 2021 18:13

moving back to development -- needs to support new pip-tools format of multiline comment in requirements file

@emkll emkll moved this from Ready for Review to In Development in SecureDrop Team Board Mar 16, 2021
@emkll
Copy link
Contributor Author

emkll commented Mar 17, 2021

Thanks @creviera , I've reverted to the old pip-tools format for the requirements file to unblock this. I've opened freedomofpress/securedrop-builder#225 to track improvements to the build scripts, which we should tackle in the near future (as we may need to revisit this logic as part of freedomofpress/securedrop-builder#218)

This should now be ready for re-review, with CI now passing.

@emkll emkll moved this from In Development to Ready for Review in SecureDrop Team Board Mar 17, 2021
Copy link
Contributor

@kushaldas kushaldas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All points are good, matched hash. Approved.

@kushaldas kushaldas merged commit 9ddbeb7 into main Mar 22, 2021
SecureDrop Team Board automation moved this from Ready for Review to Done Mar 22, 2021
@kushaldas kushaldas deleted the update-pyyaml-541 branch March 22, 2021 12:58
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

Update PyYAML to 5.4.1
3 participants