Skip to content

Commit

Permalink
typos
Browse files Browse the repository at this point in the history
  • Loading branch information
@shmilylty
shmilylty committed Jan 28, 2021
1 parent 2090901 commit bf63268
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 53 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ A clear and concise description of the actual results (optional, such as any err
Screenshot of complete OneForAll execution process (recommended upload)

**Log upload**
Upload oneforall.log log files (it is recommended to upload logs in case of complex problems)
Upload oneforall.log files (it is recommended to upload logs in case of complex problems)

**Supplementary information**
Some other supplementary notes about bug
2 changes: 1 addition & 1 deletion config/setting.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# coding=utf-8
"""
OneForAll配置
OneForAll自定义配置
"""

import pathlib
Expand Down
26 changes: 1 addition & 25 deletions data/cdn_cname_keywords.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,7 @@
"edgekey": "Akamai",
"fastly": "Fastly",
"chinacache": "ChinaCache",
"edgekey": "Akamai",
"akamai": "Akamai",
"fastly": "Fastly",
"edgecast": "EdgeCast",
"azioncdn": "Azion",
"cachefly": "CacheFly",
Expand All @@ -135,7 +133,6 @@
"cloudflare": "CloudFlare",
"hwcdn": "HighWinds",
"kxcdn": "KeyCDN",
"awsdns": "KeyCDN",
"fpbns": "Level3",
"footprint": "Level3",
"llnwd": "LimeLight",
Expand All @@ -155,63 +152,42 @@
"cdnsun": "CDN SUN",
"cdnvideo": "CDN Video",
"clients.turbobytes.net": "TurboBytes",
"clients.turbobytes.net": "TurboBytes",
"turbobytes-cdn.com": "TurboBytes",
"afxcdn.net": "afxcdn.net",
"akamai.net": "Akamai",
"akamaiedge.net": "Akamai",
"akadns.net": "Akamai",
"akamaitechnologies.com": "Akamai",
"gslb.tbcache.com": "Alimama",
"cloudfront.net": "Amazon Cloudfront",
"anankecdn.com.br": "Ananke",
"att-dsa.net": "AT&T",
"azioncdn.net": "Azion",
"belugacdn.com": "BelugaCDN",
"bluehatnetwork.com": "Blue Hat Network",
"systemcdn.net": "EdgeCast",
"cachefly.net": "Cachefly",
"cdn77.net": "CDN77",
"cdn77.org": "CDN77",
"panthercdn.com": "CDNetworks",
"cdngc.net": "CDNetworks",
"gccdn.net": "CDNetworks",
"gccdn.cn": "CDNetworks",
"cdnify.io": "CDNify",
"ccgslb.com": "ChinaCache",
"ccgslb.net": "ChinaCache",
"c3cache.net": "ChinaCache",
"chinacache.net": "ChinaCache",
"cncssr.chinacache.net": "ChinaCache",
"c3cdn.net": "ChinaCache",
"lxdns.com": "ChinaNetCenter",
"speedcdns.com": "QUANTIL/ChinaNetCenter",
"mwcloudcdn.com": "QUANTIL/ChinaNetCenter",
"cloudflare.com": "Cloudflare",
"cloudflare.net": "Cloudflare",
"edgecastcdn.net": "EdgeCast",
"adn.": "EdgeCast",
"wac.": "EdgeCast",
"wpc.": "EdgeCast",
"fastly.net": "Fastly",
"fastlylb.net": "Fastly",
"google.": "Google",
"googlesyndication.": "Google",
"youtube.": "Google",
"googleusercontent.com": "Google",
"l.doubleclick.net": "Google",
"hiberniacdn.com": "Hibernia",
"hwcdn.net": "Highwinds",
"incapdns.net": "Incapsula",
"inscname.net": "Instartlogic",
"insnw.net": "Instartlogic",
"internapcdn.net": "Internap",
"kxcdn.com": "KeyCDN",
"lswcdn.net": "LeaseWeb CDN",
"footprint.net": "Level3",
"llnwd.net": "Limelight",
"lldns.net": "Limelight",
"netdna-cdn.com": "MaxCDN",
"netdna-ssl.com": "MaxCDN",
"netdna.com": "MaxCDN",
"stackpathdns.com": "StackPath",
Expand All @@ -236,4 +212,4 @@
"ialicdn.com": "AliCDN",
"alivecdn.com": "AliCDN",
"myalicdn.com": "AliCDN"
}
}
48 changes: 24 additions & 24 deletions docs/collection_modules.md
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# 收集模块说明 #

如果要使用通过API收集子域的模块请先到[api.py](../oneforall/config/api.py)配置相关信息，大多平台的API都是可以注册账号免费获取的。
如果要使用通过API收集子域的模块请先到[api.py](../config/api.py)配置相关信息，大多平台的API都是可以注册账号免费获取的。

如果你指定使用某些模块可以在[api.py](../oneforall/config/api.py)中设置：
如果你指定使用某些模块可以在[api.py](../config/api.py)中设置：

```python
enable_all_module = False # 不开启所有模块
enable_partial_module = [('modules.search', 'ask'), ('modules.search', 'baidu')] # 只使用ask和baidu搜索引擎收集子域
```

如果你指定使用某些模块使用代理可以在[api.py](../oneforall/config/api.py)中设置：
如果你指定使用某些模块使用代理可以在[api.py](../config/api.py)中设置：

