Fix s3 image loading memory leak (#910)

pkg/api/routes_image.go

@@ -44,6 +44,7 @@ func (rs imageRoutes) image(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, err.Error(), http.StatusNotFound)
 		return
 	}
+	defer reader.Close()
 
 	if databaseImage.Width == -1 {
 		w.Header().Add("Content-Type", "image/svg+xml")

pkg/image/file.go

@@ -1,7 +1,6 @@
 package image
 
 import (
-	"bytes"
 	"io"
 	"os"
 
@@ -12,7 +11,7 @@ import (
 
 type FileBackend struct{}
 
-func (s *FileBackend) WriteFile(file *bytes.Reader, image *models.Image) error {
+func (s *FileBackend) WriteFile(file []byte, image *models.Image) error {
 	if err := config.ValidateImageLocation(); err != nil {
 		return err
 	}
@@ -26,14 +25,9 @@ func (s *FileBackend) WriteFile(file *bytes.Reader, image *models.Image) error {
 		return nil
 	}
 
-	buf := new(bytes.Buffer)
-	if _, err := buf.ReadFrom(file); err != nil {
-		return err
-	}
-
 	// write the file
 	path := GetImagePath(fileDir, image.Checksum)
-	if err := os.WriteFile(path, buf.Bytes(), os.FileMode(0644)); err != nil {
+	if err := os.WriteFile(path, file, os.FileMode(0644)); err != nil {
 		_ = os.Remove(path)
 		return err
 	}
@@ -45,7 +39,7 @@ func (s *FileBackend) DestroyFile(image *models.Image) error {
 	return os.Remove(GetImagePath(config.GetImageLocation(), image.Checksum))
 }
 
-func (s *FileBackend) ReadFile(image models.Image) (io.Reader, error) {
+func (s *FileBackend) ReadFile(image models.Image) (io.ReadCloser, error) {
 	fileDir := config.GetImageLocation()
 	path := GetImagePath(fileDir, image.Checksum)
 	return os.Open(path)

pkg/image/image_backend.go

@@ -1,14 +1,13 @@
 package image
 
 import (
-	"bytes"
 	"io"
 
 	"github.com/stashapp/stash-box/pkg/models"
 )
 
 type Backend interface {
-	WriteFile(file *bytes.Reader, image *models.Image) error
+	WriteFile(file []byte, image *models.Image) error
 	DestroyFile(image *models.Image) error
-	ReadFile(image models.Image) (io.Reader, error)
+	ReadFile(image models.Image) (io.ReadCloser, error)
 }

pkg/image/image_service.go

@@ -13,7 +13,7 @@ type BackendService interface {
 	Destroy(input models.ImageDestroyInput) error
 	DestroyUnusedImages() error
 	DestroyUnusedImage(imageID uuid.UUID) error
-	Read(image models.Image) (io.Reader, error)
+	Read(image models.Image) (io.ReadCloser, error)
 }
 
 func GetService(repo models.ImageRepo) BackendService {

pkg/image/s3.go

@@ -15,7 +15,7 @@ import (
 
 type S3Backend struct{}
 
-func (s *S3Backend) WriteFile(file *bytes.Reader, image *models.Image) error {
+func (s *S3Backend) WriteFile(file []byte, image *models.Image) error {
 	s3config := config.GetS3Config()
 	headers := s3config.UploadHeaders
 
@@ -27,11 +27,7 @@ func (s *S3Backend) WriteFile(file *bytes.Reader, image *models.Image) error {
 		return fmt.Errorf("creating minio client: %w", err)
 	}
 
-	buf := new(bytes.Buffer)
-	if _, err = buf.ReadFrom(file); err != nil {
-		return fmt.Errorf("reading from file: %w", err)
-	}
-	if err := uploadS3File(*minioClient, buf.Bytes(), s3config.Bucket, image.ID.String(), headers); err != nil {
+	if err := uploadS3File(*minioClient, file, s3config.Bucket, image.ID.String(), headers); err != nil {
 		return fmt.Errorf("uploading to s3: %w", err)
 	}
 
@@ -84,7 +80,7 @@ func uploadS3File(client minio.Client, file []byte, bucket string, id string, he
 	return err
 }
 
-func (s *S3Backend) ReadFile(image models.Image) (io.Reader, error) {
+func (s *S3Backend) ReadFile(image models.Image) (io.ReadCloser, error) {
 	ctx := context.TODO()
 
 	s3config := config.GetS3Config()

pkg/image/service.go

@@ -86,10 +86,7 @@ func (s *Service) Create(input models.ImageCreateInput) (*models.Image, error) {
 			return nil, err
 		}
 
-		if _, err = fileReader.Seek(0, 0); err != nil {
-			return nil, err
-		}
-		if err := s.Backend.WriteFile(fileReader, &newImage); err != nil {
+		if err := s.Backend.WriteFile(file, &newImage); err != nil {
 			return nil, err
 		}
 	} else if input.URL != nil {
@@ -169,6 +166,6 @@ func (s *Service) DestroyUnusedImage(imageID uuid.UUID) error {
 	return nil
 }
 
-func (s *Service) Read(image models.Image) (io.Reader, error) {
+func (s *Service) Read(image models.Image) (io.ReadCloser, error) {
 	return s.Backend.ReadFile(image)
 }