CC review

Author: fredmnl

BackupRepair/sproxyd.go

@@ -50,7 +50,10 @@ func (s *SproxydClient) Head(key string) (*SproxydObjectInfo, error) {
 		return nil, fmt.Errorf("HEAD %s returned %d", url, resp.StatusCode)
 	}
 
-	cl, _ := strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64)
+	cl, err := strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64)
+	if err != nil || cl <= 0 {
+		return nil, fmt.Errorf("HEAD %s: missing or invalid Content-Length header", url)
+	}
 	return &SproxydObjectInfo{
 		ContentLength: cl,
 		UserMD:        resp.Header.Get("X-Scal-Usermd"),
@@ -75,7 +78,11 @@ func (s *SproxydClient) Get(key string) (io.ReadCloser, *SproxydObjectInfo, erro
 		return nil, nil, fmt.Errorf("GET %s returned %d", url, resp.StatusCode)
 	}
 
-	cl, _ := strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64)
+	cl, err := strconv.ParseInt(resp.Header.Get("Content-Length"), 10, 64)
+	if err != nil || cl <= 0 {
+		resp.Body.Close()
+		return nil, nil, fmt.Errorf("GET %s: missing or invalid Content-Length header", url)
+	}
 	info := &SproxydObjectInfo{
 		ContentLength: cl,
 		UserMD:        resp.Header.Get("X-Scal-Usermd"),
@@ -100,11 +107,11 @@ func (s *SproxydClient) Put(key string, body io.Reader, info *SproxydObjectInfo)
 	if err != nil {
 		return fmt.Errorf("PUT %s: %w", url, err)
 	}
-	defer resp.Body.Close()
-	io.Copy(io.Discard, resp.Body)
+	respBody, _ := io.ReadAll(resp.Body)
+	resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("PUT %s returned %d", url, resp.StatusCode)
+		return fmt.Errorf("PUT %s returned %d: %s", url, resp.StatusCode, string(respBody))
 	}
 	return nil
 }