Skip to content

Commit d3d6f16

Browse files
authored
Update run_validator.py
1 parent a767d72 commit d3d6f16

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

proc/run_validator.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from func_timeout.exceptions import FunctionTimedOut
1515
from db import conn
1616
from config import PROC_VALIDATOR_SLEEP, VALIDATE_THREAD_NUM
17-
from config import VALIDATE_TEXT, VALIDATE_URL, VALIDATE_TIMEOUT, VALIDATE_MAX_FAILS
17+
from config import VALIDATE_METHOD, VALIDATE_KEYWORD, VALIDATE_HEADER, VALIDATE_URL, VALIDATE_TIMEOUT, VALIDATE_MAX_FAILS
1818

1919
logging.basicConfig(stream=sys.stdout, format="%(asctime)s-%(levelname)s:%(name)s:%(message)s", level='INFO')
2020

@@ -78,12 +78,19 @@ def validate_once(proxy):
7878
'http': f'{proxy.protocal}://{proxy.ip}:{proxy.port}',
7979
'https': f'{proxy.protocal}://{proxy.ip}:{proxy.port}'
8080
}
81-
r = requests.get(VALIDATE_URL, timeout=VALIDATE_TIMEOUT, proxies=proxies)
82-
r.encoding = "utf-8"
83-
html = r.text
84-
if VALIDATE_TEXT in html:
85-
return True
86-
return False
81+
if VALIDATE_METHOD == "GET":
82+
r = requests.get(VALIDATE_URL, timeout=VALIDATE_TIMEOUT, proxies=proxies)
83+
r.encoding = "utf-8"
84+
html = r.text
85+
if VALIDATE_KEYWORD in html:
86+
return True
87+
return False
88+
else:
89+
r = requests.head(VALIDATE_URL, timeout=VALIDATE_TIMEOUT, proxies=proxies)
90+
resp_headers = r.headers
91+
if VALIDATE_KEYWORD in resp_headers[VALIDATE_HEADER]:
92+
return True
93+
return False
8794

8895
def validate_thread(in_que, out_que):
8996
"""

0 commit comments

Comments
 (0)