fix(jupiter): sanitizing rendering (HTML) of jupyter notebooks, upgraded bleach version. Fixes RCCE-15, RCCE-14

requirements.txt

@@ -1,295 +1,295 b''
 # deps, generated via pipdeptree --exclude setuptools,wheel,pipdeptree,pip -f | tr '[:upper:]' '[:lower:]'
 
 alembic==1.12.1
   mako==1.2.4
     markupsafe==2.1.2
   sqlalchemy==1.4.50
     greenlet==3.0.3
   typing_extensions==4.8.0
 async-timeout==4.0.3
 babel==2.12.1
 beaker==1.12.1
 celery==5.3.4
   billiard==4.1.0
   click==8.1.3
   click-didyoumean==0.3.0
     click==8.1.3
   click-plugins==1.1.1
     click==8.1.3
   click-repl==0.2.0
     click==8.1.3
     prompt-toolkit==3.0.38
       wcwidth==0.2.6
     six==1.16.0
   kombu==5.3.2
     amqp==5.1.1
       vine==5.0.0
     vine==5.0.0
   python-dateutil==2.8.2
     six==1.16.0
   tzdata==2023.3
   vine==5.0.0
 channelstream==0.7.1
   gevent==23.9.1
     greenlet==3.0.3
     zope.event==5.0.0
     zope.interface==6.1.0
   itsdangerous==1.1.0
   marshmallow==2.18.0
   pyramid==2.0.2
     hupper==1.12
     plaster==1.1.2
     plaster-pastedeploy==1.0.1
       pastedeploy==3.1.0
       plaster==1.1.2
     translationstring==1.4
     venusian==3.0.0
     webob==1.8.7
     zope.deprecation==5.0.0
     zope.interface==6.1.0
   pyramid-apispec==0.3.3
     apispec==1.3.3
   pyramid-jinja2==2.10
     jinja2==3.1.2
       markupsafe==2.1.2
     markupsafe==2.1.2
     pyramid==2.0.2
       hupper==1.12
       plaster==1.1.2
       plaster-pastedeploy==1.0.1
         pastedeploy==3.1.0
         plaster==1.1.2
       translationstring==1.4
       venusian==3.0.0
       webob==1.8.7
       zope.deprecation==5.0.0
       zope.interface==6.1.0
     zope.deprecation==5.0.0
   python-dateutil==2.8.2
     six==1.16.0
   requests==2.28.2
     certifi==2022.12.7
     charset-normalizer==3.1.0
     idna==3.4
     urllib3==1.26.14
   ws4py==0.5.1
 deform==2.0.15
   chameleon==3.10.2
   colander==2.0
     iso8601==1.1.0
     translationstring==1.4
   iso8601==1.1.0
   peppercorn==0.6
   translationstring==1.4
   zope.deprecation==5.0.0
 diskcache==5.6.3
 docutils==0.19
 dogpile.cache==1.3.0
   decorator==5.1.1
   stevedore==5.1.0
     pbr==5.11.1
 formencode==2.1.0
   six==1.16.0
 gunicorn==21.2.0
   packaging==23.1
 gevent==23.9.1
   greenlet==3.0.3
   zope.event==5.0.0
   zope.interface==6.1.0
 ipython==8.14.0
   backcall==0.2.0
   decorator==5.1.1
   jedi==0.19.0
     parso==0.8.3
   matplotlib-inline==0.1.6
     traitlets==5.9.0
   pexpect==4.8.0
     ptyprocess==0.7.0
   pickleshare==0.7.5
   prompt-toolkit==3.0.38
     wcwidth==0.2.6
   pygments==2.15.1
   stack-data==0.6.2
     asttokens==2.2.1
       six==1.16.0
     executing==1.2.0
     pure-eval==0.2.2
   traitlets==5.9.0
 markdown==3.4.3
 msgpack==1.0.7
 mysqlclient==2.1.1
 nbconvert==7.7.3
   beautifulsoup4==4.11.2
     soupsieve==2.4
-  bleach==6.0.0
+  bleach==6.1.0
     six==1.16.0
     webencodings==0.5.1
   defusedxml==0.7.1
   jinja2==3.1.2
     markupsafe==2.1.2
   jupyter_core==5.3.1
     platformdirs==3.10.0
     traitlets==5.9.0
   jupyterlab-pygments==0.2.2
   markupsafe==2.1.2
   mistune==2.0.5
   nbclient==0.8.0
     jupyter_client==8.3.0
       jupyter_core==5.3.1
         platformdirs==3.10.0
         traitlets==5.9.0
       python-dateutil==2.8.2
         six==1.16.0
       pyzmq==25.0.0
       tornado==6.2
       traitlets==5.9.0
     jupyter_core==5.3.1
       platformdirs==3.10.0
       traitlets==5.9.0
     nbformat==5.9.2
       fastjsonschema==2.18.0
       jsonschema==4.18.6
         attrs==22.2.0
         pyrsistent==0.19.3
       jupyter_core==5.3.1
         platformdirs==3.10.0
         traitlets==5.9.0
       traitlets==5.9.0
     traitlets==5.9.0
   nbformat==5.9.2
     fastjsonschema==2.18.0
     jsonschema==4.18.6
       attrs==22.2.0
       pyrsistent==0.19.3
     jupyter_core==5.3.1
       platformdirs==3.10.0
       traitlets==5.9.0
     traitlets==5.9.0
   packaging==23.1
   pandocfilters==1.5.0
   pygments==2.15.1
   tinycss2==1.2.1
     webencodings==0.5.1
   traitlets==5.9.0
 orjson==3.9.10
 pastescript==3.3.0
   paste==3.7.1
     six==1.16.0
   pastedeploy==3.1.0
   six==1.16.0
 premailer==3.10.0
   cachetools==5.3.1
   cssselect==1.2.0
   cssutils==2.6.0
   lxml==4.9.3
   requests==2.28.2
     certifi==2022.12.7
     charset-normalizer==3.1.0
     idna==3.4
     urllib3==1.26.14
 psutil==5.9.5
 psycopg2==2.9.9
 py-bcrypt==0.4
 pycmarkgfm==1.2.0
   cffi==1.16.0
     pycparser==2.21
 pycryptodome==3.17
 pycurl==7.45.2
 pymysql==1.0.3
 pyotp==2.8.0
 pyparsing==3.1.1
 pyramid-debugtoolbar==4.10
   pygments==2.15.1
   pyramid==2.0.2
     hupper==1.12
     plaster==1.1.2
     plaster-pastedeploy==1.0.1
       pastedeploy==3.1.0
       plaster==1.1.2
     translationstring==1.4
     venusian==3.0.0
     webob==1.8.7
     zope.deprecation==5.0.0
     zope.interface==6.1.0
   pyramid-mako==1.1.0
     mako==1.2.4
       markupsafe==2.1.2
     pyramid==2.0.2
       hupper==1.12
       plaster==1.1.2
       plaster-pastedeploy==1.0.1
         pastedeploy==3.1.0
         plaster==1.1.2
       translationstring==1.4
       venusian==3.0.0
       webob==1.8.7
       zope.deprecation==5.0.0
       zope.interface==6.1.0
 pyramid-mailer==0.15.1
   pyramid==2.0.2
     hupper==1.12
     plaster==1.1.2
     plaster-pastedeploy==1.0.1
       pastedeploy==3.1.0
       plaster==1.1.2
     translationstring==1.4
     venusian==3.0.0
     webob==1.8.7
     zope.deprecation==5.0.0
     zope.interface==6.1.0
   repoze.sendmail==4.4.1
     transaction==3.1.0
       zope.interface==6.1.0
     zope.interface==6.1.0
   transaction==3.1.0
     zope.interface==6.1.0
 python-ldap==3.4.3
   pyasn1==0.4.8
   pyasn1-modules==0.2.8
     pyasn1==0.4.8
 python-memcached==1.59
   six==1.16.0
 python-pam==2.0.2
 python3-saml==1.15.0
   isodate==0.6.1
     six==1.16.0
   lxml==4.9.3
   xmlsec==1.3.13
     lxml==4.9.3
 pyyaml==6.0.1
 redis==5.0.1
 regex==2022.10.31
 routes==2.5.1
   repoze.lru==0.7
   six==1.16.0
 simplejson==3.19.1
 sshpubkeys==3.3.1
   cryptography==40.0.2
     cffi==1.16.0
       pycparser==2.21
   ecdsa==0.18.0
     six==1.16.0
 sqlalchemy==1.4.50
   greenlet==3.0.3
   typing_extensions==4.8.0
 supervisor==4.2.5
 tzlocal==4.3
   pytz-deprecation-shim==0.1.0.post0
     tzdata==2023.3
 unidecode==1.3.6
 urlobject==2.4.3
 waitress==2.1.2
 weberror==0.13.1
   paste==3.7.1
     six==1.16.0
   pygments==2.15.1
   tempita==0.5.2
   webob==1.8.7
 webhelpers2==2.0
   markupsafe==2.1.2
   six==1.16.0
 whoosh==2.7.4
 zope.cachedescriptors==5.0.0
 
 ## uncomment to add the debug libraries
 #-r requirements_debug.txt

