remove the wildcard switch from everything except DNS

README.md

@@ -44,6 +44,7 @@ All funds that are donated to this project will be donated to charity. A full lo
 
 - Use go 1.16
 - use contexts in the correct way
+- get rid of the wildcard flag (except in DNS mode)
 
 ## Changes in 3.1
 

cli/cmd/dir.go

@@ -29,7 +29,7 @@ func runDir(cmd *cobra.Command, args []string) error {
 	if err := cli.Gobuster(mainContext, globalopts, plugin); err != nil {
 		var wErr *gobusterdir.ErrWildcard
 		if errors.As(err, &wErr) {
-			return fmt.Errorf("%w. To continue please exclude the status code, the length or use the --wildcard switch", wErr)
+			return fmt.Errorf("%w. To continue please exclude the status code or the length", wErr)
 		}
 		return fmt.Errorf("error on running gobuster: %w", err)
 	}
@@ -118,11 +118,6 @@ func parseDirOptions() (*libgobuster.Options, *gobusterdir.OptionsDir, error) {
 		return nil, nil, fmt.Errorf("invalid value for hide-length: %w", err)
 	}
 
-	plugin.WildcardForced, err = cmdDir.Flags().GetBool("wildcard")
-	if err != nil {
-		return nil, nil, fmt.Errorf("invalid value for wildcard: %w", err)
-	}
-
 	plugin.DiscoverBackup, err = cmdDir.Flags().GetBool("discover-backup")
 	if err != nil {
 		return nil, nil, fmt.Errorf("invalid value for discover-backup: %w", err)
@@ -154,7 +149,6 @@ func init() {
 	cmdDir.Flags().BoolP("no-status", "n", false, "Don't print status codes")
 	cmdDir.Flags().Bool("hide-length", false, "Hide the length of the body in the output")
 	cmdDir.Flags().BoolP("add-slash", "f", false, "Append / to each request")
-	cmdDir.Flags().Bool("wildcard", false, "Force continued operation when wildcard found")
 	cmdDir.Flags().BoolP("discover-backup", "d", false, "Upon finding a file search for backup files")
 	cmdDir.Flags().IntSlice("exclude-length", []int{}, "exclude the following content length (completely ignores the status). Supply multiple times to exclude multiple sizes.")
 

cli/cmd/dir_test.go

@@ -31,7 +31,6 @@ func BenchmarkDirMode(b *testing.B) {
 	pluginopts := gobusterdir.NewOptionsDir()
 	pluginopts.URL = h.URL
 	pluginopts.Timeout = 10 * time.Second
-	pluginopts.WildcardForced = true
 
 	pluginopts.Extensions = ".php,.csv"
 	tmpExt, err := helper.ParseExtensions(pluginopts.Extensions)

cli/cmd/fuzz.go

@@ -29,7 +29,7 @@ func runFuzz(cmd *cobra.Command, args []string) error {
 	if err := cli.Gobuster(mainContext, globalopts, plugin); err != nil {
 		var wErr *gobusterfuzz.ErrWildcard
 		if errors.As(err, &wErr) {
-			return fmt.Errorf("%w. To force processing of Wildcard responses, specify the '--wildcard' switch", wErr)
+			return fmt.Errorf("%w. To continue please exclude the status code or the length", wErr)
 		}
 		return fmt.Errorf("error on running gobuster: %w", err)
 	}
@@ -74,11 +74,6 @@ func parseFuzzOptions() (*libgobuster.Options, *gobusterfuzz.OptionsFuzz, error)
 		plugin.ExcludedStatusCodesParsed = ret
 	}
 
-	plugin.WildcardForced, err = cmdFuzz.Flags().GetBool("wildcard")
-	if err != nil {
-		return nil, nil, fmt.Errorf("invalid value for wildcard: %w", err)
-	}
-
 	plugin.ExcludeLength, err = cmdFuzz.Flags().GetIntSlice("exclude-length")
 	if err != nil {
 		return nil, nil, fmt.Errorf("invalid value for excludelength: %w", err)
@@ -100,7 +95,6 @@ func init() {
 	}
 	cmdFuzz.Flags().StringP("excludestatuscodes", "b", "", "Negative status codes (will override statuscodes if set)")
 	cmdFuzz.Flags().IntSlice("exclude-length", []int{}, "exclude the following content length (completely ignores the status). Supply multiple times to exclude multiple sizes.")
-	cmdFuzz.Flags().BoolP("wildcard", "", false, "Force continued operation when wildcard found")
 
 	cmdFuzz.PersistentPreRun = func(cmd *cobra.Command, args []string) {
 		configureGlobalOptions()

gobusterdir/gobusterdir.go

@@ -134,11 +134,11 @@ func (d *GobusterDir) PreRun(ctx context.Context) error {
 	}
 
 	if d.options.StatusCodesBlacklistParsed.Length() > 0 {
-		if !d.options.StatusCodesBlacklistParsed.Contains(*wildcardResp) && !d.options.WildcardForced {
+		if !d.options.StatusCodesBlacklistParsed.Contains(*wildcardResp) {
 			return &ErrWildcard{url: url, statusCode: *wildcardResp, length: wildcardLength}
 		}
 	} else if d.options.StatusCodesParsed.Length() > 0 {
-		if d.options.StatusCodesParsed.Contains(*wildcardResp) && !d.options.WildcardForced {
+		if d.options.StatusCodesParsed.Contains(*wildcardResp) {
 			return &ErrWildcard{url: url, statusCode: *wildcardResp, length: wildcardLength}
 		}
 	} else {

gobusterdir/options.go

@@ -14,7 +14,6 @@ type OptionsDir struct {
 	StatusCodesBlacklist       string
 	StatusCodesBlacklistParsed libgobuster.IntSet
 	UseSlash                   bool
-	WildcardForced             bool
 	HideLength                 bool
 	Expanded                   bool
 	NoStatus                   bool

gobusterfuzz/options.go

@@ -9,7 +9,6 @@ type OptionsFuzz struct {
 	libgobuster.HTTPOptions
 	ExcludedStatusCodes       string
 	ExcludedStatusCodesParsed libgobuster.IntSet
-	WildcardForced            bool
 	ExcludeLength             []int
 }
 

libgobuster/options.go

@@ -13,7 +13,6 @@ type Options struct {
 	NoProgress     bool
 	NoError        bool
 	Quiet          bool
-	WildcardForced bool
 	Verbose        bool
 	Delay          time.Duration
 }