ashed
diff --git a/‎InfoLocation.py‎
Lines changed: 6 additions & 0 deletions b/‎InfoLocation.py‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎InfoLocation.pyc‎
191 Bytes b/‎InfoLocation.pyc‎
191 Bytes
diff --git a/‎NmapScanner.py‎
Lines changed: 4 additions & 0 deletions b/‎NmapScanner.py‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎NmapScanner.pyc‎
181 Bytes b/‎NmapScanner.pyc‎
181 Bytes
diff --git a/‎ShodanSearch.py‎
Lines changed: 38 additions & 0 deletions b/‎ShodanSearch.py‎
Lines changed: 38 additions & 0 deletions
diff --git a/‎ShodanSearch.pyc‎
1.01 KB b/‎ShodanSearch.pyc‎
1.01 KB
diff --git a/‎pentesting-tool.py‎
Lines changed: 5 additions & 4 deletions b/‎pentesting-tool.py‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎pynexposeHttps.py‎
Lines changed: 1 addition & 0 deletions b/‎pynexposeHttps.py‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎pynexposeHttps.pyc‎
7 Bytes b/‎pynexposeHttps.pyc‎
7 Bytes
@@ -67,6 +67,9 @@ def geocode(self,latitude,longitude):
 	    print(decoded['results'][0]['address_components'][4]['long_name'].encode('utf-8'))
 	    print(decoded['results'][0]['address_components'][5]['long_name'].encode('utf-8'))
 	    print(decoded['results'][0]['address_components'][6]['long_name'].encode('utf-8'))
+	    lat_lon = decoded['results'][0]['geometry']['location']
+	    print(lat_lon['lat'].encode('utf-8'))
+	    print(lat_lon['lng'].encode('utf-8'))   	    
 
 	except Exception,e:
 	    pass
@@ -106,6 +109,9 @@ def geocode2(self,address):
 	    print(decoded['results'][0]['address_components'][4]['long_name'].encode('utf-8'))
 	    print(decoded['results'][0]['address_components'][5]['long_name'].encode('utf-8'))
 	    print(decoded['results'][0]['address_components'][6]['long_name'].encode('utf-8'))
+	    lat_lon = decoded['results'][0]['geometry']['location']
+	    print(lat_lon['lat'].encode('utf-8'))
+	    print(lat_lon['lng'].encode('utf-8'))    
 
 	except Exception,e:
 	    pass
 
@@ -18,6 +18,10 @@ def nmapScan(self, host, port):
             print "[*] Execuing command: %s" % self.nmsc.command_line()     
             self.state = self.nmsc[host]['tcp'][int(port)]['state']
             print " [+] "+ host + " tcp/" + port + " " + self.state
+            print self.nmsc[host].tcp(int(port))
+            self.server = self.nmsc[host].tcp(int(port))['product']
+            self.version = self.nmsc[host].tcp(int(port))['version']
+            print " [+] "+ self.server + " " + self.version + " tcp/" + port
 
         except Exception,e:
             print "Error to connect with " + host + " for port scanning" 
 
@@ -1,13 +1,15 @@
 # -*- encoding: utf-8 -*-
 #class for search in shodan
 import shodan
+import requests
 
 class ShodanSearch:
 
     def __init__(self):
         #shodan key
         self.shodanKeyString = 'v4YpsPUJ3wjDxEqywwu6aF5OZKWj8kik'
         self.shodanApi = shodan.Shodan(self.shodanKeyString)
+	
 
     def shodanKeyInfo(self):
         try:
@@ -27,6 +29,42 @@ def execute(self,ip):
                 print "SHODAN empty reply or error in the call"
                 return "error"
 
+    #Obtain info IP
+    def obtain_host_info2(self,target):
+
+	dnsResolve = 'https://api.shodan.io/dns/resolve?hostnames=' + str(target) + '&key=' + self.shodanKeyString
+	
+	try:
+	    # First we need to resolve our targets domain to an IP
+	    resolved = requests.get(dnsResolve)
+	    hostIP = resolved.json()[target]
+	   
+	
+	    # Then we need to do a Shodan search on that IP
+	    host = self.shodanApi.host(hostIP)
+	    print "IP: %s" % host['ip_str']
+	    print "Organization: %s" % host.get('org', 'n/a')
+	    print "Operating System: %s" % host.get('os', 'n/a')
+	
+	
+	    # Print all banners
+	    for item in host['data']:
+		print "Port: %s" % item['port']
+		print "Banner: %s" % item['data']
+		
+	
+	    # Print vuln information
+	    for item in host['vulns']:
+		CVE = item.replace('!','')
+		print 'Vulns: %s' % item
+		exploits = api.exploits.search(CVE)
+		for item in exploits['matches']:
+		    if item.get('cve')[0] == CVE:
+			print item.get('description')
+	except Exception as e:
+	    print e
+	    print 'An error occured'	
+	   
     #Obtain info IP
     def obtain_host_info(self,ip):
         try:
 
@@ -191,8 +191,8 @@ def showMenu():
         if option == "6":
             f = open('logHostInfo.txt', 'a')
             sys.stdout = Log(sys.stdout, f)
-            shodanSearch.obtain_host_info(ip)
-	    shodanSearch.obtain_host_info(hostname)
+            shodanSearch.obtain_host_info2(ip)
+	    shodanSearch.obtain_host_info2(hostname)
         if option == "7":
             f = open('logNScanningNmap.txt', 'a')
             sys.stdout = Log(sys.stdout, f)
@@ -288,9 +288,10 @@ def showMenu():
                     pynexposeHttps = pynexposeHttps.NeXposeServer(serveraddr_nexpose, port_server_nexpose, user_nexpose, password_nexpose)
                     pyconnect = 1                
             except Exception,e:
-                pyconnect = 0 
+                pyconnect = 0
+		print e.message
                 print "Error to connecting with NeXposeServer"
-                print e
+                
                 pass
 
             try:
 
@@ -66,6 +66,7 @@ def engine_listing(self):
     def login(self):
         response = self.call("Login", {'user-id' : self.username, 'password' : self.password})
         self.token = response.attrib['session-id']
+	print response
 
     def logout(self):
         response = self.call("Logout")