Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SE-3126 Fix issue caused by XSS fix in Video > Advanced > Transcript Languages #240

Merged

Conversation

pomegranited
Copy link
Member

@pomegranited pomegranited commented Aug 16, 2020

Fixes issue introduced by #237 code ported from upstream.

Screenshots

Before this fix:

broken

After this fix:

fixed

Sandbox

Testing instructions

  1. In Studio, add a Video unit, and edit the unit.
  2. Under Basic, locate "Default Timed Transcript" and click the "Import YouTube Transcript" button, then "Download Transcript for Editing", to download an .srt file.
  3. Change to the Advanced tab, and scroll down to "Transcript languages".
  4. Add a language (any language), and upload the .srt file downloaded in the previous step.
  5. Ensure that you can save the unit.
  6. Re-edit the unit and ensure the .srt file you uploaded remains saved with the video.

Reviewer

Copy link
Member

@pkulkark pkulkark left a comment

Choose a reason for hiding this comment

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

Thanks @pomegranited. This works perfectly! I just noticed that the HtmlUtils method should actually be prepend and not append (the code before the patch was using prepend and the styling is off with append). So I went ahead and pushed the change.

  • I tested this: Verified the transcript languages setting works as described in the testing instructions.
  • I read through the code.
  • I tested for accessibility N/A
  • Includes documentation N/A

@pomegranited
Copy link
Member Author

Thanks for that @pkulkark ! I've re-tested on my devstack with prepend and put the updated screenshot here, for your reference with upstream.

Merging now..

@pomegranited pomegranited merged commit fec11c7 into opencraft-release/juniper.2 Aug 17, 2020
lgp171188 pushed a commit that referenced this pull request Aug 20, 2020
…Languages (#240)

* Fix issue caused by XSS fix in Video > Advanced > Transcript Languages

* change append to prepend

Co-authored-by: pkulkark <[email protected]>
(cherry picked from commit 6eeb1846e260173d5e327aa600f5c3897220fd31)
lgp171188 pushed a commit that referenced this pull request Aug 20, 2020
lgp171188 pushed a commit that referenced this pull request Aug 20, 2020
…Languages (#240)

* Fix issue caused by XSS fix in Video > Advanced > Transcript Languages

* change append to prepend

Co-authored-by: pkulkark <[email protected]>
@pomegranited pomegranited deleted the jill/pooja/apply-xss-patch-juniper branch August 24, 2020 23:54
toxinu pushed a commit that referenced this pull request Sep 16, 2020
…Languages (#240)

* Fix issue caused by XSS fix in Video > Advanced > Transcript Languages

* change append to prepend

Co-authored-by: pkulkark <[email protected]>
viadanna pushed a commit that referenced this pull request Dec 15, 2020
viadanna pushed a commit that referenced this pull request Dec 15, 2020
…Languages (#240)

* Fix issue caused by XSS fix in Video > Advanced > Transcript Languages

* change append to prepend

Co-authored-by: pkulkark <[email protected]>
gabor-boros pushed a commit that referenced this pull request Feb 10, 2022
…_safe

fix: ensure redirect url is whitelisted
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.

2 participants