taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #150 from taigaio/issue/1532/markdown-problems 

Adding br an ins to the whitelist of the bleach tags
remotes/origin/enhancement/email-actions
Alejandro 2014-11-05 11:43:32 +01:00
parent e695abf953 22a8e391df
commit 257ed89b04
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
taiga/mdrender/service.py
View File

@ -51,13 +51,16 @@ from .extensions.mentions import MentionsExtension
from .extensions.references import TaigaReferencesExtension
ALLOWED_TAGS = bleach.ALLOWED_TAGS + ["p", "table", "th", "tr", "td", "h1",
"h2", "h3", "div", "pre", "span", "hr", "dl", "dt", "dd", "sup",
"img", "del"]
ALLOWED_ATTRS = bleach.ALLOWED_ATTRIBUTES
ALLOWED_ATTRS["a"] = ["href", "title", "alt"]
ALLOWED_ATTRS["img"] = ["alt", "src"]
ALLOWED_ATTRS["*"] = ["class"]
# Bleach configuration
bleach.ALLOWED_TAGS += ["p", "table", "th", "tr", "td", "h1", "h2", "h3",
"div", "pre", "span", "hr", "dl", "dt", "dd", "sup",
"img", "del", "br", "ins"]
bleach.ALLOWED_STYLES.append("background")
bleach.ALLOWED_ATTRIBUTES["a"] = ["href", "title", "alt"]
bleach.ALLOWED_ATTRIBUTES["img"] = ["alt", "src"]
bleach.ALLOWED_ATTRIBUTES["*"] = ["class", "style"]
def _make_extensions_list(wikilinks_config=None, project=None):
@ -112,12 +115,12 @@ def _get_markdown(project):
@cache_by_sha
def render(project, text):
md = _get_markdown(project)
return bleach.clean(md.convert(text), tags=ALLOWED_TAGS)
return bleach.clean(md.convert(text))
def render_and_extract(project, text):
md = _get_markdown(project)
result = bleach.clean(md.convert(text), tags=ALLOWED_TAGS)
result = bleach.clean(md.convert(text))
return (result, md.extracted_data)