Commit 8eb64155 authored by Dong-hee Na's avatar Dong-hee Na Committed by Victor Stinner

[2.7] bpo-38243: Escape the server title of DocXMLRPCServer (GH-16447)

Escape the server title of DocXMLRPCServer.DocXMLRPCServer
when rendering the document page as HTML.
parent 598f6768
......@@ -20,6 +20,16 @@ from SimpleXMLRPCServer import (SimpleXMLRPCServer,
CGIXMLRPCRequestHandler,
resolve_dotted_attribute)
def _html_escape_quote(s):
s = s.replace("&", "&") # Must be done first!
s = s.replace("<", "&lt;")
s = s.replace(">", "&gt;")
s = s.replace('"', "&quot;")
s = s.replace('\'', "&#x27;")
return s
class ServerHTMLDoc(pydoc.HTMLDoc):
"""Class used to generate pydoc HTML document for a server"""
......@@ -210,7 +220,8 @@ class XMLRPCDocGenerator:
methods
)
return documenter.page(self.server_title, documentation)
title = _html_escape_quote(self.server_title)
return documenter.page(title, documentation)
class DocXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
"""XML-RPC and documentation request handler class.
......
from DocXMLRPCServer import DocXMLRPCServer
import httplib
import re
import sys
from test import test_support
threading = test_support.import_module('threading')
......@@ -176,6 +177,25 @@ class DocXMLRPCHTTPGETServer(unittest.TestCase):
self.assertIn("""Try&nbsp;self.<strong>add</strong>,&nbsp;too.""",
response.read())
def test_server_title_escape(self):
"""Test that the server title and documentation
are escaped for HTML.
"""
self.serv.set_server_title('test_title<script>')
self.serv.set_server_documentation('test_documentation<script>')
self.assertEqual('test_title<script>', self.serv.server_title)
self.assertEqual('test_documentation<script>',
self.serv.server_documentation)
generated = self.serv.generate_html_documentation()
title = re.search(r'<title>(.+?)</title>', generated).group()
documentation = re.search(r'<p><tt>(.+?)</tt></p>', generated).group()
self.assertEqual('<title>Python: test_title&lt;script&gt;</title>',
title)
self.assertEqual('<p><tt>test_documentation&lt;script&gt;</tt></p>',
documentation)
def test_main():
test_support.run_unittest(DocXMLRPCHTTPGETServer)
......
Escape the server title of :class:`DocXMLRPCServer.DocXMLRPCServer`
when rendering the document page as HTML.
(Contributed by Dong-hee Na in :issue:`38243`.)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment