Backup_Repos/FanFicFare
1
0
Fork 0
mirror of https://github.com/JimmXinu/FanFicFare.git synced 2026-05-03 20:31:32 +02:00
Code Issues Projects Releases Wiki Activity

use_ssl_unverified_context:true ignored when use_clouadscraper:true

Browse source
This commit is contained in:
Jim Miller 2021-02-23 13:32:53 -06:00
parent 8a7423d27f
commit e2d6614fe7
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fanficfare/fetcher.py
View file

@ -431,6 +431,9 @@ class RequestsFetcher(Fetcher):
self.requests_session.cookies = self.cookiejar
return self.requests_session
def use_verify(self):
return not self.getConfig('use_ssl_unverified_context',False)
def request(self,method,url,headers=None,parameters=None):
'''Returns a FetcherResponse regardless of mechanism'''
if method not in ('GET','POST'):
@ -438,11 +441,10 @@ class RequestsFetcher(Fetcher):
try:
logger.debug(make_log('RequestsFetcher',method,url,hit='REQ',bar='-'))
## resp = requests Response object
verify = not self.getConfig('use_ssl_unverified_context',False)
resp = self.get_requests_session().request(method, url,
headers=headers,
data=parameters,
verify=verify)
verify=self.use_verify())
logger.debug("response code:%s"%resp.status_code)
resp.raise_for_status() # raises RequestsHTTPError if error code.
# consider 'cached' if from file.
@ -497,6 +499,14 @@ class CloudScraperFetcher(RequestsFetcher):
del headers['User-Agent']
return headers
def use_verify(self):
## cloudscraper doesn't work with verify=False, throws an
## error about "Cannot set verify_mode to CERT_NONE when
## check_hostname is enabled."
if self.getConfig('use_ssl_unverified_context',False):
logger.warning("use_ssl_unverified_context:true ignored when use_clouadscraper:true")
return True
def request(self,method,url,headers=None,parameters=None):
try:
return super(CloudScraperFetcher,self).request(method,url,headers,parameters)