Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Prepare for the bleach 6.0.0 upgrad.

Browse Source 
Changelog: https://bleach.readthedocs.io/en/latest/changes.html#version-6-0-0-january-23rd-2023

The major change is that the tags and protocols attributes and related
constants are expected to be sets rather than lists.
This commit is contained in:
Feanil Patel
2023-01-31 10:59:21 -05:00
parent 2e4a20eded
commit 57f2ca1a21
5 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/djangoapps/discussion/rest_api/render.py
View File

@@ -7,11 +7,11 @@ implemented in Markdown.Sanitizer.js.
import bleach
import markdown
ALLOWED_TAGS = bleach.ALLOWED_TAGS + [
ALLOWED_TAGS = bleach.ALLOWED_TAGS | {
'br', 'dd', 'del', 'dl', 'dt', 'h1', 'h2', 'h3', 'h4', 'hr', 'img', 'kbd', 'p', 'pre', 's',
'strike', 'sub', 'sup'
]
ALLOWED_PROTOCOLS = ["http", "https", "ftp", "mailto"]
}
ALLOWED_PROTOCOLS = {"http", "https", "ftp", "mailto"}
ALLOWED_ATTRIBUTES = {
"a": ["href", "title", "target", "rel"],
"img": ["src", "alt", "title", "width", "height"],

2
lms/templates/courseware/progress_graph.js
View File

@@ -74,7 +74,7 @@ $(function () {
## allowing the display of such images, and remove any previously stored HTML
## to prevent ugly HTML from being shown to learners.
## xss-lint: disable=javascript-jquery-append
ticks.append( [tickIndex, bleach.clean(section['label'], tags=[], strip=True)] )
ticks.append( [tickIndex, bleach.clean(section['label'], tags=set(), strip=True)] )
if section['category'] in detail_tooltips:
## xss-lint: disable=javascript-jquery-append

2
openedx/core/djangolib/markup.py
View File

@@ -53,7 +53,7 @@ def strip_all_tags_but_br(string_to_strip):
string_to_strip = ""
string_to_strip = decode.utf8(string_to_strip)
string_to_strip = bleach.clean(string_to_strip, tags=['br'], strip=True)
string_to_strip = bleach.clean(string_to_strip, tags={'br'}, strip=True)
return HTML(string_to_strip)

4
requirements/constraints.txt
View File

@@ -75,7 +75,3 @@ pyopenssl==22.0.0
cryptography==38.0.4 # greater version has some issues with openssl.
# These two constraints will be removed in this PR: https://github.com/openedx/edx-platform/pull/31678
bleach[css]==5.0.1 # greater version has some breaking changes.
openedx-django-wiki<2.0.0 # greater version needs bleech >6.0.0

10
xmodule/capa/util.py
View File

@@ -191,8 +191,8 @@ def sanitize_html(html_code):
})
output = bleach.clean(
html_code,
protocols=bleach.ALLOWED_PROTOCOLS + ['data'],
tags=bleach.ALLOWED_TAGS + ['div', 'p', 'audio', 'pre', 'img', 'span'],
protocols=bleach.ALLOWED_PROTOCOLS | {'data'},
tags=bleach.ALLOWED_TAGS | {'div', 'p', 'audio', 'pre', 'img', 'span'},
css_sanitizer=CSSSanitizer(allowed_css_properties=["white-space"]),
attributes=attributes
)
@@ -216,12 +216,12 @@ def remove_markup(html):
"""
Return html with markup stripped and text HTML-escaped.
>>> bleach.clean("<b>Rock & Roll</b>", tags=[], strip=True)
>>> bleach.clean("<b>Rock & Roll</b>", tags=set(), strip=True)
'Rock &amp; Roll'
>>> bleach.clean("<b>Rock &amp; Roll</b>", tags=[], strip=True)
>>> bleach.clean("<b>Rock &amp; Roll</b>", tags=set(), strip=True)
'Rock &amp; Roll'
"""
return HTML(bleach.clean(html, tags=[], strip=True))
return HTML(bleach.clean(html, tags=set(), strip=True))
def get_course_id_from_capa_block(capa_block):