Skip to content

Commit 4468bf7

Browse files
darryllanedarryllane
committed
BugFix
1 parent 6c18809 commit 4468bf7

File tree

6 files changed

+51
-41
lines changed

6 files changed

+51
-41
lines changed

‎Bluto/bluto

Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ from modules.bluto_logging import info, error
3636

3737

3838

39-
VERSION = "2.3.3"
39+
VERSION = "2.3.5"
4040
myResolver = dns.resolver.Resolver()
4141
myResolver.timeout = 10
4242
myResolver.lifetime = 10
@@ -105,6 +105,7 @@ if __name__ == "__main__":
105105
check_dom(domain)
106106
#WhoisGet
107107
company = action_whois(domain)
108+
108109
#Detail Call
109110
sub_intrest = get_sub_interest(FILENAME_2, domain)
110111
zn_list = get_dns_details(domain, myResolver)
@@ -128,11 +129,7 @@ if __name__ == "__main__":
128129
userCountry, userServer = action_country_id(COUNTRIES_FILE, prox)
129130
action_bluto_use(userCountry)
130131
start_time_total = time.time()
131-
start_time_email = time.time()
132-
if api:
133-
q4 = Queue.Queue()
134-
t4 = threading.Thread(target=action_emailHunter, args=(domain, api, user_agents, q4, prox)) #Takes domain[str], api[list], user_agents[list] #Returns email,url [list[tuples]] Queue[object], prox[str]
135-
t4.start()
132+
136133
q1 = Queue.Queue()
137134
q2 = Queue.Queue()
138135
q3 = Queue.Queue()
@@ -141,17 +138,23 @@ if __name__ == "__main__":
141138
t2 = threading.Thread(target=action_bing_true, args=(domain, q2, user_agents, prox))
142139
t3 = threading.Thread(target=action_linkedin, args=(domain, userCountry, q3, company, user_agents, prox))
143140
t5 = threading.Thread(target=doc_start, args=(domain, user_agents, prox, q5))
144-
t1.start()
145-
t2.start()
146-
t3.start()
147-
t5.start()
141+
start_time_email = time.time()
148142
if api:
143+
q4 = Queue.Queue()
144+
t4 = threading.Thread(target=action_emailHunter, args=(domain, api, user_agents, q4, prox)) #Takes domain[str], api[list], user_agents[list] #Returns email,url [list[tuples]] Queue[object], prox[str]
145+
t4.start()
149146
t4.join()
147+
t1.start()
150148
t1.join()
149+
t2.start()
151150
t2.join()
151+
time_spent_email = time.time() - start_time_email
152+
t3.start()
152153
t3.join()
154+
start_download_time = time.time()
155+
t5.start()
153156
t5.join()
154-
time_spent_email = time.time() - start_time_email
157+
time_spent_download = time.time() - start_download_time
155158
google_true_results = q1.get()
156159
bing_true_results = q2.get()
157160
linkedin_results = q3.get()
@@ -182,30 +185,32 @@ if __name__ == "__main__":
182185
userCountry, userServer = action_country_id(COUNTRIES_FILE, prox)
183186
action_bluto_use(userCountry)
184187
start_time_total = time.time()
185-
start_time_email = time.time()
188+
186189
q1 = Queue.Queue()
187190
q2 = Queue.Queue()
188191
q3 = Queue.Queue()
189192
q5 = Queue.Queue()
190-
if api:
191-
q4 = Queue.Queue()
192-
t4 = threading.Thread(target=action_emailHunter, args=(domain, api, user_agents, q4, prox)) #Takes domain[str], api[list], user_agents[list] #Returns email,url [list[tuples]] Queue[object], prox[str]
193-
t4.start()
194193
t1 = threading.Thread(target=action_google, args=(domain, userCountry, userServer, q1, user_agents, prox))
195194
t2 = threading.Thread(target=action_bing_true, args=(domain, q2, user_agents, prox))
196195
t3 = threading.Thread(target=action_linkedin, args=(domain, userCountry, q3, company, user_agents, prox))
197196
t5 = threading.Thread(target=doc_start, args=(domain, user_agents, prox, q5))
198-
t1.start()
199-
t2.start()
200-
t3.start()
201-
t5.start()
197+
start_time_email = time.time()
202198
if api:
199+
q4 = Queue.Queue()
200+
t4 = threading.Thread(target=action_emailHunter, args=(domain, api, user_agents, q4, prox)) #Takes domain[str], api[list], user_agents[list] #Returns email,url [list[tuples]] Queue[object], prox[str]
201+
t4.start()
203202
t4.join()
203+
t1.start()
204204
t1.join()
205+
t2.start()
205206
t2.join()
207+
time_spent_email = time.time() - start_time_email
208+
t3.start()
206209
t3.join()
210+
start_download_time = time.time()
211+
t5.start()
207212
t5.join()
208-
time_spent_email = time.time() - start_time_email
213+
time_spent_download = time.time() - start_download_time
209214
google_true_results = q1.get()
210215
bing_true_results = q2.get()
211216
linkedin_results = q3.get()
@@ -235,30 +240,31 @@ if __name__ == "__main__":
235240
userCountry, userServer = action_country_id(COUNTRIES_FILE, prox)
236241
action_bluto_use(userCountry)
237242
start_time_total = time.time()
238-
start_time_email = time.time()
239243
q1 = Queue.Queue()
240244
q2 = Queue.Queue()
241245
q3 = Queue.Queue()
242246
q5 = Queue.Queue()
243-
if api:
244-
q4 = Queue.Queue()
245-
t4 = threading.Thread(target=action_emailHunter, args=(domain, api, user_agents, q4, prox)) #Takes domain[str], api[list], user_agents[list] #Returns email,url [list[tuples]] Queue[object], prox[str]
246-
t4.start()
247247
t1 = threading.Thread(target=action_google, args=(domain, userCountry, userServer, q1, user_agents, prox))
248248
t2 = threading.Thread(target=action_bing_true, args=(domain, q2, user_agents, prox))
249249
t3 = threading.Thread(target=action_linkedin, args=(domain, userCountry, q3, company, user_agents, prox))
250250
t5 = threading.Thread(target=doc_start, args=(domain, user_agents, prox, q5))
251+
start_time_email = time.time()
252+
if api:
253+
q4 = Queue.Queue()
254+
t4 = threading.Thread(target=action_emailHunter, args=(domain, api, user_agents, q4, prox)) #Takes domain[str], api[list], user_agents[list] #Returns email,url [list[tuples]] Queue[object], prox[str]
255+
t4.start()
256+
t4.join()
251257
t1.start()
252-
t2.start()
253-
t3.start()
254-
t5.start()
255258
t1.join()
259+
t2.start()
256260
t2.join()
261+
time_spent_email = time.time() - start_time_email
262+
t3.start()
257263
t3.join()
264+
start_download_time = time.time()
265+
t5.start()
258266
t5.join()
259-
if api:
260-
t4.join()
261-
time_spent_email = time.time() - start_time_email
267+
time_spent_download = time.time() - start_download_time
262268
google_results = q1.get()
263269
bing_results = q2.get()
264270
linkedin_results = q3.get()