rhodecode/lib/markup_renderer.py

@@ -1,543 +1,562 b''
 
 
 # Copyright (C) 2011-2023 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
 """
 Renderer for markup languages with ability to parse using rst or markdown
 """
 
 import re
 import os
 import lxml
 import logging
 import urllib.parse
 import pycmarkgfm
 
 from mako.lookup import TemplateLookup
 from mako.template import Template as MakoTemplate
 
 from docutils.core import publish_parts
 from docutils.parsers.rst import directives
 from docutils import writers
 from docutils.writers import html4css1
 import markdown
 
 from rhodecode.lib.utils2 import safe_str, MENTIONS_REGEX
 
 log = logging.getLogger(__name__)
 
 # default renderer used to generate automated comments
 DEFAULT_COMMENTS_RENDERER = 'rst'
 
 try:
     from lxml.html import fromstring
     from lxml.html import tostring
 except ImportError:
     log.exception('Failed to import lxml')
     fromstring = None
     tostring = None
 
 
 class CustomHTMLTranslator(writers.html4css1.HTMLTranslator):
     """
     Custom HTML Translator used for sandboxing potential
     JS injections in ref links
     """
     def visit_literal_block(self, node):
         self.body.append(self.starttag(node, 'pre', CLASS='codehilite literal-block'))
 
     def visit_reference(self, node):
         if 'refuri' in node.attributes:
             refuri = node['refuri']
             if ':' in refuri:
                 prefix, link = refuri.lstrip().split(':', 1)
                 prefix = prefix or ''
 
                 if prefix.lower() == 'javascript':
                     # we don't allow javascript type of refs...
                     node['refuri'] = 'javascript:alert("SandBoxedJavascript")'
 
         # old style class requires this...
         return html4css1.HTMLTranslator.visit_reference(self, node)
 
 
 class RhodeCodeWriter(writers.html4css1.Writer):
     def __init__(self):
         super(RhodeCodeWriter, self).__init__()
         self.translator_class = CustomHTMLTranslator
 
 
 def relative_links(html_source, server_paths):
     if not html_source:
         return html_source
 
     if not fromstring and tostring:
         return html_source
 
     try:
         doc = lxml.html.fromstring(html_source)
     except Exception:
         return html_source
 
     for el in doc.cssselect('img, video'):
         src = el.attrib.get('src')
         if src:
             el.attrib['src'] = relative_path(src, server_paths['raw'])
 
     for el in doc.cssselect('a:not(.gfm)'):
         src = el.attrib.get('href')
         if src:
             raw_mode = el.attrib['href'].endswith('?raw=1')
             if raw_mode:
                 el.attrib['href'] = relative_path(src, server_paths['raw'])
             else:
                 el.attrib['href'] = relative_path(src, server_paths['standard'])
 
     return lxml.html.tostring(doc, encoding='unicode')
 
 
 def relative_path(path, request_path, is_repo_file=None):
     """
     relative link support, path is a rel path, and request_path is current
     server path (not absolute)
 
     e.g.
 
     path = '../logo.png'
     request_path= '/repo/files/path/file.md'
     produces: '/repo/files/logo.png'
     """
     # TODO(marcink): unicode/str support ?
     # maybe=> safe_str(urllib.quote(safe_str(final_path), '/:'))
 
     def dummy_check(p):
         return True  # assume default is a valid file path
 
     is_repo_file = is_repo_file or dummy_check
     if not path:
         return request_path
 
     path = safe_str(path)
     request_path = safe_str(request_path)
 
     if path.startswith(('data:', 'javascript:', '#', ':')):
         # skip data, anchor, invalid links
         return path
 
     is_absolute = bool(urllib.parse.urlparse(path).netloc)
     if is_absolute:
         return path
 
     if not request_path:
         return path
 
     if path.startswith('/'):
         path = path[1:]
 
     if path.startswith('./'):
         path = path[2:]
 
     parts = request_path.split('/')
     # compute how deep we need to traverse the request_path
     depth = 0
 
     if is_repo_file(request_path):
         # if request path is a VALID file, we use a relative path with
         # one level up
         depth += 1
 
     while path.startswith('../'):
         depth += 1
         path = path[3:]
 
     if depth > 0:
         parts = parts[:-depth]
 
     parts.append(path)
     final_path = '/'.join(parts).lstrip('/')
 
     return '/' + final_path
 
 
 _cached_markdown_renderer = None
 
 
 def get_markdown_renderer(extensions, output_format):
     global _cached_markdown_renderer
 
     if _cached_markdown_renderer is None:
         _cached_markdown_renderer = markdown.Markdown(
             extensions=extensions + ['legacy_attrs'],
             output_format=output_format)
     return _cached_markdown_renderer
 
 
 def get_markdown_renderer_flavored(extensions, output_format):
     """
     Dummy wrapper to mimic markdown API and render github HTML rendered
 
     """
     md = get_markdown_renderer(extensions, output_format)
 
     class GFM(object):
         def convert(self, source):
             with pycmarkgfm.parse_gfm(source, options=pycmarkgfm.options.hardbreaks) as document:
                 parsed_md = document.to_commonmark()
                 return md.convert(parsed_md)
 
     return GFM()
 
 
 class MarkupRenderer(object):
     RESTRUCTUREDTEXT_DISALLOWED_DIRECTIVES = ['include', 'meta', 'raw']
 
     MARKDOWN_PAT = re.compile(r'\.(md|mkdn?|mdown|markdown)$', re.IGNORECASE)
     RST_PAT = re.compile(r'\.re?st$', re.IGNORECASE)
     JUPYTER_PAT = re.compile(r'\.(ipynb)$', re.IGNORECASE)
     PLAIN_PAT = re.compile(r'^readme$', re.IGNORECASE)
 
     URL_PAT = re.compile(r'(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]'
                          r'|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)')
 
     MENTION_PAT = re.compile(MENTIONS_REGEX)
 
     extensions = ['markdown.extensions.codehilite', 'markdown.extensions.extra',
                   'markdown.extensions.def_list', 'markdown.extensions.sane_lists']
 
     output_format = 'html4'
 
     # extension together with weights. Lower is first means we control how
     # extensions are attached to readme names with those.
     PLAIN_EXTS = [
         # prefer no extension
         ('', 0),  # special case that renders READMES names without extension
         ('.text', 2), ('.TEXT', 2),
         ('.txt', 3), ('.TXT', 3)
     ]
 
     RST_EXTS = [
         ('.rst', 1), ('.rest', 1),
         ('.RST', 2), ('.REST', 2)
     ]
 
     MARKDOWN_EXTS = [
         ('.md', 1), ('.MD', 1),
         ('.mkdn', 2), ('.MKDN', 2),
         ('.mdown', 3), ('.MDOWN', 3),
         ('.markdown', 4), ('.MARKDOWN', 4)
     ]
 
     def _detect_renderer(self, source, filename=None):
         """
         runs detection of what renderer should be used for generating html
         from a markup language
 
         filename can be also explicitly a renderer name
 
         :param source:
         :param filename:
         """
 
         if MarkupRenderer.MARKDOWN_PAT.findall(filename):
             detected_renderer = 'markdown'
         elif MarkupRenderer.RST_PAT.findall(filename):
             detected_renderer = 'rst'
         elif MarkupRenderer.JUPYTER_PAT.findall(filename):
             detected_renderer = 'jupyter'
         elif MarkupRenderer.PLAIN_PAT.findall(filename):
             detected_renderer = 'plain'
         else:
             detected_renderer = 'plain'
 
         return getattr(MarkupRenderer, detected_renderer)
 
     @classmethod
     def sanitize_html(cls, text):
         from .html_filters import sanitize_html
         return sanitize_html(text, markdown=True)
 
     @classmethod
     def renderer_from_filename(cls, filename, exclude):
         """
         Detect renderer markdown/rst from filename and optionally use exclude
         list to remove some options. This is mostly used in helpers.
         Returns None when no renderer can be detected.
         """
         def _filter(elements):
             if isinstance(exclude, (list, tuple)):
                 return [x for x in elements if x not in exclude]
             return elements
 
         if filename.endswith(
                 tuple(_filter([x[0] for x in cls.MARKDOWN_EXTS if x[0]]))):
             return 'markdown'
         if filename.endswith(tuple(_filter([x[0] for x in cls.RST_EXTS if x[0]]))):
             return 'rst'
 
         return None
 
     def render(self, source, filename=None):
         """
         Renders a given filename using detected renderer
         it detects renderers based on file extension or mimetype.
         At last it will just do a simple html replacing new lines with <br/>
         """
 
         renderer = self._detect_renderer(source, filename)
         readme_data = renderer(source)
         return readme_data
 
     @classmethod
     def urlify_text(cls, text):
         def url_func(match_obj):
             url_full = match_obj.groups()[0]
             return f'<a href="{url_full}">{url_full}</a>'
 
         return cls.URL_PAT.sub(url_func, text)
 
     @classmethod
     def convert_mentions(cls, text, mode):
         mention_pat = cls.MENTION_PAT
 
         def wrapp(match_obj):
             uname = match_obj.groups()[0]
             hovercard_url = "pyroutes.url('hovercard_username', {'username': '%s'});" % uname
 
             if mode == 'markdown':
                 tmpl = '<strong class="tooltip-hovercard" data-hovercard-alt="{uname}" data-hovercard-url="{hovercard_url}">@{uname}</strong>'
             elif mode == 'rst':
                 tmpl = ' **@{uname}** '
             else:
                 raise ValueError('mode must be rst or markdown')
 
             return tmpl.format(**{'uname': uname,
                                   'hovercard_url': hovercard_url})
 
         return mention_pat.sub(wrapp, text).strip()
 
     @classmethod
     def plain(cls, source, universal_newline=True, leading_newline=True):
         source = safe_str(source)
         if universal_newline:
             newline = '\n'
             source = newline.join(source.splitlines())
 
         rendered_source = cls.urlify_text(source)
         source = ''
         if leading_newline:
             source += '<br />'
         source += rendered_source.replace("\n", '<br />')
 
         rendered = cls.sanitize_html(source)
         return rendered
 
     @classmethod
     def markdown(cls, source, safe=True, flavored=True, mentions=False,
                  clean_html=True):
         """
         returns markdown rendered code cleaned by the bleach library
         """
 
         if flavored:
             markdown_renderer = get_markdown_renderer_flavored(
                 cls.extensions, cls.output_format)
         else:
             markdown_renderer = get_markdown_renderer(
                 cls.extensions, cls.output_format)
 
         if mentions:
             mention_hl = cls.convert_mentions(source, mode='markdown')
             # we extracted mentions render with this using Mentions false
             return cls.markdown(mention_hl, safe=safe, flavored=flavored,
                                 mentions=False)
 
         try:
             rendered = markdown_renderer.convert(source)
 
         except Exception:
             log.exception('Error when rendering Markdown')
             if safe:
                 log.debug('Fallback to render in plain mode')
                 rendered = cls.plain(source)
             else:
                 raise
 
         if clean_html:
             rendered = cls.sanitize_html(rendered)
         return rendered
 
     @classmethod
     def rst(cls, source, safe=True, mentions=False, clean_html=False):
 
         if mentions:
             mention_hl = cls.convert_mentions(source, mode='rst')
             # we extracted mentions render with this using Mentions false
             return cls.rst(mention_hl, safe=safe, mentions=False)
 
         source = safe_str(source)
         try:
             docutils_settings = dict(
                 [(alias, None) for alias in
                  cls.RESTRUCTUREDTEXT_DISALLOWED_DIRECTIVES])
 
             docutils_settings.update({
                 'input_encoding': 'unicode',
                 'report_level': 4,
                 'syntax_highlight': 'short',
             })
 
             for k, v in list(docutils_settings.items()):
                 directives.register_directive(k, v)
 
             parts = publish_parts(source=source,
                                   writer=RhodeCodeWriter(),
                                   settings_overrides=docutils_settings)
             rendered = parts["fragment"]
             if clean_html:
                 rendered = cls.sanitize_html(rendered)
             return parts['html_title'] + rendered
         except Exception:
             log.exception('Error when rendering RST')
             if safe:
                 log.debug('Fallback to render in plain mode')
                 return cls.plain(source)
             else:
                 raise
 
     @classmethod
     def jupyter(cls, source, safe=True):
         from rhodecode.lib import helpers
