mirror of
https://github.com/projectdiscovery/nuclei.git
synced 2025-12-18 23:05:25 +00:00
Implement -template-url and -workflow-url for retrieving lists of templates/workflows to run.
This commit is contained in:
parent
46d0058470
commit
14bb1b7b21
@ -56,7 +56,9 @@ on extensive configurability, massive extensibility and ease of use.`)
|
|||||||
flagSet.BoolVar(&options.TemplateList, "tl", false, "list all available templates"),
|
flagSet.BoolVar(&options.TemplateList, "tl", false, "list all available templates"),
|
||||||
|
|
||||||
flagSet.StringSliceVarP(&options.Templates, "templates", "t", []string{}, "template or template directory paths to include in the scan"),
|
flagSet.StringSliceVarP(&options.Templates, "templates", "t", []string{}, "template or template directory paths to include in the scan"),
|
||||||
|
flagSet.StringSliceVarP(&options.TemplateURLs, "template-urls", "tu", []string{}, "URL to a list of templates"),
|
||||||
flagSet.StringSliceVarP(&options.Workflows, "workflows", "w", []string{}, "list of workflows to run"),
|
flagSet.StringSliceVarP(&options.Workflows, "workflows", "w", []string{}, "list of workflows to run"),
|
||||||
|
flagSet.StringSliceVarP(&options.WorkflowURLs, "workflow-urls", "wu", []string{}, "URL to a list of workflows to run"),
|
||||||
|
|
||||||
flagSet.BoolVarP(&options.NewTemplates, "new-templates", "nt", false, "run newly added templates only"),
|
flagSet.BoolVarP(&options.NewTemplates, "new-templates", "nt", false, "run newly added templates only"),
|
||||||
flagSet.BoolVar(&options.Validate, "validate", false, "validate the passed templates to nuclei"),
|
flagSet.BoolVar(&options.Validate, "validate", false, "validate the passed templates to nuclei"),
|
||||||
|
|||||||
@ -337,7 +337,9 @@ func (r *Runner) RunEnumeration() error {
|
|||||||
|
|
||||||
loaderConfig := loader.Config{
|
loaderConfig := loader.Config{
|
||||||
Templates: r.options.Templates,
|
Templates: r.options.Templates,
|
||||||
|
TemplateURLs: r.options.TemplateURLs,
|
||||||
Workflows: r.options.Workflows,
|
Workflows: r.options.Workflows,
|
||||||
|
WorkflowURLs: r.options.WorkflowURLs,
|
||||||
ExcludeTemplates: r.options.ExcludedTemplates,
|
ExcludeTemplates: r.options.ExcludedTemplates,
|
||||||
Tags: r.options.Tags,
|
Tags: r.options.Tags,
|
||||||
ExcludeTags: r.options.ExcludeTags,
|
ExcludeTags: r.options.ExcludeTags,
|
||||||
|
|||||||
@ -15,7 +15,9 @@ import (
|
|||||||
// Config contains the configuration options for the loader
|
// Config contains the configuration options for the loader
|
||||||
type Config struct {
|
type Config struct {
|
||||||
Templates []string
|
Templates []string
|
||||||
|
TemplateURLs []string
|
||||||
Workflows []string
|
Workflows []string
|
||||||
|
WorkflowURLs []string
|
||||||
ExcludeTemplates []string
|
ExcludeTemplates []string
|
||||||
IncludeTemplates []string
|
IncludeTemplates []string
|
||||||
|
|
||||||
@ -37,6 +39,7 @@ type Store struct {
|
|||||||
pathFilter *filter.PathFilter
|
pathFilter *filter.PathFilter
|
||||||
config *Config
|
config *Config
|
||||||
finalTemplates []string
|
finalTemplates []string
|
||||||
|
finalWorkflows []string
|
||||||
|
|
||||||
templates []*templates.Template
|
templates []*templates.Template
|
||||||
workflows []*templates.Template
|
workflows []*templates.Template
|
||||||
@ -61,13 +64,24 @@ func New(config *Config) (*Store, error) {
|
|||||||
IncludedTemplates: config.IncludeTemplates,
|
IncludedTemplates: config.IncludeTemplates,
|
||||||
ExcludedTemplates: config.ExcludeTemplates,
|
ExcludedTemplates: config.ExcludeTemplates,
|
||||||
}, config.Catalog),
|
}, config.Catalog),
|
||||||
|
finalTemplates: config.Templates,
|
||||||
|
finalWorkflows: config.Workflows,
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(config.TemplateURLs) > 0 || len(config.WorkflowURLs) > 0 {
|
||||||
|
remoteTemplates, remoteWorkflows, err := getRemoteTemplatesAndWorkflows(config.TemplateURLs, config.WorkflowURLs)
|
||||||
|
if err != nil {
|
||||||
|
return store, err
|
||||||
|
}
|
||||||
|
store.finalTemplates = append(store.finalTemplates, remoteTemplates...)
|
||||||
|
store.finalWorkflows = append(store.finalWorkflows, remoteWorkflows...)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle a case with no templates or workflows, where we use base directory
|
// Handle a case with no templates or workflows, where we use base directory
|
||||||
if len(config.Templates) == 0 && len(config.Workflows) == 0 {
|
if len(store.finalTemplates) == 0 && len(store.finalWorkflows) == 0 {
|
||||||
config.Templates = append(config.Templates, config.TemplatesDirectory)
|
store.finalTemplates = []string{config.TemplatesDirectory}
|
||||||
}
|
}
|
||||||
store.finalTemplates = append(store.finalTemplates, config.Templates...)
|
|
||||||
return store, nil
|
return store, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -90,7 +104,7 @@ func (store *Store) RegisterPreprocessor(preprocessor templates.Preprocessor) {
|
|||||||
// the complete compiled templates for a nuclei execution configuration.
|
// the complete compiled templates for a nuclei execution configuration.
|
||||||
func (store *Store) Load() {
|
func (store *Store) Load() {
|
||||||
store.templates = store.LoadTemplates(store.finalTemplates)
|
store.templates = store.LoadTemplates(store.finalTemplates)
|
||||||
store.workflows = store.LoadWorkflows(store.config.Workflows)
|
store.workflows = store.LoadWorkflows(store.finalWorkflows)
|
||||||
}
|
}
|
||||||
|
|
||||||
// ValidateTemplates takes a list of templates and validates them
|
// ValidateTemplates takes a list of templates and validates them
|
||||||
|
|||||||
98
v2/pkg/catalog/loader/remote_loader.go
Normal file
98
v2/pkg/catalog/loader/remote_loader.go
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
package loader
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"fmt"
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type ContentType string
|
||||||
|
|
||||||
|
const (
|
||||||
|
Template ContentType = "Template"
|
||||||
|
Workflow ContentType = "Workflow"
|
||||||
|
)
|
||||||
|
|
||||||
|
type RemoteContentError struct {
|
||||||
|
Content []string
|
||||||
|
Type ContentType
|
||||||
|
Error error
|
||||||
|
}
|
||||||
|
|
||||||
|
func getRemoteTemplatesAndWorkflows(templateURLs []string, workflowURLs []string) ([]string, []string, error) {
|
||||||
|
remoteContentErrorChannel := make(chan RemoteContentError)
|
||||||
|
|
||||||
|
for _, templateURL := range templateURLs {
|
||||||
|
go getRemoteContent(templateURL, remoteContentErrorChannel, Template)
|
||||||
|
}
|
||||||
|
for _, workflowURL := range workflowURLs {
|
||||||
|
go getRemoteContent(workflowURL, remoteContentErrorChannel, Workflow)
|
||||||
|
}
|
||||||
|
|
||||||
|
var remoteTemplateList []string
|
||||||
|
var remoteWorkFlowList []string
|
||||||
|
var err error
|
||||||
|
for i := 0; i < (len(templateURLs) + len(workflowURLs)); i++ {
|
||||||
|
remoteContentError := <-remoteContentErrorChannel
|
||||||
|
if remoteContentError.Error != nil {
|
||||||
|
if err != nil {
|
||||||
|
err = errors.New(remoteContentError.Error.Error() + ": " + err.Error())
|
||||||
|
} else {
|
||||||
|
err = remoteContentError.Error
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if remoteContentError.Type == Template {
|
||||||
|
remoteTemplateList = append(remoteTemplateList, remoteContentError.Content...)
|
||||||
|
} else if remoteContentError.Type == Workflow {
|
||||||
|
remoteWorkFlowList = append(remoteWorkFlowList, remoteContentError.Content...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return remoteTemplateList, remoteWorkFlowList, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func getRemoteContent(URL string, w chan<- RemoteContentError, contentType ContentType) {
|
||||||
|
response, err := http.Get(URL)
|
||||||
|
if err != nil {
|
||||||
|
w <- RemoteContentError{
|
||||||
|
Error: err,
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer response.Body.Close()
|
||||||
|
if response.StatusCode < 200 || response.StatusCode > 299 {
|
||||||
|
w <- RemoteContentError{
|
||||||
|
Error: fmt.Errorf("get \"%s\": unexpect status %d", URL, response.StatusCode),
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
scanner := bufio.NewScanner(response.Body)
|
||||||
|
var templateList []string
|
||||||
|
for scanner.Scan() {
|
||||||
|
text := strings.TrimSpace(scanner.Text())
|
||||||
|
if text == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
templateList = append(templateList, text)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := scanner.Err(); err != nil {
|
||||||
|
w <- RemoteContentError{
|
||||||
|
Error: errors.Wrap(err, "get \"%s\""),
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
w <- RemoteContentError{
|
||||||
|
Content: templateList,
|
||||||
|
Type: contentType,
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -15,8 +15,12 @@ type Options struct {
|
|||||||
ExcludeTags goflags.NormalizedStringSlice
|
ExcludeTags goflags.NormalizedStringSlice
|
||||||
// Workflows specifies any workflows to run by nuclei
|
// Workflows specifies any workflows to run by nuclei
|
||||||
Workflows goflags.StringSlice
|
Workflows goflags.StringSlice
|
||||||
|
// WorkflowURLs specifies URLs to a list of workflows to use
|
||||||
|
WorkflowURLs goflags.StringSlice
|
||||||
// Templates specifies the template/templates to use
|
// Templates specifies the template/templates to use
|
||||||
Templates goflags.StringSlice
|
Templates goflags.StringSlice
|
||||||
|
// TemplateURLs specifies URLs to a list of templates to use
|
||||||
|
TemplateURLs goflags.StringSlice
|
||||||
// ExcludedTemplates specifies the template/templates to exclude
|
// ExcludedTemplates specifies the template/templates to exclude
|
||||||
ExcludedTemplates goflags.StringSlice
|
ExcludedTemplates goflags.StringSlice
|
||||||
// CustomHeaders is the list of custom global headers to send with each request.
|
// CustomHeaders is the list of custom global headers to send with each request.
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user