Merge pull request #1488 from projectdiscovery/issue-1459-new-templates-loader

Excluding non yaml file from new additions loading
dev
Sandeep Singh 2022-01-16 15:16:43 +05:30 committed by GitHub
commit a4c3a5c106
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions

View File

@ -38,6 +38,7 @@ import (
"github.com/projectdiscovery/nuclei/v2/pkg/utils"
"github.com/projectdiscovery/nuclei/v2/pkg/utils/stats"
yamlwrapper "github.com/projectdiscovery/nuclei/v2/pkg/utils/yaml"
"github.com/projectdiscovery/stringsutil"
)
// Runner is a client for running the enumeration process.
@ -452,8 +453,10 @@ func (r *Runner) readNewTemplatesFile() ([]string, error) {
if text == "" {
continue
}
if isNewTemplate(text) {
templatesList = append(templatesList, text)
}
}
return templatesList, nil
}
@ -476,11 +479,19 @@ func (r *Runner) countNewTemplates() int {
if text == "" {
continue
}
if isNewTemplate(text) {
count++
}
}
return count
}
func isNewTemplate(filename string) bool {
return stringsutil.EqualFoldAny(filepath.Ext(filename), templates.TemplateExtension)
}
// SaveResumeConfig to file
func (r *Runner) SaveResumeConfig() error {
resumeCfg := types.NewResumeCfg()

View File

@ -21,6 +21,11 @@ import (
"gopkg.in/yaml.v2"
)
const (
// TemplateExtension defines the template default file extension
TemplateExtension = ".yaml"
)
// Template is a YAML input file which defines all the requests and
// other metadata for a template.
type Template struct {