Fixed racy mutation that prevented file restoration in edge case, better test, fixed spelling (#262)

* Fix racy mutation, spelling
* Use timeout instead of fixed time, change delay to internally use ms instead of s

Author: Forceu

internal/storage/FileServing.go

@@ -810,30 +810,32 @@ func DeleteFile(fileId string, deleteSource bool) bool {
 
 // DeleteFileSchedule schedules a file for deletion after a specified delay and optionally deletes its source.
 // Returns true if scheduling is successful, false otherwise.
-func DeleteFileSchedule(fileId string, delaySeconds int, deleteSource bool) bool {
+func DeleteFileSchedule(fileId string, delayMs int, deleteSource bool) bool {
 	if fileId == "" {
 		return false
 	}
 	file, ok := database.GetMetaDataById(fileId)
 	if !ok {
 		return false
 	}
-	deletionTime := time.Now().Add(time.Duration(delaySeconds) * time.Second).Unix()
+	deletionTime := time.Now().Add(time.Duration(delayMs) * time.Millisecond).Unix()
 	file.PendingDeletion = deletionTime
 	database.SaveMetaData(file)
-	go func() {
+	// Explicit parameter to avoid accidental changes
+	go func(id string, timestamp int64) {
 		select {
-		case <-time.After(time.Duration(delaySeconds) * time.Second):
+		case <-time.After(time.Duration(delayMs) * time.Millisecond):
 		}
-		file, ok = database.GetMetaDataById(fileId)
-		if !ok {
+		// A new models.File needs to be assigned to avoid a racy mutation
+		retrievedFile, exists := database.GetMetaDataById(id)
+		if !exists {
 			return
 		}
 		// To prevent race conditions, it is checked if the deletion time is the same time that was originally set
-		if file.PendingDeletion == deletionTime {
-			DeleteFile(fileId, deleteSource)
+		if retrievedFile.PendingDeletion == timestamp {
+			DeleteFile(id, deleteSource)
 		}
-	}()
+	}(fileId, deletionTime)
 	return true
 }
 

internal/storage/chunking/Chunking.go

@@ -68,11 +68,11 @@ func ParseChunkInfo(r *http.Request, isApiCall bool) (ChunkInfo, error) {
 	if len(info.UUID) < 10 {
 		return ChunkInfo{}, errors.New("invalid uuid submitted, needs to be at least 10 characters long")
 	}
-	info.UUID = sanitseUuid(info.UUID)
+	info.UUID = sanitiseUuid(info.UUID)
 	return info, nil
 }
 
-func sanitseUuid(input string) string {
+func sanitiseUuid(input string) string {
 	reg, err := regexp.Compile("[^a-zA-Z0-9-]")
 	helper.Check(err)
 	return reg.ReplaceAllString(input, "_")

internal/webserver/api/Api.go

@@ -345,7 +345,7 @@ func apiDeleteFile(w http.ResponseWriter, r requestParser, user models.User) {
 	if request.DelaySeconds == 0 {
 		_ = storage.DeleteFile(request.Id, true)
 	} else {
-		_ = storage.DeleteFileSchedule(request.Id, request.DelaySeconds, true)
+		_ = storage.DeleteFileSchedule(request.Id, request.DelaySeconds*1000, true)
 	}
 }
 

internal/webserver/api/Api_test.go

@@ -1227,10 +1227,9 @@ func TestRestoreFile(t *testing.T) {
 	testRestoreFileCall(t, apiKey.Id, fileUser.Id, 200, fileUser.ToJsonResult(config.ServerUrl, config.IncludeFilename))
 	testRestoreFileCall(t, apiKey.Id, fileAdmin.Id, 401, `{"Result":"error","ErrorMessage":"No permission to restore this file"}`)
 
-	storage.DeleteFileSchedule(fileUser.Id, 1, true)
-	storage.DeleteFileSchedule(fileAdmin.Id, 1, true)
+	storage.DeleteFileSchedule(fileUser.Id, 500, true)
+	storage.DeleteFileSchedule(fileAdmin.Id, 500, true)
 
-	time.Sleep(400 * time.Millisecond)
 	file, ok := database.GetMetaDataById(fileUser.Id)
 	test.IsEqualBool(t, ok, true)
 	test.IsEqualBool(t, file.PendingDeletion != 0, true)
@@ -1248,12 +1247,38 @@ func TestRestoreFile(t *testing.T) {
 	test.IsEqualBool(t, ok, true)
 	test.IsEqualBool(t, file.PendingDeletion != 0, true)
 
-	time.Sleep(600 * time.Millisecond)
-	file, ok = database.GetMetaDataById(fileUser.Id)
-	test.IsEqualBool(t, ok, true)
+	startTime := time.Now()
+	for {
+		if time.Since(startTime) > 10*time.Second {
+			t.Errorf("Timeout waiting for file to be deleted")
+			break
+		}
+		_, ok = database.GetMetaDataById(fileAdmin.Id)
+		if !ok {
+			break
+		} else {
+			time.Sleep(50 * time.Millisecond)
+		}
+	}
+
+	startTime = time.Now()
+	for {
+		if time.Since(startTime) > 10*time.Second {
+			t.Errorf("Timeout waiting for file to be restored")
+			break
+		}
+		file, ok = database.GetMetaDataById(fileUser.Id)
+		if !ok {
+			t.Errorf("File was deleted")
+			break
+		}
+		if file.PendingDeletion == 0 {
+			break
+		} else {
+			time.Sleep(50 * time.Millisecond)
+		}
+	}
 	test.IsEqualInt64(t, file.PendingDeletion, 0)
-	_, ok = database.GetMetaDataById(fileAdmin.Id)
-	test.IsEqualBool(t, ok, false)
 	storage.DeleteFile(fileUser.Id, true)
 }