4f080ec
From 86589512cc1192e58343bbbc51bb4c09450dab90 Mon Sep 17 00:00:00 2001
4f080ec
From: Tomas Orsava <torsava@redhat.com>
4f080ec
Date: Fri, 24 Jun 2016 12:35:26 +0200
4f080ec
Subject: [PATCH] Disabled HTTP header injections in http.client.
4f080ec
4f080ec
CVE-2016-5699 python: http protocol steam injection attack
4f080ec
rhbz#1303699 : https://bugzilla.redhat.com/show_bug.cgi?id=1303699
4f080ec
4f080ec
Based on an upstream change by Demian Brecht and Serhiy Storchaka
4f080ec
- in changeset 94952:bf3e1c9b80e9 3.4
4f080ec
- https://hg.python.org/cpython/rev/bf3e1c9b80e9
4f080ec
---
4f080ec
 Lib/http/client.py       | 37 +++++++++++++++++++++++++++++++
4f080ec
 Lib/test/test_httplib.py | 57 ++++++++++++++++++++++++++++++++++++++++++++++++
4f080ec
 2 files changed, 94 insertions(+)
4f080ec
4f080ec
diff --git a/Lib/http/client.py b/Lib/http/client.py
4f080ec
index 6de4b0e..7ec5899 100644
4f080ec
--- a/Lib/http/client.py
4f080ec
+++ b/Lib/http/client.py
4f080ec
@@ -70,6 +70,7 @@ import email.parser
4f080ec
 import email.message
4f080ec
 import io
4f080ec
 import os
4f080ec
+import re
4f080ec
 import socket
4f080ec
 import collections
4f080ec
 from urllib.parse import urlsplit
4f080ec
@@ -215,6 +216,34 @@ MAXAMOUNT = 1048576
4f080ec
 _MAXLINE = 65536
4f080ec
 _MAXHEADERS = 100
4f080ec
 
4f080ec
+# Header name/value ABNF (http://tools.ietf.org/html/rfc7230#section-3.2)
4f080ec
+#
4f080ec
+# VCHAR          = %x21-7E
4f080ec
+# obs-text       = %x80-FF
4f080ec
+# header-field   = field-name ":" OWS field-value OWS
4f080ec
+# field-name     = token
4f080ec
+# field-value    = *( field-content / obs-fold )
4f080ec
+# field-content  = field-vchar [ 1*( SP / HTAB ) field-vchar ]
4f080ec
+# field-vchar    = VCHAR / obs-text
4f080ec
+#
4f080ec
+# obs-fold       = CRLF 1*( SP / HTAB )
4f080ec
+#                ; obsolete line folding
4f080ec
+#                ; see Section 3.2.4
4f080ec
+
4f080ec
+# token          = 1*tchar
4f080ec
+#
4f080ec
+# tchar          = "!" / "#" / "$" / "%" / "&" / "'" / "*"
4f080ec
+#                / "+" / "-" / "." / "^" / "_" / "`" / "|" / "~"
4f080ec
+#                / DIGIT / ALPHA
4f080ec
+#                ; any VCHAR, except delimiters
4f080ec
+#
4f080ec
+# VCHAR defined in http://tools.ietf.org/html/rfc5234#appendix-B.1
4f080ec
+
4f080ec
+# the patterns for both name and value are more leniant than RFC
4f080ec
+# definitions to allow for backwards compatibility
4f080ec
+_is_legal_header_name = re.compile(rb'[^:\s][^:\r\n]*').fullmatch
4f080ec
+_is_illegal_header_value = re.compile(rb'\n(?![ \t])|\r(?![ \t\n])').search
4f080ec
+
4f080ec
 
4f080ec
 class HTTPMessage(email.message.Message):
4f080ec
     # XXX The only usage of this method is in
4f080ec
@@ -1058,12 +1087,20 @@ class HTTPConnection:
4f080ec
 
4f080ec
         if hasattr(header, 'encode'):
4f080ec
             header = header.encode('ascii')
4f080ec
+
4f080ec
+        if not _is_legal_header_name(header):
4f080ec
+            raise ValueError('Invalid header name %r' % (header,))
4f080ec
+
4f080ec
         values = list(values)
4f080ec
         for i, one_value in enumerate(values):
4f080ec
             if hasattr(one_value, 'encode'):
4f080ec
                 values[i] = one_value.encode('latin-1')
4f080ec
             elif isinstance(one_value, int):
4f080ec
                 values[i] = str(one_value).encode('ascii')
4f080ec
+
4f080ec
+            if _is_illegal_header_value(values[i]):
4f080ec
+                raise ValueError('Invalid header value %r' % (values[i],))
4f080ec
+
4f080ec
         value = b'\r\n\t'.join(values)
4f080ec
         header = header + b': ' + value
4f080ec
         self._output(header)
4f080ec
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
4f080ec
index 3fc3466..d5037f0 100644
4f080ec
--- a/Lib/test/test_httplib.py
4f080ec
+++ b/Lib/test/test_httplib.py
4f080ec
@@ -148,6 +148,33 @@ class HeaderTests(TestCase):
4f080ec
         conn.putheader('Content-length', 42)
