Improve error handling for file closure and clean storage directory path

Author: sebastianrath

github/server/legacy.go

@@ -117,7 +117,9 @@ func (s *Server) handleLegacyUpload(w http.ResponseWriter, r *http.Request) {
 		f.Seek(start, io.SeekStart)
 	}
 	n, copyErr := io.Copy(f, r.Body)
-	f.Close()
+	if err := f.Close(); err != nil && copyErr == nil {
+		copyErr = err
+	}
 	if copyErr != nil {
 		http.Error(w, "storage error", http.StatusInternalServerError)
 		return
@@ -238,13 +240,13 @@ func (s *Server) handleLegacyListFiles(w http.ResponseWriter, r *http.Request) {
 // GET /artifact/{path...}
 func (s *Server) handleLegacyDownload(w http.ResponseWriter, r *http.Request) {
 	fullPath := r.PathValue("path")
-	idx := strings.IndexByte(fullPath, '/')
-	if idx < 0 {
+	before, after, ok := strings.Cut(fullPath, "/")
+	if !ok {
 		http.Error(w, "invalid path", http.StatusBadRequest)
 		return
 	}
-	cidStr := fullPath[:idx]
-	filePath := fullPath[idx+1:]
+	cidStr := before
+	filePath := after
 
 	cid, err := strconv.ParseInt(cidStr, 10, 64)
 	if err != nil {

github/server/server.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -586,7 +587,11 @@ func (s *Server) handleBlobUpload(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, "storage error", http.StatusInternalServerError)
 			return
 		}
-		defer f.Close()
+		defer func() {
+			if err := f.Close(); err != nil {
+				log.Printf("closing blob file: %v", err)
+			}
+		}()
 		if _, err := io.Copy(f, r.Body); err != nil {
 			http.Error(w, "storage error", http.StatusInternalServerError)
 			return
@@ -604,7 +609,11 @@ func (s *Server) handleBlobUpload(w http.ResponseWriter, r *http.Request) {
 			http.Error(w, "storage error", http.StatusInternalServerError)
 			return
 		}
-		defer f.Close()
+		defer func() {
+			if err := f.Close(); err != nil {
+				log.Printf("closing blob file: %v", err)
+			}
+		}()
 		if _, err := io.Copy(f, r.Body); err != nil {
 			http.Error(w, "storage error", http.StatusInternalServerError)
 			return

github/server/start.go

@@ -52,11 +52,7 @@ func StartServer(cfg Config) (*RunningServer, error) {
 		cfg.OIDCSub = "repo:local/repo:ref:refs/heads/main"
 	}
 
-	absDir, err := filepath.Abs(cfg.StorageDir)
-	if err != nil {
-		return nil, fmt.Errorf("invalid storage directory: %w", err)
-	}
-	cfg.StorageDir = absDir
+	cfg.StorageDir = filepath.Clean(cfg.StorageDir)
 
 	if err := os.MkdirAll(cfg.StorageDir, 0o755); err != nil {
 		return nil, fmt.Errorf("creating storage directory: %w", err)