Merge pull request #44 from mikemadden42/master

Fix few minor issues
This commit is contained in:
Ahmed Aboul-Ela 2016-10-19 09:01:25 +04:00 committed by GitHub
commit 77a1f431ed
1 changed files with 16 additions and 17 deletions

View File

@ -146,12 +146,11 @@ class enumratorBase(object):
resp = self.session.get(url, headers=headers, timeout=self.timeout)
except Exception as e:
resp = None
pass
return self.get_response(resp)
def get_response(self,response):
if response is None:
return 0
if response is None:
return 0
if hasattr(response, "text"):
return response.text
else:
@ -524,8 +523,8 @@ class NetcraftEnum(multiprocessing.Process):
return resp
def get_response(self,response):
if response is None:
return 0
if response is None:
return 0
if hasattr(response, "text"):
return response.text
else:
@ -560,7 +559,7 @@ class NetcraftEnum(multiprocessing.Process):
while True:
resp = self.get_response(self.req(url,cookies))
self.extract_domains(resp)
if not 'Next page' in resp:
if 'Next page' not in resp:
return self.subdomains
break
url = self.get_next(resp)
@ -646,8 +645,8 @@ class DNSdumpster(multiprocessing.Process):
return self.get_response(resp)
def get_response(self,response):
if response is None:
return 0
if response is None:
return 0
if hasattr(response, "text"):
return response.text
else:
@ -730,8 +729,8 @@ class Virustotal(multiprocessing.Process):
return self.get_response(resp)
def get_response(self,response):
if response is None:
return 0
if response is None:
return 0
if hasattr(response, "text"):
return response.text
else:
@ -799,8 +798,8 @@ class ThreatCrowd(multiprocessing.Process):
return self.get_response(resp)
def get_response(self,response):
if response is None:
return 0
if response is None:
return 0
if hasattr(response, "text"):
return response.text
else:
@ -873,8 +872,8 @@ class CrtSearch(multiprocessing.Process):
return self.get_response(resp)
def get_response(self,response):
if response is None:
return 0
if response is None:
return 0
if hasattr(response, "text"):
return response.text
else:
@ -943,8 +942,8 @@ class PassiveDNS(multiprocessing.Process):
return self.get_response(resp)
def get_response(self,response):
if response is None:
return 0
if response is None:
return 0
if hasattr(response, "text"):
return response.text
else:
@ -989,7 +988,7 @@ class portscan():
result = s.connect_ex((host, int(port)))
if result == 0:
openports.append(port)
s.close
s.close()
except Exception as e:
pass
self.lock.release()