Skip to content

Cherry-pick updates from upstream juniper.master branch - #273

Merged
mtyaka merged 5 commits into
opencraft-release/juniper.3from
mtyaka/juniper-security-updates
Oct 15, 2020
Merged

Cherry-pick updates from upstream juniper.master branch#273
mtyaka merged 5 commits into
opencraft-release/juniper.3from
mtyaka/juniper-security-updates

Conversation

@mtyaka

@mtyaka mtyaka commented Oct 8, 2020

Copy link
Copy Markdown
Member

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:

@mtyaka mtyaka changed the title WIP: Cherry-pick updates from upstrea juniper.master branch WIP: Cherry-pick updates from upstream juniper.master branch Oct 9, 2020
@mtyaka mtyaka changed the title WIP: Cherry-pick updates from upstream juniper.master branch Cherry-pick updates from upstream juniper.master branch Oct 12, 2020
@clemente
clemente self-requested a review October 13, 2020 13:40

@clemente clemente left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

👍

  • 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.patch are 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

@mtyaka
mtyaka merged commit 5d377d9 into opencraft-release/juniper.3 Oct 15, 2020
@mtyaka
mtyaka deleted the mtyaka/juniper-security-updates branch October 15, 2020 13:07
nizarmah added a commit that referenced this pull request Oct 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants