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

added support for multiple raw requests

Browse Source
This commit is contained in:
Mzack9999 2020-04-29 21:19:35 +02:00
parent f5b6474a11
commit ec7cd50e22
1 changed files with 36 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
pkg/requests/http-request.go
View File

@ -39,8 +39,8 @@ type HTTPRequest struct {
Redirects bool `yaml:"redirects,omitempty"`
// MaxRedirects is the maximum number of redirects that should be followed.
MaxRedirects int `yaml:"max-redirects,omitempty"`
// Raw contains a raw request
Raw string `yaml:"raw,omitempty"`
// Raw contains raw requests
Raw []string `yaml:"raw,omitempty"`
}
// GetMatchersCondition returns the condition for the matcher
@ -66,7 +66,7 @@ func (r *HTTPRequest) MakeHTTPRequest(baseURL string) ([]*retryablehttp.Request,
"Hostname": hostname,
}
if r.Raw != "" {
if len(r.Raw) > 0 {
return r.makeHTTPRequestFromRaw(baseURL, values)
}
@ -98,35 +98,42 @@ 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{}) ([]*retryablehttp.Request, error) {
// Replace the dynamic variables in the URL if any
t := fasttemplate.New(r.Raw, "{{", "}}")
raw := t.ExecuteString(values)
func (r *HTTPRequest) makeHTTPRequestFromRaw(baseURL string, values map[string]interface{}) (requests []*retryablehttp.Request, err error) {
for _, raw := range r.Raw {
// Add trailing line
raw += "\n"
// Build a parsed request from raw
parsedReq, err := http.ReadRequest(bufio.NewReader(strings.NewReader(raw)))
if err != nil {
return nil, err
// Replace the dynamic variables in the URL if any
t := fasttemplate.New(raw, "{{", "}}")
raw := t.ExecuteString(values)
// Build a parsed request from raw
parsedReq, err := http.ReadRequest(bufio.NewReader(strings.NewReader(raw)))
if err != nil {
return nil, err
}
// requests generated from http.ReadRequest have incorrect RequestURI, so they
// cannot be used to perform another request directly, we need to generate a new one
// with the new target url
finalURL := fmt.Sprintf("%s%s", baseURL, parsedReq.URL)
req, err := http.NewRequest(r.Method, finalURL, parsedReq.Body)
if err != nil {
return nil, err
}
// copy headers
req.Header = parsedReq.Header
request, err := r.fillRequest(req, values)
if err != nil {
return nil, err
}
requests = append(requests, request)
}
// requests generated from http.ReadRequest have incorrect RequestURI, so they
// cannot be used to perform another request directly, we need to generate a new one
// with the new target url
finalURL := fmt.Sprintf("%s%s", baseURL, parsedReq.URL)
req, err := http.NewRequest(r.Method, finalURL, parsedReq.Body)
if err != nil {
return nil, err
}
// copy headers
req.Header = parsedReq.Header
request, err := r.fillRequest(req, values)
if err != nil {
return nil, err
}
return []*retryablehttp.Request{request}, nil
return requests, nil
}
func (r *HTTPRequest) fillRequest(req *http.Request, values map[string]interface{}) (*retryablehttp.Request, error) {