| {"repo": "PyCon/pycon2019", "pull_number": 314, "instance_id": "PyCon__pycon2019-314", "issue_numbers": "", "base_commit": "bb5695c67a7b91e15e94bb498fb1ddb38635c0a1", "patch": "diff --git a/pycon/settings/base.py b/pycon/settings/base.py\n--- a/pycon/settings/base.py\n+++ b/pycon/settings/base.py\n@@ -4,6 +4,8 @@\n import os.path\n import posixpath\n \n+import bleach\n+\n from django.core.urlresolvers import reverse_lazy\n \n \n@@ -348,3 +350,5 @@ def env_or_default(NAME, default):\n # logging with an empty dictionary.\n from django.utils.log import DEFAULT_LOGGING\n LOGGING = DEFAULT_LOGGING\n+\n+BLEACH_ALLOWED_TAGS = bleach.ALLOWED_TAGS + ['p']\ndiff --git a/symposion/markdown_parser.py b/symposion/markdown_parser.py\n--- a/symposion/markdown_parser.py\n+++ b/symposion/markdown_parser.py\n@@ -1,17 +1,11 @@\n-import html5lib\n-from html5lib import html5parser, sanitizer\n-\n+import bleach\n import markdown\n \n+from django.conf import settings\n+\n \n def parse(text):\n- \n- # First run through the Markdown parser\n+ \"\"\"Convert markdown text to sanitized HTML.\"\"\"\n text = markdown.markdown(text, extensions=[\"extra\"], safe_mode=False)\n- \n- # Sanitize using html5lib\n- bits = []\n- parser = html5parser.HTMLParser(tokenizer=sanitizer.HTMLSanitizer)\n- for token in parser.parseFragment(text).childNodes:\n- bits.append(token.toxml())\n- return \"\".join(bits)\n+ text = bleach.clean(text, tags=settings.BLEACH_ALLOWED_TAGS)\n+ return text\ndiff --git a/symposion/reviews/templatetags/review_tags.py b/symposion/reviews/templatetags/review_tags.py\n--- a/symposion/reviews/templatetags/review_tags.py\n+++ b/symposion/reviews/templatetags/review_tags.py\n@@ -1,6 +1,7 @@\n import bleach\n \n from django import template\n+from django.conf import settings\n \n from symposion.reviews.models import Review, ReviewAssignment\n \n@@ -24,4 +25,4 @@ def review_assignments(context):\n \n @register.filter(\"bleach\")\n def _bleach(text):\n- return bleach.clean(text)\n+ return bleach.clean(text, tags=settings.BLEACH_ALLOWED_TAGS)\n", "test_patch": "", "problem_statement": "", "hints_text": "", "created_at": "2014-09-04T14:36:35Z"} | |