File writing ops respect filters/matchers (#1720)

projectdiscovery · May 29, 2024 · 7bb09b1 · 7bb09b1
1 parent 23ff173
commit 7bb09b1
Show file tree

Hide file tree

Showing 8 changed files with 139 additions and 177 deletions.
diff --git a/common/httpx/csp.go b/common/httpx/csp.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 
 	"github.com/PuerkitoBio/goquery"
-	"github.com/projectdiscovery/httpx/common/slice"
+	mapsutil "github.com/projectdiscovery/utils/maps"
 	stringsutil "github.com/projectdiscovery/utils/strings"
 )
 
@@ -49,7 +49,7 @@ func (h *HTTPX) CSPGrab(r *Response) *CSPData {
 	}
 
 	if len(domains) > 0 {
-		return &CSPData{Domains: slice.ToSlice(domains)}
+		return &CSPData{Domains: mapsutil.GetKeys(domains)}
 	}
 	return nil
 }

diff --git a/common/httpx/filter.go b/common/httpx/filter.go
@@ -2,7 +2,8 @@ package httpx
 
 import (
 	"regexp"
-	"strings"
+
+	stringsutil "github.com/projectdiscovery/utils/strings"
 )
 
 // Filter defines a generic filter interface to apply to responses
@@ -17,13 +18,7 @@ type FilterString struct {
 
 // Filter a response with strings filtering
 func (f FilterString) Filter(response *Response) (bool, error) {
-	for _, keyword := range f.Keywords {
-		if strings.Contains(response.Raw, keyword) {
-			return true, nil
-		}
-	}
-
-	return false, nil
+	return stringsutil.ContainsAnyI(response.Raw, f.Keywords...), nil
 }
 
 // FilterRegex defines a filter of type regex

diff --git a/common/httpx/pipeline.go b/common/httpx/pipeline.go
@@ -6,6 +6,8 @@ import (
 	"net"
 	"strings"
 	"time"
+
+	stringsutil "github.com/projectdiscovery/utils/strings"
 )
 
 // SupportPipeline checks if the target host supports HTTP1.1 pipelining by sending x probes
@@ -48,7 +50,7 @@ func (h *HTTPX) SupportPipeline(protocol, method, host string, port int) bool {
 
 		// The check is very naive, but it works most of the times
 		for _, s := range strings.Split(string(reply), "\n\n") {
-			if strings.Contains(s, "HTTP/1.1") || strings.Contains(s, "HTTP/1.0") {
+			if stringsutil.ContainsAnyI(s, "HTTP/1.1", "HTTP/1.0") {
 				gotReplies++
 			}
 		}

diff --git a/common/slice/doc.go b/common/slice/doc.go
diff --git a/common/slice/slice.go b/common/slice/slice.go
diff --git a/runner/options.go b/runner/options.go
@@ -23,11 +23,11 @@ import (
 	customport "github.com/projectdiscovery/httpx/common/customports"
 	fileutilz "github.com/projectdiscovery/httpx/common/fileutil"
 	"github.com/projectdiscovery/httpx/common/httpx"
-	"github.com/projectdiscovery/httpx/common/slice"
 	"github.com/projectdiscovery/httpx/common/stringz"
 	"github.com/projectdiscovery/utils/auth/pdcp"
 	"github.com/projectdiscovery/utils/env"
 	fileutil "github.com/projectdiscovery/utils/file"
+	sliceutil "github.com/projectdiscovery/utils/slice"
 	stringsutil "github.com/projectdiscovery/utils/strings"
 	updateutils "github.com/projectdiscovery/utils/update"
 )
@@ -663,7 +663,7 @@ func (options *Options) ValidateOptions() error {
 
 	if options.Hashes != "" {
 		for _, hashType := range strings.Split(options.Hashes, ",") {
-			if !slice.StringSliceContains([]string{"md5", "sha1", "sha256", "sha512", "mmh3", "simhash"}, strings.ToLower(hashType)) {
+			if !sliceutil.Contains([]string{"md5", "sha1", "sha256", "sha512", "mmh3", "simhash"}, strings.ToLower(hashType)) {
 				gologger.Error().Msgf("Unsupported hash type: %s\n", hashType)
 			}
 		}