Merge pull request #1663 from projectdiscovery/network-fix

Fixed network response error + timeout handling
projectdiscovery · Mar 2, 2022 · db8f8b4 · db8f8b4
2 parents 65aaf00 + 2955b94
commit db8f8b4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/v2/pkg/protocols/network/request.go b/v2/pkg/protocols/network/request.go
@@ -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
 		}
 	}
@@ -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")
@@ -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")
 		}