From e86c97173fbbee2dfb5b84f3d6bfca053bdba473 Mon Sep 17 00:00:00 2001
From: mark wu <saybyebyet@gmail.com>
Date: Thu, 14 Dec 2023 17:32:10 +0800
Subject: [PATCH] Check domain ownership before delete it

---
 internal/cron/verify_domain_ownership.go      |  2 +-
 internal/cron/verify_domain_ownership_test.go | 68 +++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/internal/cron/verify_domain_ownership.go b/internal/cron/verify_domain_ownership.go
index a07f283..51835c5 100644
--- a/internal/cron/verify_domain_ownership.go
+++ b/internal/cron/verify_domain_ownership.go
@@ -109,7 +109,7 @@ func (v *VerifyDomainOwnership) Run(ctx context.Context, logger *zap.Logger) err
 					return err
 				}
 			} else {
-				if domain != nil {
+				if domain != nil && domain.AppID == domainVerification.AppID {
 					c.DeleteDomain(ctx, domain.ID, now)
 				}
 				err = c.LabelDomainVerificationAsInvalid(ctx, domainVerification.ID, now)
diff --git a/internal/cron/verify_domain_ownership_test.go b/internal/cron/verify_domain_ownership_test.go
index b986cd0..b673ec9 100644
--- a/internal/cron/verify_domain_ownership_test.go
+++ b/internal/cron/verify_domain_ownership_test.go
@@ -219,6 +219,65 @@ func TestVerifyDomainOwnership(t *testing.T) {
 			}
 		})
 	})
+	t.Run("Should not delete domain owned by another app", func(t *testing.T) {
+		testutil.WithTestDB(func(database db.DB) {
+			data := setupDB(now, ctx, database)
+			err := db.WithTx(ctx, database, func(tx db.Tx) error {
+				return tx.CreateApp(ctx, models.NewApp(
+					now,
+					"test2",
+					data.userId,
+				))
+			})
+			assert.NoError(t, err)
+			err = db.WithTx(ctx, database, func(tx db.Tx) error {
+				return tx.CreateDomain(ctx, models.NewDomain(
+					now,
+					"test.com",
+					"test2",
+					"main",
+				))
+			})
+			assert.NoError(t, err)
+
+			db.WithTx(ctx, database, func(tx db.Tx) error {
+				return tx.CreateDomain(ctx, models.NewDomain(
+					now,
+					"test.com",
+					"test2",
+					"main",
+				))
+			})
+			domainVerification, err := database.GetDomainVerificationByName(ctx, "test.com", "test")
+			txtDomain, _ := domainVerification.GetTxtRecord()
+			r := mockdns.Resolver{
+				Zones: map[string]mockdns.Zone{
+					txtDomain + ".": {
+						TXT: []string{
+							"incorrect value",
+						},
+					},
+				},
+			}
+			job := cron.VerifyDomainOwnership{
+				DB:                           database,
+				Resolver:                     &r,
+				MaxConsumeActiveDomainCount:  1,
+				MaxConsumePendingDomainCount: 1,
+				RevalidatePeriod:             time.Hour,
+			}
+			err = job.Run(ctx, logger)
+			assert.NoError(t, err)
+
+			domain, err := database.GetDomainByName(ctx, "test.com")
+			if assert.NoError(t, err) {
+				assert.Equal(t, domain.Domain, "test.com")
+				assert.Equal(t, domain.AppID, "test2")
+			}
+		})
+
+	})
+
 	t.Run("Should replace the conflict domain", func(t *testing.T) {
 		testutil.WithTestDB(func(database db.DB) {
 			data := setupDB(now, ctx, database)
@@ -239,6 +298,15 @@ func TestVerifyDomainOwnership(t *testing.T) {
 				))
 			})
 			assert.NoError(t, err)
+
+			db.WithTx(ctx, database, func(tx db.Tx) error {
+				return tx.CreateDomain(ctx, models.NewDomain(
+					now,
+					"test.com",
+					"test2",
+					"main",
+				))
+			})
 			domainVerification, err := database.GetDomainVerificationByName(ctx, "test.com", "test")
 			txtDomain, value := domainVerification.GetTxtRecord()
 			r := mockdns.Resolver{