Skip to content

fix: update xblock-drag-and-drop for a high level security alert #705

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.

Sign up for GitHub

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

Merged
Ian2012 merged 2 commits into from
Dec 5, 2022
Merged

fix: update xblock-drag-and-drop for a high level security alert #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c08d69
fix: update xblock-drag-and-drop for a high level security alert
Ian2012 Nov 26, 2022
91fe287
chore: compiled dependencies
Ian2012 Nov 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion requirements/common_constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,15 @@


# using LTS django version

Django<4.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
elasticsearch<7.14.0

# setuptools==60.0 had breaking changes and busted several service's pipeline.
# Details can be found here: https://github.com/pypa/setuptools/issues/2940
setuptools<60

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0
1 change: 1 addition & 0 deletions requirements/edx-sandbox/py35.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ networkx==2.2
# -r requirements/edx-sandbox/py35.in
nltk==3.6.2
# via
# -c requirements/edx-sandbox/py35-constraints.txt
# -r requirements/edx-sandbox/py35.in
# chem
numpy==1.16.5
Expand Down
9 changes: 4 additions & 5 deletions requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,7 @@ cryptography==35.0.0
cssutils==2.3.0
# via pynliner
ddt==1.4.4
# via
# xblock-drag-and-drop-v2
# xblock-poll
# via xblock-poll
defusedxml==0.7.1
# via
# -r requirements/edx/base.in
Expand All @@ -165,6 +163,7 @@ deprecated==1.2.13
# via jwcrypto
django==3.2.13
# via
# -c requirements/edx/../common_constraints.txt
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.in
# django-appconf
Expand Down Expand Up @@ -327,6 +326,7 @@ django-ses==2.3.0
# via -r requirements/edx/base.in
django-simple-history==3.0.0
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/base.in
# edx-enterprise
# edx-organizations
Expand Down Expand Up @@ -641,7 +641,6 @@ maxminddb==2.2.0
mock==4.0.3
# via
# -r requirements/edx/paver.txt
# xblock-drag-and-drop-v2
# xblock-poll
mongodbproxy @ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a
# via -r requirements/edx/github.in
Expand Down Expand Up @@ -1056,7 +1055,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 @ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v3.0.0
# via -r requirements/edx/github.in
xblock-poll @ git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d
# via -r requirements/edx/github.in
Expand Down
6 changes: 3 additions & 3 deletions requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ cssutils==2.3.0
ddt==1.4.4
# via
# -r requirements/edx/testing.txt
# xblock-drag-and-drop-v2
# xblock-poll
defusedxml==0.7.1
# via
Expand All @@ -245,6 +244,7 @@ distlib==0.3.3
# virtualenv
django==3.2.13
# via
# -c requirements/edx/../common_constraints.txt
# -c requirements/edx/../constraints.txt
# -r requirements/edx/testing.txt
# django-appconf
Expand Down Expand Up @@ -420,6 +420,7 @@ django-ses==2.3.0
# via -r requirements/edx/testing.txt
django-simple-history==3.0.0
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/testing.txt
# edx-enterprise
# edx-organizations
Expand Down Expand Up @@ -865,7 +866,6 @@ mistune==0.8.4
mock==4.0.3
# via
# -r requirements/edx/testing.txt
# xblock-drag-and-drop-v2
# xblock-poll
mongodbproxy @ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a
# via -r requirements/edx/testing.txt
Expand Down Expand Up @@ -1537,7 +1537,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 @ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v3.0.0
# via -r requirements/edx/testing.txt
xblock-poll @ git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d
# via -r requirements/edx/testing.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/github.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ git+https://github.com/edx/django-require.git@0c54adb167142383b26ea6b3edecc32118
# Third Party XBlocks

git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d#egg=xblock-poll==1.10.2
git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v2.3.5#egg=xblock-drag-and-drop-v2==2.3.5
git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v3.0.0#egg=xblock-drag-and-drop-v2==3.0.0
7 changes: 3 additions & 4 deletions requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ attrs==21.2.0
# aiohttp
# edx-ace
# openedx-events
# outcome
# pytest
babel==2.9.1
# via
Expand Down Expand Up @@ -210,7 +209,6 @@ ddt==1.4.4
# via
# -r requirements/edx/base.txt
# -r requirements/edx/testing.in
# xblock-drag-and-drop-v2
# xblock-poll
defusedxml==0.7.1
# via
Expand All @@ -232,6 +230,7 @@ diff-cover==4.0.0
distlib==0.3.3
# via virtualenv
# via
# -c requirements/edx/../common_constraints.txt
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
# django-appconf
Expand Down Expand Up @@ -404,6 +403,7 @@ django-ses==2.3.0
# via -r requirements/edx/base.txt
django-simple-history==3.0.0
# via
# -c requirements/edx/../common_constraints.txt
# -r requirements/edx/base.txt
# edx-enterprise
# edx-organizations
Expand Down Expand Up @@ -818,7 +818,6 @@ mccabe==0.6.1
mock==4.0.3
# via
# -r requirements/edx/base.txt
# xblock-drag-and-drop-v2
# xblock-poll
mongodbproxy @ git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a
# via -r requirements/edx/base.txt
Expand Down Expand Up @@ -1413,7 +1412,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 @ git+https://github.com/edx-solutions/xblock-drag-and-drop-v2@v3.0.0
# via -r requirements/edx/base.txt
xblock-poll @ git+https://github.com/open-craft/xblock-poll@922cd36fb1c3cfe00b4ce03b19a13185d136447d
# via -r requirements/edx/base.txt
Expand Down