minor fixes

twelvesec · Apr 5, 2018 · 0818c08 · 0818c08
1 parent 74880de
commit 0818c08
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -20,12 +20,15 @@ Written by:
 * dnspython
 * requests
 * shodan
+* censys
+* mmap
 
 ### Information Gathering
 
 * ask
 * bing
 * crt
+* censys.io
 * dns
 * dnsdumpster
 * dogpile
@@ -67,12 +70,14 @@ sudo pip install -r requirements.txt
 \____/\__,_/____/_/  /_/\__,_/____/_/ |_|
 
 GasMasK - All in one Information gathering tool - OSINT
-Ver. 1.0
+Ver. 1.2
 Written by: @maldevel
 https://www.twelvesec.com/
 
 usage: gasmask.py [-h] -d DOMAIN [-s NAMESERVER] [-x PROXY] [-l LIMIT]
-                  [-i MODE] [-o BASENAME]
+                  [-i MODE] [-o BASENAME] [-k API-KEY]
+                  [--censys-api-id CENSYS_API_ID]
+                  [--censys-api-secret CENSYS_API_SECRET]
 
 optional arguments:
   -h, --help            show this help message and exit
@@ -83,12 +88,16 @@ optional arguments:
   -x PROXY, --proxy PROXY
                         Use a proxy server when retrieving results from search engines (eg. '-x http://127.0.0.1:8080')
   -l LIMIT, --limit LIMIT
-                        Limit the number of search engine results (default: 100)                                                          .
-  -i MODE, --info MODE  Limit information gathering (basic,whois,dns,revdns,vhosts,google,bing,yahoo,ask,dogpile,yandex,linkedin,twitter,googleplus,youtube,reddit,github,instagram,crt,pgp,netcraft,virustotal,dnsdump,shodan).
+                        Limit the number of search engine results (default: 100).
+  -i MODE, --info MODE  Limit information gathering (basic,whois,dns,revdns,vhosts,google,bing,yahoo,ask,dogpile,yandex,linkedin,t                             witter,googleplus,youtube,reddit,github,instagram,crt,pgp,netcraft,virustotal,dnsdump,shodan,censys).
   -o BASENAME, --output BASENAME
                         Output in the four major formats at once (markdown, txt, xml and html).
   -k API-KEY, --shodan-key API-KEY
                         API key to use with Shodan search (MODE="shodan")
+  --censys-api-id CENSYS_API_ID
+                        Provide the authentication ID for the censys.io search engine
+  --censys-api-secret CENSYS_API_SECRET
+                        Provide the secret hash for the censys.io search engine
 ```
 
 ---

diff --git a/gasmask.py b/gasmask.py
@@ -30,7 +30,7 @@
 __author__ = "maldevel"
 __credits__ = ["maldevel", "mikismaos", "xvass"]
 __license__ = "GPLv3"
-__version__ = "1.1"
+__version__ = "1.2"
 
 #######################################################
 
@@ -548,7 +548,7 @@ def PGPSearch(value, uas, proxies):
         s = requests.Session()
         r = s.get(url, verify=False, headers={'User-Agent': PickRandomUA(uas)}, proxies=proxies)
         if r.status_code != 200:
-			print "[-] Something is going wrong (status code: {})".format(r.status_code)
+            print "[-] Something is going wrong (status code: {})".format(r.status_code)
             return [], []
         results += r.content
     except Exception,e:
@@ -729,8 +729,6 @@ def ShodanSearch(domain, api_key):
 
     return sorted(set(vhosts))
 
-=======
->>>>>>> Censys.io subdomains searching - Final report output fixes
 #######################################################
 
 ## Emails & Hostnames Console report ##

diff --git a/requirements.txt b/requirements.txt
@@ -3,5 +3,4 @@ python-whois
 dnspython
 requests
 shodan
-censys
-mmap
+censys
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,5 +3,4 @@ python-whois @@
     dnspython
     requests
     shodan
-    censys
-    mmap
+    censys