From ab88324e9d604323832798c91827b1052317e63b Mon Sep 17 00:00:00 2001 From: Cl0udG0d Date: Sun, 25 Aug 2024 22:48:32 +0800 Subject: [PATCH] =?UTF-8?q?BugFix=20v2.5.1=20=E6=B7=BB=E5=8A=A0fofa=20api?= =?UTF-8?q?=E5=8F=82=E6=95=B0,=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=B8=BAjson=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 17 +++++++---------- docs/CHANGELOG.md | 4 ++++ fofa.py | 2 ++ requirements.txt | 3 +++ tookit/config.py | 2 +- tookit/outputData.py | 4 ++-- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index a085109..431df73 100644 --- a/README.md +++ b/README.md @@ -11,14 +11,9 @@ PS: 感谢[FOFA](https://fofa.info/)提供这么好的测绘工具 非付费会员,fofa数据采集工具 -`-f` 参数开启关键字fuzz - -`--authorization` 指定登录用户的 authorization , authorization需要F12获取 - 使用示例 > fofa-hack.exe --keyword thinkphp --endcount 500 -> -> fofa-hack.exe --keyword thinkphp --endcount 500 --authorization your_authorization + ### 安装 @@ -40,14 +35,15 @@ Fofa-hack>python fofa.py -h |__| \____/|__| /__/\__\ _ _ ____ ____ __ __ | |_| | / () \ / (__`| |/ / - |_| |_|/__/\__\\____)|__|\__\ V2.4.16 + |_| |_|/__/\__\\____)|__|\__\ V2.5.1 公众号: 黑糖安全 -usage: fofa.py [-h] (--keyword KEYWORD | --inputfile INPUTFILE | --base BASE | --iconurl ICONURL | --iconfile ICONFILE) [--timesleep TIMESLEEP] [--timeout TIMEOUT] [--endcount ENDCOUNT] [--level LEVEL] [--output OUTPUT] - [--outputname OUTPUTNAME] [--fuzz] [--proxy-type {socks4,socks5,http}] [--authorization AUTHORIZATION] [--authorization-file AUTHORIZATION_FILE] [--proxy PROXY | --proxy-url PROXY_URL | --proxy-file PROXY_FILE] +usage: fofa.py [-h] (--keyword KEYWORD | --inputfile INPUTFILE | --base BASE | --iconurl ICONURL | --iconfile ICONFILE) [--timesleep TIMESLEEP] [--timeout TIMEOUT] [--endcount ENDCOUNT] [--level LEVEL] + [--output OUTPUT] [--outputname OUTPUTNAME] [--fuzz] [--proxy-type {socks4,socks5,http}] [--authorization AUTHORIZATION] [--authorization-file AUTHORIZATION_FILE] [--fofa-key FOFA_KEY] + [--proxy PROXY | --proxy-url PROXY_URL | --proxy-file PROXY_FILE] -Fofa-hack v2.4.16 使用说明 +Fofa-hack v2.5.1 使用说明 optional arguments: -h, --help show this help message and exit @@ -77,6 +73,7 @@ optional arguments: 指定Authorization值 --authorization-file AUTHORIZATION_FILE 从文件中读取authorization列表 --authorization-file authorization.txt + --fofa-key FOFA_KEY fofa api key值(配合fofa终身会员使用) --proxy PROXY 指定代理,代理格式 --proxy '127.0.0.1:7890' --proxy-url PROXY_URL 指定代理url，即访问URL响应为proxy,代理格式 --proxy-url http://127.0.0.1/proxy_pool/get diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index c4edf75..945858c 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG 代码变更记录 +### 2.5.1 ++ 添加 --fofa-key 参数 (优化中) ++ 修复BUG [issue 86](https://github.com/Cl0udG0d/Fofa-hack/issues/86) + ### 2.4.18 + 合入(pull request)(https://github.com/Cl0udG0d/Fofa-hack/pull/85) diff --git a/fofa.py b/fofa.py index a57ec25..1ffa88a 100644 --- a/fofa.py +++ b/fofa.py @@ -114,6 +114,8 @@ def main(): level = args.level if args.level else "1" level_data = LevelData(level) fuzz = args.fuzz + + output = args.output if args.output else "txt" outputname = args.outputname if args.outputname else "fofaHack" diff --git a/requirements.txt b/requirements.txt index e952693..134eca9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,6 +7,7 @@ colorama==0.4.6 cryptography==43.0.0 decorator==5.1.1 docutils==0.20.1 +filelock==3.15.4 idna==3.4 importlib-metadata==7.0.1 importlib_resources==6.4.0 @@ -33,11 +34,13 @@ pyinstaller-hooks-contrib==2024.1 pywin32-ctypes==0.2.2 readme_renderer==43.0 requests==2.27.1 +requests-file==2.1.0 requests-toolbelt==1.0.0 retry==0.9.2 rfc3986==2.0.0 rich==13.7.1 SecretStorage==3.3.3 +tldextract==5.1.2 twine==5.1.1 typing_extensions==4.12.2 urllib3==1.26.19 diff --git a/tookit/config.py b/tookit/config.py index c20e26c..3254499 100644 --- a/tookit/config.py +++ b/tookit/config.py @@ -5,7 +5,7 @@ # @File : config.py # @Github: https://github.com/Cl0udG0d -VERSION_NUM = "2.5.0" +VERSION_NUM = "2.5.1" ROOT_PATH = "" AUTHORIZATION = "" AUTHORIZATION_LIST = [ diff --git a/tookit/outputData.py b/tookit/outputData.py index 5c35f9b..a883bfd 100644 --- a/tookit/outputData.py +++ b/tookit/outputData.py @@ -14,9 +14,9 @@ class OutputData: ENCODING_TYPE="utf-8" - def __init__(self,filename, outputname, level="1",pattern="txt"): + def __init__(self,filename, level="1",pattern="txt"): self.filename=filename - self.outputname=outputname + # self.outputname=outputname self.pattern = pattern if self.checkPatternStandard(pattern) else "txt" self.level=level # self.path=os.path.join(os.path.abspath(os.path.dirname(os.path.dirname(__file__))),self.filename)