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

Renamed variables to be more appropriate + changed return message

Browse Source
This commit is contained in:
Ice3man 2022-03-03 19:01:46 +05:30
parent 04b1e43780
commit a1dbbc5e88
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
v2/cmd/nuclei/main.go
View File

@ -60,7 +60,11 @@ func main() {
}() }()
if err := nucleiRunner.RunEnumeration(); err != nil { if err := nucleiRunner.RunEnumeration(); err != nil {
gologger.Fatal().Msgf("Could not run nuclei: %s\n", err) if options.Validate {
gologger.Fatal().Msgf("Could not validate templates: %s\n", err)
} else {
gologger.Fatal().Msgf("Could not run nuclei: %s\n", err)
}
} }
nucleiRunner.Close() nucleiRunner.Close()
// on successful execution remove the resume file in case it exists // on successful execution remove the resume file in case it exists

15
v2/pkg/catalog/loader/loader.go
View File

@ -148,10 +148,10 @@ func (store *Store) Load() {
store.workflows = store.LoadWorkflows(store.finalWorkflows) store.workflows = store.LoadWorkflows(store.finalWorkflows)
} }
var uniqueTemplatesIDValidateMap map[string]string var templateIDPathMap map[string]string
func init() { func init() {
uniqueTemplatesIDValidateMap = make(map[string]string) templateIDPathMap = make(map[string]string)
} }
// ValidateTemplates takes a list of templates and validates them // ValidateTemplates takes a list of templates and validates them
@ -170,7 +170,7 @@ func (store *Store) ValidateTemplates(templatesList, workflowsList []string) err
if areTemplatesValid(store, filteredTemplatePaths) && areWorkflowsValid(store, filteredWorkflowPaths) { if areTemplatesValid(store, filteredTemplatePaths) && areWorkflowsValid(store, filteredWorkflowPaths) {
return nil return nil
} }
return errors.New("an error occurred during templates validation") return errors.New("errors occured during template validation")
} }
func areWorkflowsValid(store *Store, filteredWorkflowPaths map[string]struct{}) bool { func areWorkflowsValid(store *Store, filteredWorkflowPaths map[string]struct{}) bool {
@ -189,8 +189,7 @@ func areWorkflowOrTemplatesValid(store *Store, filteredTemplatePaths map[string]
areTemplatesValid := true areTemplatesValid := true
for templatePath := range filteredTemplatePaths { for templatePath := range filteredTemplatePaths {
_, err := load(templatePath, store.tagFilter) if _, err := load(templatePath, store.tagFilter); err != nil {
if err != nil {
if isParsingError("Error occurred loading template %s: %s\n", templatePath, err) { if isParsingError("Error occurred loading template %s: %s\n", templatePath, err) {
areTemplatesValid = false areTemplatesValid = false
continue continue
@ -203,11 +202,11 @@ func areWorkflowOrTemplatesValid(store *Store, filteredTemplatePaths map[string]
areTemplatesValid = false areTemplatesValid = false
} }
} else { } else {
if old, ok := uniqueTemplatesIDValidateMap[template.ID]; !ok { if existingTemplatePath, found := templateIDPathMap[template.ID]; !found {
uniqueTemplatesIDValidateMap[template.ID] = templatePath templateIDPathMap[template.ID] = templatePath
} else { } else {
areTemplatesValid = false areTemplatesValid = false
gologger.Warning().Msgf("Found duplicate template ID during validation %s => %s: %s\n", templatePath, old, template.ID) gologger.Warning().Msgf("Found duplicate template ID during validation '%s' => '%s': %s\n", templatePath, existingTemplatePath, template.ID)
} }
if !isWorkflow && len(template.Workflows) > 0 { if !isWorkflow && len(template.Workflows) > 0 {
continue continue