Skip to content

Revert "Merge pull request #75 from tiagoCMatias/feature-db" #117

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

Merged
KingAkeem merged 1 commit into from
Aug 19, 2018
Merged

Revert "Merge pull request #75 from tiagoCMatias/feature-db" #117

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
4 changes: 0 additions & 4 deletions .env
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions settings.py
View file
Open in desktop

This file was deleted.

23 changes: 3 additions & 20 deletions torBot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import argparse
import socket
import socks
import os
import settings
from modules import (bcolors, getemails, pagereader, getweblinks, updater,
info, savefile, savedb)
info, savefile)

# GLOBAL CONSTS
LOCALHOST = "127.0.0.1"
Expand Down Expand Up @@ -116,10 +114,7 @@ def get_args():
action="store_true",
help=' '.join(("Info displays basic info of the",
"scanned site, (very slow)")))
parser.add_argument("-db", "--database",
action="store_true",
help="Specify a database to connect.")
args = parser.parse_args()
return parser.parse_args()


def main(conn=False):
Expand All @@ -135,16 +130,6 @@ def main(conn=False):
if args.update:
updater.updateTor()
exit()
if args.database:
if 'DATABASE_NAME' and 'DATABASE_USERNAME' and 'DATABASE_PASSWORD' in os.environ:
DATABASE_PASSWORD = os.getenv("DATABASE_PASSWORD")
DATABASE_USERNAME = os.getenv("DATABASE_USERNAME")
DATABASE_NAME = os.getenv("DATABASE_NAME")
#print("DB - ", DATABASE_NAME, " - ", DATABASE_USERNAME, " - ", DATABASE_PASSWORD)
else:
print("Wrong Database Configurations")
exit()

if not args.quiet:
header()
# If url flag is set then check for accompanying flag set. Only one
Expand All @@ -170,11 +155,9 @@ def main(conn=False):
links = getweblinks.get_links(soup=html_content, ext=args.extension, live=args.live)
if args.save:
savefile.saveJson("Links", links)
if(args.database):
savedb.saveToDatabase(DATABASE_NAME, DATABASE_USERNAME, DATABASE_PASSWORD, links)
else:
print("usage: torBot.py [-h] [-v] [--update] [-q] [-u URL] [-s] [-m]",
"[-e EXTENSION] [-l] [-i] [-db]")
"[-e EXTENSION] [-l] [-i]")

print("\n\n")

Expand Down