π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Simplify emergency recovery updates
Neeraj Gupta814aa09b74f1
diff --git a/server/pkg/controller/emergency/controller.go b/server/pkg/controller/emergency/controller.goindex ed3b8d186b..032d6afb12 100644--- a/server/pkg/controller/emergency/controller.go+++ b/server/pkg/controller/emergency/controller.go@@ -41,8 +41,8 @@ func (c *Controller) UpdateContact(ctx *gin.Context,if req.State == ente.UserRevokedContact {status = ente.RecoveryStatusRejected}- for _, session := range cancelled {- go c.sendRecoveryNotification(ctx, session.UserID, session.EmergencyContactID, status, nil)+ for range cancelled {+ go c.sendRecoveryNotification(ctx, req.UserID, req.EmergencyContactID, status, nil)}go c.sendContactNotification(ctx, req.UserID, req.EmergencyContactID, req.State)}diff --git a/server/pkg/repo/emergency/recovery.go b/server/pkg/repo/emergency/recovery.goindex 75359f0114..5728872288 100644--- a/server/pkg/repo/emergency/recovery.go+++ b/server/pkg/repo/emergency/recovery.go@@ -54,11 +54,11 @@ func (repo *Repository) InsertIntoRecovery(ctx context.Context, contact ente.Conlogrus.Warn("notice period is less than 24 hours")return false, nil, ente.NewBadRequestWithMessage("notice period should be greater than 24 hours")}- activeSessions, err := getActiveSessionsForUpdate(ctx, tx, contact.UserID, contact.EmergencyContactID)+ hasActiveSession, err := hasActiveRecovery(ctx, tx, contact.UserID, contact.EmergencyContactID)if err != nil {return false, nil, err}- if len(activeSessions) > 0 {+ if hasActiveSession {return false, contactRow, nil}waitTime := time.MicrosecondsAfterHours(contactRow.NoticePeriodInHrs)@@ -96,24 +96,6 @@ FROM emergency_recovery WHERE (user_id=$1 OR emergency_contact_id=$1) AND statureturn sessions, nil}-func (repo *Repository) GetActiveSessions(ctx *gin.Context, userID int64, emergencyContactID int64) ([]*RecoverRow, error) {- rows, err := repo.DB.QueryContext(ctx, `SELECT id, user_id, emergency_contact_id, status, wait_till, next_reminder_at, created_at-FROM emergency_recovery WHERE user_id=$1 and emergency_contact_id=$2 AND status= ANY($3)`, userID, emergencyContactID, pq.Array([]ente.RecoveryStatus{ente.RecoveryStatusWaiting, ente.RecoveryStatusReady}))- if err != nil {- return nil, stacktrace.Propagate(err, "")- }- defer rows.Close()- var sessions []*RecoverRow- for rows.Next() {- var row RecoverRow- if err := rows.Scan(&row.ID, &row.UserID, &row.EmergencyContactID, &row.Status, &row.WaitTill, &row.NextReminderAt, &row.CreatedAt); err != nil {- return nil, stacktrace.Propagate(err, "")- }- sessions = append(sessions, &row)- }- return sessions, nil-}-func (r *Repository) GetActiveRecoveryForNotification() (*[]RecoverRow, error) {rows, err := r.DB.Query(`SELECT id, user_id, emergency_contact_id, status, wait_till, next_reminder_at, created_at@@ -158,47 +140,21 @@ func (repo *Repository) UpdateRecoveryStatusForID(ctx context.Context, sessionID}func (repo *Repository) UpdateRecoveryStatusForSession(ctx context.Context, sessionID uuid.UUID, userID, emergencyContactID int64, status ente.RecoveryStatus) (bool, error) {- tx, err := repo.DB.BeginTx(ctx, nil)- if err != nil {- return false, stacktrace.Propagate(err, "failed to start recovery status update")- }- defer tx.Rollback()- if err = lockOwnerForUpdate(ctx, tx, userID); err != nil {- return false, err- }- if _, err = getContactForUpdate(ctx, tx, userID, emergencyContactID); err != nil {- return false, err- }- session, err := getRecoveryForUpdate(ctx, tx, sessionID)- if err != nil {- if err == sql.ErrNoRows {- return false, nil- }- return false, err- }- if session.UserID != userID || session.EmergencyContactID != emergencyContactID {- return false, nil- }validPrevStatus := validPreviousStatus(status)var result sql.Result+ var err errorif status == ente.RecoveryStatusReady {- result, err = tx.ExecContext(ctx, `UPDATE emergency_recovery SET status=$1, wait_till=$2 WHERE id=$3 and user_id=$4 and emergency_contact_id=$5 and status = ANY($6)`,+ result, err = repo.DB.ExecContext(ctx, `UPDATE emergency_recovery SET status=$1, wait_till=$2 WHERE id=$3 and user_id=$4 and emergency_contact_id=$5 and status = ANY($6)`,status, time.Microseconds(), sessionID, userID, emergencyContactID, pq.Array(validPrevStatus))} else {- result, err = tx.ExecContext(ctx, `UPDATE emergency_recovery SET status=$1 WHERE id=$2 and user_id=$3 and emergency_contact_id=$4 and status = ANY($5)`,+ result, err = repo.DB.ExecContext(ctx, `UPDATE emergency_recovery SET status=$1 WHERE id=$2 and user_id=$3 and emergency_contact_id=$4 and status = ANY($5)`,status, sessionID, userID, emergencyContactID, pq.Array(validPrevStatus))}if err != nil {return false, stacktrace.Propagate(err, "")}rows, _ := result.RowsAffected()- if rows == 0 {- return false, nil- }- if err = tx.Commit(); err != nil {- return false, stacktrace.Propagate(err, "failed to commit recovery status update")- }- return true, nil+ return rows > 0, nil}func (repo *Repository) CompleteRecovery(ctx context.Context, tx *sql.Tx, sessionID uuid.UUID, userID, emergencyContactID int64) error {@@ -233,23 +189,12 @@ func (repo *Repository) GetRecoverRowByID(ctx context.Context, sessionID uuid.UUreturn &row, nil}-func getActiveSessionsForUpdate(ctx context.Context, tx *sql.Tx, userID, emergencyContactID int64) ([]*RecoverRow, error) {- rows, err := tx.QueryContext(ctx, `SELECT id, user_id, emergency_contact_id, status, wait_till, next_reminder_at, created_at- FROM emergency_recovery WHERE user_id=$1 AND emergency_contact_id=$2 AND status=ANY($3) ORDER BY id FOR UPDATE`,- userID, emergencyContactID, pq.Array([]ente.RecoveryStatus{ente.RecoveryStatusWaiting, ente.RecoveryStatusReady}))- if err != nil {- return nil, stacktrace.Propagate(err, "failed to lock active recovery sessions")- }- defer rows.Close()- var sessions []*RecoverRow- for rows.Next() {- var session RecoverRow- if err := rows.Scan(&session.ID, &session.UserID, &session.EmergencyContactID, &session.Status, &session.WaitTill, &session.NextReminderAt, &session.CreatedAt); err != nil {- return nil, stacktrace.Propagate(err, "failed to scan active recovery session")- }- sessions = append(sessions, &session)- }- return sessions, stacktrace.Propagate(rows.Err(), "failed to read active recovery sessions")+func hasActiveRecovery(ctx context.Context, tx *sql.Tx, userID, emergencyContactID int64) (bool, error) {+ var exists bool+ err := tx.QueryRowContext(ctx, `SELECT EXISTS (+ SELECT 1 FROM emergency_recovery WHERE user_id=$1 AND emergency_contact_id=$2 AND status=ANY($3))`,+ userID, emergencyContactID, pq.Array([]ente.RecoveryStatus{ente.RecoveryStatusWaiting, ente.RecoveryStatusReady})).Scan(&exists)+ return exists, stacktrace.Propagate(err, "failed to check active recovery sessions")}func getRecoveryForUpdate(ctx context.Context, tx *sql.Tx, sessionID uuid.UUID) (*RecoverRow, error) {diff --git a/server/pkg/repo/emergency/repository.go b/server/pkg/repo/emergency/repository.goindex 3e93c38df9..2a21ea9157 100644--- a/server/pkg/repo/emergency/repository.go+++ b/server/pkg/repo/emergency/repository.go@@ -97,63 +97,50 @@ func (r *Repository) GetActiveEmergencyContact(ctx context.Context, userID int64func (r *Repository) UpdateState(ctx context.Context,userID int64,emergencyContactID int64,- newState ente.ContactState) (bool, []*RecoverRow, error) {+ newState ente.ContactState) (bool, int64, error) {tx, err := r.DB.BeginTx(ctx, nil)if err != nil {- return false, nil, stacktrace.Propagate(err, "failed to start emergency contact update")+ return false, 0, stacktrace.Propagate(err, "failed to start emergency contact update")}defer tx.Rollback()if err = lockOwnerForUpdate(ctx, tx, userID); err != nil {- return false, nil, err+ return false, 0, err}- contact, err := getContactForUpdate(ctx, tx, userID, emergencyContactID)- if err == sql.ErrNoRows {- return false, nil, nil+ allowedPreviousStates := getValidPreviousState(newState)+ var result sql.Result+ if newState == ente.ContactAccepted || newState == ente.UserInvitedContact {+ result, err = tx.ExecContext(ctx, `UPDATE emergency_contact SET state=$1 WHERE user_id=$2 and emergency_contact_id=$3 and state = ANY($4)`,+ newState, userID, emergencyContactID, pq.Array(allowedPreviousStates))+ } else {+ result, err = tx.ExecContext(ctx, `UPDATE emergency_contact SET state=$1, encrypted_key = NULL WHERE user_id=$2 and emergency_contact_id=$3 and state = ANY($4)`,+ newState, userID, emergencyContactID, pq.Array(allowedPreviousStates))}if err != nil {- return false, nil, err+ return false, 0, stacktrace.Propagate(err, "")}- validState := false- for _, state := range getValidPreviousState(newState) {- if contact.State == state {- validState = true- break- }- }- if !validState {- return false, nil, nil+ count, err := result.RowsAffected()+ if err != nil || count == 0 {+ return false, 0, stacktrace.Propagate(err, "")}- var cancelled []*RecoverRow+ var cancelled int64if newState == ente.ContactDenied || newState == ente.ContactLeft || newState == ente.UserRevokedContact {- cancelled, err = getActiveSessionsForUpdate(ctx, tx, userID, emergencyContactID)+ status := ente.RecoveryStatusStopped+ if newState == ente.UserRevokedContact {+ status = ente.RecoveryStatusRejected+ }+ result, err = tx.ExecContext(ctx, `UPDATE emergency_recovery SET status=$1 WHERE user_id=$2 AND emergency_contact_id=$3 AND status = ANY($4)`,+ status, userID, emergencyContactID, pq.Array([]ente.RecoveryStatus{ente.RecoveryStatusWaiting, ente.RecoveryStatusReady}))if err != nil {- return false, nil, err+ return false, 0, stacktrace.Propagate(err, "failed to cancel emergency recovery")}- if len(cancelled) > 0 {- status := ente.RecoveryStatusStopped- if newState == ente.UserRevokedContact {- status = ente.RecoveryStatusRejected- }- if _, err = tx.ExecContext(ctx, `UPDATE emergency_recovery SET status=$1 WHERE user_id=$2 AND emergency_contact_id=$3 AND status = ANY($4)`,- status, userID, emergencyContactID, pq.Array([]ente.RecoveryStatus{ente.RecoveryStatusWaiting, ente.RecoveryStatusReady})); err != nil {- return false, nil, stacktrace.Propagate(err, "failed to cancel emergency recovery")- }+ cancelled, err = result.RowsAffected()+ if err != nil {+ return false, 0, stacktrace.Propagate(err, "")}}-- if newState == ente.ContactAccepted || newState == ente.UserInvitedContact {- _, err = tx.ExecContext(ctx, `UPDATE emergency_contact SET state=$1 WHERE user_id=$2 and emergency_contact_id=$3`,- newState, userID, emergencyContactID)- } else {- _, err = tx.ExecContext(ctx, `UPDATE emergency_contact SET state=$1, encrypted_key = NULL WHERE user_id=$2 and emergency_contact_id=$3`,- newState, userID, emergencyContactID)- }- if err != nil {- return false, nil, stacktrace.Propagate(err, "")- }if err = tx.Commit(); err != nil {- return false, nil, stacktrace.Propagate(err, "failed to commit emergency contact update")+ return false, 0, stacktrace.Propagate(err, "failed to commit emergency contact update")}return true, cancelled, nil}@@ -174,11 +161,11 @@ func (r *Repository) UpdateRecoveryNotice(ctx context.Context,if err != nil && err != sql.ErrNoRows {return err}- activeSessions, err := getActiveSessionsForUpdate(ctx, tx, userID, emergencyContactID)+ hasActiveSession, err := hasActiveRecovery(ctx, tx, userID, emergencyContactID)if err != nil {return err}- if len(activeSessions) > 0 {+ if hasActiveSession {return stacktrace.Propagate(&ente.ErrActiveRecoverySession, "")}if contact == nil || contact.State != ente.UserInvitedContact && contact.State != ente.ContactAccepted {