(chore) code cleanups & go-staticcheck fixes

Author: leonjza

cmd/file.go

@@ -15,8 +15,10 @@ import (
 var fileCmd = &cobra.Command{
 	Use:   "file [input]",
 	Short: "screenshot URLs sourced from a file or stdin",
-	Long: `Screenshot URLs sourced from a file or stdin. URLs in the source
-file should be newline separated. Invalid URLs are simply logged and ignored.`,
+	Long: `Screenshot URLs sourced from a file or stdin.
+
+URLs in the source file should be newline separated. Invalid URLs are simply
+logged and ignored.`,
 	Example: `$ gowitness file -f ~/Desktop/urls
 $ gowitness file -f urls.txt --threads 2
 $ cat urls.txt | gowitness file -f -
@@ -86,17 +88,6 @@ func init() {
 	cobra.MarkFlagRequired(fileCmd.Flags(), "file")
 }
 
-// getInput determines what the file input should be
-// without any file argument we will assume stdin with -
-func getInput(a []string) (input string) {
-	if len(a) <= 0 {
-		input = "-"
-	} else {
-		input = a[0]
-	}
-	return
-}
-
 // getScanner prepares a bufio.Scanner to read from either
 // stdin, or a file.
 // the size attribute > 0 will be returned if a file was the input

cmd/nmap.go

@@ -170,16 +170,12 @@ func getNmapURLs() (urls []string, err error) {
 				// add the hostnames if the option has been set
 				if options.NmapScanHostanmes {
 					for _, hn := range host.Hostnames {
-						for _, r := range buildURI(hn.Name, port.PortId) {
-							urls = append(urls, r)
-						}
+						urls = append(urls, buildURI(hn.Name, port.PortId)...)
 					}
 				}
 
 				// process the port successfully
-				for _, r := range buildURI(address.Addr, port.PortId) {
-					urls = append(urls, r)
-				}
+				urls = append(urls, buildURI(address.Addr, port.PortId)...)
 			}
 		}
 	}

cmd/report_serve.go

@@ -95,7 +95,6 @@ func submitHandler(w http.ResponseWriter, r *http.Request) {
 		if err != nil {
 			panic(err)
 		}
-		break
 	case "POST":
 		// prepare target
 		url, err := url.Parse(strings.TrimSpace(r.FormValue("url")))
@@ -140,12 +139,11 @@ func submitHandler(w http.ResponseWriter, r *http.Request) {
 		}
 
 		if rid > 0 {
-			http.Redirect(w, r, "/details?id="+strconv.Itoa(int(rid)), 301)
+			http.Redirect(w, r, "/details?id="+strconv.Itoa(int(rid)), http.StatusMovedPermanently)
 			return
 		}
 
-		http.Redirect(w, r, "/submit", 301)
-		break
+		http.Redirect(w, r, "/submit", http.StatusMovedPermanently)
 	}
 }
 
@@ -154,7 +152,7 @@ func detailHandler(w http.ResponseWriter, r *http.Request) {
 
 	d := strings.TrimSpace(r.URL.Query().Get("id"))
 	if d == "" {
-		http.Redirect(w, r, "/", 301)
+		http.Redirect(w, r, "/", http.StatusMovedPermanently)
 		return
 	}
 	id, err := strconv.Atoi(d)

cmd/scan.go

@@ -19,6 +19,7 @@ var scanCmd = &cobra.Command{
 	Use:   "scan",
 	Short: "Scan a CIDR range and take screenshots along the way",
 	Long: `Scans a CIDR range and takes screenshots along the way.
+
 This command takes a CIDR, ports and flag arguments to specify wether
 it is nessesary to connect via HTTP and or HTTPS to urls. The
 combination of these flags are used to generate permutations that
@@ -157,9 +158,7 @@ func getScanPorts() ([]int, error) {
 func getScanCidrIps() (ips []string, err error) {
 
 	var cidrs []string
-	for _, cidr := range options.ScanCidr {
-		cidrs = append(cidrs, cidr)
-	}
+	cidrs = append(cidrs, options.ScanCidr...)
 
 	if options.ScanCidrFile != "" {
 		file, err := os.Open(options.ScanCidrFile)

cmd/single.go

@@ -13,6 +13,7 @@ var singleCmd = &cobra.Command{
 	Short: "Take a screenshot of a single URL",
 	Args:  cobra.ExactArgs(1),
 	Long: `Takes a screenshot of a single given URL and saves it to a file.
+
 If no --output is provided, a filename for the screenshot will
 be automatically generated based on the given URL. If an absolute
 output file path is given, the --destination parameter will be