Cherry-pick updates from upstream juniper.master branch - #273
Merged
mtyaka merged 5 commits intoOct 15, 2020
Conversation
clemente
self-requested a review
October 13, 2020 13:40
clemente
approved these changes
Oct 13, 2020
clemente
left a comment
There was a problem hiding this comment.
👍
- I tested this: (describe what you tested)
- in the sandbox, the password reset form worked and I could change mine. It's not very intuitive in an edge case (when you mistype the new password you want, it will refresh and complain that the password reset link isn't valid, and you need to click the link again)
- the password reset link went to https://juniper-security-fixes.opencraft.hosting/password_reset_confirm/c-5kp-505exxxxxxxxxxxxxxxxx/?track=pwreset, which redirected to https://juniper-security-fixes.opencraft.hosting/password_reset_confirm/c-set-password/, and this means that clicking away from this page wont't leak the token in the Referer HTTP field
- the video transcript upload (previously broken): in Advanced → transcript languages → add → upload → I could upload one. This was fixed by a previous commit but is part of SE-3474 too
- the signature upload worked (fixed in the same way)
- [] some of the CMS parts affected by
juniper-sustaining-security-fixes-6.patchare working. I didn't test this since the changes seem small and it would take long to test, and we rely on the upstream patch working - the new certificate URL works, and the old one shows a warning
- I read through the code
- I checked that the sandbox runs the right branch
- it applies
juniper-sustaining-security-fixes-6.patch(CMS), in full - it doesn't apply the fix for the video upload because it was already merged in #272
- it applies the fix for the password reset
- it includes 3 other commits from upstream (juniper-worker, exposed user id in certificates, Django 2.2.16)
- I checked for accessibility issues: no new ones
- Includes documentation: not needed
nizarmah
added a commit
that referenced
this pull request
Oct 18, 2020
Cherry picked and squashed from #273
This was referenced Oct 30, 2020
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This cherry-picks security updates and fixes from open-release/juniper.master.
Sandbox:
Test instructions:
Verify that things work correctly with the security fixes & updates applied.
The main changes are in password reset handling and certificate URLs.
Reviewers: