From 204087efa1bd084ea8300ef86c6d8711c6b135de Mon Sep 17 00:00:00 2001 From: Max Sokolski Date: Wed, 7 Feb 2024 17:41:04 +0200 Subject: [PATCH] revert: fix JWT scopes in XBlock callbacks Reverts https://github.com/overhangio/tutor/pull/986 --- changelog.d/20240207_173504_cmltawt0_revert_jwt_security.md | 2 ++ tutor/templates/build/openedx/Dockerfile | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 changelog.d/20240207_173504_cmltawt0_revert_jwt_security.md diff --git a/changelog.d/20240207_173504_cmltawt0_revert_jwt_security.md b/changelog.d/20240207_173504_cmltawt0_revert_jwt_security.md new file mode 100644 index 0000000000..a4ca2c66a1 --- /dev/null +++ b/changelog.d/20240207_173504_cmltawt0_revert_jwt_security.md @@ -0,0 +1,2 @@ +- [Security] Revert XBlock JWT security patch introduced in https://github.com/overhangio/tutor/pull/986 + since https://github.com/openedx/edx-platform/pull/34047 is merged. (by @cmltawt0) diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile index 51e7db456b..0aef8e81b8 100644 --- a/tutor/templates/build/openedx/Dockerfile +++ b/tutor/templates/build/openedx/Dockerfile @@ -51,8 +51,6 @@ RUN git config --global user.email "tutor@overhang.io" \ {{ patch("openedx-dockerfile-git-patches-default") }} {%- else %} # Patch edx-platform -# XBlock JWT security fix https://github.com/openedx/edx-platform/pull/34047 -RUN curl -fsSL https://github.com/openedx/edx-platform/commit/89f5f69682a5e1422f89e867491e8974dd0a8208.patch | git am {%- endif %} {# Example: RUN curl -fsSL https://github.com/openedx/edx-platform/commit/.patch | git am #}