fix(imgproxy): properly handle missing last-modified

picosh · Jan 15, 2025 · 0c80ce2 · 0c80ce2
1 parent b60f3d1
commit 0c80ce2
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 39 deletions.
diff --git a/cmd/scripts/clean-object-store/clean.go b/cmd/scripts/clean-object-store/clean.go
@@ -45,7 +45,7 @@ func main() {
 
 	var st storage.StorageServe
 	var err error
-	st, err = storage.NewStorageMinio(picoCfg.MinioURL, picoCfg.MinioUser, picoCfg.MinioPass)
+	st, err = storage.NewStorageMinio(logger, picoCfg.MinioURL, picoCfg.MinioUser, picoCfg.MinioPass)
 	bail(err)
 
 	logger.Info("fetching all users")

diff --git a/feeds/api.go b/feeds/api.go
@@ -81,9 +81,9 @@ func StartApiServer() {
 	var st storage.StorageServe
 	var err error
 	if cfg.MinioURL == "" {
-		st, err = storage.NewStorageFS(cfg.StorageDir)
+		st, err = storage.NewStorageFS(cfg.Logger, cfg.StorageDir)
 	} else {
-		st, err = storage.NewStorageMinio(cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
+		st, err = storage.NewStorageMinio(cfg.Logger, cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
 	}
 
 	if err != nil {

diff --git a/feeds/ssh.go b/feeds/ssh.go
@@ -68,9 +68,9 @@ func StartSshServer() {
 	var st storage.StorageServe
 	var err error
 	if cfg.MinioURL == "" {
-		st, err = storage.NewStorageFS(cfg.StorageDir)
+		st, err = storage.NewStorageFS(cfg.Logger, cfg.StorageDir)
 	} else {
-		st, err = storage.NewStorageMinio(cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
+		st, err = storage.NewStorageMinio(cfg.Logger, cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
 	}
 
 	if err != nil {

diff --git a/imgs/api.go b/imgs/api.go
@@ -313,9 +313,9 @@ func StartApiServer() {
 	var st storage.StorageServe
 	var err error
 	if cfg.MinioURL == "" {
-		st, err = storage.NewStorageFS(cfg.StorageDir)
+		st, err = storage.NewStorageFS(cfg.Logger, cfg.StorageDir)
 	} else {
-		st, err = storage.NewStorageMinio(cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
+		st, err = storage.NewStorageMinio(cfg.Logger, cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
 	}
 
 	if err != nil {

diff --git a/imgs/ssh.go b/imgs/ssh.go
@@ -265,7 +265,7 @@ func StartSshServer() {
 	logger := shared.CreateLogger("imgs")
 	logger.Info("bootup", "registry", registryUrl, "minio", minioUrl)
 	dbh := postgres.NewDB(dbUrl, logger)
-	st, err := storage.NewStorageMinio(minioUrl, minioUser, minioPass)
+	st, err := storage.NewStorageMinio(logger, minioUrl, minioUser, minioPass)
 	if err != nil {
 		panic(err)
 	}

diff --git a/pastes/api.go b/pastes/api.go
@@ -373,9 +373,9 @@ func StartApiServer() {
 	var st storage.StorageServe
 	var err error
 	if cfg.MinioURL == "" {
-		st, err = storage.NewStorageFS(cfg.StorageDir)
+		st, err = storage.NewStorageFS(cfg.Logger, cfg.StorageDir)
 	} else {
-		st, err = storage.NewStorageMinio(cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
+		st, err = storage.NewStorageMinio(cfg.Logger, cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
 	}
 
 	if err != nil {

diff --git a/pastes/ssh.go b/pastes/ssh.go
@@ -67,9 +67,9 @@ func StartSshServer() {
 	var st storage.StorageServe
 	var err error
 	if cfg.MinioURL == "" {
-		st, err = storage.NewStorageFS(cfg.StorageDir)
+		st, err = storage.NewStorageFS(cfg.Logger, cfg.StorageDir)
 	} else {
-		st, err = storage.NewStorageMinio(cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
+		st, err = storage.NewStorageMinio(cfg.Logger, cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
 	}
 
 	if err != nil {

diff --git a/pgs/ssh.go b/pgs/ssh.go
@@ -64,9 +64,9 @@ func StartSshServer() {
 	var st storage.StorageServe
 	var err error
 	if cfg.MinioURL == "" {
-		st, err = storage.NewStorageFS(cfg.StorageDir)
+		st, err = storage.NewStorageFS(cfg.Logger, cfg.StorageDir)
 	} else {
-		st, err = storage.NewStorageMinio(cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
+		st, err = storage.NewStorageMinio(cfg.Logger, cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
 	}
 
 	if err != nil {

diff --git a/pgs/web.go b/pgs/web.go
@@ -53,9 +53,9 @@ func StartApiServer() {
 	var st storage.StorageServe
 	var err error
 	if cfg.MinioURL == "" {
-		st, err = storage.NewStorageFS(cfg.StorageDir)
+		st, err = storage.NewStorageFS(cfg.Logger, cfg.StorageDir)
 	} else {
-		st, err = storage.NewStorageMinio(cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
+		st, err = storage.NewStorageMinio(cfg.Logger, cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
 	}
 
 	if err != nil {
@@ -472,8 +472,8 @@ func (web *WebRouter) ServeAsset(fname string, opts *storage.ImgProcessOpts, fro
 		bucket, err = web.Storage.GetBucket(shared.GetImgsBucketName(user.ID))
 	} else {
 		bucket, err = web.Storage.GetBucket(shared.GetAssetBucketName(user.ID))
-		project, err := web.Dbpool.FindProjectByName(user.ID, props.ProjectName)
-		if err != nil {
+		project, perr := web.Dbpool.FindProjectByName(user.ID, props.ProjectName)
+		if perr != nil {
 			logger.Info("project not found")
 			http.Error(w, "project not found", http.StatusNotFound)
 			return
@@ -499,7 +499,7 @@ func (web *WebRouter) ServeAsset(fname string, opts *storage.ImgProcessOpts, fro
 	}
 
 	if err != nil {
-		logger.Info("bucket not found")
+		logger.Error("bucket not found", "err", err)
 		http.Error(w, "bucket not found", http.StatusNotFound)
 		return
 	}

diff --git a/pgs/web_asset_handler.go b/pgs/web_asset_handler.go
@@ -131,15 +131,19 @@ func (h *ApiAssetHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		attempts = append(attempts, fp.Filepath)
-		logger = logger.With("filename", fp.Filepath)
 		var c io.ReadCloser
+		fpath := fp.Filepath
+		attempts = append(attempts, fpath)
+		logger = logger.With("object", fpath)
+		logger.Info("serving object")
 		c, info, err = h.Storage.ServeObject(
 			h.Bucket,
-			fp.Filepath,
+			fpath,
 			h.ImgProcessOpts,
 		)
-		if err == nil {
+		if err != nil {
+			logger.Error("serving object", "err", err)
+		} else {
 			contents = c
 			assetFilepath = fp.Filepath
 			status = fp.Status

diff --git a/prose/api.go b/prose/api.go
@@ -898,9 +898,9 @@ func StartApiServer() {
 	var st storage.StorageServe
 	var err error
 	if cfg.MinioURL == "" {
-		st, err = storage.NewStorageFS(cfg.StorageDir)
+		st, err = storage.NewStorageFS(cfg.Logger, cfg.StorageDir)
 	} else {
-		st, err = storage.NewStorageMinio(cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
+		st, err = storage.NewStorageMinio(cfg.Logger, cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
 	}
 
 	if err != nil {

diff --git a/prose/ssh.go b/prose/ssh.go
@@ -69,9 +69,9 @@ func StartSshServer() {
 	var st storage.StorageServe
 	var err error
 	if cfg.MinioURL == "" {
-		st, err = storage.NewStorageFS(cfg.StorageDir)
+		st, err = storage.NewStorageFS(cfg.Logger, cfg.StorageDir)
 	} else {
-		st, err = storage.NewStorageMinio(cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
+		st, err = storage.NewStorageMinio(cfg.Logger, cfg.MinioURL, cfg.MinioUser, cfg.MinioPass)
 	}
 
 	if err != nil {

diff --git a/shared/storage/fs.go b/shared/storage/fs.go
@@ -3,6 +3,7 @@ package storage
 import (
 	"fmt"
 	"io"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"strings"
@@ -12,14 +13,15 @@ import (
 
 type StorageFS struct {
 	*sst.StorageFS
+	Logger *slog.Logger
 }
 
-func NewStorageFS(dir string) (*StorageFS, error) {
+func NewStorageFS(logger *slog.Logger, dir string) (*StorageFS, error) {
 	st, err := sst.NewStorageFS(dir)
 	if err != nil {
 		return nil, err
 	}
-	return &StorageFS{st}, nil
+	return &StorageFS{st, logger}, nil
 }
 
 func (s *StorageFS) ServeObject(bucket sst.Bucket, fpath string, opts *ImgProcessOpts) (io.ReadCloser, *sst.ObjectInfo, error) {
@@ -37,7 +39,7 @@ func (s *StorageFS) ServeObject(bucket sst.Bucket, fpath string, opts *ImgProces
 	} else {
 		filePath := filepath.Join(bucket.Name, fpath)
 		dataURL := fmt.Sprintf("s3://%s", filePath)
-		rc, info, err = HandleProxy(dataURL, opts)
+		rc, info, err = HandleProxy(s.Logger, dataURL, opts)
 	}
 	if err != nil {
 		return nil, nil, err

diff --git a/shared/storage/minio.go b/shared/storage/minio.go
@@ -3,6 +3,7 @@ package storage
 import (
 	"fmt"
 	"io"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"strings"
@@ -12,14 +13,15 @@ import (
 
 type StorageMinio struct {
 	*sst.StorageMinio
+	Logger *slog.Logger
 }
 
-func NewStorageMinio(address, user, pass string) (*StorageMinio, error) {
+func NewStorageMinio(logger *slog.Logger, address, user, pass string) (*StorageMinio, error) {
 	st, err := sst.NewStorageMinio(address, user, pass)
 	if err != nil {
 		return nil, err
 	}
-	return &StorageMinio{st}, nil
+	return &StorageMinio{st, logger}, nil
 }
 
 func (s *StorageMinio) ServeObject(bucket sst.Bucket, fpath string, opts *ImgProcessOpts) (io.ReadCloser, *sst.ObjectInfo, error) {
@@ -37,7 +39,7 @@ func (s *StorageMinio) ServeObject(bucket sst.Bucket, fpath string, opts *ImgPro
 	} else {
 		filePath := filepath.Join(bucket.Name, fpath)
 		dataURL := fmt.Sprintf("s3://%s", filePath)
-		rc, info, err = HandleProxy(dataURL, opts)
+		rc, info, err = HandleProxy(s.Logger, dataURL, opts)
 	}
 	if err != nil {
 		return nil, nil, err

diff --git a/shared/storage/proxy.go b/shared/storage/proxy.go
@@ -7,6 +7,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
+	"log/slog"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -202,7 +203,7 @@ func (img *ImgProcessOpts) String() string {
 	return processOpts
 }
 
-func HandleProxy(dataURL string, opts *ImgProcessOpts) (io.ReadCloser, *storage.ObjectInfo, error) {
+func HandleProxy(logger *slog.Logger, dataURL string, opts *ImgProcessOpts) (io.ReadCloser, *storage.ObjectInfo, error) {
 	imgProxyURL := os.Getenv("IMGPROXY_URL")
 	imgProxySalt := os.Getenv("IMGPROXY_SALT")
 	imgProxyKey := os.Getenv("IMGPROXY_KEY")
@@ -242,13 +243,15 @@ func HandleProxy(dataURL string, opts *ImgProcessOpts) (io.ReadCloser, *storage.
 	lastModified := res.Header.Get("Last-Modified")
 	parsedTime, err := time.Parse(time.RFC1123, lastModified)
 	if err != nil {
-		return nil, nil, fmt.Errorf("decoding last-modified: %w", err)
+		logger.Error("decoding last-modified", "err", err)
 	}
 	info := &storage.ObjectInfo{
-		Size:         res.ContentLength,
-		LastModified: parsedTime,
-		ETag:         trimEtag(res.Header.Get("etag")),
-		Metadata:     res.Header,
+		Size:     res.ContentLength,
+		ETag:     trimEtag(res.Header.Get("etag")),
+		Metadata: res.Header,
+	}
+	if !parsedTime.IsZero() {
+		info.LastModified = parsedTime
 	}
 
 	return res.Body, info, nil