diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-02-15 16:58:00 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-02-15 16:58:00 +0000 |
| commit | 434d713861b70f6c6563d6ee50a8e64f14c970d9 (patch) | |
| tree | b72c523c72e764420f835ba9d63d43ffef687dcf /dev-python/dugong | |
| parent | f78108598211053d41752a83e0345441bb9014ae (diff) | |
gentoo resync : 15.02.2018
Diffstat (limited to 'dev-python/dugong')
| -rw-r--r-- | dev-python/dugong/Manifest | 1 | ||||
| -rw-r--r-- | dev-python/dugong/files/dugong-3.7-test-html-escape.patch | 46 |
2 files changed, 0 insertions, 47 deletions
diff --git a/dev-python/dugong/Manifest b/dev-python/dugong/Manifest index 56ec466d252c..416a37b70f88 100644 --- a/dev-python/dugong/Manifest +++ b/dev-python/dugong/Manifest @@ -1,4 +1,3 @@ -AUX dugong-3.7-test-html-escape.patch 1765 BLAKE2B b0fda0d85a1978e351e83b235d3f6866dc8193364d6ff5a77b0555a6952324d21e008af27953fb57b01cefac375b734aa0c4a88796f60588a4e1e9dda3cd727c SHA512 8a341199805baef25e4d8316e7a5f290b5e33c97b53a53f19da03eb55035feed2ba7709e3429ac69c906af86c63dbc21835c3ccef4aa713ffd09b3d1643b7f3d DIST dugong-3.7.1.tar.bz2 194243 BLAKE2B a7514f4b515fcd519f5c11b834d44d16cd395d9eada659dd1913bd07a9a072e19f6737a3d702d9ef2a63160eb5452f146a4b04e744610b8f51c9403a648aef9b SHA512 85c276bba85d650bf0baa6257bf0872cb2da546a23d19e0c94cc15c95721a8d9f6392db0e64b38ab2e801803e3ab7908e6a931d18736d33c87138eca35b4f27c EBUILD dugong-3.7.1.ebuild 778 BLAKE2B 6009fb01fa66fd5cc61370abba8decddb266daa4cc3b46e3c462bad1ddee1e952a1e7a2465f8b83c543676e184019b113a4c9fed8d8ac2ac0d820ff876422d92 SHA512 be73a4ab89970d3fcfe2b651950eadab8ca3c7fc3652acdad632bb71874cb0faa3f673678c5f6f62a9175a5c73c391635ddadf2082371bc24b4429b09caeec73 MISC metadata.xml 386 BLAKE2B 8a2dc259255a5fe345b1f1e04b1708bc34f7c31351b01b90a856b93604fef92be88bc75f7120dac1fb4f86f9aace962729a2d91e13094e5ee59b9c464280628f SHA512 9ac2081eb11077d2d9d7318410053fca1855abc8fe288bc18de829c1874e38c649620c56e2a7eb9fe29e41bed8dcb7c3327a2203c60511ab233a58d93f542db2 diff --git a/dev-python/dugong/files/dugong-3.7-test-html-escape.patch b/dev-python/dugong/files/dugong-3.7-test-html-escape.patch deleted file mode 100644 index ba2ee587d0c9..000000000000 --- a/dev-python/dugong/files/dugong-3.7-test-html-escape.patch +++ /dev/null @@ -1,46 +0,0 @@ -# HG changeset patch -# User Zac Medico <zmedico@gentoo.org> -# Date 1494468556 25200 -# Branch test-quote-html -# Node ID b8a28438442ec12cd4067fd3240d9afc8e6998da -# Parent a986296769f3fc4daa0f29fe28b857f43d05634d -Use html.escape for python3.6 compat - -https://bitbucket.org/nikratio/python-dugong/pull-requests/3 - -diff --git a/test/test_dugong.py b/test/test_dugong.py ---- a/test/test_dugong.py -+++ b/test/test_dugong.py -@@ -24,7 +24,7 @@ - from dugong import (HTTPConnection, BodyFollowing, CaseInsensitiveDict, _join, - ConnectionClosed) - import dugong --from http.server import BaseHTTPRequestHandler, _quote_html -+from http.server import BaseHTTPRequestHandler - from io import TextIOWrapper - from base64 import b64encode - import http.client -@@ -34,6 +34,7 @@ - import ssl - import re - import os -+import html - import hashlib - import threading - import socketserver -@@ -1163,9 +1164,12 @@ - message = shortmsg - explain = longmsg - self.log_error("code %d, message %s", code, message) -- # using _quote_html to prevent Cross Site Scripting attacks (see bug #1100201) -- content = (self.error_message_format % {'code': code, 'message': _quote_html(message), -- 'explain': explain}).encode('utf-8', 'replace') -+ # HTML encode to prevent Cross Site Scripting attacks (see bug #1100201) -+ content = (self.error_message_format % { -+ 'code': code, -+ 'message': html.escape(message, quote=False), -+ 'explain': explain -+ }).encode('utf-8', 'replace') - self.send_response(code, message) - self.send_header("Content-Type", self.error_content_type) - self.send_header("Content-Length", str(len(content))) |