+        from .html_sanitizer_defs import markdown_attrs, all_tags, all_styles
 
         from traitlets import default, config
         import nbformat
         from nbconvert import HTMLExporter
         from nbconvert.preprocessors import Preprocessor
+        from nbconvert.preprocessors.sanitize import SanitizeHTML
 
         class CustomHTMLExporter(HTMLExporter):
 
             @default("template_file")
             def _template_file_default(self):
                 if self.template_extension:
                     return "basic/index" + self.template_extension
 
         class Sandbox(Preprocessor):
 
-            def preprocess(self, nb, resources):
-                sandbox_text = 'SandBoxed(IPython.core.display.Javascript object)'
-                for cell in nb['cells']:
+            def preprocess_cell(self, cell, resources, cell_index):
                     if not safe:
-                        continue
+                    return cell, resources
+                sandbox_text = 'SandBoxed(IPython.core.display.Javascript object)'
+                if cell.cell_type == "markdown":
+                    cell.source = cls.sanitize_html(cell.source)
+                    return cell, resources
 
-                    if 'outputs' in cell:
-                        for cell_output in cell['outputs']:
+                for cell_output in cell.outputs:
                             if 'data' in cell_output:
                                 if 'application/javascript' in cell_output['data']:
                                     cell_output['data']['text/plain'] = sandbox_text
                                     cell_output['data'].pop('application/javascript', None)
