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

Sustaining xss fixes #228

Merged

Conversation

Agrendalath
Copy link
Member

This is a cherry-pick of a patch fixing XSS vulnerabilities (edx/edx-platform#24568).

@Agrendalath
Copy link
Member Author

@taniwha, is there an upstream commit for this second fix? If so, please drop this one and use git cherry-pick -x COMMIT_HASH (-x will provide the original commit hash). This way we will preserve the proper commit history.

@taniwha
Copy link

taniwha commented Aug 3, 2020

@Agrendalath that would apply to all these PRs, right?

@Agrendalath
Copy link
Member Author

@taniwha, that's correct.

@taniwha taniwha force-pushed the agrendalath/bb-2779-xss-patches branch from 81ce7d3 to db0ce9c Compare August 7, 2020 01:06
@lgp171188
Copy link

@Agrendalath, except for the 3704eb2 commit, I don't see pointers to where the other commits are cherry-picked from and how they are related to the reported security issues and the corresponding fixes. Do you have any context about this?

@lgp171188 lgp171188 force-pushed the agrendalath/bb-2779-xss-patches branch from a8500fa to c048164 Compare August 20, 2020 15:20
Ali-D-Akbar and others added 10 commits August 20, 2020 20:56
This commit contains xsslint fixes for the following Jira Tickets:

PROD-1661
PROD-1663
PROD-1665
PROD-1727
PROD-1729
PROD-1731
PROD-1732
PROD-1795

(cherry picked from commit 0e45ecb)
PROD-1725
PROD-1726
PROD-1617
1. PROD-1603
2. PROD-1605
3. PROD-1612
4. PROD-1619
5. PROD-1289
6. PROD-1530
7. PROD-1525
8. PROD-1534

(cherry picked from commit d9e0ca5)
…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 lgp171188 force-pushed the agrendalath/bb-2779-xss-patches branch from c048164 to 1818f76 Compare August 20, 2020 15:27
@Agrendalath
Copy link
Member Author

@lgp171188, I suppose this question is no longer relevant after your force push?

@lgp171188
Copy link

@lgp171188, I suppose this question is no longer relevant after your force push?

@Agrendalath, those commits still don't have any reference to upstream PRs. So I my question is still relevant. But since all those commits are from someone outside OpenCraft, it is obvious that they are cherry-picks from upstream and I am okay with merging this PR as-is.

@lgp171188
Copy link

@Agrendalath, if you are okay with the changes in this PR, can you approve it? CC @kaizoku

@kaizoku
Copy link

kaizoku commented Aug 21, 2020

👍

  • [✓] I tested this: (verified changes match upstream as they are cherry-picked)
  • [✓] I read through the code
  • [n/a] I checked for accessibility issues
  • [n/a] Includes documentation

@lgp171188 lgp171188 merged commit b726fe1 into opencraft-release/ironwood.2 Aug 21, 2020
jvdm pushed a commit that referenced this pull request Apr 23, 2021
@bradenmacdonald bradenmacdonald deleted the agrendalath/bb-2779-xss-patches branch January 12, 2022 01:09
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.

7 participants