From 71e5c8968944267644e75b8e4f48a9d091d1b146 Mon Sep 17 00:00:00 2001 From: Jing Ling Date: Mon, 2 Mar 2020 03:09:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9banner=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oneforall/common/request.py | 5 +---- oneforall/common/utils.py | 8 ++++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/oneforall/common/request.py b/oneforall/common/request.py index e7a1c14..809c849 100644 --- a/oneforall/common/request.py +++ b/oneforall/common/request.py @@ -172,10 +172,7 @@ def request_callback(future, index, datas): else: datas[index]['valid'] = 1 headers = resp.headers - banner = str({'Server': headers.get('Server'), - 'Via': headers.get('Via'), - 'X-Powered-By': headers.get('X-Powered-By')}) - datas[index]['banner'] = banner[1:-1] + datas[index]['banner'] = utils.get_sample_banner(headers) datas[index]['header'] = str(dict(headers))[1:-1] if isinstance(text, str): title = get_title(text).strip() diff --git a/oneforall/common/utils.py b/oneforall/common/utils.py index 9388548..db17131 100644 --- a/oneforall/common/utils.py +++ b/oneforall/common/utils.py @@ -374,3 +374,11 @@ def get_filtered_data(data): if valid == 0 or valid == 1: filtered_data.append(item) return filtered_data + + +def get_sample_banner(headers): + server = headers.get('Server') or '' + via = headers.get('Via') or '' + power = headers.get('X-Powered-By') or '' + banner = server + via + power + return banner