mirror of
https://git.yoctoproject.org/poky
synced 2026-04-16 06:32:13 +02:00
python-2.7: Security fix CVE-2016-5699
affect python-2.7 < 2.7.10 (From OE-Core rev: 1b16f5238460f65168851d5cdf74e7e0e64f6bdf) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Armin Kuster
committed by
Richard Purdie
Richard Purdie
parent
6976f01adc
commit
70799fb931
162
meta/recipes-devtools/python/python/CVE-2016-5699.patch
Normal file
162
meta/recipes-devtools/python/python/CVE-2016-5699.patch
Normal file
@@ -0,0 +1,162 @@
|
||||
|
||||
# HG changeset patch
|
||||
# User Serhiy Storchaka <storchaka@gmail.com>
|
||||
# Date 1426151571 -7200
|
||||
# Node ID 1c45047c51020d46246385949d5c02e026d47320
|
||||
# Parent 36bd5add973285cce9d3ec7e068bbb20c9080565
|
||||
Issue #22928: Disabled HTTP header injections in httplib.
|
||||
Original patch by Demian Brecht.
|
||||
|
||||
Index: Python-2.7.9/Lib/httplib.py
|
||||
===================================================================
|
||||
--- Python-2.7.9.orig/Lib/httplib.py
|
||||
+++ Python-2.7.9/Lib/httplib.py
|
||||
@@ -68,6 +68,7 @@ Req-sent-unread-response _CS_REQ_S
|
||||
|
||||
from array import array
|
||||
import os
|
||||
+import re
|
||||
import socket
|
||||
from sys import py3kwarning
|
||||
from urlparse import urlsplit
|
||||
@@ -218,6 +219,34 @@ _MAXLINE = 65536
|
||||
# maximum amount of headers accepted
|
||||
_MAXHEADERS = 100
|
||||
|
||||
+# Header name/value ABNF (http://tools.ietf.org/html/rfc7230#section-3.2)
|
||||
+#
|
||||
+# VCHAR = %x21-7E
|
||||
+# obs-text = %x80-FF
|
||||
+# header-field = field-name ":" OWS field-value OWS
|
||||
+# field-name = token
|
||||
+# field-value = *( field-content / obs-fold )
|
||||
+# field-content = field-vchar [ 1*( SP / HTAB ) field-vchar ]
|
||||
+# field-vchar = VCHAR / obs-text
|
||||
+#
|
||||
+# obs-fold = CRLF 1*( SP / HTAB )
|
||||
+# ; obsolete line folding
|
||||
+# ; see Section 3.2.4
|
||||
+
|
||||
+# token = 1*tchar
|
||||
+#
|
||||
+# tchar = "!" / "#" / "$" / "%" / "&" / "'" / "*"
|
||||
+# / "+" / "-" / "." / "^" / "_" / "`" / "|" / "~"
|
||||
+# / DIGIT / ALPHA
|
||||
+# ; any VCHAR, except delimiters
|
||||
+#
|
||||
+# VCHAR defined in http://tools.ietf.org/html/rfc5234#appendix-B.1
|
||||
+
|
||||
+# the patterns for both name and value are more leniant than RFC
|
||||
+# definitions to allow for backwards compatibility
|
||||
+_is_legal_header_name = re.compile(r'\A[^:\s][^:\r\n]*\Z').match
|
||||
+_is_illegal_header_value = re.compile(r'\n(?![ \t])|\r(?![ \t\n])').search
|
||||
+
|
||||
|
||||
class HTTPMessage(mimetools.Message):
|
||||
|
||||
@@ -978,7 +1007,16 @@ class HTTPConnection:
|
||||
if self.__state != _CS_REQ_STARTED:
|
||||
raise CannotSendHeader()
|
||||
|
||||
- hdr = '%s: %s' % (header, '\r\n\t'.join([str(v) for v in values]))
|
||||
+ header = '%s' % header
|
||||
+ if not _is_legal_header_name(header):
|
||||
+ raise ValueError('Invalid header name %r' % (header,))
|
||||
+
|
||||
+ values = [str(v) for v in values]
|
||||
+ for one_value in values:
|
||||
+ if _is_illegal_header_value(one_value):
|
||||
+ raise ValueError('Invalid header value %r' % (one_value,))
|
||||
+
|
||||
+ hdr = '%s: %s' % (header, '\r\n\t'.join(values))
|
||||
self._output(hdr)
|
||||
|
||||
def endheaders(self, message_body=None):
|
||||
Index: Python-2.7.9/Lib/test/test_httplib.py
|
||||
===================================================================
|
||||
--- Python-2.7.9.orig/Lib/test/test_httplib.py
|
||||
+++ Python-2.7.9/Lib/test/test_httplib.py
|
||||
@@ -138,6 +138,33 @@ class HeaderTests(TestCase):
|
||||
conn.putheader('Content-length',42)
|
||||
self.assertIn('Content-length: 42', conn._buffer)
|
||||
|
||||
+ conn.putheader('Foo', ' bar ')
|
||||
+ self.assertIn(b'Foo: bar ', conn._buffer)
|
||||
+ conn.putheader('Bar', '\tbaz\t')
|
||||
+ self.assertIn(b'Bar: \tbaz\t', conn._buffer)
|
||||
+ conn.putheader('Authorization', 'Bearer mytoken')
|
||||
+ self.assertIn(b'Authorization: Bearer mytoken', conn._buffer)
|
||||
+ conn.putheader('IterHeader', 'IterA', 'IterB')
|
||||
+ self.assertIn(b'IterHeader: IterA\r\n\tIterB', conn._buffer)
|
||||
+ conn.putheader('LatinHeader', b'\xFF')
|
||||
+ self.assertIn(b'LatinHeader: \xFF', conn._buffer)
|
||||
+ conn.putheader('Utf8Header', b'\xc3\x80')
|
||||
+ self.assertIn(b'Utf8Header: \xc3\x80', conn._buffer)
|
||||
+ conn.putheader('C1-Control', b'next\x85line')
|
||||
+ self.assertIn(b'C1-Control: next\x85line', conn._buffer)
|
||||
+ conn.putheader('Embedded-Fold-Space', 'is\r\n allowed')
|
||||
+ self.assertIn(b'Embedded-Fold-Space: is\r\n allowed', conn._buffer)
|
||||
+ conn.putheader('Embedded-Fold-Tab', 'is\r\n\tallowed')
|
||||
+ self.assertIn(b'Embedded-Fold-Tab: is\r\n\tallowed', conn._buffer)
|
||||
+ conn.putheader('Key Space', 'value')
|
||||
+ self.assertIn(b'Key Space: value', conn._buffer)
|
||||
+ conn.putheader('KeySpace ', 'value')
|
||||
+ self.assertIn(b'KeySpace : value', conn._buffer)
|
||||
+ conn.putheader(b'Nonbreak\xa0Space', 'value')
|
||||
+ self.assertIn(b'Nonbreak\xa0Space: value', conn._buffer)
|
||||
+ conn.putheader(b'\xa0NonbreakSpace', 'value')
|
||||
+ self.assertIn(b'\xa0NonbreakSpace: value', conn._buffer)
|
||||
+
|
||||
def test_ipv6host_header(self):
|
||||
# Default host header on IPv6 transaction should wrapped by [] if
|
||||
# its actual IPv6 address
|
||||
@@ -157,6 +184,35 @@ class HeaderTests(TestCase):
|
||||
conn.request('GET', '/foo')
|
||||
self.assertTrue(sock.data.startswith(expected))
|
||||
|
||||
+ def test_invalid_headers(self):
|
||||
+ conn = httplib.HTTPConnection('example.com')
|
||||
+ conn.sock = FakeSocket('')
|
||||
+ conn.putrequest('GET', '/')
|
||||
+
|
||||
+ # http://tools.ietf.org/html/rfc7230#section-3.2.4, whitespace is no
|
||||
+ # longer allowed in header names
|
||||
+ cases = (
|
||||
+ (b'Invalid\r\nName', b'ValidValue'),
|
||||
+ (b'Invalid\rName', b'ValidValue'),
|
||||
+ (b'Invalid\nName', b'ValidValue'),
|
||||
+ (b'\r\nInvalidName', b'ValidValue'),
|
||||
+ (b'\rInvalidName', b'ValidValue'),
|
||||
+ (b'\nInvalidName', b'ValidValue'),
|
||||
+ (b' InvalidName', b'ValidValue'),
|
||||
+ (b'\tInvalidName', b'ValidValue'),
|
||||
+ (b'Invalid:Name', b'ValidValue'),
|
||||
+ (b':InvalidName', b'ValidValue'),
|
||||
+ (b'ValidName', b'Invalid\r\nValue'),
|
||||
+ (b'ValidName', b'Invalid\rValue'),
|
||||
+ (b'ValidName', b'Invalid\nValue'),
|
||||
+ (b'ValidName', b'InvalidValue\r\n'),
|
||||
+ (b'ValidName', b'InvalidValue\r'),
|
||||
+ (b'ValidName', b'InvalidValue\n'),
|
||||
+ )
|
||||
+ for name, value in cases:
|
||||
+ with self.assertRaisesRegexp(ValueError, 'Invalid header'):
|
||||
+ conn.putheader(name, value)
|
||||
+
|
||||
|
||||
class BasicTest(TestCase):
|
||||
def test_status_lines(self):
|
||||
Index: Python-2.7.9/Misc/NEWS
|
||||
===================================================================
|
||||
--- Python-2.7.9.orig/Misc/NEWS
|
||||
+++ Python-2.7.9/Misc/NEWS
|
||||
@@ -13,6 +13,9 @@ What's New in Python 2.7.9?
|
||||
Library
|
||||
-------
|
||||
|
||||
+- Issue #22928: Disabled HTTP header injections in httplib.
|
||||
+ Original patch by Demian Brecht.
|
||||
+
|
||||
- Issue #22959: Remove the *check_hostname* parameter of
|
||||
httplib.HTTPSConnection. The *context* parameter should be used instead.
|
||||
|
||||
@@ -28,6 +28,7 @@ SRC_URI += "\
|
||||
file://avoid_parallel_make_races_on_pgen.patch \
|
||||
file://CVE-2016-0772.patch \
|
||||
file://CVE-2016-5636.patch \
|
||||
file://CVE-2016-5699.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/Python-${PV}"
|
||||
|
||||
Reference in New Issue
Block a user