mirror of https://github.com/daffainfo/nuclei.git
removed fasttemplate
parent
5865cda707
commit
920a561819
1
go.mod
1
go.mod
|
@ -10,7 +10,6 @@ require (
|
|||
github.com/projectdiscovery/gologger v1.0.0
|
||||
github.com/projectdiscovery/retryabledns v1.0.4
|
||||
github.com/projectdiscovery/retryablehttp-go v1.0.1
|
||||
github.com/valyala/fasttemplate v1.1.0
|
||||
golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0
|
||||
gopkg.in/yaml.v2 v2.2.8
|
||||
)
|
||||
|
|
4
go.sum
4
go.sum
|
@ -19,10 +19,6 @@ github.com/projectdiscovery/retryablehttp-go v1.0.1 h1:V7wUvsZNq1Rcz7+IlcyoyQlNw
|
|||
github.com/projectdiscovery/retryablehttp-go v1.0.1/go.mod h1:SrN6iLZilNG1X4neq1D+SBxoqfAF4nyzvmevkTkWsek=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
|
||||
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
|
||||
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
|
||||
github.com/valyala/fasttemplate v1.1.0 h1:RZqt0yGBsps8NGvLSGW804QQqCUYYLsaOjTVHy1Ocw4=
|
||||
github.com/valyala/fasttemplate v1.1.0/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
|
||||
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
|
||||
|
|
|
@ -6,7 +6,6 @@ import (
|
|||
"github.com/miekg/dns"
|
||||
"github.com/projectdiscovery/nuclei/pkg/extractors"
|
||||
"github.com/projectdiscovery/nuclei/pkg/matchers"
|
||||
"github.com/valyala/fasttemplate"
|
||||
)
|
||||
|
||||
// DNSRequest contains a request to be made from a template
|
||||
|
@ -54,8 +53,9 @@ func (r *DNSRequest) MakeDNSRequest(domain string) (*dns.Msg, error) {
|
|||
|
||||
var q dns.Question
|
||||
|
||||
t := fasttemplate.New(r.Name, "{{", "}}")
|
||||
q.Name = dns.Fqdn(t.ExecuteString(map[string]interface{}{"FQDN": domain}))
|
||||
replacer := newReplacer(map[string]interface{}{"FQDN": domain})
|
||||
|
||||
q.Name = dns.Fqdn(replacer.Replace(r.Name))
|
||||
q.Qclass = toQClass(r.Class)
|
||||
q.Qtype = toQType(r.Type)
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@ import (
|
|||
"github.com/projectdiscovery/nuclei/pkg/extractors"
|
||||
"github.com/projectdiscovery/nuclei/pkg/matchers"
|
||||
retryablehttp "github.com/projectdiscovery/retryablehttp-go"
|
||||
"github.com/valyala/fasttemplate"
|
||||
)
|
||||
|
||||
// HTTPRequest contains a request to be made from a template
|
||||
|
@ -75,13 +74,13 @@ func (r *HTTPRequest) MakeHTTPRequest(baseURL string) ([]*retryablehttp.Request,
|
|||
|
||||
// MakeHTTPRequestFromModel creates a *http.Request from a request template
|
||||
func (r *HTTPRequest) makeHTTPRequestFromModel(baseURL string, values map[string]interface{}) (requests []*retryablehttp.Request, err error) {
|
||||
replacer := newReplacer(values)
|
||||
for _, path := range r.Path {
|
||||
// Replace the dynamic variables in the URL if any
|
||||
t := fasttemplate.New(path, "{{", "}}")
|
||||
url := t.ExecuteString(values)
|
||||
URL := replacer.Replace(path)
|
||||
|
||||
// Build a request on the specified URL
|
||||
req, err := http.NewRequest(r.Method, url, nil)
|
||||
req, err := http.NewRequest(r.Method, URL, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
@ -99,13 +98,13 @@ func (r *HTTPRequest) makeHTTPRequestFromModel(baseURL string, values map[string
|
|||
|
||||
// makeHTTPRequestFromRaw creates a *http.Request from a raw request
|
||||
func (r *HTTPRequest) makeHTTPRequestFromRaw(baseURL string, values map[string]interface{}) (requests []*retryablehttp.Request, err error) {
|
||||
replacer := newReplacer(values)
|
||||
for _, raw := range r.Raw {
|
||||
// Add trailing line
|
||||
raw += "\n"
|
||||
|
||||
// Replace the dynamic variables in the URL if any
|
||||
t := fasttemplate.New(raw, "{{", "}}")
|
||||
raw := t.ExecuteString(values)
|
||||
raw = replacer.Replace(raw)
|
||||
|
||||
// Build a parsed request from raw
|
||||
parsedReq, err := http.ReadRequest(bufio.NewReader(strings.NewReader(raw)))
|
||||
|
@ -137,6 +136,7 @@ func (r *HTTPRequest) makeHTTPRequestFromRaw(baseURL string, values map[string]i
|
|||
}
|
||||
|
||||
func (r *HTTPRequest) fillRequest(req *http.Request, values map[string]interface{}) (*retryablehttp.Request, error) {
|
||||
replacer := newReplacer(values)
|
||||
// Check if the user requested a request body
|
||||
if r.Body != "" {
|
||||
req.Body = ioutil.NopCloser(strings.NewReader(r.Body))
|
||||
|
@ -144,9 +144,7 @@ func (r *HTTPRequest) fillRequest(req *http.Request, values map[string]interface
|
|||
|
||||
// Set the header values requested
|
||||
for header, value := range r.Headers {
|
||||
t := fasttemplate.New(value, "{{", "}}")
|
||||
val := t.ExecuteString(values)
|
||||
req.Header.Set(header, val)
|
||||
req.Header.Set(header, replacer.Replace(value))
|
||||
}
|
||||
|
||||
// Set some headers only if the header wasn't supplied by the user
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
package requests
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func newReplacer(values map[string]interface{}) *strings.Replacer {
|
||||
var replacerItems []string
|
||||
for k, v := range values {
|
||||
replacerItems = append(replacerItems, fmt.Sprintf("{{%s}}", k))
|
||||
replacerItems = append(replacerItems, fmt.Sprintf("%s", v))
|
||||
}
|
||||
|
||||
return strings.NewReplacer(replacerItems...)
|
||||
}
|
Loading…
Reference in New Issue