From 1b008791e5f0c6e48e211c10ac61f259e990a6d7 Mon Sep 17 00:00:00 2001
From: Agrendalath <piotr@surowiec.it>
Date: Mon, 28 Nov 2022 16:14:31 +0100
Subject: [PATCH] feat!: update Drag and Drop v2 XBlock to prevent XSS
 vulnerabilities

BREAKING CHANGE: disallowed HTML tags (e.g. <script>) will no longer be
rendered in LMS and Studio.
---
 requirements/edx/base.in         | 1 +
 requirements/edx/base.txt        | 4 ++--
 requirements/edx/development.txt | 2 +-
 requirements/edx/github.in       | 1 -
 requirements/edx/testing.txt     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/requirements/edx/base.in b/requirements/edx/base.in
index 2ca76e88e8f0..6ec934f21e9a 100644
--- a/requirements/edx/base.in
+++ b/requirements/edx/base.in
@@ -165,3 +165,4 @@ XBlock                              # Courseware component architecture
 xblock-utils                        # Provides utilities used by the Discussion XBlock
 xss-utils                           # https://github.com/edx/edx-platform/pull/20633 Fix XSS via Translations
 enmerkar-underscore                 # Implements a underscore extractor for django-babel.
+xblock-drag-and-drop-v2             # Drag and Drop XBlock
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 590481bc84c9..5ee97f7be7a5 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -1069,8 +1069,8 @@ xblock==1.5.1
     #   xblock-google-drive
     #   xblock-poll
     #   xblock-utils
-xblock-drag-and-drop-v2 @ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5
-    # via -r requirements/edx/github.in
+xblock-drag-and-drop-v2==3.0.0
+    # via -r requirements/edx/base.in
 xblock-poll @ git+https://github.com/open-craft/xblock-poll@v1.12.0
     # via -r requirements/edx/github.in
 xblock-utils==2.2.0
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 9c38cc6b95ab..f433cfca405f 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -1560,7 +1560,7 @@ xblock==1.5.1
     #   xblock-google-drive
     #   xblock-poll
     #   xblock-utils
-xblock-drag-and-drop-v2 @ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5
+xblock-drag-and-drop-v2==3.0.0
     # via -r requirements/edx/testing.txt
 xblock-poll @ git+https://github.com/open-craft/xblock-poll@v1.12.0
     # via -r requirements/edx/testing.txt
diff --git a/requirements/edx/github.in b/requirements/edx/github.in
index 54d08e572a21..f340326d9516 100644
--- a/requirements/edx/github.in
+++ b/requirements/edx/github.in
@@ -74,4 +74,3 @@ git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc32118
 # Third Party XBlocks
 
 git+https://github.com/open-craft/xblock-poll@v1.12.0#egg=xblock-poll==1.12.0
-git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5#egg=xblock-drag-and-drop-v2==2.3.5
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 4922a9351ae8..65d3b3b8db7d 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -1435,7 +1435,7 @@ xblock==1.5.1
     #   xblock-google-drive
     #   xblock-poll
     #   xblock-utils
-xblock-drag-and-drop-v2 @ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5
+xblock-drag-and-drop-v2==3.0.0
     # via -r requirements/edx/base.txt
 xblock-poll @ git+https://github.com/open-craft/xblock-poll@v1.12.0
     # via -r requirements/edx/base.txt