Enforce base domains since subdomain use cases are not currently defined

code-payments · Jan 11, 2024 · 4dbf936 · 4dbf936
1 parent 40ff964
commit 4dbf936
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/pkg/code/server/grpc/messaging/message_handler.go b/pkg/code/server/grpc/messaging/message_handler.go
@@ -606,7 +606,7 @@ func verifyThirdPartyDomain(ctx context.Context, verifier thirdparty.DomainVerif
 
 	ownsDomain, err := verifier(ctx, owner, domain.Value)
 	if err != nil {
-		return newMessageValidationErrorf("error veryfing domain ownership: %s", err.Error())
+		return newMessageAuthenticationErrorf("error veryfing domain ownership: %s", err.Error())
 	} else if !ownsDomain {
 		return newMessageAuthorizationErrorf("%s does not own domain %s", owner.PublicKey().ToBase58(), asciiBaseDomain)
 	}

diff --git a/pkg/code/thirdparty/domain.go b/pkg/code/thirdparty/domain.go
@@ -33,12 +33,20 @@ func VerifyDomainNameOwnership(ctx context.Context, owner *common.Account, domai
 		PublicKeys []string `json:"public_keys,omitempty"`
 	}
 
-	asciiBaseDomain, err := GetAsciiBaseDomain(domain)
-	if err != nil {
-		return false, err
-	}
+	var asciiBaseDomain string
+	var err error
 	if domain == "app.getcode.com" {
 		asciiBaseDomain = "app.getcode.com" // Temporary testing hack
+	} else {
+		// Subdomains are not currently used, so explicitly deny for now
+		if len(strings.Split(domain, ".")) > 2 {
+			return false, errors.New("subdomains cannot be verified")
+		}
+
+		asciiBaseDomain, err = GetAsciiBaseDomain(domain)
+		if err != nil {
+			return false, err
+		}
 	}
 
 	wellKnownUrl := fmt.Sprintf("https://%s%s", asciiBaseDomain, "/.well-known/code-payments.json")