-
-                    if 'source' in cell and cell['cell_type'] == 'markdown':
-                        # sanitize similar like in markdown
-                        cell['source'] = cls.sanitize_html(cell['source'])
-
-                return nb, resources
+                return cell, resources
 
         def _sanitize_resources(input_resources):
             """
             Skip/sanitize some of the CSS generated and included in jupyter
             so it doesn't mess up UI so much
             """
 
             # TODO(marcink): probably we should replace this with whole custom
             # CSS set that doesn't screw up, but jupyter generated html has some
             # special markers, so it requires Custom HTML exporter template with
             # _default_template_path_default, to achieve that
 
             # strip the reset CSS
             input_resources[0] = input_resources[0][input_resources[0].find('/*! Source'):]
             return input_resources
 
         def as_html(notebook):
             conf = config.Config()
-            conf.CustomHTMLExporter.default_preprocessors = [Sandbox]
+            # TODO: Keep an eye on the order of preprocessors
+            conf.CustomHTMLExporter.default_preprocessors = [Sandbox, SanitizeHTML]
             conf.Sandbox.enabled = True
+            conf.SanitizeHTML.enabled = True
+            conf.SanitizeHTML.attributes = markdown_attrs
+            conf.SanitizeHTML.tags = all_tags
+            conf.SanitizeHTML.styles = all_styles
+            conf.SanitizeHTML.sanitized_output_types = {
+                "text/html",
+                "text/markdown",
+            }
+            conf.SanitizeHTML.safe_output_keys = {
+                "metadata",
+                "text/plain",
+                "text/latex",
+                "application/json",
+                "image/png",
+                "image/jpg"
+                "image/jpeg",
+                "image/svg",
+                "image/svg+xml"
+            }
+
             html_exporter = CustomHTMLExporter(config=conf)
 
             (body, resources) = html_exporter.from_notebook_node(notebook)
 
             header = '<!-- ## IPYTHON NOTEBOOK RENDERING ## -->'
             js = MakoTemplate(r'''
             <!-- MathJax configuration -->
             <script type="text/x-mathjax-config">
             MathJax.Hub.Config({
                 jax: ["input/TeX","output/HTML-CSS", "output/PreviewHTML"],
                 extensions: ["tex2jax.js","MathMenu.js","MathZoom.js", "fast-preview.js", "AssistiveMML.js", "[Contrib]/a11y/accessibility-menu.js"],
                 TeX: {
                     extensions: ["AMSmath.js","AMSsymbols.js","noErrors.js","noUndefined.js"]
                 },
                 tex2jax: {
                     inlineMath: [ ['$','$'], ["\\(","\\)"] ],
                     displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
                     processEscapes: true,
                     processEnvironments: true
                 },
                 // Center justify equations in code and markdown cells. Elsewhere
                 // we use CSS to left justify single line equations in code cells.
                 displayAlign: 'center',
                 "HTML-CSS": {
                     styles: {'.MathJax_Display': {"margin": 0}},
                     linebreaks: { automatic: true },
                     availableFonts: ["STIX", "TeX"]
                 },
                 showMathMenu: false
             });
             </script>
             <!-- End of MathJax configuration -->
             <script src="${h.asset('js/src/math_jax/MathJax.js')}"></script>
             ''').render(h=helpers)
 
             css = MakoTemplate(r'''
             <link rel="stylesheet" type="text/css" href="${h.asset('css/style-ipython.css', ver=ver)}" media="screen"/>
             ''').render(h=helpers, ver='ver1')
 
             body = '\n'.join([header, css, js, body])
             return body, resources
 
         # TODO: In the event of a newer jupyter notebook version, consider increasing the as_version parameter
         notebook = nbformat.reads(source, as_version=4)
         (body, resources) = as_html(notebook)
         return body
 
 
 class RstTemplateRenderer(object):
 
     def __init__(self):
         base = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
         rst_template_dirs = [os.path.join(base, 'templates', 'rst_templates')]
         self.template_store = TemplateLookup(
             directories=rst_template_dirs,
             input_encoding='utf-8',
             imports=['from rhodecode.lib import helpers as h'])
 
     def _get_template(self, templatename):
         return self.template_store.get_template(templatename)
 
     def render(self, template_name, **kwargs):
         template = self._get_template(template_name)
         return template.render(**kwargs)

rhodecode/tests/lib/test_markup_renderer.py

@@ -1,785 +1,897 b''
 
 # Copyright (C) 2010-2023 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
