enable http body close linter (#2479)

Author: AskAlexSharov

.golangci.yml

@@ -15,6 +15,8 @@ linters:
     - unused
     - varcheck
     - gocritic
+    - bodyclose
+#    - gosec
 #    - forcetypeassert
 
 linters-settings:
@@ -92,7 +94,19 @@ issues:
         - staticcheck
       text: "SA(1019|1029|5011)"
     # Exclude some linters from running on tests files.
-    - path: _test\.go
+    - path: test\.go
+      linters:
+        - gosec
+        - unused
+        - deadcode
+        - gocritic
+    - path: hack\.go
+      linters:
+        - gosec
+        - unused
+        - deadcode
+        - gocritic
+    - path: cmd/devp2p
       linters:
         - gosec
         - unused
@@ -102,3 +116,7 @@ issues:
       linters:
         - gosec
         - gocritic
+    - path: p2p/simulations
+      linters:
+        - gosec
+        - gocritic

cmd/rpctest/rpctest/utils.go

@@ -561,6 +561,7 @@ func print(client *http.Client, url, request string) {
 		fmt.Printf("Could not print: %v\n", err)
 		return
 	}
+	defer r.Body.Close()
 	if r.StatusCode != 200 {
 		fmt.Printf("Status %s", r.Status)
 		return

metrics/librato/client.go

@@ -90,6 +90,7 @@ func (c *LibratoClient) PostMetrics(batch Batch) (err error) {
 	if resp, err = http.DefaultClient.Do(req); err != nil {
 		return
 	}
+	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		var body []byte

node/node_test.go

@@ -447,6 +447,7 @@ func TestRegisterHandler_Successful(t *testing.T) {
 
 	// check response
 	resp := doHTTPRequest(t, httpReq)
+	defer resp.Body.Close()
 	buf := make([]byte, 7)
 	_, err = io.ReadFull(resp.Body, buf)
 	if err != nil {
@@ -607,12 +608,14 @@ func (test rpcPrefixTest) check(t *testing.T, node *Node) {
 		if resp.StatusCode != 200 {
 			t.Errorf("Error: %s: bad status code %d, want 200", path, resp.StatusCode)
 		}
+		resp.Body.Close()
 	}
 	for _, path := range test.wantNoHTTP {
 		resp := rpcRequest(t, httpBase+path)
 		if resp.StatusCode != 404 {
 			t.Errorf("Error: %s: bad status code %d, want 404", path, resp.StatusCode)
 		}
+		resp.Body.Close()
 	}
 	for _, path := range test.wantWS {
 		err := wsRequest(t, wsBase+path, "")

node/rpcstack_test.go

@@ -41,9 +41,11 @@ func TestCorsHandler(t *testing.T) {
 	url := "http://" + srv.listenAddr()
 
 	resp := rpcRequest(t, url, "origin", "test.com")
+	defer resp.Body.Close()
 	assert.Equal(t, "test.com", resp.Header.Get("Access-Control-Allow-Origin"))
 
 	resp2 := rpcRequest(t, url, "origin", "bad")
+	defer resp2.Body.Close()
 	assert.Equal(t, "", resp2.Header.Get("Access-Control-Allow-Origin"))
 }
 
@@ -54,9 +56,11 @@ func TestVhosts(t *testing.T) {
 	url := "http://" + srv.listenAddr()
 
 	resp := rpcRequest(t, url, "host", "test")
+	defer resp.Body.Close()
 	assert.Equal(t, resp.StatusCode, http.StatusOK)
 
 	resp2 := rpcRequest(t, url, "host", "bad")
+	defer resp2.Body.Close()
 	assert.Equal(t, resp2.StatusCode, http.StatusForbidden)
 }
 
@@ -269,6 +273,7 @@ func wsRequest(t *testing.T, url, browserOrigin string) error {
 	if browserOrigin != "" {
 		headers.Set("Origin", browserOrigin)
 	}
+	//nolint
 	conn, _, err := websocket.DefaultDialer.Dial(url, headers)
 	if conn != nil {
 		conn.Close()
@@ -293,6 +298,7 @@ func testCustomRequest(t *testing.T, srv *httpServer, method string) bool {
 	if err != nil {
 		return false
 	}
+	defer resp.Body.Close()
 	respBody, err := ioutil.ReadAll(resp.Body)
 	assert.NoError(t, err)
 

p2p/simulations/adapters/exec.go

@@ -331,6 +331,7 @@ func (n *ExecNode) NodeInfo() *p2p.NodeInfo {
 // ServeRPC serves RPC requests over the given connection by dialling the
 // node's WebSocket address and joining the two connections
 func (n *ExecNode) ServeRPC(clientConn *websocket.Conn) error {
+	//nolint
 	conn, _, err := websocket.DefaultDialer.Dial(n.wsAddr, nil)
 	if err != nil {
 		return err
@@ -438,9 +439,12 @@ func execP2PNode() {
 
 	// Send status to the host.
 	statusJSON, _ := json.Marshal(status)
-	if _, err := http.Post(statusURL, "application/json", bytes.NewReader(statusJSON)); err != nil {
+	r, err := http.Post(statusURL, "application/json", bytes.NewReader(statusJSON))
+	if err != nil {
 		log.Crit("Can't post startup info", "url", statusURL, "err", err)
 	}
+	r.Body.Close()
+
 	if stackErr != nil {
 		os.Exit(1)
 	}

p2p/simulations/mocker_test.go

@@ -125,6 +125,8 @@ func TestMocker(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Could not start mocker: %s", err)
 	}
+	defer resp.Body.Close()
+
 	if resp.StatusCode != 200 {
 		t.Fatalf("Invalid Status Code received for starting mocker, expected 200, got %d", resp.StatusCode)
 	}
@@ -146,15 +148,17 @@ func TestMocker(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Could not stop mocker: %s", err)
 	}
+	defer resp.Body.Close()
 	if resp.StatusCode != 200 {
 		t.Fatalf("Invalid Status Code received for stopping mocker, expected 200, got %d", resp.StatusCode)
 	}
 
 	//reset the network
-	_, err = http.Post(s.URL+"/reset", "", nil)
+	r, err := http.Post(s.URL+"/reset", "", nil)
 	if err != nil {
 		t.Fatalf("Could not reset network: %s", err)
 	}
+	r.Body.Close()
 
 	//now the number of nodes in the network should be zero
 	nodesInfo, err = client.GetNodes()

rpc/http_test.go

@@ -92,6 +92,7 @@ func confirmHTTPRequestYieldsStatusCode(t *testing.T, method, contentType, body
 	if err != nil {
 		t.Fatalf("request failed: %v", err)
 	}
+	defer resp.Body.Close()
 	confirmStatusCode(t, resp.StatusCode, expectedStatusCode)
 }
 

rpc/websocket.go

@@ -189,6 +189,7 @@ func DialWebsocketWithDialer(ctx context.Context, endpoint, origin string, diale
 		return nil, err
 	}
 	return newClient(ctx, func(ctx context.Context) (ServerCodec, error) {
+		//nolint
 		conn, resp, err := dialer.DialContext(ctx, endpoint, header)
 		if err != nil {
 			hErr := wsHandshakeError{err: err}