fix: stabilize transfer expiry and link checks

Author: czyt

internal/transfer/service_test.go

@@ -595,7 +595,7 @@ func TestExpirySchedulerDeletesIdleShareAndCompletedJobWithoutAccessOrRestart(t
 	db, storage, box, owner, server, _ := newTransferServiceData(t)
 	client := db.TailClient.Create().SetUserID(owner.ID).SetName("expiry-client").SetServerTokenCipher([]byte("cipher")).SetTokenHint("hint").SaveX(t.Context())
 	service := newLoopbackTransferService(t, db, storage, box, owner.ID, client.ID, server.ID)
-	expiresAt := time.Now().Add(250 * time.Millisecond)
+	expiresAt := time.Now().Add(5 * time.Second)
 
 	idleShare, err := service.CreateShare(t.Context(), owner.ID, CreateShareInput{ServerID: server.ID, ExpiresAt: expiresAt})
 	if err != nil {
@@ -627,7 +627,7 @@ func TestExpirySchedulerDeletesIdleShareAndCompletedJobWithoutAccessOrRestart(t
 	}
 	waitForTransferJobStatus(t, db, job.ID, transferjob.StatusCompleted)
 
-	deadline := time.Now().Add(3 * time.Second)
+	deadline := expiresAt.Add(3 * time.Second)
 	for time.Now().Before(deadline) {
 		shareExists := db.TransferShare.Query().Where(transfershare.IDEQ(idleShare.ID)).ExistX(t.Context())
 		jobExists := db.TransferJob.Query().Where(transferjob.IDEQ(job.ID)).ExistX(t.Context())
@@ -2610,7 +2610,14 @@ func waitForTransferJobStatus(t *testing.T, db *ent.Client, jobID string, want t
 	t.Helper()
 	deadline := time.Now().Add(5 * time.Second)
 	for {
-		status := db.TransferJob.GetX(t.Context(), jobID).Status
+		row, err := db.TransferJob.Get(t.Context(), jobID)
+		if ent.IsNotFound(err) {
+			t.Fatalf("job %s was deleted before reaching status %s", jobID, want)
+		}
+		if err != nil {
+			t.Fatalf("load job %s while waiting for status %s: %v", jobID, want, err)
+		}
+		status := row.Status
 		if status == want {
 			return
 		}

internal/transfer/storage.go

@@ -991,19 +991,24 @@ func (s *Storage) CleanupTemps(ctx context.Context, ownerID, shareID string) (re
 		if linkErr != nil {
 			return removed, linkErr
 		}
-		if available && links == 2 {
-			outcome, recoverErr := s.recoverTempAlias(shareRoot, entry.Name())
-			if outcome.aliasRemoved {
-				removed++
-				directoryDirty = true
-			}
-			if recoverErr != nil {
-				return removed, recoverErr
+		if available {
+			if links == 2 {
+				outcome, recoverErr := s.recoverTempAlias(shareRoot, entry.Name())
+				if outcome.aliasRemoved {
+					removed++
+					directoryDirty = true
+				}
+				if recoverErr != nil {
+					return removed, recoverErr
+				}
+				if !outcome.finalValidated {
+					return removed, ErrFileChanged
+				}
+				continue
 			}
-			if !outcome.finalValidated {
-				return removed, ErrFileChanged
+			if links != 1 {
+				return removed, ErrMultipleLinks
 			}
-			continue
 		}
 		if err := validateStoredFileInfo(info); err != nil {
 			return removed, err

internal/transfer/storage_test.go

@@ -51,7 +51,7 @@ func TestNewStorageRequiresSafeRootAndCreatesPrivateDirectories(t *testing.T) {
 		if err != nil {
 			t.Fatalf("Stat(%q): %v", path, err)
 		}
-		if got := info.Mode().Perm(); got != 0o700 {
+		if got := info.Mode().Perm(); runtime.GOOS != "windows" && got != 0o700 {
 			t.Errorf("mode for %q = %o, want 700", path, got)
 		}
 	}
@@ -825,7 +825,7 @@ func TestStorePublishesAtomicallyAndRemoveReleasesCommittedQuota(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Stat stored file: %v", err)
 	}
-	if got := info.Mode().Perm(); got != 0o600 {
+	if got := info.Mode().Perm(); runtime.GOOS != "windows" && got != 0o600 {
 		t.Errorf("stored mode = %o, want 600", got)
 	}
 	if got := requireUsage(t, storage); got != (QuotaUsage{OwnerBytes: 3, OwnerFiles: 1, ShareBytes: 3, ShareFiles: 1}) {