diff -uNrp a/Lib/DocXMLRPCServer.py b/Lib/DocXMLRPCServer.py --- a/Lib/DocXMLRPCServer.py 2019-12-21 16:13:25.240000000 +0800 +++ b/Lib/DocXMLRPCServer.py 2019-12-21 16:15:24.076000000 +0800 @@ -20,6 +20,15 @@ from SimpleXMLRPCServer import (SimpleXM CGIXMLRPCRequestHandler, resolve_dotted_attribute) +def _html_escape_quote(s): + s = s.replace("&", "&") # Must be done first! + s = s.replace("<", "<") + s = s.replace(">", ">") + s = s.replace('"', """) + s = s.replace('\'', "'") + return s + + class ServerHTMLDoc(pydoc.HTMLDoc): """Class used to generate pydoc HTML document for a server""" @@ -210,7 +219,9 @@ 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. diff -uNrp a/Lib/test/test_docxmlrpc.py b/Lib/test/test_docxmlrpc.py --- a/Lib/test/test_docxmlrpc.py 2019-12-21 16:13:25.340000000 +0800 +++ b/Lib/test/test_docxmlrpc.py 2019-12-21 16:16:49.828000000 +0800 @@ -1,5 +1,6 @@ from DocXMLRPCServer import DocXMLRPCServer import httplib +import re import sys from test import test_support threading = test_support.import_module('threading') @@ -176,6 +177,26 @@ class DocXMLRPCHTTPGETServer(unittest.Te self.assertIn("""Try self.add, 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