Blame SOURCES/00344-CVE-2019-16935.patch

1d2a87
diff --git a/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py
1d2a87
index 0090333..d2adb21 100644
1d2a87
--- a/Lib/test/test_docxmlrpc.py
1d2a87
+++ b/Lib/test/test_docxmlrpc.py
1d2a87
@@ -1,5 +1,6 @@
1d2a87
 from xmlrpc.server import DocXMLRPCServer
1d2a87
 import http.client
1d2a87
+import re
1d2a87
 import sys
1d2a87
 from test import support
1d2a87
 threading = support.import_module('threading')
1d2a87
@@ -193,6 +194,21 @@ class DocXMLRPCHTTPGETServer(unittest.TestCase):
1d2a87
              b'method_annotation(x: bytes)'),
1d2a87
             response.read())
1d2a87
 
1d2a87
+    def test_server_title_escape(self):
1d2a87
+        # bpo-38243: Ensure that the server title and documentation
1d2a87
+        # are escaped for HTML.
1d2a87
+        self.serv.set_server_title('test_title<script>')
1d2a87
+        self.serv.set_server_documentation('test_documentation<script>')
1d2a87
+        self.assertEqual('test_title<script>', self.serv.server_title)
1d2a87
+        self.assertEqual('test_documentation<script>',
1d2a87
+                self.serv.server_documentation)
1d2a87
+
1d2a87
+        generated = self.serv.generate_html_documentation()
1d2a87
+        title = re.search(r'<title>(.+?)</title>', generated).group()
1d2a87
+        documentation = re.search(r'

<tt>(.+?)</tt>

', generated).group()
1d2a87
+        self.assertEqual('<title>Python: test_title<script></title>', title)
1d2a87
+        self.assertEqual('

<tt>test_documentation<script></tt>

', documentation)
1d2a87
+
1d2a87
 
1d2a87
 if __name__ == '__main__':
1d2a87
     unittest.main()
1d2a87
diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py
1d2a87
index 3e0dca0..efe5937 100644
1d2a87
--- a/Lib/xmlrpc/server.py
1d2a87
+++ b/Lib/xmlrpc/server.py
1d2a87
@@ -106,6 +106,7 @@ server.handle_request()
1d2a87
 
1d2a87
 from xmlrpc.client import Fault, dumps, loads, gzip_encode, gzip_decode
1d2a87
 from http.server import BaseHTTPRequestHandler
1d2a87
+import html
1d2a87
 import http.server
1d2a87
 import socketserver
1d2a87
 import sys
1d2a87
@@ -904,7 +905,7 @@ class XMLRPCDocGenerator:
1d2a87
                                 methods
1d2a87
                             )
1d2a87
 
1d2a87
-        return documenter.page(self.server_title, documentation)
1d2a87
+        return documenter.page(html.escape(self.server_title), documentation)
1d2a87
 
1d2a87
 class DocXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
1d2a87
     """XML-RPC and documentation request handler class.