Skip to content

armgit / ente

Public Imported from GitHub
0

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

Defer platform routing from push session cleanup

AmanRajSinghMourya7a285e8673a8
diff --git a/server/ente/push.go b/server/ente/push.go
index 4dba725249..31f77fd0f8 100644
--- a/server/ente/push.go
+++ b/server/ente/push.go
@@ -6,9 +6,8 @@ import (
)
type PushTokenRequest struct {
- FCMToken string `json:"fcmToken" binding:"required"`
- APNSToken string `json:"apnsToken"`
- Platform *string `json:"platform" binding:"required,oneof=ios android"`
+ FCMToken string `json:"fcmToken" binding:"required"`
+ APNSToken string `json:"apnsToken"`
LastNotificationTime int64
}
diff --git a/server/migrations/149_push_token_registration.down.sql b/server/migrations/149_push_token_registration.down.sql
index ea6aec6bf9..18475acf75 100644
--- a/server/migrations/149_push_token_registration.down.sql
+++ b/server/migrations/149_push_token_registration.down.sql
@@ -1,3 +1,2 @@
ALTER TABLE push_tokens
- DROP COLUMN session_token_hash,
- DROP COLUMN platform;
+ DROP COLUMN session_token_hash;
diff --git a/server/migrations/149_push_token_registration.up.sql b/server/migrations/149_push_token_registration.up.sql
index a66692ece6..f067dd3e53 100644
--- a/server/migrations/149_push_token_registration.up.sql
+++ b/server/migrations/149_push_token_registration.up.sql
@@ -1,6 +1,5 @@
ALTER TABLE push_tokens
- ADD COLUMN session_token_hash BYTEA,
- ADD COLUMN platform TEXT NOT NULL DEFAULT 'ios' CHECK (platform IN ('ios', 'android'));
+ ADD COLUMN session_token_hash BYTEA;
CREATE INDEX push_tokens_session_token_hash_idx ON push_tokens (session_token_hash)
WHERE session_token_hash IS NOT NULL;
diff --git a/server/pkg/api/push.go b/server/pkg/api/push.go
index 63919466f7..30772d344d 100644
--- a/server/pkg/api/push.go
+++ b/server/pkg/api/push.go
@@ -16,8 +16,7 @@ type PushHandler struct {
}
func (h *PushHandler) AddToken(c *gin.Context) {
- platform := "ios"
- req := ente.PushTokenRequest{Platform: &platform}
+ var req ente.PushTokenRequest
err := handler.BindJSON(c, &req)
if err != nil {
handler.Error(c, stacktrace.Propagate(err, ""))
diff --git a/server/pkg/api/push_test.go b/server/pkg/api/push_test.go
index 6eca11673a..bedf12f255 100644
--- a/server/pkg/api/push_test.go
+++ b/server/pkg/api/push_test.go
@@ -29,7 +29,7 @@ func TestPushRegistrationBindsRequestSession(t *testing.T) {
testutil.InsertUser(t, db, testutil.UserFixture{UserID: id, Email: fmt.Sprintf("user%[email protected]", id), CreationTime: 1})
session := fmt.Sprintf("session-%d", id)
require.NoError(t, (&repo.UserAuthRepository{DB: db}).AddToken(id, ente.Photos, session, "", ""))
- body := fmt.Sprintf(`{"fcmToken":"device", "apnsToken":"apns", "sessionTokenHash":"%s"}`, base64.StdEncoding.EncodeToString([]byte("untrusted-session")))
+ body := fmt.Sprintf(`{"fcmToken":"device", "apnsToken":"apns-%d", "sessionTokenHash":"%s"}`, id, base64.StdEncoding.EncodeToString([]byte("untrusted-session")))
request := httptest.NewRequest(http.MethodPost, "/push/token", strings.NewReader(body))
request.Header.Set("Content-Type", "application/json")
request.Header.Set("X-Auth-User-ID", fmt.Sprint(id))
@@ -38,8 +38,10 @@ func TestPushRegistrationBindsRequestSession(t *testing.T) {
router.ServeHTTP(response, request)
require.Equal(t, http.StatusOK, response.Code)
var owner int64
- require.NoError(t, db.QueryRow(`SELECT user_id FROM push_tokens WHERE fcm_token = 'device'`).Scan(&owner))
+ var apns string
+ require.NoError(t, db.QueryRow(`SELECT user_id, apns_token FROM push_tokens WHERE fcm_token = 'device'`).Scan(&owner, &apns))
require.Equal(t, id, owner)
+ require.Equal(t, fmt.Sprintf("apns-%d", id), apns)
}
oldHash := auth.HashToken("session-1")
_, err := (&repo.UserAuthRepository{DB: db}).RemoveTokenByHash(1, oldHash[:])
@@ -61,64 +63,3 @@ func TestPushRegistrationBindsRequestSession(t *testing.T) {
expected := auth.HashToken("session-2")
require.Equal(t, expected[:], hash)
}
-
-func TestPushRegistrationPlatform(t *testing.T) {
- testutil.WithServerRoot(t)
- db := testutil.RequireTestDB(t)
- testutil.ResetTables(t, db)
- t.Cleanup(func() { testutil.ResetTables(t, db) })
- for _, id := range []int64{1, 2} {
- testutil.InsertUser(t, db, testutil.UserFixture{UserID: id, Email: fmt.Sprintf("user%[email protected]", id), CreationTime: 1})
- }
- router := gin.New()
- handler := PushHandler{PushController: &controller.PushController{PushRepo: &repo.PushTokenRepository{DB: db}}}
- router.POST("/push/token", handler.AddToken)
- for _, tc := range []struct {
- name, fields, platform string
- userID int64
- }{
- {"legacy omission", `"apnsToken":"apns"`, "ios", 1},
- {"android reassignment", `"platform":"android","apnsToken":null`, "android", 2},
- {"ios reassignment", `"platform":"ios","apnsToken":"apns"`, "ios", 1},
- {"omission without APNs", `"apnsToken":null`, "ios", 2},
- } {
- t.Run(tc.name, func(t *testing.T) {
- require.NoError(t, (&repo.UserAuthRepository{DB: db}).AddToken(tc.userID, ente.Photos, tc.name, "", ""))
- body := fmt.Sprintf(`{"fcmToken":"device",%s}`, tc.fields)
- request := httptest.NewRequest(http.MethodPost, "/push/token", strings.NewReader(body))
- request.Header.Set("Content-Type", "application/json")
- request.Header.Set("X-Auth-User-ID", fmt.Sprint(tc.userID))
- request.Header.Set("X-Auth-Token", tc.name)
- response := httptest.NewRecorder()
- router.ServeHTTP(response, request)
- require.Equal(t, http.StatusOK, response.Code, response.Body.String())
- var owner int64
- var platform, apns string
- var hash []byte
- require.NoError(t, db.QueryRow(`SELECT user_id, platform, apns_token, session_token_hash FROM push_tokens WHERE fcm_token = 'device'`).Scan(&owner, &platform, &apns, &hash))
- require.Equal(t, tc.userID, owner)
- require.Equal(t, tc.platform, platform)
- expectedHash := auth.HashToken(tc.name)
- require.Equal(t, expectedHash[:], hash)
- if strings.Contains(tc.fields, "null") {
- require.Empty(t, apns)
- } else {
- require.Equal(t, "apns", apns)
- }
- })
- }
- for _, platform := range []string{`""`, `"web"`, `"Android"`, `null`, `1`} {
- t.Run("reject "+platform, func(t *testing.T) {
- body := fmt.Sprintf(`{"fcmToken":"invalid-device","platform":%s}`, platform)
- request := httptest.NewRequest(http.MethodPost, "/push/token", strings.NewReader(body))
- request.Header.Set("Content-Type", "application/json")
- request.Header.Set("X-Auth-User-ID", "1")
- response := httptest.NewRecorder()
- router.ServeHTTP(response, request)
- require.Equal(t, http.StatusBadRequest, response.Code, response.Body.String())
- var count int
- require.NoError(t, db.QueryRow(`SELECT count(*) FROM push_tokens WHERE fcm_token = 'invalid-device'`).Scan(&count))
- require.Zero(t, count)
- })
- }
-}
diff --git a/server/pkg/repo/push.go b/server/pkg/repo/push.go
index 4d3c010c37..7a03055b5e 100644
--- a/server/pkg/repo/push.go
+++ b/server/pkg/repo/push.go
@@ -14,12 +14,12 @@ type PushTokenRepository struct {
}
func (repo *PushTokenRepository) AddToken(userID int64, sessionTokenHash []byte, token ente.PushTokenRequest) error {
- result, err := repo.DB.Exec(`INSERT INTO push_tokens(user_id, fcm_token, apns_token, session_token_hash, platform)
- SELECT user_id, $2, $3, token_hash, COALESCE($5, 'ios') FROM tokens
+ result, err := repo.DB.Exec(`INSERT INTO push_tokens(user_id, fcm_token, apns_token, session_token_hash)
+ SELECT user_id, $2, $3, token_hash FROM tokens
WHERE user_id = $1 AND token_hash = $4 AND is_deleted = false FOR SHARE
ON CONFLICT (fcm_token) DO UPDATE
- SET user_id = $1, apns_token = $3, session_token_hash = $4, platform = EXCLUDED.platform`,
- userID, token.FCMToken, token.APNSToken, sessionTokenHash, token.Platform)
+ SET user_id = EXCLUDED.user_id, apns_token = EXCLUDED.apns_token, session_token_hash = EXCLUDED.session_token_hash`,
+ userID, token.FCMToken, token.APNSToken, sessionTokenHash)
if err != nil {
return stacktrace.Propagate(err, "")
}
@@ -35,7 +35,7 @@ func (repo *PushTokenRepository) AddToken(userID int64, sessionTokenHash []byte,
func (repo *PushTokenRepository) GetTokensToBeNotified(lastNotificationTime int64, limit int) ([]ente.PushToken, error) {
rows, err := repo.DB.Query(`SELECT p.user_id, p.fcm_token, p.created_at, p.last_notified_at FROM push_tokens p
- WHERE p.platform = 'ios' AND p.last_notified_at < $1
+ WHERE p.last_notified_at < $1
AND (p.session_token_hash IS NULL OR EXISTS (
SELECT 1 FROM tokens t WHERE t.token_hash = p.session_token_hash
AND t.user_id = p.user_id AND t.is_deleted = false
diff --git a/server/pkg/repo/push_test.go b/server/pkg/repo/push_test.go
index 39588da831..8e4ed3ad3e 100644
--- a/server/pkg/repo/push_test.go
+++ b/server/pkg/repo/push_test.go
@@ -29,10 +29,8 @@ func TestPushTokenRegistrationMigration(t *testing.T) {
_, err = tx.Exec(`INSERT INTO push_tokens (fcm_token) VALUES ('old-server')`)
require.NoError(t, err)
var count int
- require.NoError(t, tx.QueryRow(`SELECT count(*) FROM push_tokens WHERE platform = 'ios' AND session_token_hash IS NULL`).Scan(&count))
+ require.NoError(t, tx.QueryRow(`SELECT count(*) FROM push_tokens WHERE session_token_hash IS NULL`).Scan(&count))
require.Equal(t, 3, count)
- _, err = tx.Exec(`UPDATE push_tokens SET platform = 'android' WHERE fcm_token = 'without-apns'`)
- require.NoError(t, err)
down, err := os.ReadFile("migrations/149_push_token_registration.down.sql")
require.NoError(t, err)
_, err = tx.Exec(string(down))
@@ -41,26 +39,6 @@ func TestPushTokenRegistrationMigration(t *testing.T) {
require.Equal(t, 3, count)
}
-func TestGetTokensToBeNotifiedFiltersPlatformBeforeLimit(t *testing.T) {
- testutil.WithServerRoot(t)
- db := testutil.RequireTestDB(t)
- testutil.ResetTables(t, db)
- t.Cleanup(func() { testutil.ResetTables(t, db) })
- testutil.InsertUser(t, db, testutil.UserFixture{UserID: 1, Email: "[email protected]", CreationTime: 1})
- _, err := db.Exec(`INSERT INTO push_tokens (user_id, fcm_token, platform, last_notified_at) VALUES
- (1, 'android-one', 'android', 0), (1, 'android-two', 'android', 0),
- (1, 'ios-one', 'ios', 0), (1, 'ios-two', 'ios', 0), (1, 'ios-recent', 'ios', 100)`)
- require.NoError(t, err)
- r := PushTokenRepository{DB: db}
- tokens, err := r.GetTokensToBeNotified(100, 2)
- require.NoError(t, err)
- var fcmTokens []string
- for _, token := range tokens {
- fcmTokens = append(fcmTokens, token.FCMToken)
- }
- require.ElementsMatch(t, []string{"ios-one", "ios-two"}, fcmTokens)
-}
-
func TestPeriodicPushExcludesRevokedSessions(t *testing.T) {
testutil.WithServerRoot(t)
db := testutil.RequireTestDB(t)
@@ -86,10 +64,10 @@ func TestPeriodicPushExcludesRevokedSessions(t *testing.T) {
_, err := db.Exec(`INSERT INTO push_tokens(user_id, fcm_token, session_token_hash, last_notified_at) VALUES(1, $1, $2, 0)`, token, hash[:])
require.NoError(t, err)
}
- _, err = db.Exec(`INSERT INTO push_tokens(user_id, fcm_token, last_notified_at) VALUES(1, 'legacy', 0)`)
+ _, err = db.Exec(`INSERT INTO push_tokens(user_id, fcm_token, last_notified_at) VALUES(1, 'legacy', 0), (1, 'recent', 1)`)
require.NoError(t, err)
r := &PushTokenRepository{DB: db}
- tokens, err := r.GetTokensToBeNotified(1, 10)
+ tokens, err := r.GetTokensToBeNotified(1, 2)
require.NoError(t, err)
var fcmTokens []string
for _, token := range tokens {