BackTrackZ/scrapy
BackTrackZ/scrapy
1
0
Fork 0
mirror of https://github.com/scrapy/scrapy.git synced 2025-02-23 11:03:54 +00:00
Code Releases Wiki Activity

Merge pull request #2094 from redapple/dns-invalid-id

Browse Source 
Catch and ignore certification verification exception for IP-address hosts
This commit is contained in:
Mikhail Korobov 2016-07-13 10:48:08 +00:00 committed by GitHub
commit 2dd1a9e3bc
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scrapy/core/downloader/tls.py
View File

@ -34,9 +34,15 @@ try:
VerificationError)
class ScrapyClientTLSOptions(ClientTLSOptions):
# same as Twisted's ClientTLSOptions,
# except that VerificationError is caught
# and doesn't close the connection
"""
SSL Client connection creator ignoring certificate verification errors
(for genuinely invalid certificates or bugs in verification code).
Same as Twisted's private _sslverify.ClientTLSOptions,
except that VerificationError and ValueError exceptions are caught,
so that the connection is not closed, only logging warnings.
"""
def _identityVerifyingInfoCallback(self, connection, where, ret):
if where & SSL_CB_HANDSHAKE_START:
_maybeSetHostNameIndication(connection, self._hostnameBytes)
@ -48,6 +54,12 @@ try:
'Remote certificate is not valid for hostname "{}"; {}'.format(
self._hostnameASCII, e))
except ValueError as e:
logger.warning(
'Ignoring error while verifying certificate '
'from host "{}" (exception: {})'.format(
self._hostnameASCII, repr(e)))
except ImportError:
# ImportError should not matter for older Twisted versions
# as the above is not used in the fallback ScrapyClientContextFactory

8
tests/test_downloader_handlers.py
View File

@ -356,6 +356,14 @@ class Https11WrongHostnameTestCase(Http11TestCase):
certfile = 'keys/example-com.cert.pem'
class Https11InvalidDNSId(Https11TestCase):
"""Connect to HTTPS hosts with IP while certificate uses domain names IDs."""
def setUp(self):
super(Https11InvalidDNSId, self).setUp()
self.host = '127.0.0.1'
class Http11MockServerTestCase(unittest.TestCase):
"""HTTP 1.1 test case with MockServer"""
if twisted_version < (11, 1, 0):