projectdiscovery · LuitelSamikshya · Sep 30, 2021 · Sep 30, 2021 · Oct 2, 2021 · Oct 2, 2021
diff --git a/README.md b/README.md
@@ -53,34 +53,46 @@ subfinder -h
 ```
 This will display help for the tool. Here are all the switches it supports.
 
-| Flag             | Description                                                | Example                                     |
-| ---------------- | ---------------------------------------------------------- | --------------------------------------------|
-| -all             | Use all sources (slow) for enumeration                     | subfinder -d uber.com -all                  |
-| -b               | IP address to be used as local bind                        | subfinder -b 172.16.0.1                |
-| -config          | Configuration file for API Keys, etc                       | subfinder -config config.yaml               |
-| -d               | Domain to find subdomains for                              | subfinder -d uber.com                       |
-| -dL              | File containing list of domains to enumerate               | subfinder -dL hackerone-hosts.txt           |
-| -exclude-sources | List of sources to exclude from enumeration                | subfinder -exclude-sources archiveis        |
-| -max-time        | Minutes to wait for enumeration results (default 10)       | subfinder -max-time 1                       |
-| -nC              | Don't Use colors in output                                 | subfinder -nC                               |
-| -nW              | Remove Wildcard & Dead Subdomains from output              | subfinder -nW                               |
-| -ls              | List all available sources                                 | subfinder -ls                               |
-| -o               | File to write output to (optional)                         | subfinder -o output.txt                     |
-| -oD              | Directory to write enumeration results to (optional)       | subfinder -oD ~/outputs                     |
-| -oI              | Write output in Host,IP format                             | subfinder -oI                               |
-| -oJ              | Write output in JSON lines Format                          | subfinder -oJ                               |
-| -r               | Comma-separated list of resolvers to use                   | subfinder -r 1.1.1.1,1.0.0.1                |
-| -rL              | Text file containing list of resolvers to use              | subfinder -rL resolvers.txt                 |
-| -recursive       | Enumeration recursive subdomains                           | subfinder -d news.yahoo.com -recursive      |
-| -silent          | Show only subdomains in output                             | subfinder -silent                           |
-| -sources         | Comma separated list of sources to use                     | subfinder -sources shodan,censys            |
-| -t               | Number of concurrent goroutines for resolving (default 10) | subfinder -t 100                            |
-| -timeout         | Seconds to wait before timing out (default 30)             | subfinder -timeout 30                       |
-| -proxy           | HTTP proxy to use with subfinder                           | subfinder -proxy http://localhost:3128      |
-| -rate-limit      | Maximum number of HTTP requests to send per second         | subfinder -rate-limit 10                    |
-| -v               | Show Verbose output                                        | subfinder -v                                |
-| -version         | Show current program version                               | subfinder -version                          |
-
+Flags:
+INPUT:
+   -d, -domain string  Domain to find subdomains for
+   -dL, -list string   File containing list of domains to enumerate
+
+SOURCE:
+   -s, -sources string           Sources to use for enumeration (-s crtsh,bufferover)
+   -recursive                    Sources to use supports recursive enumeration
+   -all                          Use all sources (slow) for enumeration
+   -es, -exclude-sources string  Sources to exclude from enumeration (-es archiveis,zoomeye)
+
+RATE-LIMIT:
+   -rate-limit int  Maximum number of HTTP requests to send per second
+   -t int           Number of concurrent goroutines for resolving (-active only) (default 10)
+
+OUTPUT:
+   -o, -output string       File to write output to (optional)
+   -oJ, -json               Write output in JSONL(ines) format
+   -oD, -output-dir string  Directory to write output (-dL only)
+   -cs, -collect-sources    Include all sources in the output (-json only)
+   -oI, -ip                 Include host IP in output (-active only)
+
+CONFIGURATION:
+   -config string       Configuration file for API Keys, etc
+   -r string            Comma separated list of resolvers to use
+   -rL, -rlist string   File containing list of resolvers to use
+   -nW, -active         Display active subdomains only
+   -b, -bind-ip string  IP address to be used as local bind
+   -proxy string        HTTP proxy to use with subfinder
+
+DEBUG:
+   -silent   Show only subdomains in output
+   -version  Show version of subfinder
+   -v        Show Verbose output
+   -nC, -nc  Disable color in output
+   -ls       List all available sources
+
+OPTIMIZATION:
+   -timeout int   Seconds to wait before timing out (default 30)
+   -max-time int  Minutes to wait for enumeration results (default 10)
 
 # Installation
 

diff --git a/v2/go.mod b/v2/go.mod
@@ -21,6 +21,7 @@ require (
 
 require (
 	github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
+	github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/logrusorgru/aurora v2.0.3+incompatible // indirect
 	github.com/miekg/dns v1.1.41 // indirect
@@ -29,8 +30,11 @@ require (
 	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/projectdiscovery/goflags v0.0.7-0.20220203040211-bbdcd4c06ed5
 	github.com/projectdiscovery/retryabledns v1.0.12-0.20210419174848-eec3ac17d61e // indirect
+	github.com/projectdiscovery/stringsutil v0.0.0-20210804142656-fd3c28dbaafe // indirect
 	golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d // indirect
 	golang.org/x/sys v0.0.0-20210419170143-37df388d1f33 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
diff --git a/v2/go.sum b/v2/go.sum
@@ -7,6 +7,8 @@ github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 h1:MzBOUgng9or
 github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129/go.mod h1:rFgpPQZYZ8vdbc+48xibu8ALc3yeyd64IhHS+PU6Yyg=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08 h1:ox2F0PSMlrAAiAdknSRMDrAr8mfxPCfSZolH+/qQnyQ=
+github.com/cnf/structhash v0.0.0-20201127153200-e1b16c1ebc08/go.mod h1:pCxVEbcm3AMg7ejXyorUXi6HQCzOIBf7zEDVPtw0/U4=
 github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA=
 github.com/corpix/uarand v0.1.1 h1:RMr1TWc9F4n5jiPDzFHtmaUXLKLNUFK0SgCLo4BhX/U=
 github.com/corpix/uarand v0.1.1/go.mod h1:SFKZvkcRoLqVRFZ4u25xPmp6m9ktANfbpXZ7SJ0/FNU=
@@ -89,12 +91,20 @@ github.com/projectdiscovery/dnsx v1.0.3 h1:IbMlMEeki6mlllHxATVh50+eOBwyOn8OKD1Cl
 github.com/projectdiscovery/dnsx v1.0.3/go.mod h1:M79ADVHwnNQM6kN2J4/XvjydJ3cDhaHHoI5lxJR2Z/A=
 github.com/projectdiscovery/fdmax v0.0.3 h1:FM6lv9expZ/rEEBI9tkRh6tx3DV0gtpwzdc0h7bGPqg=
 github.com/projectdiscovery/fdmax v0.0.3/go.mod h1:NWRcaR7JTO7fC27H4jCl9n7Z+KIredwpgw1fV+4KrKI=
+github.com/projectdiscovery/goflags v0.0.7-0.20220127045615-f8749b99fe7c h1:TZ+p5LdrgkbsYHchUPezjYCUXPQ1bhBcF/mUJdr9TDo=
+github.com/projectdiscovery/goflags v0.0.7-0.20220127045615-f8749b99fe7c/go.mod h1:Jjwsf4eEBPXDSQI2Y+6fd3dBumJv/J1U0nmpM+hy2YY=
+github.com/projectdiscovery/goflags v0.0.7-0.20220203040211-bbdcd4c06ed5 h1:QXXMALyjxKNTvCneAxxzSjtiOl2lAspbjP0B4TnetrQ=
+github.com/projectdiscovery/goflags v0.0.7-0.20220203040211-bbdcd4c06ed5/go.mod h1:Jjwsf4eEBPXDSQI2Y+6fd3dBumJv/J1U0nmpM+hy2YY=
+github.com/projectdiscovery/goflags v0.0.7 h1:aykmRkrOgDyRwcvGrK3qp+9aqcjGfAMs/+LtRmtyxwk=
+github.com/projectdiscovery/goflags v0.0.7/go.mod h1:Jjwsf4eEBPXDSQI2Y+6fd3dBumJv/J1U0nmpM+hy2YY=
 github.com/projectdiscovery/gologger v1.0.0/go.mod h1:Ok+axMqK53bWNwDSU1nTNwITLYMXMdZtRc8/y1c7sWE=
 github.com/projectdiscovery/gologger v1.1.4 h1:qWxGUq7ukHWT849uGPkagPKF3yBPYAsTtMKunQ8O2VI=
 github.com/projectdiscovery/gologger v1.1.4/go.mod h1:Bhb6Bdx2PV1nMaFLoXNBmHIU85iROS9y1tBuv7T5pMY=
 github.com/projectdiscovery/hmap v0.0.1/go.mod h1:VDEfgzkKQdq7iGTKz8Ooul0NuYHQ8qiDs6r8bPD1Sb0=
 github.com/projectdiscovery/retryabledns v1.0.12-0.20210419174848-eec3ac17d61e h1:cxke2L/GKym765W0UnA9RuyaY/LI2u5z+fYqDtoQY0M=
 github.com/projectdiscovery/retryabledns v1.0.12-0.20210419174848-eec3ac17d61e/go.mod h1:4sMC8HZyF01HXukRleSQYwz4870bwgb4+hTSXTMrkf4=
+github.com/projectdiscovery/stringsutil v0.0.0-20210804142656-fd3c28dbaafe h1:tQTgf5XLBgZbkJDPtnV3SfdP9tzz5ZWeDBwv8WhnH9Q=
+github.com/projectdiscovery/stringsutil v0.0.0-20210804142656-fd3c28dbaafe/go.mod h1:oTRc18WBv9t6BpaN9XBY+QmG28PUpsyDzRht56Qf49I=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rs/xid v1.3.0 h1:6NjYksEUlhurdVehpc7S7dk6DAmcKv8V9gG0FsVN2U4=
 github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
@@ -207,6 +217,7 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=

diff --git a/v2/pkg/runner/banners.go b/v2/pkg/runner/banners.go
@@ -1,6 +1,9 @@
 package runner
 
 import (
+	"strings"
+
+	"github.com/projectdiscovery/goflags"
 	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/subfinder/v2/pkg/passive"
 	"github.com/projectdiscovery/subfinder/v2/pkg/resolve"
@@ -27,13 +30,12 @@ func showBanner() {
 	gologger.Print().Msgf("By using subfinder, you also agree to the terms of the APIs used.\n\n")
 }
 
-// normalRunTasks runs the normal startup tasks
-func (options *Options) normalRunTasks() {
+// sourceRunTasks runs the app with source config
+func (options *Options) sourceRunTasks() {
 	configFile, err := UnmarshalRead(options.ConfigFile)
 	if err != nil {
 		gologger.Fatal().Msgf("Could not read configuration file %s: %s\n", options.ConfigFile, err)
 	}
-
 	// If we have a different version of subfinder installed
 	// previously, use the new iteration of config file.
 	if configFile.Version != Version {
@@ -46,31 +48,20 @@ func (options *Options) normalRunTasks() {
 		if err != nil {
 			gologger.Fatal().Msgf("Could not update configuration file to %s: %s\n", options.ConfigFile, err)
 		}
+		gologger.Info().Msgf("Configuration file updated to %s\n", options.ConfigFile)
 	}
 	options.YAMLConfig = configFile
 }
 
-// firstRunTasks runs some housekeeping tasks done
-// when the program is ran for the first time
-func (options *Options) firstRunTasks() {
-	// Create the configuration file and display information
-	// about it to the user.
-	config := ConfigFile{
-		// Use the default list of resolvers by marshaling it to the config
-		Resolvers: resolve.DefaultResolvers,
-		// Use the default list of passive sources
-		Sources: passive.DefaultSources,
-		// Use the default list of all passive sources
-		AllSources: passive.DefaultAllSources,
-		// Use the default list of recursive sources
-		Recursive: passive.DefaultRecursiveSources,
-	}
-
-	err := config.MarshalWrite(options.ConfigFile)
-	if err != nil {
-		gologger.Fatal().Msgf("Could not write configuration file to %s: %s\n", options.ConfigFile, err)
+// defaultRunTasks runs the app with default configuration
+func (options *Options) defaultRunTasks() {
+	configFile, err := UnmarshalRead(options.ConfigFile)
+	if err != nil && !strings.Contains(err.Error(), goflags.ErrEofYaml.Error()) {
+		gologger.Fatal().Msgf("Could not read configuration file %s: %s\n", options.ConfigFile, err)
 	}
-	options.YAMLConfig = config
-
-	gologger.Info().Msgf("Configuration file saved to %s\n", options.ConfigFile)
+	configFile.Sources = passive.DefaultSources
+	configFile.AllSources = passive.DefaultAllSources
+	configFile.Recursive = passive.DefaultRecursiveSources
+	configFile.Resolvers = resolve.DefaultResolvers
+	options.YAMLConfig = configFile
 }