forked from pool/python
f5ffed7eba
- Add CVE-2019-16935-xmlrpc-doc-server_title.patch fixing bsc#1153238 (aka CVE-2019-16935) fixing a reflected XSS in python/Lib/DocXMLRPCServer.py OBS-URL: https://build.opensuse.org/request/show/736435 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=253
77 lines
2.8 KiB
Diff
77 lines
2.8 KiB
Diff
From b41cde823d026f2adc21ef14b1c2e92b1006de06 Mon Sep 17 00:00:00 2001
|
|
From: Dong-hee Na <donghee.na92@gmail.com>
|
|
Date: Sat, 28 Sep 2019 10:17:25 +0900
|
|
Subject: [PATCH 1/3] [2.7] bpo-38243: Escape the server title of
|
|
DocXMLRPCServer when rendering
|
|
|
|
--- a/Lib/DocXMLRPCServer.py
|
|
+++ b/Lib/DocXMLRPCServer.py
|
|
@@ -20,6 +20,16 @@ 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 +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.
|
|
--- a/Lib/test/test_docxmlrpc.py
|
|
+++ b/Lib/test/test_docxmlrpc.py
|
|
@@ -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,25 @@ class DocXMLRPCHTTPGETServer(unittest.Te
|
|
self.assertIn("""Try self.<strong>add</strong>, 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<script></title>',
|
|
+ title)
|
|
+ self.assertEqual('<p><tt>test_documentation<script></tt></p>',
|
|
+ documentation)
|
|
+
|
|
+
|
|
def test_main():
|
|
test_support.run_unittest(DocXMLRPCHTTPGETServer)
|
|
|
|
--- /dev/null
|
|
+++ b/Misc/NEWS.d/next/Security/2019-09-25-13-21-09.bpo-38243.1pfz24.rst
|
|
@@ -0,0 +1,3 @@
|
|
+Escape the server title of :class:`DocXMLRPCServer.DocXMLRPCServer`
|
|
+when rendering the document page as HTML.
|
|
+(Contributed by Dong-hee Na in :issue:`38243`.)
|