+import mock
 import pytest
 
 from rhodecode.lib.markup_renderer import (
     MarkupRenderer, RstTemplateRenderer, relative_path, relative_links)
 
 
 @pytest.mark.parametrize(
     "filename, expected_renderer",
     [
         ('readme.md', 'markdown'),
         ('readme.Md', 'markdown'),
         ('readme.MdoWn', 'markdown'),
         ('readme.rst', 'rst'),
         ('readme.Rst', 'rst'),
         ('readme.rest', 'rst'),
         ('readme.rest', 'rst'),
 
         ('markdown.xml', 'plain'),
         ('rest.xml', 'plain'),
         ('readme.xml', 'plain'),
 
         ('readme', 'plain'),
         ('README', 'plain'),
         ('readme.mdx', 'plain'),
         ('readme.rstx', 'plain'),
         ('readmex', 'plain'),
     ])
 def test_detect_renderer(filename, expected_renderer):
     detected_renderer = MarkupRenderer()._detect_renderer(
         '', filename=filename).__name__
     assert expected_renderer == detected_renderer
 
 
 def test_markdown_xss_link():
     xss_md = "[link](javascript:alert('XSS: pwned!'))"
     rendered_html = MarkupRenderer.markdown(xss_md)
     assert 'href="javascript:alert(\'XSS: pwned!\')"' not in rendered_html
 
 
 def test_markdown_xss_inline_html():
     xss_md = '\n'.join([
         '> <a name="n"',
         '> href="javascript:alert(\'XSS: pwned!\')">link</a>'])
     rendered_html = MarkupRenderer.markdown(xss_md)
     assert 'href="javascript:alert(\'XSS: pwned!\')">' not in rendered_html
 
 
 def test_markdown_inline_html():
     xss_md = '\n'.join(['> <a name="n"',
                         '> onload="javascript:alert()" href="https://rhodecode.com">link</a>'])
     rendered_html = MarkupRenderer.markdown(xss_md)
     assert '<a name="n" href="https://rhodecode.com">link</a>' in rendered_html
 
 
 def test_markdown_bleach_renders_correct():
     test_md = """
 This is intended as a quick reference and showcase. For more complete info, see [John Gruber's original spec](http://daringfireball.net/projects/markdown/) and the [Github-flavored Markdown info page](http://github.github.com/github-flavored-markdown/).
 
 Note that there is also a [Cheatsheet specific to Markdown Here](./Markdown-Here-Cheatsheet) if that's what you're looking for. You can also check out [more Markdown tools](./Other-Markdown-Tools).
 
 ##### Table of Contents  
 [Headers](#headers)  
 [Emphasis](#emphasis)  
 [Lists](#lists)  
 [Links](#links)  
 [Images](#images)  
 [Code and Syntax Highlighting](#code)  
 [Tables](#tables)  
 [Blockquotes](#blockquotes)  
 [Inline HTML](#html)  
 [Horizontal Rule](#hr)  
 [Line Breaks](#lines)  
 [Youtube videos](#videos)  
 
 
 ## Headers
 
 ```no-highlight
 # H1
 ## H2
 ### H3
 #### H4
 ##### H5
 ###### H6
 
 Alternatively, for H1 and H2, an underline-ish style:
 
 Alt-H1
 ======
 
 Alt-H2
 ------
 ```
 
 # H1
 ## H2
 ### H3
 #### H4
 ##### H5
 ###### H6
 
 Alternatively, for H1 and H2, an underline-ish style:
 
 Alt-H1
 ======
 
 Alt-H2
 ------
 
 ## Emphasis
 
 ```no-highlight
 Emphasis, aka italics, with *asterisks* or _underscores_.
 
 Strong emphasis, aka bold, with **asterisks** or __underscores__.
 
 Combined emphasis with **asterisks and _underscores_**.
 
 Strikethrough uses two tildes. ~~Scratch this.~~
 ```
 
 Emphasis, aka italics, with *asterisks* or _underscores_.
 
 Strong emphasis, aka bold, with **asterisks** or __underscores__.
 
 Combined emphasis with **asterisks and _underscores_**.
 
 Strikethrough uses two tildes. ~~Scratch this.~~
 
 
 ## Lists
 
 (In this example, leading and trailing spaces are shown with with dots: ⋅)
 
 ```no-highlight
 1. First ordered list item
 2. Another item
 ⋅⋅* Unordered sub-list. 
 1. Actual numbers don't matter, just that it's a number
 ⋅⋅1. Ordered sub-list
 4. And another item.
 
 ⋅⋅⋅You can have properly indented paragraphs within list items. Notice the blank line above, and the leading spaces (at least one, but we'll use three here to also align the raw Markdown).
 
 ⋅⋅⋅To have a line break without a paragraph, you will need to use two trailing spaces.⋅⋅
 ⋅⋅⋅Note that this line is separate, but within the same paragraph.⋅⋅
 ⋅⋅⋅(This is contrary to the typical GFM line break behaviour, where trailing spaces are not required.)
 
 * Unordered list can use asterisks
 - Or minuses
 + Or pluses
 ```
 
 1. First ordered list item
 2. Another item
   * Unordered sub-list. 
 1. Actual numbers don't matter, just that it's a number
   1. Ordered sub-list
 4. And another item.
 
    You can have properly indented paragraphs within list items. Notice the blank line above, and the leading spaces (at least one, but we'll use three here to also align the raw Markdown).
 
    To have a line break without a paragraph, you will need to use two trailing spaces.  
    Note that this line is separate, but within the same paragraph.  
    (This is contrary to the typical GFM line break behaviour, where trailing spaces are not required.)
 
 * Unordered list can use asterisks
 - Or minuses
 + Or pluses
 
 
 ## Links
 
 There are two ways to create links.
 
 ```no-highlight
 [I'm an inline-style link](https://www.google.com)
 
 [I'm an inline-style link with title](https://www.google.com "Google's Homepage")
 
 [I'm a reference-style link][Arbitrary case-insensitive reference text]
 
 [I'm a relative reference to a repository file (LICENSE)](./LICENSE)
 
 [I'm a relative reference to a repository file (IMAGE)](./img/logo.png)
 
 [I'm a relative reference to a repository file (IMAGE2)](img/logo.png)
 
 [You can use numbers for reference-style link definitions][1]
 
 Or leave it empty and use the [link text itself].
 
 URLs and URLs in angle brackets will automatically get turned into links. 
 http://www.example.com or <http://www.example.com> and sometimes 
 example.com (but not on Github, for example).
 
 Some text to show that the reference links can follow later.
 
 [arbitrary case-insensitive reference text]: https://www.mozilla.org
 [1]: http://slashdot.org
 [link text itself]: http://www.reddit.com
 ```
 
 [I'm an inline-style link](https://www.google.com)
 
 [I'm an inline-style link with title](https://www.google.com "Google's Homepage")
 
 [I'm a reference-style link][Arbitrary case-insensitive reference text]
 
 [I'm a relative reference to a repository file (LICENSE)](./LICENSE)
 
 [I'm a relative reference to a repository file (IMAGE)](./img/logo.png)
 
 [I'm a relative reference to a repository file (IMAGE2)](img/logo.png)
 
 [You can use numbers for reference-style link definitions][1]
 
 Or leave it empty and use the [link text itself].
 
 URLs and URLs in angle brackets will automatically get turned into links. 
 http://www.example.com or <http://www.example.com> and sometimes 
 example.com (but not on Github, for example).
 
 Some text to show that the reference links can follow later.
 
 [arbitrary case-insensitive reference text]: https://www.mozilla.org
 [1]: http://slashdot.org
 [link text itself]: http://www.reddit.com
 
 
 ## Images
 
 ```no-highlight
 Here's our logo (hover to see the title text):
 
 Inline-style: 
 ![alt text](https://github.com/adam-p/markdown-here/raw/master/src/common/images/icon48.png "Logo Title Text 1")
 
 relative-src-style: 
 ![alt text](img/logo.png)
 
 Reference-style: 
 ![alt text][logo]
 
 [logo]: https://github.com/adam-p/markdown-here/raw/master/src/common/images/icon48.png "Logo Title Text 2"
 ```
 
 Here's our logo (hover to see the title text):
 
 Inline-style: 
 ![alt text](https://github.com/adam-p/markdown-here/raw/master/src/common/images/icon48.png "Logo Title Text 1")
 
 relative-src-style: 
 ![alt text](img/logo.png)
 
 relative-src-style: 
 ![alt text](./img/logo.png)
 
 Reference-style: 
 ![alt text][logo]
 
 [logo]: https://github.com/adam-p/markdown-here/raw/master/src/common/images/icon48.png "Logo Title Text 2"
 
 
 ## Code and Syntax Highlighting
 
 Code blocks are part of the Markdown spec, but syntax highlighting isn't. However, many renderers -- like Github's and *Markdown Here* -- support syntax highlighting. Which languages are supported and how those language names should be written will vary from renderer to renderer. *Markdown Here* supports highlighting for dozens of languages (and not-really-languages, like diffs and HTTP headers); to see the complete list, and how to write the language names, see the [highlight.js demo page](http://softwaremaniacs.org/media/soft/highlight/test.html).
 
 ```no-highlight
 Inline `code` has `back-ticks around` it.
 ```
 
 Inline `code` has `back-ticks around` it.
 
 Blocks of code are either fenced by lines with three back-ticks <code>```</code>, or are indented with four spaces. I recommend only using the fenced code blocks -- they're easier and only they support syntax highlighting.
 
 ```javascript
 var s = "JavaScript syntax highlighting";
 console.log(s);
 ```
  
 ```python
 s = "Python syntax highlighting"
 print(s)
 
 class Orm(object):
     pass
 ```
  
 ```
 No language indicated, so no syntax highlighting. 
 But let's throw in a &lt;b&gt;tag&lt;/b&gt;.
 ```
 
 
 ```javascript
 var s = "JavaScript syntax highlighting";
 alert(s);
 ```
 
 ```python
 s = "Python syntax highlighting"
 print(s)
 
 class Orm(object):
     pass
 ```
 
 ```
 No language indicated, so no syntax highlighting in Markdown Here (varies on Github). 
 But let's throw in a <b>tag</b>.
 ```
 
 
 ## Tables
 
 Tables aren't part of the core Markdown spec, but they are part of GFM and *Markdown Here* supports them. They are an easy way of adding tables to your email -- a task that would otherwise require copy-pasting from another application.
 
 ```no-highlight
 Colons can be used to align columns.
 
 | Tables        | Are           | Cool  |
 | ------------- |:-------------:| -----:|
 | col 3 is      | right-aligned | $1600 |
 | col 2 is      | centered      |   $12 |
 | zebra stripes | are neat      |    $1 |
 
 There must be at least 3 dashes separating each header cell.
 The outer pipes (|) are optional, and you don't need to make the 
 raw Markdown line up prettily. You can also use inline Markdown.
 
 Markdown | Less | Pretty
 --- | --- | ---
 *Still* | `renders` | **nicely**
 1 | 2 | 3
 ```
 
 Colons can be used to align columns.
 
 | Tables        | Are           | Cool |
 | ------------- |:-------------:| -----:|
 | col 3 is      | right-aligned | $1600 |
 | col 2 is      | centered      |   $12 |
 | zebra stripes | are neat      |    $1 |
 
 There must be at least 3 dashes separating each header cell. The outer pipes (|) are optional, and you don't need to make the raw Markdown line up prettily. You can also use inline Markdown.
 
 Markdown | Less | Pretty
 --- | --- | ---
 *Still* | `renders` | **nicely**
 1 | 2 | 3
 
 
 ## Blockquotes
 
 ```no-highlight
 > Blockquotes are very handy in email to emulate reply text.
 > This line is part of the same quote.
 
 Quote break.
 
 > This is a very long line that will still be quoted properly when it wraps. Oh boy let's keep writing to make sure this is long enough to actually wrap for everyone. Oh, you can *put* **Markdown** into a blockquote. 
 ```
 
 > Blockquotes are very handy in email to emulate reply text.
 > This line is part of the same quote.
 
 Quote break.
 
 > This is a very long line that will still be quoted properly when it wraps. Oh boy let's keep writing to make sure this is long enough to actually wrap for everyone. Oh, you can *put* **Markdown** into a blockquote. 
 
 
 ## Inline HTML
 
 You can also use raw HTML in your Markdown, and it'll mostly work pretty well. 
 
 ```no-highlight
 <dl>
   <dt>Definition list</dt>
   <dd>Is something people use sometimes.</dd>
 
   <dt>Markdown in HTML</dt>
   <dd>Does *not* work **very** well. Use HTML <em>tags</em>.</dd>
 </dl>
 ```
 
 <dl>
   <dt>Definition list</dt>
   <dd>Is something people use sometimes.</dd>
 
   <dt>Markdown in HTML</dt>
   <dd>Does *not* work **very** well. Use HTML <em>tags</em>.</dd>
 </dl>
 
 
 ## Horizontal Rule
 
 ```
 Three or more...
 
 ---
 
 Hyphens
 
 ***
 
 Asterisks
 
 ___
 
 Underscores
 ```
 
 Three or more...
 
 ---
 
 Hyphens
 
 ***
 
 Asterisks
 
 ___
 
 Underscores
 
 
 ## Line Breaks
 
 My basic recommendation for learning how line breaks work is to experiment and discover -- hit &lt;Enter&gt; once (i.e., insert one newline), then hit it twice (i.e., insert two newlines), see what happens. You'll soon learn to get what you want. "Markdown Toggle" is your friend. 
 
 Here are some things to try out:
 
 ```
 Here's a line for us to start with.
 
 This line is separated from the one above by two newlines, so it will be a *separate paragraph*.
 
 This line is also a separate paragraph, but...
 This line is only separated by a single newline, so it's a separate line in the *same paragraph*.
 ```
 
 Here's a line for us to start with.
 
 This line is separated from the one above by two newlines, so it will be a *separate paragraph*.
 
 This line is also begins a separate paragraph, but...  
 This line is only separated by a single newline, so it's a separate line in the *same paragraph*.
 
 (Technical note: *Markdown Here* uses GFM line breaks, so there's no need to use MD's two-space line breaks.)
 
 
 ## Youtube videos
 
 They can't be added directly but you can add an image with a link to the video like this:
 
 ```no-highlight
 <a href="http://www.youtube.com/watch?feature=player_embedded&v=YOUTUBE_VIDEO_ID_HERE
 " target="_blank"><img src="http://img.youtube.com/vi/YOUTUBE_VIDEO_ID_HERE/0.jpg" 
 alt="IMAGE ALT TEXT HERE" width="240" height="180" border="10" /></a>
 ```
 
 Or, in pure Markdown, but losing the image sizing and border:
 
 ```no-highlight
 [![IMAGE ALT TEXT HERE](http://img.youtube.com/vi/YOUTUBE_VIDEO_ID_HERE/0.jpg)](http://www.youtube.com/watch?v=YOUTUBE_VIDEO_ID_HERE)
 ```
 
 Referencing a bug by #bugID in your git commit links it to the slip. For example #1. 
 
 ---
 
 License: [CC-BY](https://creativecommons.org/licenses/by/3.0/)    
     """
     raw_rendered_html = MarkupRenderer.markdown(test_md, clean_html=False)
     bleached_rendered_html = MarkupRenderer.markdown(test_md, clean_html=True)
     assert raw_rendered_html == bleached_rendered_html
 
 
 def test_rst_xss_link():
     xss_rst = "`Link<javascript:alert('XSS: pwned!')>`_"
     rendered_html = MarkupRenderer.rst(xss_rst)
     assert "href=javascript:alert('XSS: pwned!')" not in rendered_html
 
 
 @pytest.mark.xfail(reason='Bug in docutils. Waiting answer from the author')
 def test_rst_xss_inline_html():
     xss_rst = '<a href="javascript:alert(\'XSS: pwned!\')">link</a>'
     rendered_html = MarkupRenderer.rst(xss_rst)
     assert 'href="javascript:alert(' not in rendered_html
 
 
 def test_rst_xss_raw_directive():
     xss_rst = '\n'.join([
         '.. raw:: html',
         '',
         '  <a href="javascript:alert(\'XSS: pwned!\')">link</a>'])
     rendered_html = MarkupRenderer.rst(xss_rst)
     assert 'href="javascript:alert(' not in rendered_html
 
 
 def test_render_rst_template_without_files():
     expected = u'''\
 Pull request updated. Auto status change to |under_review|
 
 .. role:: added
 .. role:: removed
 .. parsed-literal::
 
   Changed commits:
     * :added:`2 added`
     * :removed:`3 removed`
 
   No file changes found
 
 .. |under_review| replace:: *"NEW STATUS"*'''
 
     params = {
         'under_review_label': 'NEW STATUS',
         'added_commits': ['a', 'b'],
         'removed_commits': ['a', 'b', 'c'],
         'changed_files': [],
         'added_files': [],
         'modified_files': [],
         'removed_files': [],
         'ancestor_commit_id': 'aaabbbcccdddeee',
     }
     renderer = RstTemplateRenderer()
     rendered = renderer.render('pull_request_update.mako', **params)
     assert expected == rendered
 
 
 def test_render_rst_template_with_files():
     expected = u'''\
 Pull request updated. Auto status change to |under_review|
 
 .. role:: added
 .. role:: removed
 .. parsed-literal::
 
   Changed commits:
     * :added:`1 added`
     * :removed:`3 removed`
 
   Changed files:
     * `A /path/a.py <#a_c-aaabbbcccddd-68ed34923b68>`_
     * `A /path/b.js <#a_c-aaabbbcccddd-64f90608b607>`_
     * `M /path/d.js <#a_c-aaabbbcccddd-85842bf30c6e>`_
     * `M /path/ę.py <#a_c-aaabbbcccddd-d713adf009cd>`_
     * `R /path/ź.py`
 
 .. |under_review| replace:: *"NEW STATUS"*'''
 
     added = ['/path/a.py', '/path/b.js']
     modified = ['/path/d.js', u'/path/ę.py']
     removed = [u'/path/ź.py']
 
     params = {
         'under_review_label': 'NEW STATUS',
         'added_commits': ['a'],
         'removed_commits': ['a', 'b', 'c'],
         'changed_files': added + modified + removed,
         'added_files': added,
         'modified_files': modified,
         'removed_files': removed,
         'ancestor_commit_id': 'aaabbbcccdddeee',
     }
     renderer = RstTemplateRenderer()
     rendered = renderer.render('pull_request_update.mako', **params)
 
     assert expected == rendered
 
 
 def test_render_rst_auto_status_template():
     expected = u'''\
 Auto status change to |new_status|
 
 .. |new_status| replace:: *"NEW STATUS"*'''
 
     params = {
         'new_status_label': 'NEW STATUS',
         'pull_request': None,
         'commit_id': None,
     }
     renderer = RstTemplateRenderer()
     rendered = renderer.render('auto_status_change.mako', **params)
     assert expected == rendered
 
 
 @pytest.mark.parametrize(
     "src_path, server_path, is_path, expected",
     [
         ('source.png', '/repo/files/path', lambda p: False,
          '/repo/files/path/source.png'),
 
         ('source.png', 'mk/git/blob/master/README.md', lambda p: True,
          '/mk/git/blob/master/source.png'),
 
         ('./source.png', 'mk/git/blob/master/README.md', lambda p: True,
          '/mk/git/blob/master/source.png'),
 
         ('/source.png', 'mk/git/blob/master/README.md', lambda p: True,
          '/mk/git/blob/master/source.png'),
 
         ('./source.png', 'repo/files/path/source.md', lambda p: True,
          '/repo/files/path/source.png'),
 
         ('./source.png', '/repo/files/path/file.md', lambda p: True,
          '/repo/files/path/source.png'),
 
         ('../source.png', '/repo/files/path/file.md', lambda p: True,
          '/repo/files/source.png'),
 
         ('./../source.png', '/repo/files/path/file.md', lambda p: True,
          '/repo/files/source.png'),
 
         ('./source.png', '/repo/files/path/file.md', lambda p: True,
          '/repo/files/path/source.png'),
 
         ('../../../source.png', 'path/file.md', lambda p: True,
          '/source.png'),
 
         ('../../../../../source.png', '/path/file.md', None,
          '/source.png'),
 
         ('../../../../../source.png', 'files/path/file.md', None,
          '/source.png'),
 
         ('../../../../../https://google.com/image.png', 'files/path/file.md', None,
          '/https://google.com/image.png'),
 
         ('https://google.com/image.png', 'files/path/file.md', None,
          'https://google.com/image.png'),
 
         ('://foo', '/files/path/file.md', None,
          '://foo'),
 
         (u'한글.png', '/files/path/file.md', None,
          u'/files/path/한글.png'),
 
         ('my custom image.png', '/files/path/file.md', None,
          '/files/path/my custom image.png'),
     ])
 def test_relative_path(src_path, server_path, is_path, expected):
     path = relative_path(src_path, server_path, is_path)
     assert path == expected
 
 
 @pytest.mark.parametrize(
     "src_html, expected_html",
     [
         ('<div></div>', '<div></div>'),
         ('<img src="/file.png"></img>', '<img src="/path/raw/file.png">'),
         ('<img src="data:abcd"/>', '<img src="data:abcd">'),
         ('<a href="/file.png?raw=1"></a>', '<a href="/path/raw/file.png?raw=1"></a>'),
         ('<a href="/file.png"></a>', '<a href="/path/file.png"></a>'),
         ('<a href="#anchor"></a>', '<a href="#anchor"></a>'),
         ('<a href="./README.md?raw=1"></a>', '<a href="/path/raw/README.md?raw=1"></a>'),
         ('<a href="./README.md"></a>', '<a href="/path/README.md"></a>'),
         ('<a href="../README.md"></a>', '<a href="/README.md"></a>'),
 
     ])
 def test_relative_links(src_html, expected_html):
     server_paths = {'raw': '/path/raw/file.md', 'standard': '/path/file.md'}
     assert relative_links(src_html, server_paths=server_paths) == expected_html
 
 
 @pytest.mark.parametrize("notebook_source, expected_output", [
     ("""
         {
           "nbformat": 3,
           "nbformat_minor": 0,
           "worksheets": [
             {
               "cells": [
                 {
                   "cell_type": "code",
                   "execution_count": 1,
                   "metadata": {},
                   "outputs": [
                     {
                       "name": "stdout",
                       "output_type": "stream",
                       "text": [
                         "Hello, World!\\n"
                       ]
                     }
                   ],
                   "input": "print('Hello, World!')"
                 }
               ]
             }
           ],
           "metadata": {
             "kernelspec": {
               "display_name": "Python 3",
               "language": "python",
               "name": "python3"
             },
             "language_info": {
               "codemirror_mode": {
                 "name": "ipython",
                 "version": 3
               },
               "file_extension": ".py",
               "mimetype": "text/x-python",
               "name": "python",
               "nbconvert_exporter": "python",
               "pygments_lexer": "ipython3",
               "version": "3.8.5"
             }
           }
         }
     """, "Hello, World!"),
     ("""
         {
           "nbformat": 4,
           "nbformat_minor": 1,
           "cells": [
             {
               "cell_type": "code",
               "execution_count": 1,
               "metadata": {},
               "outputs": [
                 {
                   "name": "stdout",
                   "output_type": "stream",
                   "text": [
                     "Hello, World!\\n"
                   ]
                 }
               ],
               "source": [
                 "print('Hello, World!')"
               ]
             }
           ],
           "metadata": {
             "kernelspec": {
               "display_name": "Python 3",
               "language": "python",
               "name": "python3"
             },
             "language_info": {
               "codemirror_mode": {
                 "name": "ipython",
                 "version": 4
               },
               "file_extension": ".py",
               "mimetype": "text/x-python",
               "name": "python",
               "nbconvert_exporter": "python",
               "pygments_lexer": "ipython3",
               "version": "3.9.1"
             }
           }
         }
     """, "Hello, World!")
 ])
 def test_jp_notebook_html_generation(notebook_source, expected_output):
