daffainfo
/
nuclei
mirror of https://github.com/daffainfo/nuclei.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc changes / fixes

dev
Ice3man543 2021-03-06 14:31:21 +05:30
parent 908889ccb5
commit 0dd2e10fd2
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@ func validateOptions(options *types.Options) error {
if !options.TemplateList {
// Check if a list of templates was provided and it exists
if len(options.Templates) == 0 && len(options.Workflows) == 0 && len(options.Tags) == 0 && !options.UpdateTemplates {
if len(options.Templates) == 0 && !options.NewTemplates && len(options.Workflows) == 0 && len(options.Tags) == 0 && !options.UpdateTemplates {
return errors.New("no template/templates provided")
}
}

8
v2/pkg/protocols/headless/engine/page_actions.go
View File

@ -244,8 +244,10 @@ func (p *Page) Screenshot(act *Action, out map[string]string) error {
to := act.GetArg("to")
if to == "" {
to = ksuid.New().String()
if act.Name != "" {
out[act.Name] = to
}
}
var data []byte
var err error
if act.GetArg("fullpage") == "true" {
@ -354,7 +356,9 @@ func (p *Page) GetResource(act *Action, out map[string]string) error {
if err != nil {
return errors.Wrap(err, "could not get src for element")
}
if act.Name != "" {
out[act.Name] = string(resource)
}
return nil
}
@ -394,14 +398,18 @@ func (p *Page) ExtractElement(act *Action, out map[string]string) error {
if err != nil {
return errors.Wrap(err, "could not get attribute")
}
if act.Name != "" {
out[act.Name] = *attrValue
}
default:
text, err := element.Text()
if err != nil {
return errors.Wrap(err, "could not get element text node")
}
if act.Name != "" {
out[act.Name] = text
}
}
return nil
}

2
v2/pkg/protocols/headless/operators.go
View File

@ -62,7 +62,7 @@ func (r *Request) Extract(data map[string]interface{}, extractor *extractors.Ext
}
// responseToDSLMap converts a DNS response to a map for use in DSL matching
func (r *Request) responseToDSLMap(resp, req, host, matched string) output.InternalEvent {
func (r *Request) responseToDSLMap(resp, req string, host, matched string) output.InternalEvent {
data := make(output.InternalEvent, 5)
// Some data regarding the request metadata