Merge pull request #57 from BloodHoundAD/fix-deadlock-with-close

Add close to body to prevent deadlock
SpecterOps · Oct 20, 2023 · 207d9ad · 207d9ad
2 parents 1dd97b0 + 773d377
commit 207d9ad
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/cmd/start.go b/cmd/start.go
@@ -224,14 +224,24 @@ func ingest(ctx context.Context, bheUrl url.URL, bheClient *http.Client, in <-ch
 						log.Error(ErrExceededRetryLimit, "")
 						hasErrors = true
 					}
+					if err := response.Body.Close(); err != nil {
+						log.Error(fmt.Errorf("failed to close ingest body: %w", err), unrecoverableErrMsg)
+					}
 					continue
 				} else if response.StatusCode != http.StatusAccepted {
 					if bodyBytes, err := io.ReadAll(response.Body); err != nil {
 						log.Error(fmt.Errorf("received unexpected response code from %v: %s; failure reading response body", endpoint, response.Status), unrecoverableErrMsg)
 					} else {
 						log.Error(fmt.Errorf("received unexpected response code from %v: %s %s", req.URL, response.Status, bodyBytes), unrecoverableErrMsg)
 					}
+					if err := response.Body.Close(); err != nil {
+						log.Error(fmt.Errorf("failed to close ingest body: %w", err), unrecoverableErrMsg)
+					}
 					return true
+				} else {
+					if err := response.Body.Close(); err != nil {
+						log.Error(fmt.Errorf("failed to close ingest body: %w", err), unrecoverableErrMsg)
+					}
 				}
 			}
 		}