PostgreSQL backup tool with Point-In-Time-Recovery and restore verification
TypeScript backupbackupsdatabasedatabase-backupdevopsdockergolangkubernetesmariadbmongodbmysqlpgpostgrespostgresqls3self-hostedsystem-administrationtoolsweb-ui
FIX (backups): Throw error on parallel download token generation
Rostislav Dugin6973241e2516
diff --git a/backend/internal/features/backups/backups/controller.go b/backend/internal/features/backups/backups/controller.goindex 403fccdc..978c4e8e 100644--- a/backend/internal/features/backups/backups/controller.go+++ b/backend/internal/features/backups/backups/controller.go@@ -177,6 +177,7 @@ func (c *BackupController) CancelBackup(ctx *gin.Context) {// @Success 200 {object} backups_download.GenerateDownloadTokenResponse// @Failure 400// @Failure 401+// @Failure 409 {object} map[string]string "Download already in progress"// @Router /backups/{id}/download-token [post]func (c *BackupController) GenerateDownloadToken(ctx *gin.Context) {user, ok := users_middleware.GetUserFromContext(ctx)@@ -193,6 +194,15 @@ func (c *BackupController) GenerateDownloadToken(ctx *gin.Context) {response, err := c.backupService.GenerateDownloadToken(user, id)if err != nil {+ if err == backups_download.ErrDownloadAlreadyInProgress {+ ctx.JSON(+ http.StatusConflict,+ gin.H{+ "error": "Download already in progress for some of backups. Please wait until previous download completed or cancel it",+ },+ )+ return+ }ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})return}diff --git a/backend/internal/features/backups/backups/controller_test.go b/backend/internal/features/backups/backups/controller_test.goindex 3610001f..56825b94 100644--- a/backend/internal/features/backups/backups/controller_test.go+++ b/backend/internal/features/backups/backups/controller_test.go@@ -1051,6 +1051,88 @@ func Test_ConcurrentDownloadPrevention(t *testing.T) {)}+func Test_GenerateDownloadToken_BlockedWhenDownloadInProgress(t *testing.T) {+ router := createTestRouter()+ owner := users_testing.CreateTestUser(users_enums.UserRoleMember)+ workspace := workspaces_testing.CreateTestWorkspace("Test Workspace", owner, router)++ database, backup := createTestDatabaseWithBackups(workspace, owner, router)++ var token1Response backups_download.GenerateDownloadTokenResponse+ test_utils.MakePostRequestAndUnmarshal(+ t,+ router,+ fmt.Sprintf("/api/v1/backups/%s/download-token", backup.ID.String()),+ "Bearer "+owner.Token,+ nil,+ http.StatusOK,+ &token1Response,+ )++ downloadComplete := make(chan bool, 1)++ go func() {+ test_utils.MakeGetRequest(+ t,+ router,+ fmt.Sprintf(+ "/api/v1/backups/%s/file?token=%s",+ backup.ID.String(),+ token1Response.Token,+ ),+ "",+ http.StatusOK,+ )+ downloadComplete <- true+ }()++ time.Sleep(50 * time.Millisecond)++ service := GetBackupService()+ if !service.IsDownloadInProgress(owner.UserID) {+ t.Log("Warning: First download completed before we could test token generation blocking")+ <-downloadComplete+ return+ }++ resp := test_utils.MakePostRequest(+ t,+ router,+ fmt.Sprintf("/api/v1/backups/%s/download-token", backup.ID.String()),+ "Bearer "+owner.Token,+ nil,+ http.StatusConflict,+ )++ var errorResponse map[string]string+ err := json.Unmarshal(resp.Body, &errorResponse)+ assert.NoError(t, err)+ assert.Contains(t, errorResponse["error"], "download already in progress")++ <-downloadComplete++ time.Sleep(100 * time.Millisecond)++ var token2Response backups_download.GenerateDownloadTokenResponse+ test_utils.MakePostRequestAndUnmarshal(+ t,+ router,+ fmt.Sprintf("/api/v1/backups/%s/download-token", backup.ID.String()),+ "Bearer "+owner.Token,+ nil,+ http.StatusOK,+ &token2Response,+ )++ assert.NotEmpty(t, token2Response.Token)+ assert.NotEqual(t, token1Response.Token, token2Response.Token)++ t.Log("Database:", database.Name)+ t.Log(+ "Successfully blocked token generation during download and allowed generation after completion",+ )+}+func createTestRouter() *gin.Engine {return CreateTestRouter()}diff --git a/backend/internal/features/backups/backups/download/service.go b/backend/internal/features/backups/backups/download/service.goindex 6a451fec..0d11411a 100644--- a/backend/internal/features/backups/backups/download/service.go+++ b/backend/internal/features/backups/backups/download/service.go@@ -16,6 +16,10 @@ type DownloadTokenService struct {}func (s *DownloadTokenService) Generate(backupID, userID uuid.UUID) (string, error) {+ if s.downloadTracker.IsDownloadInProgress(userID) {+ return "", ErrDownloadAlreadyInProgress+ }+token := GenerateSecureToken()downloadToken := &DownloadToken{