Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug_fixes #109

Merged
merged 1 commit into from
Aug 4, 2018
Merged

Bug_fixes #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions modules/pagereader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ def connection_msg(site):


def read_first_page(site):
headers = {'User-Agent': 'TorBot - Onion crawler | www.github.com/DedSecInside/TorBot'}
headers = {'User-Agent': 'XXXX-XXXXX-XXXX'}
attempts_left = 3
err = " "
while attempts_left:
if attempts_left == 3:
print(next(connection_msg(site)))
response = get_url_status(site, headers)
if response != 0:
page = BeautifulSoup(response.text, 'html.parser')
Expand Down
4 changes: 2 additions & 2 deletions modules/updater.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def updateTor():
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
update_out = update.stdout.read()
if update_out[90:109].decode("utf-8") == 'Already up-to-date.':
if update_out[90:109].decode("utf-8") == 'Already up to date.':
print("TorBot is already up-to-date.")
else:
print("TorBot has succesfully updated to latest stable version.")
Expand All @@ -42,7 +42,7 @@ def updateTor():
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
update_out = update.stdout.read()
if update_out[90:109].decode("utf-8") == 'Already up-to-date.':
if update_out[90:109].decode("utf-8") == 'Already up to date.':
print("TorBot is already up-to-date.")
else:
print("TorBot has succesfully updated to latest stable version.")
10 changes: 5 additions & 5 deletions torBot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ def header():
/ __/ / / / /_/ / __ \/ __ \/ /
/ /_/ /_/ / _, _/ /_/ / /_/ / /
\__/\____/_/ |_/_____/\____/_/ V{VERSION}
{FAIL} + {On_Black}
{FAIL} {On_Black}
#######################################################
# TorBot - A python Tor Crawler #
# TorBot - An OSINT Tool for Deep Web #
# GitHub : https://github.com/DedsecInside/TorBot #
# Help : use -h for help text #
#######################################################
{FAIL} + "LICENSE: GNU Public License" + {END}""".format(
{FAIL} LICENSE: GNU Public License {END}""".format(
D3DSEC=D3DSEC, INS1DE=INS1DE, FAIL=b_color.FAIL,
BOLD=b_color.BOLD, VERSION=__VERSION, END=b_color.ENDC,
On_Black=b_color.On_Black, WHITE=b_color.WHITE
Expand All @@ -91,9 +91,9 @@ def get_args():
action="store_true")
parser.add_argument("-u", "--url",
help="Specifiy a website link to crawl")
parser.add_argument("--ip", help="Change ip address for tor")
parser.add_argument("--ip", help="Change default ip of tor")
parser.add_argument("-p", "--port",
help="Change port number for tor")
help="Change default port of tor")
parser.add_argument("-s", "--save",
action="store_true",
help="Save results in a file")
Expand Down