Skip to content

armgit / ente

Public Imported from GitHub
0

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

Reject stale login credential state

Neeraj Guptae29c1b60b2c3
diff --git a/server/pkg/controller/user/userauth.go b/server/pkg/controller/user/userauth.go
index 23dccc9b6a..25513268a6 100644
--- a/server/pkg/controller/user/userauth.go
+++ b/server/pkg/controller/user/userauth.go
@@ -652,6 +652,20 @@ func (c *UserController) onVerificationSuccess(context *gin.Context, email strin
if err != nil {
return ente.EmailAuthorizationResponse{}, stacktrace.Propagate(err, "")
}
+ if srpAuth == nil {
+ srpAuth, err = c.UserAuthRepo.GetSRPAuthEntity(context, userID)
+ if err != nil && !errors.Is(err, sql.ErrNoRows) {
+ return ente.EmailAuthorizationResponse{}, stacktrace.Propagate(err, "")
+ }
+ }
+ keyAttributesValue, err := c.UserRepo.GetKeyAttributes(userID)
+ if err != nil && !errors.Is(err, sql.ErrNoRows) {
+ return ente.EmailAuthorizationResponse{}, stacktrace.Propagate(err, "")
+ }
+ var keyAttributes *ente.KeyAttributes
+ if err == nil {
+ keyAttributes = &keyAttributesValue
+ }
var passKeySessionID, twoFactorSessionID, accountsUrl string
if hasPasskeys {
@@ -666,7 +680,7 @@ func (c *UserController) onVerificationSuccess(context *gin.Context, email strin
twoFactorSessionID = auth.GenerateURLSafeRandomString(TwoFactorSessionIDLength)
}
if hasPasskeys || isTwoFactorEnabled {
- err = c.UserAuthRepo.AddLoginResult(context, userID, srpAuth, app, "", "", "", passKeySessionID, twoFactorSessionID, time.Microseconds()+TwoFactorValidityDurationInMicroSeconds)
+ err = c.UserAuthRepo.AddLoginResult(context, userID, srpAuth, keyAttributes, app, "", "", "", passKeySessionID, twoFactorSessionID, time.Microseconds()+TwoFactorValidityDurationInMicroSeconds)
if err != nil {
return ente.EmailAuthorizationResponse{}, stacktrace.Propagate(err, "")
}
@@ -680,23 +694,18 @@ func (c *UserController) onVerificationSuccess(context *gin.Context, email strin
}
token := auth.GenerateURLSafeRandomString(TokenLength)
- keyAttributes, err := c.UserRepo.GetKeyAttributes(userID)
- if err != nil {
- if errors.Is(err, sql.ErrNoRows) {
- // user creation is pending on key attributes set based on the password.
- // No need to send login notification
- if err := c.ensureStorageWarningDeletionLoginAllowed(userID, app); err != nil {
- return ente.EmailAuthorizationResponse{}, err
- }
- err = c.UserAuthRepo.AddLoginResult(context, userID, srpAuth, app, token,
- network.GetClientIP(context), context.Request.UserAgent(), "", "", 0)
- if err != nil {
- return ente.EmailAuthorizationResponse{}, stacktrace.Propagate(err, "")
- }
- return ente.EmailAuthorizationResponse{ID: userID, Token: token}, nil
- } else {
+ if keyAttributes == nil {
+ // user creation is pending on key attributes set based on the password.
+ // No need to send login notification
+ if err := c.ensureStorageWarningDeletionLoginAllowed(userID, app); err != nil {
+ return ente.EmailAuthorizationResponse{}, err
+ }
+ err = c.UserAuthRepo.AddLoginResult(context, userID, srpAuth, nil, app, token,
+ network.GetClientIP(context), context.Request.UserAgent(), "", "", 0)
+ if err != nil {
return ente.EmailAuthorizationResponse{}, stacktrace.Propagate(err, "")
}
+ return ente.EmailAuthorizationResponse{ID: userID, Token: token}, nil
}
var encryptedToken string
encryptedToken, err = crypto.GetEncryptedToken(token, keyAttributes.PublicKey)
@@ -708,7 +717,7 @@ func (c *UserController) onVerificationSuccess(context *gin.Context, email strin
if err = c.ensureStorageWarningDeletionLoginAllowed(userID, app); err != nil {
return ente.EmailAuthorizationResponse{}, err
}
- err = c.UserAuthRepo.AddLoginResult(context, userID, srpAuth, app, token, ip, userAgent, "", "", 0)
+ err = c.UserAuthRepo.AddLoginResult(context, userID, srpAuth, keyAttributes, app, token, ip, userAgent, "", "", 0)
if err == nil {
err = c.notifyLogin(context, userID, app, ip, userAgent)
}
@@ -717,7 +726,7 @@ func (c *UserController) onVerificationSuccess(context *gin.Context, email strin
}
return ente.EmailAuthorizationResponse{
ID: userID,
- KeyAttributes: &keyAttributes,
+ KeyAttributes: keyAttributes,
EncryptedToken: encryptedToken,
}, nil
diff --git a/server/pkg/repo/srp.go b/server/pkg/repo/srp.go
index 2796128ae0..29f0ed77f2 100644
--- a/server/pkg/repo/srp.go
+++ b/server/pkg/repo/srp.go
@@ -124,7 +124,7 @@ func (repo *UserAuthRepository) InsertOrUpdateSRPAuthAndKeyAttr(ctx context.Cont
return nil, stacktrace.Propagate(err, "")
}
defer tx.Rollback()
- if err = lockUserForLogin(ctx, tx, userID, nil); err != nil {
+ if err = lockUserForLogin(ctx, tx, userID, nil, nil); err != nil {
return nil, err
}
if len(currentTokenHash) != 0 {
diff --git a/server/pkg/repo/userauth.go b/server/pkg/repo/userauth.go
index 28111d7078..5992676683 100644
--- a/server/pkg/repo/userauth.go
+++ b/server/pkg/repo/userauth.go
@@ -174,7 +174,7 @@ func (repo *UserAuthRepository) AddToken(userID int64, app ente.App, token strin
return stacktrace.Propagate(err, "")
}
-func (repo *UserAuthRepository) AddLoginResult(ctx context.Context, userID int64, srpAuth *ente.SRPAuthEntity,
+func (repo *UserAuthRepository) AddLoginResult(ctx context.Context, userID int64, srpAuth *ente.SRPAuthEntity, expectedKeyAttributes *ente.KeyAttributes,
app ente.App, token, ip, userAgent, passkeySessionID, twoFactorSessionID string, expirationTime int64,
) error {
tx, err := repo.DB.BeginTx(ctx, nil)
@@ -182,7 +182,7 @@ func (repo *UserAuthRepository) AddLoginResult(ctx context.Context, userID int64
return stacktrace.Propagate(err, "")
}
defer tx.Rollback()
- if err = lockUserForLogin(ctx, tx, userID, srpAuth); err != nil {
+ if err = lockUserForLogin(ctx, tx, userID, srpAuth, expectedKeyAttributes); err != nil {
return err
}
now := time.Microseconds()
@@ -213,7 +213,7 @@ func (repo *UserAuthRepository) AddTokenForPendingLogin(ctx context.Context, use
return stacktrace.Propagate(err, "")
}
defer tx.Rollback()
- if err = lockUserForLogin(ctx, tx, userID, nil); err != nil {
+ if err = lockUserForLogin(ctx, tx, userID, nil, nil); err != nil {
return err
}
now := time.Microseconds()
@@ -242,25 +242,35 @@ func (repo *UserAuthRepository) AddTokenForPendingLogin(ctx context.Context, use
return stacktrace.Propagate(tx.Commit(), "")
}
-func lockUserForLogin(ctx context.Context, tx *sql.Tx, userID int64, srpAuth *ente.SRPAuthEntity) error {
+func lockUserForLogin(ctx context.Context, tx *sql.Tx, userID int64, srpAuth *ente.SRPAuthEntity, expectedKeyAttributes *ente.KeyAttributes) error {
var lockedUserID int64
if err := tx.QueryRowContext(ctx, `SELECT user_id FROM users WHERE user_id = $1 FOR NO KEY UPDATE`, userID).Scan(&lockedUserID); err != nil {
return stacktrace.Propagate(err, "")
}
- if srpAuth == nil {
- return nil
- }
- var currentSRPUserID uuid.UUID
- var currentSRPSalt string
- var currentSRPVerifier string
- if err := tx.QueryRowContext(ctx, `SELECT srp_user_id, salt, verifier FROM srp_auth WHERE user_id = $1`, userID).Scan(&currentSRPUserID, &currentSRPSalt, &currentSRPVerifier); err != nil {
- if err == sql.ErrNoRows {
+ if srpAuth != nil {
+ var currentSRPUserID uuid.UUID
+ var currentSRPSalt string
+ var currentSRPVerifier string
+ if err := tx.QueryRowContext(ctx, `SELECT srp_user_id, salt, verifier FROM srp_auth WHERE user_id = $1`, userID).Scan(&currentSRPUserID, &currentSRPSalt, &currentSRPVerifier); err != nil {
+ if err == sql.ErrNoRows {
+ return stacktrace.Propagate(ente.ErrInvalidPassword, "stale SRP login")
+ }
+ return stacktrace.Propagate(err, "")
+ }
+ if currentSRPUserID != srpAuth.SRPUserID || currentSRPSalt != srpAuth.Salt || currentSRPVerifier != srpAuth.Verifier {
return stacktrace.Propagate(ente.ErrInvalidPassword, "stale SRP login")
}
- return stacktrace.Propagate(err, "")
}
- if currentSRPUserID != srpAuth.SRPUserID || currentSRPSalt != srpAuth.Salt || currentSRPVerifier != srpAuth.Verifier {
- return stacktrace.Propagate(ente.ErrInvalidPassword, "stale SRP login")
+ if expectedKeyAttributes != nil {
+ var matches bool
+ err := tx.QueryRowContext(ctx, `SELECT EXISTS (SELECT 1 FROM key_attributes WHERE user_id = $1 AND kek_salt = $2 AND encrypted_key = $3 AND key_decryption_nonce = $4 AND mem_limit = $5 AND ops_limit = $6)`,
+ userID, expectedKeyAttributes.KEKSalt, expectedKeyAttributes.EncryptedKey, expectedKeyAttributes.KeyDecryptionNonce, expectedKeyAttributes.MemLimit, expectedKeyAttributes.OpsLimit).Scan(&matches)
+ if err != nil {
+ return stacktrace.Propagate(err, "")
+ }
+ if !matches {
+ return stacktrace.Propagate(ente.ErrAuthenticationRequired, "key attributes changed during login")
+ }
}
return nil
}
diff --git a/server/pkg/repo/userauth_test.go b/server/pkg/repo/userauth_test.go
index 27c7a7e63e..0da2ab3bd2 100644
--- a/server/pkg/repo/userauth_test.go
+++ b/server/pkg/repo/userauth_test.go
@@ -146,3 +146,51 @@ func TestAddTokenForPendingLoginConsumesPasskeyRecoverySession(t *testing.T) {
t.Fatalf("replayed recovery returned %v, want no rows", err)
}
}
+
+func TestAddLoginResultRejectsStaleCredentials(t *testing.T) {
+ testutil.WithServerRoot(t)
+
+ db := testutil.RequireTestDB(t)
+ testutil.ResetTables(t, db)
+ t.Cleanup(func() { testutil.ResetTables(t, db) })
+
+ userID := testutil.InsertUser(t, db, testutil.UserFixture{Email: "[email protected]", CreationTime: 1})
+ keyAttributes := ente.KeyAttributes{
+ KEKSalt: "old-salt", EncryptedKey: "old-key", KeyDecryptionNonce: "old-nonce",
+ PublicKey: "public-key", EncryptedSecretKey: "secret-key", SecretKeyDecryptionNonce: "secret-nonce",
+ MemLimit: 1, OpsLimit: 1,
+ }
+ if err := (&UserRepository{DB: db}).SetKeyAttributes(userID, keyAttributes); err != nil {
+ t.Fatal(err)
+ }
+ if _, err := db.Exec(`INSERT INTO srp_auth(user_id, srp_user_id, salt, verifier) VALUES($1, '00000000-0000-0000-0000-000000000001', 'old-srp-salt', 'old-verifier')`, userID); err != nil {
+ t.Fatal(err)
+ }
+ repo := &UserAuthRepository{DB: db}
+ srpAuth, err := repo.GetSRPAuthEntity(context.Background(), userID)
+ if err != nil {
+ t.Fatal(err)
+ }
+ if _, err := db.Exec(`UPDATE key_attributes SET encrypted_key = 'new-key' WHERE user_id = $1`, userID); err != nil {
+ t.Fatal(err)
+ }
+
+ err = repo.AddLoginResult(context.Background(), userID, srpAuth, &keyAttributes, ente.Photos, "token", "", "", "", "", 0)
+ if !errors.Is(err, ente.ErrAuthenticationRequired) {
+ t.Fatalf("stale key attributes returned %v", err)
+ }
+ if _, err = db.Exec(`UPDATE key_attributes SET encrypted_key = 'old-key' WHERE user_id = $1`, userID); err != nil {
+ t.Fatal(err)
+ }
+ if _, err = db.Exec(`UPDATE srp_auth SET verifier = 'new-verifier' WHERE user_id = $1`, userID); err != nil {
+ t.Fatal(err)
+ }
+ err = repo.AddLoginResult(context.Background(), userID, srpAuth, &keyAttributes, ente.Photos, "token", "", "", "", "", 0)
+ if !errors.Is(err, ente.ErrInvalidPassword) {
+ t.Fatalf("stale SRP returned %v", err)
+ }
+ var tokenCount int
+ if err := db.QueryRow(`SELECT COUNT(*) FROM tokens WHERE user_id = $1`, userID).Scan(&tokenCount); err != nil || tokenCount != 0 {
+ t.Fatalf("token count = %d, err = %v", tokenCount, err)
+ }
+}