Fix: Ensure proper closure of HTTP response body to prevent resource …

…leaks (#592) Co-authored-by: Sahib Yar <[email protected]>
fastly · Feb 6, 2025 · 3161fa7 · 3161fa7
1 parent 918eb17
commit 3161fa7
Show file tree

Hide file tree

Showing 17 changed files with 106 additions and 37 deletions.
diff --git a/fastly/automation_token.go b/fastly/automation_token.go
@@ -142,10 +142,11 @@ type CreateAutomationTokenInput struct {
 //
 // Requires sudo capability for the token being used.
 func (c *Client) CreateAutomationToken(i *CreateAutomationTokenInput) (*AutomationToken, error) {
-	_, err := c.PostForm("/sudo", i, nil)
+	ignored, err := c.PostForm("/sudo", i, nil)
 	if err != nil {
 		return nil, err
 	}
+	defer ignored.Body.Close()
 
 	resp, err := c.PostJSON("/automation-tokens", i, nil)
 	if err != nil {

diff --git a/fastly/domain.go b/fastly/domain.go
@@ -189,8 +189,12 @@ func (c *Client) DeleteDomain(i *DeleteDomainInput) error {
 
 	path := ToSafeURL("service", i.ServiceID, "version", strconv.Itoa(i.ServiceVersion), "domain", i.Name)
 
-	_, err := c.Delete(path, nil)
-	return err
+	ignored, err := c.Delete(path, nil)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
 
 // ValidateDomainInput is used as input to the ValidateDomain function.

diff --git a/fastly/kv_store.go b/fastly/kv_store.go
@@ -463,8 +463,12 @@ func (c *Client) InsertKVStoreKey(i *InsertKVStoreKeyInput) error {
 	}
 	defer resp.Body.Close()
 
-	_, err = checkResp(resp, err)
-	return err
+	ignored, err := checkResp(resp, err)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
 
 // DeleteKVStoreKeyInput is the input to the DeleteKVStoreKey function.
@@ -534,6 +538,10 @@ func (c *Client) BatchModifyKVStoreKey(i *BatchModifyKVStoreKeyInput) error {
 	}
 	defer resp.Body.Close()
 
-	_, err = checkResp(resp, err)
-	return err
+	ignored, err := checkResp(resp, err)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
diff --git a/fastly/managed_logging.go b/fastly/managed_logging.go
@@ -92,6 +92,10 @@ func (c *Client) DeleteManagedLogging(i *DeleteManagedLoggingInput) error {
 		return ErrNotImplemented
 	}
 
-	_, err := c.Delete(path, nil)
-	return err
+	ignored, err := c.Delete(path, nil)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
diff --git a/fastly/product_enablement.go b/fastly/product_enablement.go
@@ -127,6 +127,10 @@ func (c *Client) DisableProduct(i *ProductEnablementInput) error {
 
 	path := ToSafeURL("enabled-products", i.ProductID.String(), "services", i.ServiceID)
 
-	_, err := c.Delete(path, nil)
-	return err
+	ignored, err := c.Delete(path, nil)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
diff --git a/fastly/service_authorization.go b/fastly/service_authorization.go
@@ -219,7 +219,10 @@ func (c *Client) DeleteServiceAuthorization(i *DeleteServiceAuthorizationInput)
 
 	path := ToSafeURL("service-authorizations", i.ID)
 
-	_, err := c.Delete(path, nil)
-
-	return err
+	ignored, err := c.Delete(path, nil)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
diff --git a/fastly/tls_custom_activation.go b/fastly/tls_custom_activation.go
@@ -221,6 +221,10 @@ func (c *Client) DeleteTLSActivation(i *DeleteTLSActivationInput) error {
 
 	path := ToSafeURL("tls", "activations", i.ID)
 
-	_, err := c.Delete(path, nil)
-	return err
+	ignored, err := c.Delete(path, nil)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
diff --git a/fastly/tls_custom_certificate.go b/fastly/tls_custom_certificate.go
@@ -222,6 +222,10 @@ func (c *Client) DeleteCustomTLSCertificate(i *DeleteCustomTLSCertificateInput)
 
 	path := ToSafeURL("tls", "certificates", i.ID)
 
-	_, err := c.Delete(path, nil)
-	return err
+	ignored, err := c.Delete(path, nil)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
diff --git a/fastly/tls_mutual_authentication.go b/fastly/tls_mutual_authentication.go
@@ -204,6 +204,10 @@ func (c *Client) DeleteTLSMutualAuthentication(i *DeleteTLSMutualAuthenticationI
 
 	path := ToSafeURL("tls", "mutual_authentications", i.ID)
 
-	_, err := c.Delete(path, nil)
-	return err
+	ignored, err := c.Delete(path, nil)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
diff --git a/fastly/tls_platform.go b/fastly/tls_platform.go
@@ -236,6 +236,10 @@ func (c *Client) DeleteBulkCertificate(i *DeleteBulkCertificateInput) error {
 
 	path := ToSafeURL("tls", "bulk", "certificates", i.ID)
 
-	_, err := c.Delete(path, nil)
-	return err
+	ignored, err := c.Delete(path, nil)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
diff --git a/fastly/tls_private_keys.go b/fastly/tls_private_keys.go
@@ -164,6 +164,10 @@ func (c *Client) DeletePrivateKey(i *DeletePrivateKeyInput) error {
 
 	path := ToSafeURL("tls", "private_keys", i.ID)
 
-	_, err := c.Delete(path, nil)
-	return err
+	ignored, err := c.Delete(path, nil)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
diff --git a/fastly/tls_subscription.go b/fastly/tls_subscription.go
@@ -319,6 +319,10 @@ func (c *Client) DeleteTLSSubscription(i *DeleteTLSSubscriptionInput) error {
 
 	path := ToSafeURL("tls", "subscriptions", i.ID)
 
-	_, err := c.Delete(path, &ro)
-	return err
+	ignored, err := c.Delete(path, &ro)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
diff --git a/fastly/token.go b/fastly/token.go
@@ -118,10 +118,11 @@ type CreateTokenInput struct {
 
 // CreateToken creates a new resource.
 func (c *Client) CreateToken(i *CreateTokenInput) (*Token, error) {
-	_, err := c.PostForm("/sudo", i, nil)
+	ignored, err := c.PostForm("/sudo", i, nil)
 	if err != nil {
 		return nil, err
 	}
+	defer ignored.Body.Close()
 
 	resp, err := c.PostForm("/tokens", i, nil)
 	if err != nil {
@@ -194,6 +195,10 @@ func (c *Client) BatchDeleteTokens(i *BatchDeleteTokensInput) error {
 	if len(i.Tokens) == 0 {
 		return ErrMissingTokensValue
 	}
-	_, err := c.DeleteJSONAPIBulk("/tokens", i.Tokens, nil)
-	return err
+	ignored, err := c.DeleteJSONAPIBulk("/tokens", i.Tokens, nil)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
diff --git a/fastly/waf.go b/fastly/waf.go
@@ -273,8 +273,12 @@ func (c *Client) DeleteWAF(i *DeleteWAFInput) error {
 
 	path := ToSafeURL("waf", "firewalls", i.ID)
 
-	_, err := c.DeleteJSONAPI(path, i, nil)
-	return err
+	ignored, err := c.DeleteJSONAPI(path, i, nil)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
 
 // infoResponse is used to pull the links and meta from the result.

diff --git a/fastly/waf_active_rule.go b/fastly/waf_active_rule.go
@@ -298,6 +298,10 @@ func (c *Client) DeleteWAFActiveRules(i *DeleteWAFActiveRulesInput) error {
 
 	path := ToSafeURL("waf", "firewalls", i.WAFID, "versions", strconv.Itoa(i.WAFVersionNumber), "active-rules")
 
-	_, err := c.DeleteJSONAPIBulk(path, i.Rules, nil)
-	return err
+	ignored, err := c.DeleteJSONAPIBulk(path, i.Rules, nil)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
diff --git a/fastly/waf_rule_exclusion.go b/fastly/waf_rule_exclusion.go
@@ -304,6 +304,10 @@ func (c *Client) DeleteWAFRuleExclusion(i *DeleteWAFRuleExclusionInput) error {
 
 	path := ToSafeURL("waf", "firewalls", i.WAFID, "versions", strconv.Itoa(i.WAFVersionNumber), "exclusions", strconv.Itoa(i.Number))
 
-	_, err := c.Delete(path, nil)
-	return err
+	ignored, err := c.Delete(path, nil)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
diff --git a/fastly/waf_version.go b/fastly/waf_version.go
@@ -437,8 +437,12 @@ func (c *Client) DeployWAFVersion(i *DeployWAFVersionInput) error {
 
 	path := ToSafeURL("waf", "firewalls", i.WAFID, "versions", strconv.Itoa(i.WAFVersionNumber), "activate")
 
-	_, err := c.PutJSONAPI(path, &DeployWAFVersionInput{}, nil)
-	return err
+	ignored, err := c.PutJSONAPI(path, &DeployWAFVersionInput{}, nil)
+	if err != nil {
+		return err
+	}
+	defer ignored.Body.Close()
+	return nil
 }
 
 // CreateEmptyWAFVersionInput creates a new resource.