Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed network response error + timeout handling #1663

Merged
merged 2 commits into from
Mar 2, 2022
Merged

Fixed network response error + timeout handling #1663

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a9000d
Fixed network response error + timeout handling
Ice3man543 Mar 1, 2022
2955b94
Merge branch 'dev' of https://github.com/projectdiscovery/nuclei into…
ehsandeep Mar 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions v2/pkg/protocols/network/request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (request *Request) ExecuteWithResults(input string, metadata /*TODO review
actualAddress := replacer.Replace(kv.address, variables)

if err := request.executeAddress(variables, actualAddress, address, input, kv.tls, previous, callback); err != nil {
gologger.Verbose().Label("ERR").Msgf("Could not make network request for %s: %s\n", actualAddress, err)
gologger.Warning().Msgf("Could not make network request for %s: %s\n", actualAddress, err)
continue
}
}
Expand Down Expand Up @@ -223,7 +223,7 @@ func (request *Request) executeRequestWithPayloads(variables map[string]interfac
default:
buf := make([]byte, bufferSize)
nBuf, err := conn.Read(buf)
if err != nil && !os.IsTimeout(err) {
if err != nil && !os.IsTimeout(err) && err != io.EOF {
request.options.Output.Request(request.options.TemplatePath, address, request.Type().String(), err)
closeTimer(readInterval)
return errors.Wrap(err, "could not read from server")
Expand All @@ -236,7 +236,7 @@ func (request *Request) executeRequestWithPayloads(variables map[string]interfac
} else {
final = make([]byte, bufferSize)
n, err = conn.Read(final)
if err != nil && err != io.EOF {
if err != nil && !os.IsTimeout(err) && err != io.EOF {
request.options.Output.Request(request.options.TemplatePath, address, request.Type().String(), err)
return errors.Wrap(err, "could not read from server")
}
Expand Down