RomanNum3ral
/
Sublist3r
mirror of https://github.com/aboul3la/Sublist3r.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/fleetcaptain/Turbolist3r 

fixing conflicts
This commit is contained in:
fleetcaptain 2019-10-10 19:33:08 -07:00
parent 7222ab9a7b 84d82d9019
commit a2ea42fb0e
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -73,7 +73,11 @@ Short Form | Long Form | Description
Note that turbolist3r has not been tested on Windows. Note that turbolist3r has not been tested on Windows.
<<<<<<< HEAD
Turbolist3r depends on the `dnslib`, `requests`, and `argparse` python modules. Turbolist3r depends on the `dnslib`, `requests`, and `argparse` python modules.
=======
Turbolist3r depends on the `dnslib`, `requests`, `dnspython`, and `argparse` python modules. The `subbrute` module is required for bruteforce capability, but Turbolist3r should run without it as long as you don't invoke bruteforce. Submit a PR or contact me if you have issues.
>>>>>>> 84d82d9019bc65d836e14ce8d8959fd1deafd1de
#### dnslib Module #### dnslib Module

5
turbolist3r.py
View File

@ -24,9 +24,14 @@ from collections import Counter
try: try:
from subbrute import subbrute from subbrute import subbrute
except: except:
<<<<<<< HEAD
print("Failed to import subbrute, you will not be able to bruteforce") print("Failed to import subbrute, you will not be able to bruteforce")
#import dns.resolver #import dns.resolver
=======
print("Failed to import subbrute, you will not be able to bruteforce")
import dns.resolver
>>>>>>> 84d82d9019bc65d836e14ce8d8959fd1deafd1de
import requests import requests
# import dnslib, which provides better features compared to dns.resolver for finding subdomains # import dnslib, which provides better features compared to dns.resolver for finding subdomains