4f080ec
         self.assertIn(b'Content-length: 42', conn._buffer)
4f080ec
 
4f080ec
+        conn.putheader('Foo', ' bar ')
4f080ec
+        self.assertIn(b'Foo:  bar ', conn._buffer)
4f080ec
+        conn.putheader('Bar', '\tbaz\t')
4f080ec
+        self.assertIn(b'Bar: \tbaz\t', conn._buffer)
4f080ec
+        conn.putheader('Authorization', 'Bearer mytoken')
4f080ec
+        self.assertIn(b'Authorization: Bearer mytoken', conn._buffer)
4f080ec
+        conn.putheader('IterHeader', 'IterA', 'IterB')
4f080ec
+        self.assertIn(b'IterHeader: IterA\r\n\tIterB', conn._buffer)
4f080ec
+        conn.putheader('LatinHeader', b'\xFF')
4f080ec
+        self.assertIn(b'LatinHeader: \xFF', conn._buffer)
4f080ec
+        conn.putheader('Utf8Header', b'\xc3\x80')
4f080ec
+        self.assertIn(b'Utf8Header: \xc3\x80', conn._buffer)
4f080ec
+        conn.putheader('C1-Control', b'next\x85line')
4f080ec
+        self.assertIn(b'C1-Control: next\x85line', conn._buffer)
4f080ec
+        conn.putheader('Embedded-Fold-Space', 'is\r\n allowed')
4f080ec
+        self.assertIn(b'Embedded-Fold-Space: is\r\n allowed', conn._buffer)
4f080ec
+        conn.putheader('Embedded-Fold-Tab', 'is\r\n\tallowed')
4f080ec
+        self.assertIn(b'Embedded-Fold-Tab: is\r\n\tallowed', conn._buffer)
4f080ec
+        conn.putheader('Key Space', 'value')
4f080ec
+        self.assertIn(b'Key Space: value', conn._buffer)
4f080ec
+        conn.putheader('KeySpace ', 'value')
4f080ec
+        self.assertIn(b'KeySpace : value', conn._buffer)
4f080ec
+        conn.putheader(b'Nonbreak\xa0Space', 'value')
4f080ec
+        self.assertIn(b'Nonbreak\xa0Space: value', conn._buffer)
4f080ec
+        conn.putheader(b'\xa0NonbreakSpace', 'value')
4f080ec
+        self.assertIn(b'\xa0NonbreakSpace: value', conn._buffer)
4f080ec
+
4f080ec
     def test_ipv6host_header(self):
4f080ec
         # Default host header on IPv6 transaction should wrapped by [] if
4f080ec
         # its actual IPv6 address
4f080ec
@@ -177,6 +204,36 @@ class HeaderTests(TestCase):
4f080ec
         self.assertEqual(resp.getheader('First'), 'val')
4f080ec
         self.assertEqual(resp.getheader('Second'), 'val')
4f080ec
 
4f080ec
+    def test_invalid_headers(self):
4f080ec
+        conn = client.HTTPConnection('example.com')
4f080ec
+        conn.sock = FakeSocket('')
4f080ec
+        conn.putrequest('GET', '/')
4f080ec
+
4f080ec
+        # http://tools.ietf.org/html/rfc7230#section-3.2.4, whitespace is no
4f080ec
+        # longer allowed in header names
4f080ec
+        cases = (
4f080ec
+            (b'Invalid\r\nName', b'ValidValue'),
4f080ec
+            (b'Invalid\rName', b'ValidValue'),
4f080ec
+            (b'Invalid\nName', b'ValidValue'),
4f080ec
+            (b'\r\nInvalidName', b'ValidValue'),
4f080ec
+            (b'\rInvalidName', b'ValidValue'),
4f080ec
+            (b'\nInvalidName', b'ValidValue'),
4f080ec
+            (b' InvalidName', b'ValidValue'),
4f080ec
+            (b'\tInvalidName', b'ValidValue'),
4f080ec
+            (b'Invalid:Name', b'ValidValue'),
4f080ec
+            (b':InvalidName', b'ValidValue'),
4f080ec
+            (b'ValidName', b'Invalid\r\nValue'),
4f080ec
+            (b'ValidName', b'Invalid\rValue'),
4f080ec
+            (b'ValidName', b'Invalid\nValue'),
4f080ec
+            (b'ValidName', b'InvalidValue\r\n'),
4f080ec
+            (b'ValidName', b'InvalidValue\r'),
4f080ec
+            (b'ValidName', b'InvalidValue\n'),
4f080ec
+        )
4f080ec
+        for name, value in cases:
4f080ec
+            with self.subTest((name, value)):
4f080ec
+                with self.assertRaisesRegex(ValueError, 'Invalid header'):
4f080ec
+                    conn.putheader(name, value)
4f080ec
+
4f080ec
 
4f080ec
 class BasicTest(TestCase):
4f080ec
     def test_status_lines(self):
4f080ec
-- 
4f080ec
2.9.0
4f080ec