RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-26 08:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review feedback: limit number of bytes read under error.

Browse Source
This commit is contained in:
Tom Wilkie 2017-06-01 11:21:48 +01:00
parent 46abe8cbf2
commit 24a113bb09
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
storage/remote/client.go
View File

@ -17,6 +17,7 @@ import (
"bufio"
"bytes"
"fmt"
"io"
"io/ioutil"
"net/http"
"time"
@ -32,6 +33,8 @@ import (
"github.com/prometheus/prometheus/util/httputil"
)
const maxErrMsgLen = 256
// Client allows reading and writing from/to a remote HTTP endpoint.
type Client struct {
index int // Used to differentiate metrics.
@ -118,7 +121,7 @@ func (c *Client) Store(samples model.Samples) error {
defer httpResp.Body.Close()
if httpResp.StatusCode/100 != 2 {
scanner := bufio.NewScanner(httpResp.Body)
scanner := bufio.NewScanner(io.LimitReader(httpResp.Body, maxErrMsgLen))
line := ""
if scanner.Scan() {
line = scanner.Text()

11
storage/remote/client_test.go
View File

@ -19,6 +19,7 @@ import (
"net/http/httptest"
"net/url"
"reflect"
"strings"
"testing"
"time"
@ -26,6 +27,8 @@ import (
"github.com/prometheus/prometheus/config"
)
var longErrMessage = strings.Repeat("error message", maxErrMsgLen)
func TestStoreHTTPErrorHandling(t *testing.T) {
tests := []struct {
code int
@ -37,22 +40,22 @@ func TestStoreHTTPErrorHandling(t *testing.T) {
},
{
code: 300,
err: fmt.Errorf("server returned HTTP status 300 Multiple Choices: test error"),
err: fmt.Errorf("server returned HTTP status 300 Multiple Choices: " + longErrMessage[:maxErrMsgLen]),
},
{
code: 404,
err: fmt.Errorf("server returned HTTP status 404 Not Found: test error"),
err: fmt.Errorf("server returned HTTP status 404 Not Found: " + longErrMessage[:maxErrMsgLen]),
},
{
code: 500,
err: recoverableError{fmt.Errorf("server returned HTTP status 500 Internal Server Error: test error")},
err: recoverableError{fmt.Errorf("server returned HTTP status 500 Internal Server Error: " + longErrMessage[:maxErrMsgLen])},
},
}
for i, test := range tests {
server := httptest.NewServer(
http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
http.Error(w, "test error", test.code)
http.Error(w, longErrMessage, test.code)
}),
)