Merge branch 'master' of github.com:tomnomnom/assetfinder

README.md

@@ -32,12 +32,12 @@ Please feel free to issue pull requests with new sources! :)
 * wayback machine
 * dns.bufferover.run
 * facebook
-    * Needs `FB_APP_ID` and `FB_APP_SECRET` environment variables set
+    * Needs `FB_APP_ID` and `FB_APP_SECRET` environment variables set (https://developers.facebook.com/)
     * You need to be careful with your app's rate limits
 * virustotal
-    * Needs `VT_API_KEY` environment variable set
+    * Needs `VT_API_KEY` environment variable set (https://developers.virustotal.com/reference)
 * findsubdomains
-    * Needs `SPYSE_API_TOKEN` environment variable set (the free version always gives the first response page, and you also get "25 unlimited requests")
+    * Needs `SPYSE_API_TOKEN` environment variable set (the free version always gives the first response page, and you also get "25 unlimited requests") — (https://spyse.com/apidocs)
 
 ### Sources to be implemented
 * http://api.passivetotal.org/api/docs/

bufferoverrun.go

@@ -20,6 +20,9 @@ func fetchBufferOverrun(domain string) ([]string, error) {
 
 	for _, r := range wrapper.Records {
 		parts := strings.SplitN(r, ",", 2)
+		if len(parts) != 2 {
+			continue
+		}
 		out = append(out, parts[1])
 	}
 

crtsh.go

@@ -3,10 +3,17 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"net/http"
 )
 
+type CrtShResult struct {
+	Name string `json:"name_value"`
+}
+
 func fetchCrtSh(domain string) ([]string, error) {
+	var results []CrtShResult
+
 	resp, err := http.Get(
 		fmt.Sprintf("https://crt.sh/?q=%%25.%s&output=json", domain),
 	)
@@ -17,22 +24,14 @@ func fetchCrtSh(domain string) ([]string, error) {
 
 	output := make([]string, 0)
 
-	dec := json.NewDecoder(resp.Body)
+	body, _ := ioutil.ReadAll(resp.Body)
 
-	// The crt.sh API is a little funky... It returns multiple
-	// JSON objects with no delimiter, so you just have to keep
-	// attempting a decode until you hit EOF
-	for {
-		wrapper := struct {
-			Name string `json:"name_value"`
-		}{}
-
-		err := dec.Decode(&wrapper)
-		if err != nil {
-			break
-		}
+	if err := json.Unmarshal(body, &results); err != nil {
+		return []string{}, err
+	}
 
-		output = append(output, wrapper.Name)
+	for _, res := range results {
+		output = append(output, res.Name)
 	}
 	return output, nil
 }