Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Add an API error code for active recovery sessions

Manav Rathib589dccdcfc3
diff --git a/server/ente/errors.go b/server/ente/errors.go
index ac30f4f094..2c9fbabc1a 100644
--- a/server/ente/errors.go
+++ b/server/ente/errors.go
@@ -218,6 +218,12 @@ var ErrLinkDeviceLimitExceeded = ApiError{
HttpStatusCode: http.StatusForbidden,
}
+var ErrActiveRecoverySession = ApiError{
+ Code: ActiveRecoverySession,
+ Message: "cannot update recovery notice while there is an active recovery session",
+ HttpStatusCode: http.StatusBadRequest,
+}
+
var ErrFileInTrash = ApiError{
Code: FileInTrash,
Message: "One or more files are in trash or have been deleted, please restore them first",
@@ -282,6 +288,8 @@ const (
LinkEditNotAllowed ErrorCode = "LINK_EDIT_NOT_ALLOWED"
LinkDeviceLimitExceeded ErrorCode = "LINK_DEVICE_LIMIT_EXCEEDED"
+
+ ActiveRecoverySession ErrorCode = "ACTIVE_RECOVERY_SESSION"
)
type ApiError struct {
diff --git a/server/pkg/controller/emergency/account_owner.go b/server/pkg/controller/emergency/account_owner.go
index 640e232898..c75ecf2513 100644
--- a/server/pkg/controller/emergency/account_owner.go
+++ b/server/pkg/controller/emergency/account_owner.go
@@ -138,7 +138,7 @@ func (c *Controller) UpdateRecoveryNotice(ctx *gin.Context, userID int64, reques
return stacktrace.Propagate(err, "failed to check active recovery sessions")
}
if len(activeSessions) > 0 {
- return stacktrace.Propagate(ente.NewBadRequestWithMessage("cannot update recovery notice while there is an active recovery session"), "")
+ return stacktrace.Propagate(&ente.ErrActiveRecoverySession, "")
}
noticePeriodInHrs := request.RecoveryNoticeInDays * 24
diff --git a/server/pkg/controller/emergency/recovery_contact_test.go b/server/pkg/controller/emergency/recovery_contact_test.go
index 73d5b9393f..60f4bcbcca 100644
--- a/server/pkg/controller/emergency/recovery_contact_test.go
+++ b/server/pkg/controller/emergency/recovery_contact_test.go
@@ -3,6 +3,7 @@ package emergency
import (
"database/sql"
"errors"
+ "net/http"
"net/http/httptest"
"testing"
@@ -14,6 +15,31 @@ import (
"github.com/google/uuid"
)
+func TestUpdateRecoveryNoticeRejectsActiveSession(t *testing.T) {
+ ctx, db, ctrl := setupEmergencyRecoveryControllerTest(t)
+ ownerID := testutil.InsertUser(t, db, testutil.UserFixture{
+ UserID: 1, Email: "[email protected]", CreationTime: 1,
+ })
+ contactID := testutil.InsertUser(t, db, testutil.UserFixture{
+ UserID: 2, Email: "[email protected]", CreationTime: 1,
+ })
+ mustInsertEmergencyRecoverySession(t, db, ownerID, contactID, ente.RecoveryStatusWaiting)
+
+ err := ctrl.UpdateRecoveryNotice(ctx, ownerID, ente.UpdateRecoveryNotice{
+ EmergencyContactID: contactID, RecoveryNoticeInDays: 7,
+ })
+ var apiErr *ente.ApiError
+ if !errors.As(err, &apiErr) {
+ t.Fatalf("UpdateRecoveryNotice() error = %v, want API error", err)
+ }
+ if apiErr.Code != ente.ActiveRecoverySession || apiErr.HttpStatusCode != http.StatusBadRequest {
+ t.Fatalf("UpdateRecoveryNotice() error = %+v, want ACTIVE_RECOVERY_SESSION with HTTP 400", apiErr)
+ }
+ if apiErr.Message != "cannot update recovery notice while there is an active recovery session" {
+ t.Fatalf("UpdateRecoveryNotice() message = %q, want the message recognized by older clients", apiErr.Message)
+ }
+}
+
func TestApproveRecoveryRejectsSpoofedSessionPartiesBeforeUpdate(t *testing.T) {
ctx, db, ctrl := setupEmergencyRecoveryControllerTest(t)
diff --git a/server/pkg/repo/legacy_kit/repository.go b/server/pkg/repo/legacy_kit/repository.go
index 49b12eb4f0..22c2789365 100644
--- a/server/pkg/repo/legacy_kit/repository.go
+++ b/server/pkg/repo/legacy_kit/repository.go
@@ -430,7 +430,7 @@ func (r *Repository) UpdateRecoveryNotice(ctx context.Context, userID int64, kit
return false, err
}
if session != nil {
- return false, stacktrace.Propagate(ente.NewBadRequestWithMessage("cannot update recovery notice while there is an active recovery session"), "")
+ return false, stacktrace.Propagate(&ente.ErrActiveRecoverySession, "")
}
result, err := tx.ExecContext(ctx, `
UPDATE legacy_kit
diff --git a/server/pkg/repo/legacy_kit/repository_test.go b/server/pkg/repo/legacy_kit/repository_test.go
index ba17e5b7dd..e5d04c516f 100644
--- a/server/pkg/repo/legacy_kit/repository_test.go
+++ b/server/pkg/repo/legacy_kit/repository_test.go
@@ -3,6 +3,7 @@ package legacy_kit
import (
"database/sql"
"errors"
+ "net/http"
"testing"
"github.com/ente/museum/ente"
@@ -223,6 +224,8 @@ func TestUpdateRecoveryNoticeRejectsActiveSession(t *testing.T) {
var apiErr *ente.ApiError
require.True(t, errors.As(err, &apiErr))
+ require.Equal(t, ente.ActiveRecoverySession, apiErr.Code)
+ require.Equal(t, http.StatusBadRequest, apiErr.HttpStatusCode)
require.Equal(t, "cannot update recovery notice while there is an active recovery session", apiErr.Message)
var noticePeriod int32