‎Bluto/modules/data_mine.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import time
88
import re
99
import random
10+
import math
1011
import sys
1112
import Queue
1213
import time
@@ -81,7 +82,7 @@ def action_download(doc_list, docs):
8182
if i < 1:
8283
sys.exit()
8384
data_size = get_size(docs)
84-
print '\nData Downloaded: {}'.format(str(data_size))
85+
print '\n\nData Downloaded: {}MB'.format(str(math.floor(data_size)))
8586
info('Documents Downloaded: {}'.format(initial_count))
8687
return download_list
8788

@@ -203,6 +204,7 @@ def doc_start(domain, USERAGENT_F, prox, q):
203204
if doc_list == []:
204205
q.put(None)
205206
return
207+
doc_list = set(sorted(doc_list))
206208
download_list = action_download(doc_list, docs)
207209
download_count = len(download_list)
208210

‎Bluto/modules/general.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ def get_size(dir_location):
3030
for f in filenames:
3131
fp = os.path.join(dirpath, f)
3232
total_size += os.path.getsize(fp)
33+
total_size = total_size / 1024.0
34+
total_size = total_size / 1024.0
3335
return total_size
3436

3537

@@ -51,7 +53,7 @@ def action_whois(domain):
5153
print '\nThe Whois Results Look Promising: ' + colored('{}','green').format(company)
5254
accept = raw_input(colored('\nIs The Search Term sufficient?: ','green')).lower()
5355
if accept in ('y', 'yes'):
54-
company = accept
56+
company = company
5557
break
5658
elif accept in ('n', 'no'):
5759
temp_company = raw_input(colored('\nRegistered Company Name: ','green'))

‎Bluto/modules/get_dns.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
from termcolor import colored
1414

1515
myResolver = dns.resolver.Resolver()
16-
myResolver.timeout = 10
17-
myResolver.lifetime = 10
16+
myResolver.timeout = 4
1817
myResolver.nameservers = ['8.8.8.8', '8.8.4.4']
1918

2019
targets = []
@@ -118,7 +117,7 @@ def action_brute(subdomain):
118117

119118
def action_brute_start(subs):
120119
info('Bruting SubDomains')
121-
pool = ThreadPool(12)
120+
pool = ThreadPool(8)
122121
pool.map(action_brute, subs)
123122
pool.close()
124123
info('Completed Bruting SubDomains')
@@ -192,6 +191,7 @@ def action_zone_transfer(zn_list, domain):
192191
print colored(ns, 'green')
193192

194193
if vulnerable_listT:
194+
info('Vulnerable To Zone Transfers')
195195
print "\nVulnerable:\n"
196196
for ns in vulnerable_listT:
197197
print colored(ns,'red'), colored("\t" + "TCP/53", 'red')

‎Bluto/modules/output.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def action_output_vuln_zone(google_results, bing_results, linkedin_results, time
182182
else:
183183
shutil.rmtree(docs)
184184
shutil.rmtree(LOG_DIR)
185-
shutil.rmtree(report_location)
185+
os.remove(report_location)
186186
break
187187
else:
188188
print '\tYour answer needs to be either yes|y|no|n rather than, {}' .format(answer)
@@ -361,7 +361,7 @@ def action_output_vuln_zone_hunter(google_results, bing_results, linkedin_result
361361
else:
362362
shutil.rmtree(docs)
363363
shutil.rmtree(LOG_DIR)
364-
shutil.rmtree(report_location)
364+
os.remove(report_location)
365365
break
366366
else:
367367
print '\tYour answer needs to be either yes|y|no|n rather than, {}' .format(answer)
@@ -539,7 +539,7 @@ def action_output_wild_false(brute_results_dict, sub_intrest, google_results, bi
539539
else:
540540
shutil.rmtree(docs)
541541
shutil.rmtree(LOG_DIR)
542-
shutil.rmtree(report_location)
542+
os.remove(report_location)
543543
break
544544
else:
545545
print '\tYour answer needs to be either yes|y|no|n rather than, {}' .format(answer)

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
setup(
44
name='Bluto',
5-
version='2.3.3',
5+
version='2.3.5',
66
author='Darryl lane',
77
author_email='[email protected]',
88
url='https://github.com/darryllane/Bluto',

0 commit comments

Comments
 (0)