Merge pull request #941 from projectdiscovery/cleanup_migration_code

Cleanup migration code

.gitignore

@@ -7,4 +7,5 @@ v2/subfinder
 vendor/
 .idea
 .devcontainer
+.vscode
 dist

v2/pkg/runner/config.go

@@ -30,14 +30,22 @@ func GetConfigDirectory() (string, error) {
 	return config, nil
 }
 
-// CreateProviderConfigYAML marshals the input map to the given location on the disk
-func CreateProviderConfigYAML(configFilePath string, sourcesRequiringApiKeysMap map[string][]string) error {
+// createProviderConfigYAML marshals the input map to the given location on the disk
+func createProviderConfigYAML(configFilePath string) error {
 	configFile, err := os.Create(configFilePath)
 	if err != nil {
 		return err
 	}
 	defer configFile.Close()
 
+	sourcesRequiringApiKeysMap := make(map[string][]string)
+	for _, source := range passive.AllSources {
+		if source.NeedsKey() {
+			sourceName := strings.ToLower(source.Name())
+			sourcesRequiringApiKeysMap[sourceName] = []string{}
+		}
+	}
+
 	return yaml.NewEncoder(configFile).Encode(sourcesRequiringApiKeysMap)
 }
 

v2/pkg/runner/options.go

@@ -11,8 +11,6 @@ import (
 	"regexp"
 	"strings"
 
-	"gopkg.in/yaml.v3"
-
 	"github.com/projectdiscovery/goflags"
 	"github.com/projectdiscovery/gologger"
 	"github.com/projectdiscovery/subfinder/v2/pkg/passive"
@@ -76,18 +74,6 @@ type OnResultCallback func(result *resolve.HostEntry)
 func ParseOptions() *Options {
 	logutil.DisableDefaultLogger()
 
-	// Migrate config to provider config
-	if fileutil.FileExists(defaultConfigLocation) && !fileutil.FileExists(defaultProviderConfigLocation) {
-		gologger.Info().Msgf("Detected old %s config file, trying to migrate providers to %s\n", defaultConfigLocation, defaultProviderConfigLocation)
-		if err := migrateToProviderConfig(defaultConfigLocation, defaultProviderConfigLocation); err != nil {
-			gologger.Warning().Msgf("Could not migrate providers from existing config %s to provider config %s: %s\n", defaultConfigLocation, defaultProviderConfigLocation, err)
-		} else {
-			// cleanup the existing config file post migration
-			_ = os.Remove(defaultConfigLocation)
-			gologger.Info().Msgf("Migration successful from %s to %s.\n", defaultConfigLocation, defaultProviderConfigLocation)
-		}
-	}
-
 	options := &Options{}
 
 	var err error
@@ -159,6 +145,12 @@ func ParseOptions() *Options {
 		os.Exit(1)
 	}
 
+	if exists := fileutil.FileExists(defaultProviderConfigLocation); !exists {
+		if err := createProviderConfigYAML(defaultProviderConfigLocation); err != nil {
+			gologger.Error().Msgf("Could not create provider config file: %s\n", err)
+		}
+	}
+
 	if options.Config != defaultConfigLocation {
 		// An empty source file is not a fatal error
 		if err := flagSet.MergeConfigFile(options.Config); err != nil && !errors.Is(err, io.EOF) {
@@ -226,49 +218,6 @@ func (options *Options) loadProvidersFrom(location string) {
 	}
 }
 
-func migrateToProviderConfig(defaultConfigLocation, defaultProviderLocation string) error {
-	configs, err := unMarshalToLowerCaseMap(defaultConfigLocation)
-	if err != nil {
-		return err
-	}
-
-	sourcesRequiringApiKeysMap := make(map[string][]string)
-	for _, source := range passive.AllSources {
-		if source.NeedsKey() {
-			sourceName := strings.ToLower(source.Name())
-			if sourceKeys, ok := configs[sourceName]; ok {
-				sourcesRequiringApiKeysMap[sourceName] = sourceKeys
-			} else {
-				sourcesRequiringApiKeysMap[sourceName] = []string{}
-			}
-		}
-	}
-
-	return CreateProviderConfigYAML(defaultProviderLocation, sourcesRequiringApiKeysMap)
-}
-
-func unMarshalToLowerCaseMap(defaultConfigLocation string) (map[string][]string, error) {
-	defaultConfigFile, err := os.Open(defaultConfigLocation)
-	if err != nil {
-		return nil, err
-	}
-	defer defaultConfigFile.Close()
-
-	configs := map[string][]string{}
-	if err := yaml.NewDecoder(defaultConfigFile).Decode(configs); isFatalErr(err) {
-		return nil, err
-	}
-
-	for k, v := range configs {
-		configs[strings.ToLower(k)] = v
-	}
-	return configs, nil
-}
-
-func isFatalErr(err error) bool {
-	return err != nil && !errors.Is(err, io.EOF)
-}
-
 func listSources(options *Options) {
 	gologger.Info().Msgf("Current list of available sources. [%d]\n", len(passive.AllSources))
 	gologger.Info().Msgf("Sources marked with an * need key(s) or token(s) to work.\n")