π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Add token hash compatibility column
Neeraj Gupta5281effb2d43
diff --git a/server/migrations/134_add_token_hash.down.sql b/server/migrations/134_add_token_hash.down.sqlnew file mode 100644index 0000000000..73e9fac7d7--- /dev/null+++ b/server/migrations/134_add_token_hash.down.sql@@ -0,0 +1,7 @@+BEGIN;++DROP TRIGGER sync_token_hash ON tokens;+DROP FUNCTION sync_token_hash();+ALTER TABLE tokens DROP COLUMN token_hash;++COMMIT;diff --git a/server/migrations/134_add_token_hash.up.sql b/server/migrations/134_add_token_hash.up.sqlnew file mode 100644index 0000000000..00793c5359--- /dev/null+++ b/server/migrations/134_add_token_hash.up.sql@@ -0,0 +1,18 @@+BEGIN;++ALTER TABLE tokens ADD COLUMN token_hash BYTEA;++CREATE FUNCTION sync_token_hash() RETURNS TRIGGER AS $$+BEGIN+ IF NEW.token IS NOT NULL THEN+ NEW.token_hash := sha256(convert_to(NEW.token, 'UTF8'));+ END IF;+ RETURN NEW;+END;+$$ LANGUAGE plpgsql;++CREATE TRIGGER sync_token_hash+ BEFORE INSERT OR UPDATE OF token ON tokens+ FOR EACH ROW EXECUTE FUNCTION sync_token_hash();++COMMIT;diff --git a/server/pkg/repo/userauth_test.go b/server/pkg/repo/userauth_test.goindex f2f8a0f8a1..dfb546a069 100644--- a/server/pkg/repo/userauth_test.go+++ b/server/pkg/repo/userauth_test.go@@ -1,6 +1,8 @@package repoimport (+ "bytes"+ "crypto/sha256""testing""github.com/ente/museum/ente"@@ -8,6 +10,50 @@ import ("github.com/ente/museum/pkg/utils/time")+func TestTokenHashCompatibilityTrigger(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,+ })+ rawToken := "existing-bearer-token"+ var storedToken string+ var storedHash []byte+ err := db.QueryRow(+ `INSERT INTO tokens(user_id, token, token_hash, creation_time, last_used_at, app)+ VALUES($1, $2, $3, $4, $5, $6)+ RETURNING token, token_hash`,+ userID, rawToken, bytes.Repeat([]byte{0xff}, sha256.Size), 1, 1, ente.Photos,+ ).Scan(&storedToken, &storedHash)+ if err != nil {+ t.Fatalf("failed to insert token: %v", err)+ }++ expectedHash := sha256.Sum256([]byte(rawToken))+ if storedToken != rawToken {+ t.Fatalf("raw token changed: got %q want %q", storedToken, rawToken)+ }+ if !bytes.Equal(storedHash, expectedHash[:]) {+ t.Fatalf("unexpected token hash: got %x want %x", storedHash, expectedHash)+ }++ rawToken = "updated-bearer-token"+ if err := db.QueryRow(+ `UPDATE tokens SET token = $1 WHERE user_id = $2 RETURNING token_hash`, rawToken, userID,+ ).Scan(&storedHash); err != nil {+ t.Fatalf("failed to update token: %v", err)+ }+ expectedHash = sha256.Sum256([]byte(rawToken))+ if !bytes.Equal(storedHash, expectedHash[:]) {+ t.Fatalf("unexpected updated token hash: got %x want %x", storedHash, expectedHash)+ }+}+func TestUserAuthRepositoryRemoveOTTReturnsWhetherRowWasConsumed(t *testing.T) {testutil.WithServerRoot(t)