From bc78e5950e498ec22536e9f06718ae1ba7409e62 Mon Sep 17 00:00:00 2001 From: Jing Ling Date: Thu, 10 Sep 2020 21:06:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=BC=82=E5=B8=B8=E4=B9=9F?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/request.py | 7 ++++++- modules/finder.py | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common/request.py b/common/request.py index c1a52c4..3cfa603 100644 --- a/common/request.py +++ b/common/request.py @@ -135,7 +135,7 @@ def get(url, resp_list, session): resp = session.get(url, timeout=timeout, allow_redirects=redirect, proxies=proxy) except Exception as e: logger.log('DEBUG', e.args) - return + resp = e resp_list.append((url, resp)) @@ -194,6 +194,11 @@ def bulk_request(urls): def gen_new_info(info, resp): + if isinstance(resp, Exception): + info['reason'] = str(resp.args) + info['request'] = 0 + info['alive'] = 0 + return info info['reason'] = resp.reason code = resp.status_code info['status'] = code diff --git a/modules/finder.py b/modules/finder.py index 951463d..304d7b6 100644 --- a/modules/finder.py +++ b/modules/finder.py @@ -1,6 +1,7 @@ import re import time from urllib import parse +from requests import Response from common import utils from common import resolve @@ -192,7 +193,7 @@ def find_subdomains(domain, data): resp_data = request.bulk_request(js_urls) for _, resp in resp_data: - if not resp: + if not isinstance(resp, Response): continue text = utils.decode_resp_text(resp) subdomains.update(find_in_resp(domain, resp.url, text))