feat: target handling improvements

feat: target handling improvements

main.go

@@ -237,11 +237,11 @@ func parseRegex(v []string) string {
 	return x
 }
 
-func returnPossibleDomains(target string) []string {
-	var possibleDomains []string
+func returnPossibleTargets(target string) []string {
+	var possibleTargets []string
 
 	// By default, always add target name
-	possibleDomains = append(possibleDomains, target)
+	possibleTargets = append(possibleTargets, target)
 
 	// Remove leading and trailing spaces and convert to lowercase
 	target = strings.TrimSpace(strings.ToLower(target))
@@ -250,11 +250,11 @@ func returnPossibleDomains(target string) []string {
 	for _, s := range suffixes {
 		for _, c := range []string{".", "-", ""} {
 			domain := fmt.Sprintf(`%s%s%s`, target, c, s) // {target}{character}{suffix}
-			possibleDomains = append(possibleDomains, domain)
+			possibleTargets = append(possibleTargets, domain)
 		}
 	}
 
-	return possibleDomains
+	return possibleTargets
 }
 
 func getTemplate(id string, services []Service) interface{} {
@@ -581,7 +581,7 @@ func main() {
 	}
 
 	// Parse "permutations" CLI flag
-	var possibleDomains []string
+	var possibleTargets []string
 	var permutations bool
 
 	switch strings.ToLower(*permutationsFlag) {
@@ -601,39 +601,61 @@ func main() {
 
 		if permutations {
 			for _, e := range targets {
-				possibleDomains = append(possibleDomains, returnPossibleDomains(e)...)
+				possibleTargets = append(possibleTargets, returnPossibleTargets(e)...)
 			}
 		} else {
-			possibleDomains = append(possibleDomains, targets...)
+			possibleTargets = append(possibleTargets, targets...)
 		}
 	} else {
 		// Treat target as a domain
 		if permutations {
 			// Perform permutations on target and scan all of them
-			possibleDomains = returnPossibleDomains(target)
+			possibleTargets = returnPossibleTargets(target)
 		} else {
 			// Only perfom a scan on the supplied target flag value
-			possibleDomains = append(possibleDomains, target)
+			possibleTargets = append(possibleTargets, target)
 		}
 	}
 
-	fmt.Printf("[+] Checking %v possible target URLs...\n", len(possibleDomains))
+	fmt.Printf("[+] Checking %v possible target URLs...\n", len(possibleTargets))
 
 	for _, selectedService := range selectedServices {
-		for _, domain := range possibleDomains {
+		for _, t := range possibleTargets {
 			for _, path := range selectedService.Request.Path {
 				var result Result
 				var targetURL string
 
-				limiter.Wait(context.Background())
+				_ = limiter.Wait(context.Background())
 
-				// Make sure we only request the baseURL when we're only looking if the technology exists
+				// Make sure we only request the BaseURL when we're only looking if the technology exists
 				if reqCTX.SkipChecks {
 					path = "/"
 				}
 
 				// Crafting URL
-				targetURL = craftTargetURL(selectedService.Request.BaseURL, path, domain)
+				if permutations {
+					// Construct target URL based on template's "baseURL" variable
+					targetURL = craftTargetURL(selectedService.Request.BaseURL, path, t)
+				} else {
+					// Normalise URI scheme and override template's baseURL
+					if !strings.HasPrefix(t, "http") {
+						t = fmt.Sprintf(`https://%v`, t)
+					}
+
+					u, err := url.Parse(t)
+					if err != nil {
+						if reqCTX.Verbose {
+							fmt.Printf("[-] Error: Failed to Craft Target URL \"%s\"... Skipping... (%v)\n", t, err)
+						} else {
+							fmt.Printf("[-] Error: Failed to Craft Target URL \"%s\"... Skipping...\n", t)
+						}
+
+						continue // Skip invalid URLs and move on to the next one
+					}
+
+					u.Path = path
+					targetURL = u.String()
+				}
 
 				URL, err := url.Parse(targetURL)
 				if err != nil {
@@ -642,11 +664,8 @@ func main() {
 					} else {
 						fmt.Printf("[-] Error: Invalid Target URL \"%s\"... Skipping...\n", targetURL)
 					}
-					continue // Skip invalid URLs and move on to the next one
-				}
 
-				if !permutations && (URL.Scheme == "") {
-					URL.Scheme = "https"
+					continue // Skip invalid URLs and move on to the next one
 				}
 
 				result.URL = URL.String()