From 8c1c10d6ba78936c24150d6229ee1e49376c8e80 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Tue, 28 Apr 2015 18:29:44 +0100 Subject: [PATCH] Update change to suppress HTTPS verification InsecureRequestWarning to updated package as listed in hacks.txt, and remove listed hacks.txt record for check that SSLv3 is available because issue was addressed by vendor. --- CHANGES.md | 2 ++ HACKS.txt | 2 +- lib/requests/packages/urllib3/connectionpool.py | 2 ++ lib/requests/packages/urllib3/util/ssl_.py | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index a90ab258..3936ae45 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,8 @@ * Change network names to only display on top line of Day by Day layout on Episode View * Reposition country part of network name into the hover over in Day by Day layout * Update Requests library 2.4.3 to 2.6.2 (ff71b25) +* Update change to suppress HTTPS verification InsecureRequestWarning to updated package as listed in hacks.txt +* Remove listed hacks.txt record for check that SSLv3 is available because issue was addressed by vendor * Add ToTV provider * Fix Backlog scheduler initialization and change backlog frequency from minutes to days * Change to consolidate and tidy some provider code diff --git a/HACKS.txt b/HACKS.txt index b1e6363d..cbae91d6 100644 --- a/HACKS.txt +++ b/HACKS.txt @@ -1,5 +1,5 @@ Libs with customisations... /tornado -/lib/requests/packages/urllib3/contrib/pyopenssl.py /lib/requests/packages/urllib3/connectionpool.py +/lib/requests/packages/urllib3/util/ssl_.py diff --git a/lib/requests/packages/urllib3/connectionpool.py b/lib/requests/packages/urllib3/connectionpool.py index 117269ac..43c67967 100644 --- a/lib/requests/packages/urllib3/connectionpool.py +++ b/lib/requests/packages/urllib3/connectionpool.py @@ -760,12 +760,14 @@ class HTTPSConnectionPool(HTTPConnectionPool): if not getattr(conn, 'sock', None): # AppEngine might not have `.sock` conn.connect() + """ if not conn.is_verified: warnings.warn(( 'Unverified HTTPS request is being made. ' 'Adding certificate verification is strongly advised. See: ' 'https://urllib3.readthedocs.org/en/latest/security.html'), InsecureRequestWarning) + """ def connection_from_url(url, **kw): diff --git a/lib/requests/packages/urllib3/util/ssl_.py b/lib/requests/packages/urllib3/util/ssl_.py index b846d42c..f9573af2 100644 --- a/lib/requests/packages/urllib3/util/ssl_.py +++ b/lib/requests/packages/urllib3/util/ssl_.py @@ -81,6 +81,7 @@ except ImportError: self.ciphers = cipher_suite def wrap_socket(self, socket, server_hostname=None): + """ warnings.warn( 'A true SSLContext object is not available. This prevents ' 'urllib3 from configuring SSL appropriately and may cause ' @@ -89,6 +90,7 @@ except ImportError: '#insecureplatformwarning.', InsecurePlatformWarning ) + """ kwargs = { 'keyfile': self.keyfile, 'certfile': self.certfile,