feat(domain): 支持通配符域名及关联功能适配 (#63)

* feat(domain): 支持通配符域名及关联功能适配

* fix(domain): preserve legacy Unicode imports and address review findings

* fix(domain): canonicalize legacy IDNs and exclude empty host labels

* fix(domain): normalize equivalent Unicode IDN spellings

---------

Co-authored-by: Ryan <63696351+Rain-kl@users.noreply.github.com>
Co-authored-by: ryan <ryan@arctel.net>
This commit is contained in:
Deqiying
2026-11-09 10:31:03 +08:00
committed by GitHub
parent 8d8b3e1ea8
commit 9a51a68206
37 changed files with 1614 additions and 113 deletions
+27 -5
View File
@@ -13,6 +13,7 @@ import (
"strings"
"github.com/Rain-kl/Wavelet/internal/apps/openflare/routeidentity"
"golang.org/x/net/idna"
)
// ImportReport describes the idempotent legacy migration result.
@@ -82,7 +83,7 @@ func ImportLegacyTx(ctx context.Context, tx *sql.Tx, postgres bool) (report Impo
}
for _, item := range items {
domain, normErr := normalizeDomain(item.Domain)
domain, normErr := normalizeLegacyDomain(item.Domain)
if normErr != nil {
report.Conflicts = append(report.Conflicts, fmt.Sprintf("%s: %v", item.Domain, normErr))
continue
@@ -95,22 +96,28 @@ func ImportLegacyTx(ctx context.Context, tx *sql.Tx, postgres bool) (report Impo
var existingID uint
var existingZoneDomain string
var existingRouteID, existingCertID sql.Null[uint]
scanErr := tx.QueryRowContext(ctx, q(`
SELECT zd.id, z.domain
SELECT zd.id, z.domain, zd.proxy_route_id, zd.cert_id
FROM of_zone_domains zd
JOIN of_zones z ON z.id = zd.zone_id
WHERE zd.domain = ?
`), domain).Scan(&existingID, &existingZoneDomain)
`), domain).Scan(&existingID, &existingZoneDomain, &existingRouteID, &existingCertID)
if scanErr == nil {
if (item.ProxyRouteID != nil && existingRouteID.Valid && existingRouteID.V != *item.ProxyRouteID) ||
(item.CertID != nil && existingCertID.Valid && existingCertID.V != *item.CertID) {
report.Conflicts = append(report.Conflicts, domain+": canonical domain binding conflict")
continue
}
if existingZoneDomain != root {
report.Conflicts = append(report.Conflicts, domain+": global domain conflict")
} else if item.ProxyRouteID != nil {
} else if item.ProxyRouteID != nil || item.CertID != nil {
if _, bindErr := tx.ExecContext(ctx, q(`
UPDATE of_zone_domains
SET proxy_route_id = COALESCE(proxy_route_id, ?),
cert_id = COALESCE(cert_id, ?)
WHERE id = ?
`), *item.ProxyRouteID, nullableUint(item.CertID), existingID); bindErr != nil {
`), nullableUint(item.ProxyRouteID), nullableUint(item.CertID), existingID); bindErr != nil {
return report, bindErr
}
}
@@ -152,6 +159,21 @@ func ImportLegacyTx(ctx context.Context, tx *sql.Tx, postgres bool) (report Impo
return report, nil
}
// normalizeLegacyDomain canonicalizes historical IDNs for DNS identity and rendering.
// Certificate associations and route bindings remain attached to the imported row.
func normalizeLegacyDomain(raw string) (string, error) {
domain := strings.ToLower(strings.TrimSpace(raw))
host := strings.TrimPrefix(domain, "*.")
ascii, err := idna.Lookup.ToASCII(host)
if err != nil {
return "", errors.New(errDomainInvalid)
}
if host != domain {
ascii = "*." + ascii
}
return normalizeDomain(ascii)
}
func ensureZone(
ctx context.Context,
tx *sql.Tx,