💚 End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Align custom domain handling
Neeraj Gupta3403d5d4bc45
diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.goindex d940b3484e..79db0607bb 100644--- a/server/cmd/museum/main.go+++ b/server/cmd/museum/main.go@@ -1094,7 +1094,7 @@ func main() {setKnownAPIs(server.Routes())setupAndStartBackgroundJobs(objectCleanupController, replicationController3, fileDataCtrl, contactController, spaceModule)time.AfterFunc(10*time.Minute, func() {- if err := remoteStoreRepository.MigrateCustomDomainCanonicalValues20260824(context.Background()); err != nil {+ if err := remoteStoreRepository.MigrateCustomDomainCanonicalValues(context.Background()); err != nil {log.WithError(err).Error("Failed to backfill custom domain canonical values")}})diff --git a/server/pkg/middleware/collection_link.go b/server/pkg/middleware/collection_link.goindex 4416d84307..3cf4839371 100644--- a/server/pkg/middleware/collection_link.go+++ b/server/pkg/middleware/collection_link.go@@ -13,8 +13,6 @@ import ("strconv""strings"- "golang.org/x/net/idna"-"github.com/ente/museum/pkg/repo/remotestore""github.com/gin-contrib/requestid""github.com/spf13/viper"@@ -319,7 +317,7 @@ func (m *CollectionLinkMiddleware) validateOrigin(c *gin.Context, ownerID int64)logger.WithError(err).Error("originParseFailedL")return ente.NewPermissionDeniedError("unknown custom domain")}- asciiDomain, err := idna.ToASCII(*domain)+ asciiDomain, err := ente.CanonicalDomain(*domain)if err != nil {logger.WithError(err).Error("domainToASCIIFailed")m.DiscordController.NotifyPotentialAbuse(alertMessage + " - domainToASCIIFailed")diff --git a/server/pkg/repo/remotestore/repository_migration.go b/server/pkg/repo/remotestore/repository_migration.goindex d4491557fe..936c10ea6b 100644--- a/server/pkg/repo/remotestore/repository_migration.go+++ b/server/pkg/repo/remotestore/repository_migration.go@@ -11,7 +11,8 @@ import ("github.com/ente/stacktrace")-func (r *Repository) MigrateCustomDomainCanonicalValues20260824(ctx context.Context) error {+// MigrateCustomDomainCanonicalValues backfills canonical domains (2026-08-24).+func (r *Repository) MigrateCustomDomainCanonicalValues(ctx context.Context) error {tx, err := r.DB.BeginTx(ctx, nil)if err != nil {return stacktrace.Propagate(err, "failed to begin custom domain backfill")diff --git a/server/pkg/repo/remotestore/repository_test.go b/server/pkg/repo/remotestore/repository_test.goindex 8913c50b19..6aa9936550 100644--- a/server/pkg/repo/remotestore/repository_test.go+++ b/server/pkg/repo/remotestore/repository_test.go@@ -25,10 +25,7 @@ func TestCustomDomainCanonicalUniqueness(t *testing.T) {domain, err := repository.GetDomain(t.Context(), ownerID)require.NoError(t, err)require.Equal(t, "BÜCHER.example", *domain)- resolvedOwnerID, err := repository.DomainOwner(t.Context(), "xn--bcher-kva.example")- require.NoError(t, err)- require.Equal(t, ownerID, *resolvedOwnerID)- resolvedOwnerID, err = repository.DomainOwner(t.Context(), "XN--BCHER-KVA.EXAMPLE")+ resolvedOwnerID, err := repository.DomainOwner(t.Context(), "XN--BCHER-KVA.EXAMPLE")require.NoError(t, err)require.Equal(t, ownerID, *resolvedOwnerID)@@ -37,17 +34,12 @@ func TestCustomDomainCanonicalUniqueness(t *testing.T) {require.ErrorAs(t, err, &apiErr)require.Equal(t, ente.CONFLICT, apiErr.Code)- require.NoError(t, repository.InsertOrUpdateCustomDomain(t.Context(), ownerID, "xn--bcher-kva.example"))- domain, err = repository.GetDomain(t.Context(), ownerID)- require.NoError(t, err)- require.Equal(t, "xn--bcher-kva.example", *domain)-pointer := ente.BuildFamilyCustomDomainPointer(ownerID, "family.example")require.NoError(t, repository.InsertOrUpdate(t.Context(), ownerID, string(ente.CustomDomain), pointer))+ require.NoError(t, repository.InsertOrUpdateCustomDomain(t.Context(), otherID, "BÜCHER.example"))_, 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'WHERE user_id = $1 AND key_name = 'customDomain'`, otherID)@@ -57,7 +49,7 @@ func TestCustomDomainCanonicalUniqueness(t *testing.T) {($2, 'customDomain', 'xn--bcher-kva.example'),($3, 'customDomain', 'invalid')`, collisionID1, collisionID2, invalidID)require.NoError(t, err)- require.NoError(t, repository.MigrateCustomDomainCanonicalValues20260824(t.Context()))+ require.NoError(t, repository.MigrateCustomDomainCanonicalValues(t.Context()))var value stringvar canonicalValue *string