From ddd8f3dbbb3844db68e6b16b733eddb93ba84fae Mon Sep 17 00:00:00 2001 From: Jing Ling Date: Mon, 11 May 2020 13:28:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=99=E9=BB=98?= =?UTF-8?q?=E7=BA=A7=E5=88=AB=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/utils.py | 4 ++-- config/log.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/common/utils.py b/common/utils.py index ca381e4..bbe4038 100644 --- a/common/utils.py +++ b/common/utils.py @@ -311,7 +311,7 @@ def check_value(values): def export_all_results(path, name, format, datas): path = check_path(path, name, format) - logger.log('INFOR', f'所有主域的子域结果 {path}') + logger.log('ALERT', f'所有主域的子域结果 {path}') row_list = list() for row in datas: if 'header' in row: @@ -330,7 +330,7 @@ def export_all_results(path, name, format, datas): def export_all_subdomains(alive, path, name, datas): path = check_path(path, name, 'txt') - logger.log('INFOR', f'所有主域的纯子域结果 {path}') + logger.log('ALERT', f'所有主域的纯子域结果 {path}') subdomains = set() for row in datas: subdomain = row.get('subdomain') diff --git a/config/log.py b/config/log.py index 730aa37..4f3ebfc 100644 --- a/config/log.py +++ b/config/log.py @@ -26,10 +26,12 @@ logger.remove() logger.level(name='TRACE', no=5, color='', icon='✏️') logger.level(name='DEBUG', no=10, color='', icon='🐞 ') logger.level(name='INFOR', no=20, color='', icon='ℹ️') +logger.level(name='QUITE', no=25, color='', icon='🤫 ') logger.level(name='ALERT', no=30, color='', icon='⚠️') logger.level(name='ERROR', no=40, color='', icon='❌️') logger.level(name='FATAL', no=50, color='', icon='☠️') -logger.add(sys.stderr, level='INFOR', format=stdout_fmt, enqueue=True) +# 如果你想在命令终端静默运行OneForAll，可以将以下一行中的level设置为QUITE +logger.add(sys.stderr, level='INFOR', format=stdout_fmt, enqueue=True) # 命令终端日志级别默认为INFOR logger.add(log_path, level='DEBUG', format=logfile_fmt, enqueue=True, - encoding='utf-8') + encoding='utf-8') # 日志文件默认为级别为DEBUG From 6d1e8d8fb1b574ce8f27955292ac701117486f8a Mon Sep 17 00:00:00 2001 From: Jing Ling Date: Mon, 11 May 2020 14:23:33 +0800 Subject: [PATCH 2/4] typos --- brute.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/brute.py b/brute.py index 428195b..5fe6684 100644 --- a/brute.py +++ b/brute.py @@ -35,7 +35,7 @@ def do_query_a(domain, resolver): logger.log('ALERT', f'DNS resolve timeout, retrying...') logger.log('DEBUG', e.args) raise tenacity.TryAgain - # If resolve random subdomain raise NXDOMAIN error + # If resolve random subdomain raise NXDOMAIN, YXDOMAIN, NoAnswer, NoNameservers error # It means that there is no A record of random subdomain and not use wildcard dns record except (NXDOMAIN, YXDOMAIN, NoAnswer, NoNameservers) as e: logger.log('DEBUG', e.args) @@ -427,7 +427,7 @@ def delete_file(dict_path, output_paths): class Brute(Module): """ - OneForAll子域爆破模块 + OneForAll subdomain brute module Example： brute.py --target domain.com --word True run From f0e3a343bf648b0129a55fccbc6b8874a642f94d Mon Sep 17 00:00:00 2001 From: Jing Ling Date: Mon, 11 May 2020 16:29:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=A7=BB=E9=99=A4js2py=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/datasets/bufferover.py | 1 - modules/datasets/threatcrowd.py | 1 - 2 files changed, 2 deletions(-) diff --git a/modules/datasets/bufferover.py b/modules/datasets/bufferover.py index d95f254..cdea847 100644 --- a/modules/datasets/bufferover.py +++ b/modules/datasets/bufferover.py @@ -17,7 +17,6 @@ class BufferOver(Query): """ # 绕过cloudFlare验证 scraper = cloudscraper.create_scraper() - scraper.interpreter = 'js2py' scraper.proxies = self.get_proxy(self.source) url = self.addr + self.domain try: diff --git a/modules/datasets/threatcrowd.py b/modules/datasets/threatcrowd.py index e0bc7f1..d064cb4 100644 --- a/modules/datasets/threatcrowd.py +++ b/modules/datasets/threatcrowd.py @@ -16,7 +16,6 @@ class ThreatCrowd(Query): def query(self): # 绕过cloudFlare验证 scraper = cloudscraper.create_scraper() - scraper.interpreter = 'js2py' scraper.proxies = self.get_proxy(self.source) url = self.addr + self.domain try: From 5854c7ffa8617b2a88a92f4980fef98284f0587b Mon Sep 17 00:00:00 2001 From: Jing Ling Date: Mon, 11 May 2020 16:39:00 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pipfile | 2 -- Pipfile.lock | 65 ++++++++++++++---------------------------------- requirements.txt | 14 ++++------- 3 files changed, 23 insertions(+), 58 deletions(-) diff --git a/Pipfile b/Pipfile index 40c2818..a7b0f13 100644 --- a/Pipfile +++ b/Pipfile @@ -7,7 +7,6 @@ verify_ssl = true [packages] tqdm = "*" -aiomultiprocess = "*" loguru = "*" dnspython = "*" requests = "*" @@ -19,7 +18,6 @@ fire = "*" bs4 = "*" pysocks = "*" cloudscraper = "*" -js2py = "*" tablib = "*" brotli = "*" psutil = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 572a727..8c59584 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "d61abc7e1e2904735bf756b2efa14cce255f158d0f961a5ef00f42f775e1fb43" + "sha256": "331fa72389c511a19913a7b58136a45391775ade2ef946e4790cd199e4098a39" }, "pipfile-spec": 6, "requires": { @@ -34,13 +34,6 @@ "index": "pypi", "version": "==3.6.2" }, - "aiomultiprocess": { - "hashes": [ - "sha256:341d53af9b7fedf6425d9c09636d029035d63eecaa54caaff7354145a969c65e" - ], - "index": "pypi", - "version": "==0.7.0" - }, "async-timeout": { "hashes": [ "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f", @@ -83,11 +76,11 @@ "sha256:9d1c2dd27a1083fefd05b1b2f8df4a6bc2aaa6c21dd82cd41c8ae5e7c23a87f8", "sha256:a13ce9b419fe9f277c63f700efb0e444331509d1881b5610d2ba7e9080606967", "sha256:a19ef0952b9d2803df88dff07f45a6c92d5676afb9b8d69cf32232d684036d11", - "sha256:a44d41e7a80cc832f04f4c1577a67bd311e28a6e40702a258590d8949a204d9d", "sha256:ad766ca8b8c1419b71a22756b45264f45725c86133dc80a7cbe30b6b78c75620", "sha256:ad7963f261988ee0883816b6b9f206f11461c9b3cb5cfbca0c9ab5adc406d395", "sha256:af0451e23016631a2f52925a10d738ac4a0f794ac315c30380b22efc0c90cbc6", "sha256:c16201060c5a3f8742e3deae759014251ac92f382f82bc2a41dc079ff18c3f24", + "sha256:c43b202f65891861a9a336984a103de25de235f756de69e32db893156f767013", "sha256:c675c6cce4295cb1a692f3de7416aacace7314e064b94bc86e93aceefce7fd3e", "sha256:d17cec0b992b1434f5f9df9986563605a4d1b1acd5574c87fc2ac014bcbd3316", "sha256:dc91f6129953861a73d9a65c52a8dd682b561a9ebaf65283541645cab6489917", @@ -125,11 +118,11 @@ }, "cloudscraper": { "hashes": [ - "sha256:478d3cf2044d6b70a8e4f436afff4a8f74cb730cc34841cc9411c80d41d5e9e3", - "sha256:50a131a9bfc1969b01d48eecb4ecc1acd92ee992be31c0bee4f1f31ac3cbae8f" + "sha256:06eb4fd7462dc08a193228830f45097993efc8af4fd75a74815ba16a05c6a0fd", + "sha256:dec9d92a323e85d390af8d02e475de425604212bc6e50c78c0897bf05d355352" ], "index": "pypi", - "version": "==1.2.34" + "version": "==1.2.36" }, "colorama": { "hashes": [ @@ -187,14 +180,6 @@ ], "version": "==1.4.1" }, - "js2py": { - "hashes": [ - "sha256:7568b33f6bd15ee8ab1f3655928ed05481a6236ad2acca4598703ae501571661", - "sha256:f78e76c88942585973129a0a10e7054b5ea1602d761d4c0ccfa0593bc819f0bb" - ], - "index": "pypi", - "version": "==0.70" - }, "loguru": { "hashes": [ "sha256:074b3caa6748452c1e4f2b302093c94b65d5a4c5a4d7743636b4121e06437b0e", @@ -248,12 +233,12 @@ "index": "pypi", "version": "==5.7.0" }, - "pyjsparser": { + "pyparsing": { "hashes": [ - "sha256:2b12842df98d83f65934e0772fa4a5d8b123b3bc79f1af1789172ac70265dd21", - "sha256:be60da6b778cc5a5296a69d8e7d614f1f870faf94e1b1b6ac591f2ad5d729579" + "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", + "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" ], - "version": "==2.7.1" + "version": "==2.4.7" }, "pysocks": { "hashes": [ @@ -264,13 +249,6 @@ "index": "pypi", "version": "==1.7.1" }, - "pytz": { - "hashes": [ - "sha256:1c557d7d0e871de1f5ccd5833f60fb2550652da6be2693c1e02300743d21500d", - "sha256:b02c06db6cf09c12dd25137e563b31700d3b80fcc4ad23abb7a315f2789819be" - ], - "version": "==2019.3" - }, "records": { "hashes": [ "sha256:47e4874096f4a8f4b5bcad8c7c7cf512be36186e6e263ff3dfd750b05ff0d3c4", @@ -289,10 +267,10 @@ }, "requests-file": { "hashes": [ - "sha256:75c175eed739270aec3c5279ffd74e6527dada275c5c0d76b5817e9c86bb7dea", - "sha256:8f04aa6201bacda0567e7ac7f677f1499b0fc76b22140c54bc06edf1ba92e2fa" + "sha256:07d74208d3389d01c38ab89ef403af0cfec63957d53a0081d8eca738d0247d8e", + "sha256:dfe5dae75c12481f68ba353183c53a65e6044c923e64c24b2209f6c7570ca953" ], - "version": "==1.4.3" + "version": "==1.5.1" }, "requests-toolbelt": { "hashes": [ @@ -350,11 +328,11 @@ }, "tenacity": { "hashes": [ - "sha256:f7bcbf5bb53875cfc38f61f596a88b1c994af32420f120c4409542a683ad613b", - "sha256:fb01d8ef2474eed422d8314a566c9e391cccb6e50cf4585022add6cb5cda66c8" + "sha256:29ae90e7faf488a8628432154bb34ace1cca58244c6ea399fd33f066ac71339a", + "sha256:5a5d3dcd46381abe8b4f82b5736b8726fd3160c6c7161f53f8af7f1eb9b82173" ], "index": "pypi", - "version": "==6.1.0" + "version": "==6.2.0" }, "termcolor": { "hashes": [ @@ -372,18 +350,11 @@ }, "tqdm": { "hashes": [ - "sha256:00339634a22c10a7a22476ee946bbde2dbe48d042ded784e4d88e0236eca5d81", - "sha256:ea9e3fd6bd9a37e8783d75bfc4c1faf3c6813da6bd1c3e776488b41ec683af94" + "sha256:4733c4a10d0f2a4d098d801464bdaf5240c7dadd2a7fde4ee93b0a0efd9fb25e", + "sha256:acdafb20f51637ca3954150d0405ff1a7edde0ff19e38fb99a80a66210d2a28f" ], "index": "pypi", - "version": "==4.45.0" - }, - "tzlocal": { - "hashes": [ - "sha256:11c9f16e0a633b4b60e1eede97d8a46340d042e67b670b290ca526576e039048", - "sha256:949b9dd5ba4be17190a80c0268167d7e6c92c62b30026cf9764caf3e308e5590" - ], - "version": "==2.0.0" + "version": "==4.46.0" }, "urllib3": { "hashes": [ diff --git a/requirements.txt b/requirements.txt index eb2221f..80f247b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ aiohttp==3.6.2 -aiomultiprocess==0.7.0 async-timeout==3.0.1 attrs==19.3.0 beautifulsoup4==4.9.0 @@ -7,7 +6,7 @@ Brotli==1.0.7 bs4==0.0.1 certifi==2020.4.5.1 chardet==3.0.4 -cloudscraper==1.2.33 +cloudscraper==1.2.36 colorama==0.4.3 dnspython==1.16.0 docopt==0.6.2 @@ -16,27 +15,24 @@ exrex==0.10.5 fire==0.3.1 idna==2.9 jdcal==1.4.1 -Js2Py==0.70 loguru==0.4.1 multidict==4.7.5 openpyxl==2.4.11 psutil==5.7.0 -pyjsparser==2.7.1 +pyparsing==2.4.7 PySocks==1.7.1 -pytz==2019.3 records==0.5.3 requests==2.23.0 -requests-file==1.4.3 +requests-file==1.5.1 requests-toolbelt==0.9.1 six==1.14.0 soupsieve==2.0 SQLAlchemy==1.3.16 tablib==1.1.0 -tenacity==6.1.0 +tenacity==6.2.0 termcolor==1.1.0 tldextract==2.2.2 -tqdm==4.45.0 -tzlocal==2.0.0 +tqdm==4.46.0 urllib3==1.25.9 win32-setctime==1.0.1 yarl==1.4.2 \ No newline at end of file