💚 End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Handle custom domain migration edge cases
Neeraj Gupta714e308ac04d
diff --git a/server/pkg/controller/remotestore/controller.go b/server/pkg/controller/remotestore/controller.goindex 8501e1b3cd..7e5d26c0f8 100644--- a/server/pkg/controller/remotestore/controller.go+++ b/server/pkg/controller/remotestore/controller.go@@ -186,8 +186,16 @@ func (c *Controller) insertOrUpdateCustomDomain(ctx *gin.Context, userID int64,}func isReservedCustomDomain(value, configuredCNAME string) bool {+ canonicalValue, err := ente.CanonicalDomain(value)+ if err != nil {+ return false+ }for _, domain := range []string{configuredCNAME, "my.ente.com", "my.ente.io"} {- if domain != "" && strings.EqualFold(value, domain) {+ if domain == "" {+ continue+ }+ canonicalDomain, err := ente.CanonicalDomain(domain)+ if err == nil && canonicalValue == canonicalDomain {return true}}diff --git a/server/pkg/controller/remotestore/controller_test.go b/server/pkg/controller/remotestore/controller_test.gonew file mode 100644index 0000000000..b6d1c5dae0--- /dev/null+++ b/server/pkg/controller/remotestore/controller_test.go@@ -0,0 +1,9 @@+package remotestore++import "testing"++func TestReservedCustomDomainCanonicalization(t *testing.T) {+ if !isReservedCustomDomain("my.ente.com", "") {+ t.Error("width-mapped Ente domain was not reserved")+ }+}diff --git a/server/pkg/repo/remotestore/repository.go b/server/pkg/repo/remotestore/repository.goindex 823240e7cd..21c4421857 100644--- a/server/pkg/repo/remotestore/repository.go+++ b/server/pkg/repo/remotestore/repository.go@@ -4,6 +4,7 @@ import ("context""database/sql""errors"+ "strings""github.com/ente/museum/ente""github.com/lib/pq"@@ -36,7 +37,7 @@ func (r *Repository) BackfillCustomDomainCanonicalValues(ctx context.Context) erdefer tx.Rollback()rows, err := tx.QueryContext(ctx, `SELECT user_id, key_value, canonical_value FROM remote_store- WHERE key_name = $1 AND left(key_value, 1) <> '_' FOR UPDATE`, ente.CustomDomain)+ WHERE key_name = $1 FOR UPDATE`, ente.CustomDomain)if err != nil {return stacktrace.Propagate(err, "failed to fetch custom domains")}@@ -65,6 +66,9 @@ func (r *Repository) BackfillCustomDomainCanonicalValues(ctx context.Context) er}for _, domain := range domains {+ if strings.HasPrefix(domain.value, "_") {+ continue+ }if err := ente.ValidatePublicCustomDomain(domain.value); err != nil {log.WithField("user_id", domain.userID).WithError(err).Warn("Skipping invalid custom domain during backfill")continue@@ -146,14 +150,17 @@ func (r *Repository) DomainOwner(ctx context.Context, domain string) (*int64, erif err != nil {return nil, stacktrace.Propagate(err, "failed to canonicalize custom domain")}- rows := r.DB.QueryRowContext(ctx, `SELECT user_id FROM remote_store- WHERE key_name = $1 AND (canonical_value = $2 OR lower(key_value) = lower($3))`,+ row := r.DB.QueryRowContext(ctx, `SELECT user_id FROM remote_store+ WHERE key_name = $1 AND canonical_value = $2`,ente.CustomDomain,canonicalDomain,- domain,)var userID int64- err = rows.Scan(&userID)+ err = row.Scan(&userID)+ if errors.Is(err, sql.ErrNoRows) {+ err = r.DB.QueryRowContext(ctx, `SELECT user_id FROM remote_store+ WHERE key_name = $1 AND lower(key_value) = lower($2)`, ente.CustomDomain, domain).Scan(&userID)+ }if err != nil {if errors.Is(err, sql.ErrNoRows) {return nil, stacktrace.Propagate(&ente.ErrNotFoundError, "")diff --git a/server/pkg/repo/remotestore/repository_test.go b/server/pkg/repo/remotestore/repository_test.goindex 0b16be28c8..810b060c74 100644--- a/server/pkg/repo/remotestore/repository_test.go+++ b/server/pkg/repo/remotestore/repository_test.go@@ -44,6 +44,9 @@ func TestCustomDomainCanonicalUniqueness(t *testing.T) {pointer := ente.BuildFamilyCustomDomainPointer(ownerID, "family.example")require.NoError(t, repository.InsertOrUpdate(t.Context(), ownerID, string(ente.CustomDomain), pointer))+ _, err = db.ExecContext(t.Context(), `UPDATE remote_store SET canonical_value = 'released.example'+ WHERE user_id = $1 AND key_name = 'customDomain'`, ownerID)+ require.NoError(t, err)require.NoError(t, repository.InsertOrUpdateCustomDomain(t.Context(), otherID, "BÜCHER.example"))_, err = db.ExecContext(t.Context(), `UPDATE remote_store SET key_value = 'LEGACY.example'