Skip to content

armgit / ente

Public Imported from GitHub
0

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

[server] Bind SRP setup completion to users (#14335)

neeraj-pilote9b671e8d77e
diff --git a/server/pkg/controller/user/srp.go b/server/pkg/controller/user/srp.go
index ba45ee7b29..c64422f20c 100644
--- a/server/pkg/controller/user/srp.go
+++ b/server/pkg/controller/user/srp.go
@@ -54,7 +54,7 @@ func (c *UserController) SetupSRP(context *gin.Context, userID int64, req ente.S
func (c *UserController) CompleteSRPSetup(context *gin.Context, req ente.CompleteSRPSetupRequest) (*ente.CompleteSRPSetupResponse, error) {
userID := auth.GetUserID(context.Request.Header)
- setup, err := c.UserAuthRepo.GetTempSRPSetupEntity(context, req.SetupID)
+ setup, err := c.UserAuthRepo.GetTempSRPSetupEntity(context, req.SetupID, userID)
if err != nil {
return nil, stacktrace.Propagate(err, "")
}
@@ -99,7 +99,7 @@ func (c *UserController) updateSrpAndKeyAttributes(ctx *gin.Context,
if err := req.Validate(); err != nil {
return nil, stacktrace.Propagate(err, "invalid request")
}
- setup, err := c.UserAuthRepo.GetTempSRPSetupEntity(ctx, req.SetupID)
+ setup, err := c.UserAuthRepo.GetTempSRPSetupEntity(ctx, req.SetupID, userID)
if err != nil {
return nil, stacktrace.Propagate(err, "")
}
diff --git a/server/pkg/controller/user/srp_test.go b/server/pkg/controller/user/srp_test.go
index cbbfb6cd25..3446627f5a 100644
--- a/server/pkg/controller/user/srp_test.go
+++ b/server/pkg/controller/user/srp_test.go
@@ -125,7 +125,7 @@ func TestVerifySRPSessionRejectsAnotherAccountAndEnabledEmailMFA(t *testing.T) {
require.Equal(t, 1, tokens)
}
-func TestCompleteSRPSetupPreservesSessionBinding(t *testing.T) {
+func TestCompleteSRPSetupRequiresOwnerAndPreservesSessionBinding(t *testing.T) {
testutil.WithServerRoot(t)
db := testutil.RequireTestDB(t)
testutil.ResetTables(t, db)
@@ -152,9 +152,17 @@ func TestCompleteSRPSetupPreservesSessionBinding(t *testing.T) {
b, err := convertStringToBytes(setup.SRPB)
require.NoError(t, err)
client.SetB(b)
+ otherUserID := testutil.InsertUser(t, db, testutil.UserFixture{Email: "[email protected]", CreationTime: 1})
+ ctx.Request.Header.Set("X-Auth-User-ID", strconv.FormatInt(otherUserID, 10))
response, err := controller.CompleteSRPSetup(ctx, ente.CompleteSRPSetupRequest{
SetupID: setup.SetupID, SRPM1: convertBytesToString(client.ComputeM1()),
})
+ require.Error(t, err)
+ require.Nil(t, response)
+ ctx.Request.Header.Set("X-Auth-User-ID", strconv.FormatInt(userID, 10))
+ response, err = controller.CompleteSRPSetup(ctx, ente.CompleteSRPSetupRequest{
+ SetupID: setup.SetupID, SRPM1: convertBytesToString(client.ComputeM1()),
+ })
require.NoError(t, err)
m2, err := convertStringToBytes(response.SRPM2)
require.NoError(t, err)
diff --git a/server/pkg/repo/srp.go b/server/pkg/repo/srp.go
index 2d74d232be..63b0b5eb30 100644
--- a/server/pkg/repo/srp.go
+++ b/server/pkg/repo/srp.go
@@ -94,9 +94,9 @@ func (repo *UserAuthRepository) InsertTempSRPSetup(ctx context.Context, req ente
return &id, stacktrace.Propagate(err, "")
}
-func (repo *UserAuthRepository) GetTempSRPSetupEntity(ctx context.Context, setUpID uuid.UUID) (*ente.SRPSetupEntity, error) {
+func (repo *UserAuthRepository) GetTempSRPSetupEntity(ctx context.Context, setUpID uuid.UUID, userID int64) (*ente.SRPSetupEntity, error) {
result := ente.SRPSetupEntity{}
- row := repo.DB.QueryRowContext(ctx, `SELECT id, session_id, user_id, srp_user_id, salt, verifier FROM temp_srp_setup WHERE id = $1`, setUpID)
+ row := repo.DB.QueryRowContext(ctx, `SELECT id, session_id, user_id, srp_user_id, salt, verifier FROM temp_srp_setup WHERE id = $1 AND user_id = $2`, setUpID, userID)
err := row.Scan(&result.ID, &result.SessionID, &result.UserID, &result.SRPUserID, &result.Salt, &result.Verifier)
if err != nil {
return nil, stacktrace.Propagate(err, "")