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

Remove import check for service_identity

Browse Source 
service_identity.exceptions.CertificateError is available in the current minimum version (16.0.0)
This commit is contained in:
Eugenio Lacuesta 2019-08-08 23:18:47 -03:00
parent 3164543ed1
commit b404941e0d
No known key found for this signature in database
GPG Key ID: DA3EF2D0913E9810
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,9 @@
import logging import logging
from OpenSSL import SSL from OpenSSL import SSL
from twisted.internet.ssl import AcceptableCiphers from service_identity.exceptions import CertificateError
from twisted.internet._sslverify import ClientTLSOptions, verifyHostname, VerificationError from twisted.internet._sslverify import ClientTLSOptions, verifyHostname, VerificationError
from twisted.internet.ssl import AcceptableCiphers
from scrapy import twisted_version from scrapy import twisted_version
from scrapy.utils.ssl import x509name_to_string, get_temp_key_info from scrapy.utils.ssl import x509name_to_string, get_temp_key_info
@ -27,15 +28,6 @@ openssl_methods = {
} }
try:
# XXX: this import would fail on Debian jessie with system installed
# service_identity library, due to lack of cryptography.x509 dependency
# See https://github.com/pyca/service_identity/issues/21
from service_identity.exceptions import CertificateError
verification_errors = (CertificateError, VerificationError)
except ImportError:
verification_errors = VerificationError
if twisted_version < (17, 0, 0): if twisted_version < (17, 0, 0):
from twisted.internet._sslverify import _maybeSetHostNameIndication from twisted.internet._sslverify import _maybeSetHostNameIndication
set_tlsext_host_name = _maybeSetHostNameIndication set_tlsext_host_name = _maybeSetHostNameIndication
@ -87,7 +79,7 @@ class ScrapyClientTLSOptions(ClientTLSOptions):
try: try:
verifyHostname(connection, self._hostnameASCII) verifyHostname(connection, self._hostnameASCII)
except verification_errors as e: except (CertificateError, VerificationError) as e:
logger.warning( logger.warning(
'Remote certificate is not valid for hostname "{}"; {}'.format( 'Remote certificate is not valid for hostname "{}"; {}'.format(
self._hostnameASCII, e)) self._hostnameASCII, e))