Address code review comments

- Sort chunks by offset before assembling final file
- Use chunk.Offset directly instead of recalculating
- Return error on invalid file ID instead of skipping
- Require Content-Length header for PATCH requests
- Use fs.option.Cipher for encryption setting
- Detect MIME type from data using http.DetectContentType
- Fix concurrency group for push events in workflow
- Use os.Interrupt instead of Kill for graceful shutdown in tests

.github/workflows/tus-tests.yml

@@ -15,7 +15,7 @@ on:
       - 'test/tus/**'
 
 concurrency:
-  group: ${{ github.head_ref }}/tus-tests
+  group: ${{ github.head_ref || github.ref }}/tus-tests
   cancel-in-progress: true
 
 permissions:

test/tus/tus_integration_test.go

@@ -36,15 +36,15 @@ type TestCluster struct {
 
 func (c *TestCluster) Stop() {
 	if c.filerCmd != nil && c.filerCmd.Process != nil {
-		c.filerCmd.Process.Kill()
+		c.filerCmd.Process.Signal(os.Interrupt)
 		c.filerCmd.Wait()
 	}
 	if c.volumeCmd != nil && c.volumeCmd.Process != nil {
-		c.volumeCmd.Process.Kill()
+		c.volumeCmd.Process.Signal(os.Interrupt)
 		c.volumeCmd.Wait()
 	}
 	if c.masterCmd != nil && c.masterCmd.Process != nil {
-		c.masterCmd.Process.Kill()
+		c.masterCmd.Process.Signal(os.Interrupt)
 		c.masterCmd.Wait()
 	}
 }

weed/server/filer_server_tus_handlers.go

@@ -222,6 +222,12 @@ func (fs *FilerServer) tusPatchHandler(w http.ResponseWriter, r *http.Request, u
 		return
 	}
 
+	// TUS requires Content-Length header for PATCH requests
+	if r.ContentLength < 0 {
+		http.Error(w, "Content-Length header required", http.StatusBadRequest)
+		return
+	}
+
 	// Write data
 	bytesWritten, err := fs.tusWriteData(ctx, session, uploadOffset, r.Body, r.ContentLength)
 	if err != nil {
@@ -309,12 +315,15 @@ func (fs *FilerServer) tusWriteData(ctx context.Context, session *TusSession, of
 		return 0, fmt.Errorf("create uploader: %w", uploaderErr)
 	}
 
+	// Detect MIME type from data
+	mimeType := http.DetectContentType(buf.Bytes())
+
 	uploadResult, uploadErr, _ := uploader.Upload(ctx, bytes.NewReader(buf.Bytes()), &operation.UploadOption{
 		UploadUrl:         urlLocation,
 		Filename:          "",
-		Cipher:            false,
+		Cipher:            fs.option.Cipher,
 		IsInputCompressed: false,
-		MimeType:          "",
+		MimeType:          mimeType,
 		PairMap:           nil,
 		Jwt:               auth,
 	})

weed/server/filer_server_tus_session.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"sort"
 	"time"
 
 	"github.com/seaweedfs/seaweedfs/weed/filer"
@@ -191,26 +192,28 @@ func (fs *FilerServer) completeTusUpload(ctx context.Context, session *TusSessio
 		return fmt.Errorf("upload incomplete: offset=%d, expected=%d", session.Offset, session.Size)
 	}
 
+	// Sort chunks by offset to ensure correct order
+	sort.Slice(session.Chunks, func(i, j int) bool {
+		return session.Chunks[i].Offset < session.Chunks[j].Offset
+	})
+
 	// Assemble file chunks in order
 	var fileChunks []*filer_pb.FileChunk
-	var offset int64 = 0
 
 	for _, chunk := range session.Chunks {
 		fid, fidErr := filer_pb.ToFileIdObject(chunk.FileId)
 		if fidErr != nil {
-			glog.Warningf("Invalid file ID %s: %v", chunk.FileId, fidErr)
-			continue
+			return fmt.Errorf("invalid file ID %s at offset %d: %w", chunk.FileId, chunk.Offset, fidErr)
 		}
 
 		fileChunk := &filer_pb.FileChunk{
 			FileId:       chunk.FileId,
-			Offset:       offset,
+			Offset:       chunk.Offset,
 			Size:         uint64(chunk.Size),
 			ModifiedTsNs: chunk.UploadAt,
 			Fid:          fid,
 		}
 		fileChunks = append(fileChunks, fileChunk)
-		offset += chunk.Size
 	}
 
 	// Determine content type from metadata