diff --git a/modules/autotake/github.py b/modules/autotake/github.py index 4285301..bbae1f5 100644 --- a/modules/autotake/github.py +++ b/modules/autotake/github.py @@ -23,12 +23,12 @@ def github_takeover(url): print('[*]正在读取配置文件') user = api.github_api_user token = api.github_api_token - CHECK_HEADERS = { + headers = { "Authorization": 'token ' + token, "Accept": "application/vnd.github.switcheroo-preview+json" } repos_url = 'https://api.github.com/repos/' + user + '/' + repo_name - repos_r = requests.get(url=repos_url, headers=CHECK_HEADERS) + repos_r = requests.get(url=repos_url, headers=headers) # 验证token是否正确 if 'message' in repos_r.json(): if repos_r.json()['message'] == 'Bad credentials': @@ -41,7 +41,7 @@ def github_takeover(url): } creat_repo_url = 'https://api.github.com/user/repos' creat_repo_r = requests.post(url=creat_repo_url, - headers=CHECK_HEADERS, + headers=headers, data=json.dumps(creat_repo_dict)) creat_repo_status = creat_repo_r.status_code if creat_repo_status == 201: @@ -76,9 +76,9 @@ def github_takeover(url): html_url = 'https://api.github.com/repos/' + user + '/' + repo_name + '/contents/index.html' url_url = 'https://api.github.com/repos/' + user + '/' + repo_name + '/contents/CNAME' html_r = requests.put(url=html_url, data=json.dumps(html_dict), - headers=CHECK_HEADERS) # 上传index.html + headers=headers) # 上传index.html cname_r = requests.put(url=url_url, data=json.dumps(url_dict), - headers=CHECK_HEADERS) # 上传CNAME + headers=headers) # 上传CNAME rs = cname_r.status_code if rs == 201: print('[*]生成接管库成功，正在开启Github pages') @@ -90,7 +90,7 @@ def github_takeover(url): } page_r = requests.post(url=page_url, data=json.dumps(page_dict), - headers=CHECK_HEADERS) # 开启page + headers=headers) # 开启page if page_r.status_code == 201: print('[+]自动接管成功，请稍后访问http://' + str(url) + '查看结果') else: diff --git a/modules/certificates/certspotter.py b/modules/certificates/certspotter.py index 61435a4..7e49864 100644 --- a/modules/certificates/certspotter.py +++ b/modules/certificates/certspotter.py @@ -1,4 +1,3 @@ -from common import utils from common.query import Query diff --git a/modules/certificates/crtsh.py b/modules/certificates/crtsh.py index 4dd9593..54abb2d 100644 --- a/modules/certificates/crtsh.py +++ b/modules/certificates/crtsh.py @@ -1,4 +1,3 @@ -from common import utils from common.query import Query diff --git a/modules/certificates/google.py b/modules/certificates/google.py index bb83a6b..dbf7b7d 100644 --- a/modules/certificates/google.py +++ b/modules/certificates/google.py @@ -1,4 +1,3 @@ -from common import utils from common.query import Query diff --git a/modules/check/cdx.py b/modules/check/cdx.py index 2da2a5f..69be5b3 100644 --- a/modules/check/cdx.py +++ b/modules/check/cdx.py @@ -3,7 +3,6 @@ """ from common.module import Module -from common import utils class CheckCDX(Module): diff --git a/modules/check/cert.py b/modules/check/cert.py index 05a81ea..9b82fe0 100644 --- a/modules/check/cert.py +++ b/modules/check/cert.py @@ -6,7 +6,6 @@ import socket import ssl -from common import utils from common.module import Module from config.log import logger diff --git a/modules/check/csp.py b/modules/check/csp.py index beb2150..518abfb 100644 --- a/modules/check/csp.py +++ b/modules/check/csp.py @@ -3,7 +3,6 @@ Collect subdomains from ContentSecurityPolicy """ import requests -from common import utils from common.module import Module from config.log import logger @@ -79,4 +78,4 @@ def do(domain, header=None): # 统一入口名字 方便多线程调用 if __name__ == '__main__': resp = requests.get('https://content-security-policy.com/') - do('google-analytics.com', resp.headers) + do('google-analytics.com', dict(resp.headers)) diff --git a/modules/check/robots.py b/modules/check/robots.py index 416b101..6a37e7f 100644 --- a/modules/check/robots.py +++ b/modules/check/robots.py @@ -2,7 +2,6 @@ 检查内容安全策略收集子域名收集子域名 """ from common.module import Module -from common import utils class CheckRobots(Module): diff --git a/modules/check/sitemap.py b/modules/check/sitemap.py index 64f71f4..5696f53 100644 --- a/modules/check/sitemap.py +++ b/modules/check/sitemap.py @@ -2,7 +2,6 @@ 检查内容安全策略收集子域名收集子域名 """ from common.module import Module -from common import utils class CheckRobots(Module): diff --git a/modules/datasets/cloudflare_api.py b/modules/datasets/cloudflare_api.py index 35d82c3..f28313a 100644 --- a/modules/datasets/cloudflare_api.py +++ b/modules/datasets/cloudflare_api.py @@ -42,8 +42,6 @@ class CloudFlareAPI(Query): else: return elif zones_resp.json()['success']: - zone_id = zones_resp.json()['result'][0]['id'] - delete_zone_resp = self.delete(self.addr + f'zones/{zone_id}', check=False) zone_id = self.create_zone(account_id) if zone_id: self.list_dns(zone_id) diff --git a/modules/datasets/dnsdb_api.py b/modules/datasets/dnsdb_api.py index 798ae4e..0fc2f45 100644 --- a/modules/datasets/dnsdb_api.py +++ b/modules/datasets/dnsdb_api.py @@ -1,5 +1,4 @@ from config import api -from common import utils from common.query import Query diff --git a/modules/datasets/dnsdumpster.py b/modules/datasets/dnsdumpster.py index 33828b5..4822db8 100644 --- a/modules/datasets/dnsdumpster.py +++ b/modules/datasets/dnsdumpster.py @@ -1,4 +1,3 @@ -from common import utils from common.query import Query diff --git a/modules/datasets/hackertarget.py b/modules/datasets/hackertarget.py index 14013c1..0bfd7e4 100644 --- a/modules/datasets/hackertarget.py +++ b/modules/datasets/hackertarget.py @@ -1,4 +1,3 @@ -from common import utils from common.query import Query diff --git a/modules/datasets/rapiddns.py b/modules/datasets/rapiddns.py index 755d2cc..105be91 100644 --- a/modules/datasets/rapiddns.py +++ b/modules/datasets/rapiddns.py @@ -1,4 +1,3 @@ -from common import utils from common.query import Query diff --git a/modules/datasets/spyse_api.py b/modules/datasets/spyse_api.py index a409484..6e0564e 100644 --- a/modules/datasets/spyse_api.py +++ b/modules/datasets/spyse_api.py @@ -1,5 +1,4 @@ from config import api -from common import utils from common.query import Query