```python
enable_proxy = True # 使用代理
Expand All @@ -23,12 +23,12 @@ proxy_partial_module = ['GoogleQuery', 'AskSearch'] # 只代理GoogleQuery和As

| 模块名称 | 是否需要代理 | 是否需要API | 其他说明 |
| ----------- | ------------ | ----------- | -------------------------------------------------- |
| censys_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| censys_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| certspotter | 否 | 否 | |
| crtsh | 否 | 否 | |
| entrust | 否 | 否 | |
| google | 是 | 否 | |
| spyse_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| spyse_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |


2. 常规检查收集子域（目前有4个模块：域传送漏洞利用`axfr`，检查跨域策略文件`cdx`，检查HTTPS证书`cert`，检查内容安全策略`csp`，后续会添加检查NSEC记录，NSEC3记录等模块）
Expand All @@ -52,25 +52,25 @@ proxy_partial_module = ['GoogleQuery', 'AskSearch'] # 只代理GoogleQuery和As

| 模块名称 | 是否需要代理 | 是否需要API | 其他说明 |
| ------------------ | ------------ | ----------- | -------------------------------------------------- |
| binaryedge_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| binaryedge_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| bufferover | 否 | 否 | |
| cebaidu | 否 | 否 | |
| chinaz | 否 | 否 | |
| chinaz_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| circl_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| cloudflare_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| chinaz_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| circl_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| cloudflare_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| dnsdb | 否 | 否 | |
| dnsdb_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| dnsdb_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| dnsdumpster | 否 | 否 | |
| hackertarget | 否 | 否 | |
| ip138 | 否 | 否 | |
| ipv4info | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| ipv4info | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| netcraft | 否 | 否 | |
| passivedns_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| ptrarchive | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| riddler | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| passivedns_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| ptrarchive | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| riddler | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| robtex | 否 | 否 | |
| securitytrails_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| securitytrails_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| sitedossier | 否 | 否 | |
| threatcrowd | 否 | 否 | |
| ximcx | 否 | 否 | |
Expand All @@ -84,11 +84,11 @@ proxy_partial_module = ['GoogleQuery', 'AskSearch'] # 只代理GoogleQuery和As
| 模块名称 | 是否需要代理 | 是否需要API | 其他说明 |
| -------------- | ------------ | ----------- | ------------------------------------------------- |
| alienvault | 否 | 否 | |
| riskiq_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| threatbook_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| riskiq_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| threatbook_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| threatminer | 否 | 否 | |
| virustotal | 否 | 否 | |
| virustotal_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| virustotal_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
7. 利用搜索引擎发现子域（目前有16个模块：`ask`, `bing_api`, `fofa_api`, `shodan_api`, `yahoo`, `baidu`, `duckduckgo`, `github`, `google`, `so`, `yandex`, `bing`, `exalead`, `google_api`, `sogou`, `zoomeye_api`）

除特殊搜索引擎，通用的搜索引擎都支持自动排除搜索，全量搜索，递归搜索。
Expand All @@ -98,17 +98,17 @@ proxy_partial_module = ['GoogleQuery', 'AskSearch'] # 只代理GoogleQuery和As
| ask | 是 | 否 | |
| baidu | 否 | 否 | |
| bing | 否 | 否 | |
| bing_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| bing_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| duckduckgo | 是 | 否 | |
| exalead | 否，最好使用国外代理。 | 否 | |
| fofa_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| fofa_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
| gitee | 否 | 否 | |
| github | 否 | 否 | 在[api.py](../oneforall/config/api.py)设置Github邮件名和密码。 |
| github | 否 | 否 | 在[api.py](../config/api.py)设置Github邮件名和密码。 |
| google | 是 | 否 | |
| google_api | 是 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| shodan_api | 否，最好使用国外代理。 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| google_api | 是 | 是 | API使用和申请见[api.py](../config/api.py) |
| shodan_api | 否，最好使用国外代理。 | 是 | API使用和申请见[api.py](../config/api.py) |
| so | 否 | 否 | |
| sogou | 否 | 否 | |
| yahoo | 是 | 否 | |
| yandex | 是 | 否 | |
| zoomeye_api | 否 | 是 | API使用和申请见[api.py](../oneforall/config/api.py) |
| zoomeye_api | 否 | 是 | API使用和申请见[api.py](../config/api.py) |
4 changes: 2 additions & 2 deletions docs/en-us/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Let's take the command `python3 oneforall.py --target example.com run` as an exa

`example_com_now_result` table stores the collection results of the current subdomains. Usually using this table is enough.

For more information, please see [Field explanation](./docs/field.md).
For more information, please see [Field explanation](../field.md).

</details>

Expand Down Expand Up @@ -221,7 +221,7 @@ Problems with other tools

In order to solve the above problems, OneForAll born! As its name, OneForAll is committed to becoming the only one subdomain integration tool you need. We hope that one day OneForAll can be called "probably the best subdomain tool"

At present, OneForAll is under development, there must be a lot of problems and areas for improvement. Welcome to submit [Issues](https://github.com/shmilylty/OneForAll/issues) or [PR](https://github.com/shmilylty/OneForAll/pulls), If you like, star please✨. You can contact me through QQ group [**824414244**](//shang.qq.com/wpa/qunwpa?idkey=125d3689b60445cdbb11e4ddff38036b7f6f2abbf4f7957df5dddba81aa90771) or twitter [tweet](https://twitter.com/shmilylty) to me: 👨‍👨‍👦‍👦.
At present, OneForAll is under development, there must be a lot of problems and areas for improvement. Welcome to submit [Issues](https://github.com/shmilylty/OneForAll/issues) or [PR](https://github.com/shmilylty/OneForAll/pulls), If you like, star please✨. You can contact me through QQ group [**824414244**](https://shang.qq.com/wpa/qunwpa?idkey=125d3689b60445cdbb11e4ddff38036b7f6f2abbf4f7957df5dddba81aa90771) or twitter [tweet](https://twitter.com/shmilylty) to me: 👨‍👨‍👦‍👦.

## 👍Features

Expand Down

0 comments on commit bf63268

Please sign in to comment.