External/nuclei
1
0
Fork 0
mirror of https://github.com/projectdiscovery/nuclei.git synced 2025-12-18 22:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc changes to update logic (#1212)

Browse Source 
* Misc changes to update logic

* Misc adjustments to update logic

* update: build check

* update: revert test update

Co-authored-by: sandeep <sandeep@projectdiscovery.io>
This commit is contained in:
Ice3man 2021-12-16 13:59:19 +05:30 committed by GitHub
parent 3f86bc7d62
commit fea3fabdf2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
v2/internal/runner/options.go
View File

@ -29,6 +29,10 @@ func ParseOptions(options *types.Options) {
// Show the user the banner // Show the user the banner
showBanner() showBanner()
if !filepath.IsAbs(options.TemplatesDirectory) {
cwd, _ := os.Getwd()
options.TemplatesDirectory = filepath.Join(cwd, options.TemplatesDirectory)
}
if options.Version { if options.Version {
gologger.Info().Msgf("Current Version: %s\n", config.Version) gologger.Info().Msgf("Current Version: %s\n", config.Version)
os.Exit(0) os.Exit(0)

2
v2/internal/runner/runner.go
View File

@ -73,7 +73,7 @@ func New(options *types.Options) (*Runner, error) {
options.NoUpdateTemplates = true options.NoUpdateTemplates = true
} }
if err := runner.updateTemplates(); err != nil { if err := runner.updateTemplates(); err != nil {
gologger.Warning().Msgf("Could not update templates: %s\n", err) gologger.Error().Msgf("Could not update templates: %s\n", err)
} }
if options.Headless { if options.Headless {
if engine.MustDisableSandbox() { if engine.MustDisableSandbox() {

12
v2/internal/runner/update.go
View File

@ -119,7 +119,7 @@ func (r *Runner) updateTemplates() error { // TODO this method does more than ju
if err := config.WriteConfiguration(r.templatesConfig); err != nil { if err := config.WriteConfiguration(r.templatesConfig); err != nil {
return err return err
} }
gologger.Info().Msgf("Successfully downloaded nuclei-templates (v%s). GoodLuck!\n", version.String()) gologger.Info().Msgf("Successfully downloaded nuclei-templates (v%s) to %s. GoodLuck!\n", version.String(), r.templatesConfig.TemplatesDirectory)
return nil return nil
} }
@ -135,13 +135,13 @@ func (r *Runner) updateTemplates() error { // TODO this method does more than ju
return config.WriteConfiguration(r.templatesConfig) return config.WriteConfiguration(r.templatesConfig)
} }
if err := updateTemplates(latestVersion, currentVersion, r, ctx); err != nil { if err := r.updateTemplatesWithVersion(latestVersion, currentVersion, r, ctx); err != nil {
return err return err
} }
return nil return nil
} }
func updateTemplates(latestVersion semver.Version, currentVersion semver.Version, runner *Runner, ctx context.Context) error { func (r *Runner) updateTemplatesWithVersion(latestVersion semver.Version, currentVersion semver.Version, runner *Runner, ctx context.Context) error {
if latestVersion.GT(currentVersion) { if latestVersion.GT(currentVersion) {
gologger.Info().Msgf("Your current nuclei-templates v%s are outdated. Latest is v%s\n", currentVersion, latestVersion.String()) gologger.Info().Msgf("Your current nuclei-templates v%s are outdated. Latest is v%s\n", currentVersion, latestVersion.String())
gologger.Info().Msgf("Downloading latest release...") gologger.Info().Msgf("Downloading latest release...")
@ -163,7 +163,7 @@ func updateTemplates(latestVersion semver.Version, currentVersion semver.Version
if err := config.WriteConfiguration(runner.templatesConfig); err != nil { if err := config.WriteConfiguration(runner.templatesConfig); err != nil {
return err return err
} }
gologger.Info().Msgf("Successfully updated nuclei-templates (v%s). GoodLuck!\n", latestVersion.String()) gologger.Info().Msgf("Successfully updated nuclei-templates (v%s) to %s. GoodLuck!\n", latestVersion.String(), r.templatesConfig.TemplatesDirectory)
} }
return nil return nil
} }
@ -200,10 +200,6 @@ func (r *Runner) readInternalConfigurationFile(home, configDir string) error {
return readErr return readErr
} }
r.templatesConfig = configuration r.templatesConfig = configuration
if configuration.TemplatesDirectory != "" && configuration.TemplatesDirectory != filepath.Join(home, "nuclei-templates") {
r.options.TemplatesDirectory = configuration.TemplatesDirectory
}
} }
return nil return nil
} }