Merge remote-tracking branch 'origin/master'

Author: shmilylty

README.md

@@ -279,7 +279,7 @@ FLAGS
 
 ## 📄版权
 
-该项目签署了GPL-3.0授权许可，详情请参阅[LICENSE](https://github.com/shmilylty/OneForAll/LICENSE)。
+该项目签署了GPL-3.0授权许可，详情请参阅[LICENSE](https://github.com/shmilylty/OneForAll/blob/master/LICENSE)。
 
 ## 😘鸣谢
 

brute.py

@@ -579,7 +579,7 @@ def main(self, domain):
         output_path = temp_dir.joinpath(output_name)
         log_path = result_dir.joinpath('massdns.log')
         check_dict()
-        logger.log('INFOR', f'Running massdns to resolve subdomains')
+        logger.log('INFOR', f'Running massdns to brute subdomains')
         utils.call_massdns(massdns_path, dict_path, ns_path, output_path,
                            log_path, quiet_mode=self.quite,
                            process_num=self.process_num,

common/resolve.py

@@ -161,7 +161,7 @@ def run_resolve(domain, data):
 
     ns_path = setting.brute_nameservers_path
 
-    logger.log('INFOR', f'Running massdns to brute subdomains')
+    logger.log('INFOR', f'Running massdns to resolve subdomains')
     utils.call_massdns(massdns_path, save_path, ns_path,
                        output_path, log_path, quiet_mode=True)
 

common/utils.py

@@ -308,7 +308,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('ALERT', f'The txt subdomain result for all main domains {path}')
+    logger.log('ALERT', f'The txt subdomain result for all main domains: {path}')
     subdomains = set()
     for row in datas:
         subdomain = row.get('subdomain')

docs/en-us/README.md

@@ -21,7 +21,7 @@ The OneForAll command line interface is based on [Fire](https://github.com/googl
        oneforall.py --target=TARGET <flags>
 
    DESCRIPTION
-       OneForAll is a powerful subdomain collection tool
+       OneForAll is a powerful subdomain integration tool
 
        Example:
            python3 oneforall.py version

docs/en-us/usage_help.md

@@ -52,7 +52,7 @@ git clone https://gitee.com/shmilylty/OneForAll.git
 3. 安装相关依赖
 ```bash
 cd OneForAll/
-sudo yum install python3-devel python3-pip -y
+sudo yum install gcc python3-devel python3-pip -y
 sudo python3 -m pip install -U pip setuptools wheel -i https://mirrors.aliyun.com/pypi/simple/
 sudo pip3 install uvloop -i https://mirrors.aliyun.com/pypi/simple/
 sudo pip3 install --ignore-installed -r requirements.txt -i https://mirrors.aliyun.com/pypi/simple/

docs/installation_dependency.md

@@ -31,7 +31,7 @@ def query(self):
         json = resp.json()
         status = json.get('status')
         if status != 'ok':
-            logger.log('ALERT', status)
+            logger.log('ALERT', f'{self.source} module {status}')
             return
         subdomains = self.match_subdomains(self.domain, str(json))
         self.subdomains = self.subdomains.union(subdomains)

modules/certificates/censys_api.py

@@ -17,8 +17,9 @@
 
 class CheckAXFR(Module):
     """
-    DNS域传送漏洞检查类
+    DNS zone transfer vulnerability base class
     """
+
     def __init__(self, domain: str):
         Module.__init__(self)
         self.domain = self.register(domain)
@@ -28,18 +29,18 @@ def __init__(self, domain: str):
 
     def axfr(self, server):
         """
-        执行域传送
+        Perform domain transfer
 
-        :param server: 域名服务器
+        :param server: domain server
         """
-        logger.log('DEBUG', f'尝试对{self.domain}的域名服务器{server}进行域传送')
+        logger.log('DEBUG', f'Trying to perform domain transfer in {server} of {self.domain}')
         try:
             xfr = dns.query.xfr(where=server, zone=self.domain,
                                 timeout=5.0, lifetime=10.0)
             zone = dns.zone.from_xfr(xfr)
         except Exception as e:
             logger.log('DEBUG', e.args)
-            logger.log('DEBUG', f'对{self.domain}的域名服务器{server}进行域传送失败')
+            logger.log('DEBUG', f'Domain transfer to server {server} of {self.domain} failed')
             return
         names = zone.nodes.keys()
         for name in names:
@@ -49,13 +50,13 @@ def axfr(self, server):
             record = zone[name].to_text(name)
             self.results.append(record)
         if self.results:
-            logger.log('DEBUG', f'发现{self.domain}在{server}上的域传送记录')
+            logger.log('DEBUG', f'Found the domain transfer record of {self.domain} on {server}')
             logger.log('DEBUG', '\n'.join(self.results))
             self.results = []
 
     def check(self):
         """
-        正则匹配响应头中的内容安全策略字段以发现子域名
+        check
         """
         resolver = utils.dns_resolver()
         try:
@@ -65,7 +66,7 @@ def check(self):
             return
         nsservers = [str(answer) for answer in answers]
         if not len(nsservers):
-            logger.log('ALERT', f'没有找到{self.domain}的NS域名服务器记录')
+            logger.log('ALERT', f'No name server record found for {self.domain}')
             return
         for nsserver in nsservers:
             self.axfr(nsserver)

modules/check/axfr.py

@@ -1,5 +1,5 @@
 """
-检查内容安全策略收集子域名收集子域名
+Collect subdomains from ContentSecurityPolicy
 """
 import requests
 
@@ -10,7 +10,7 @@
 
 class CheckCSP(Module):
     """
-    检查内容安全策略收集子域名
+    Collect subdomains from ContentSecurityPolicy
     """
     def __init__(self, domain, header):
         Module.__init__(self)
@@ -21,9 +21,9 @@ def __init__(self, domain, header):
 
     def grab_header(self):
         """
-        抓取请求头
+        Get header
 
-        :return: 请求头
+        :return: ContentSecurityPolicy header
         """
         csp_header = dict()
         urls = [f'http://{self.domain}',
@@ -47,10 +47,10 @@ def check(self):
             self.csp_header = self.grab_header()
         csp = self.header.get('Content-Security-Policy')
         if not self.csp_header:
-            logger.log('DEBUG', f'获取{self.domain}域的请求头失败')
+            logger.log('DEBUG', f'Failed to get header of {self.domain} domain')
             return
         if not csp:
-            logger.log('DEBUG', f'{self.domain}域的响应头不存在内容安全策略字段')
+            logger.log('DEBUG', f'There is no Content-Security-Policy in the header of {self.domain}')
             return
         self.subdomains = self.match_subdomains(self.domain, csp)