vrr/cozystack
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(controller): add HTTP status check and limit response body size

Browse source 
- Check resp.StatusCode before parsing Prometheus response
- Limit response body read to 1 MB via io.LimitReader
- Use strings.HasPrefix in test instead of fragile slice indexing
- Add TestQueryPrometheusMetricServerError for 500 responses

Co-Authored-By: Claude <noreply@anthropic.com>
Signed-off-by: ZverGuy <maximbel2003@gmail.com>
This commit is contained in:
ZverGuy 2026-04-13 18:20:12 +03:00
parent 04f340ab84
commit bfdfe989e0
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
internal/controller/workloadmonitor_controller.go
View file

@ -146,7 +146,12 @@ func (r *WorkloadMonitorReconciler) queryPrometheusMetric(ctx context.Context, p
}
defer resp.Body.Close()
body, err := io.ReadAll(resp.Body)
if resp.StatusCode != http.StatusOK {
logger.V(1).Info("Prometheus returned non-OK status", "query", promQL, "status", resp.StatusCode)
return 0
}
body, err := io.ReadAll(io.LimitReader(resp.Body, 1<<20))
if err != nil {
logger.Error(err, "Failed to read Prometheus response")
return 0

16
internal/controller/workloadmonitor_controller_test.go
View file

@ -5,6 +5,7 @@ import (
"fmt"
"net/http"
"net/http/httptest"
"strings"
"testing"
cozyv1alpha1 "github.com/cozystack/cozystack/api/v1alpha1"
@ -412,6 +413,19 @@ func TestQueryPrometheusMetricEmpty(t *testing.T) {
}
}
func TestQueryPrometheusMetricServerError(t *testing.T) {
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusInternalServerError)
}))
defer srv.Close()
reconciler := &WorkloadMonitorReconciler{PrometheusURL: srv.URL}
size := reconciler.queryPrometheusMetric(context.TODO(), `SeaweedFS_s3_bucket_size_bytes{bucket="test"}`)
if size != 0 {
t.Errorf("expected 0 for server error, got %d", size)
}
}
func TestQueryPrometheusMetricNoURL(t *testing.T) {
reconciler := &WorkloadMonitorReconciler{PrometheusURL: ""}
size := reconciler.queryPrometheusMetric(context.TODO(), `anything`)
@ -424,7 +438,7 @@ func TestReconcileBucketClaimWithPrometheus(t *testing.T) {
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
query := r.URL.Query().Get("query")
switch {
case len(query) > 0 && query[0:len("SeaweedFS_s3_bucket_physical")] == "SeaweedFS_s3_bucket_physical":
case strings.HasPrefix(query, "SeaweedFS_s3_bucket_physical"):
fmt.Fprint(w, `{"status":"success","data":{"resultType":"vector","result":[{"metric":{"bucket":"cosi-abc123"},"value":[1713000000,"2147483648"]}]}}`)
default:
fmt.Fprint(w, `{"status":"success","data":{"resultType":"vector","result":[{"metric":{"bucket":"cosi-abc123"},"value":[1713000000,"1073741824"]}]}}`)