修复requests使用时默认使用环境系统代理的问题

This commit is contained in:
JrD
2020-09-07 15:11:06 +08:00
parent 3407a84b8d
commit c2985352b1
4 changed files with 43 additions and 28 deletions
+12 -4
View File
@@ -75,8 +75,10 @@ class Module(object):
:param kwargs: other params
:return: response object
"""
session = requests.Session()
session.trust_env = False
try:
resp = requests.head(url,
resp = session.head(url,
params=params,
cookies=self.cookie,
headers=self.header,
@@ -104,11 +106,13 @@ class Module(object):
:param kwargs: other params
:return: response object
"""
session = requests.Session()
session.trust_env = False
level = 'ERROR'
if ignore:
level = 'DEBUG'
try:
resp = requests.get(url,
resp = session.get(url,
params=params,
cookies=self.cookie,
headers=self.header,
@@ -135,8 +139,10 @@ class Module(object):
:param kwargs: other params
:return: response object
"""
session = requests.Session()
session.trust_env = False
try:
resp = requests.post(url,
resp = session.post(url,
data=data,
cookies=self.cookie,
headers=self.header,
@@ -162,8 +168,10 @@ class Module(object):
:param kwargs: other params
:return: requests's response object
"""
session = requests.Session()
session.trust_env = False
try:
resp = requests.delete(url,
resp = session.delete(url,
cookies=self.cookie,
headers=self.header,
proxies=self.proxy,
+1 -1
View File
@@ -2,7 +2,6 @@ import json
from threading import Thread
from queue import Queue
import tqdm
import requests
from bs4 import BeautifulSoup
@@ -161,6 +160,7 @@ def get_session():
verify = settings.request_ssl_verify
redirect_limit = settings.request_redirect_limit
session = requests.Session()
session.trust_env = False
session.headers = header
session.verify = verify
session.max_redirects = redirect_limit
+9 -3
View File
@@ -521,8 +521,10 @@ def check_net():
'http://www.apple.com', 'http://microsoft.com']
url = random.choice(urls)
logger.log('INFOR', f'Trying to access {url}')
session = requests.Session()
session.trust_env = False
try:
rsp = requests.get(url)
rsp = session.get(url, proxies=get_proxy())
except Exception as e:
logger.log('ERROR', e.args)
logger.log('ALERT', 'Can not access Internet, retrying')
@@ -565,8 +567,10 @@ def check_version(local):
proxy = get_proxy()
timeout = settings.request_timeout_second
verify = settings.request_ssl_verify
session = requests.Session()
session.trust_env = False
try:
resp = requests.get(url=api, headers=header, proxies=proxy,
resp = session.get(url=api, headers=header, proxies=proxy,
timeout=timeout, verify=verify)
resp_json = resp.json()
latest = resp_json['tag_name']
@@ -705,8 +709,10 @@ def get_url_resp(url):
logger.log('INFOR', f'Attempting to request {url}')
timeout = settings.request_timeout_second
verify = settings.request_ssl_verify
session = requests.Session()
session.trust_env = False
try:
resp = requests.get(url, params=None, timeout=timeout, verify=verify)
resp = session.get(url, params=None, timeout=timeout, verify=verify)
except Exception as e:
logger.log('ALERT', f'Error request {url}')
logger.log('DEBUG', e.args)
+1
View File
@@ -12,6 +12,7 @@ class GithubAPI(Search):
self.addr = 'https://api.github.com/search/code'
self.domain = domain
self.session = requests.Session()
self.session.trust_env = False
self.auth_url = 'https://api.github.com'
self.token = settings.github_api_token