-    import mock
     with mock.patch('rhodecode.lib.helpers.asset'):
         body = MarkupRenderer.jupyter(notebook_source)
         assert "<!-- ## IPYTHON NOTEBOOK RENDERING ## -->" in body
         assert expected_output in body
+
+
[e-mail]("notebook_source, expected_output", [
+    ({"cells": [
+        {
+            "cell_type": "code",
+            "execution_count": 0,
+            "metadata": {},
+            "outputs": [
+                {
+                    "data": {
+                        "text/html": [
+                            "<select><iframe></select><img src=x: onerror=alert('xss')>\n"
+                        ],
+                        "text/plain": []
+                    },
+                    "metadata": {},
+                    "output_type": "display_data"
+                }
+            ],
+            "source": [
+                ""
+            ]
+        }
+    ],
+         "metadata": {
+             "kernelspec": {
+                 "display_name": "Python 3",
+                 "language": "python",
+                 "name": "python3"
+             },
+             "language_info": {
+                 "codemirror_mode": {
+                     "name": "ipython",
+                     "version": 3
+                 },
+                 "file_extension": ".py",
+                 "mimetype": "text/x-python",
+                 "name": "python",
+                 "nbconvert_exporter": "python",
+                 "pygments_lexer": "ipython3",
+                 "version": "3.9.6"
+             }
+         },
+         "nbformat": 4,
+         "nbformat_minor": 5
+     }, '<select></select><img alt="No description has been provided for this image"/>'),
+    ({
+         "cells": [
+             {
+                 "cell_type": "markdown",
+                 "metadata": {},
+                 "source": [
+                     "<label for=buttonid style=\"cursor: text\">not safe to click here</label>\n"
+                 ]
+             },
+             {
+                 "cell_type": "markdown",
+                 "metadata": {
+                     "highlighter": "codemirror"
+                 },
+                 "source": "<div class=\"jp-InputArea-editor\"><div class=\"CodeMirror cm-s-jupyter\"><div class=\"CodeMirror-scroll\"><div class=\"CodeMirror-sizer\"><div style=\"top:0px; position:relative\"><div class=\"CodeMirror-lines\"><div style=\"outline:none; position:relative\"><div class=\"CodeMirror-code\"><div style=\"position: relative\"><label for=buttonid style=\"cursor: text\"><pre class=\"CodeMirror-line\" style=\"background:transparent\"><span style=\"padding-right: 0.1px\"><span class=\"cm-builtin\">print</span>(<span class=\"cm-string\">&quot;Also not safe to click here&quot;</span>)</span></pre></label></div></div></div></div></div></div></div></div></div>"
+             },
+             {
+                 "cell_type": "code",
+                 "execution_count": 0,
+                 "metadata": {
+                     "xrender": True
+                 },
+                 "outputs": [
+                     {
+                         "data": {
+                             "text/html": [
+                                 "<form id=jp-mk-edit action='javascript:alert(1)' style='display:none'><button type=submit id=buttonid></form>\n"
+                             ],
+                             "text/plain": []
+                         },
+                         "metadata": {},
+                         "output_type": "display_data"
+                     }
+                 ],
+                 "source": ""
+             }
+         ],
+         "metadata": {
+             "kernelspec": {
+                 "display_name": "Python 3",
+                 "language": "python",
+                 "name": "python3"
+             },
+             "language_info": {
+                 "codemirror_mode": {
+                     "name": "ipython",
+                     "version": 3
+                 },
+                 "file_extension": ".py",
+                 "mimetype": "text/x-python",
+                 "name": "python",
+                 "nbconvert_exporter": "python",
+                 "pygments_lexer": "ipython3",
+                 "version": "3.9.6"
+             }
+         },
+         "nbformat": 4,
+         "nbformat_minor": 5
+     }, '<form style="display:none;">')
+])
+def test_jp_notebook_against_xss(notebook_source, expected_output):
+    import json
+    with mock.patch('rhodecode.lib.helpers.asset'):
+        body = MarkupRenderer.jupyter(json.dumps(notebook_source))
+        assert expected_output in body