opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region-dns): dns query for *.example.com (#17915)

Browse Source
This commit is contained in:
屈轩
2023-09-04 11:51:35 +08:00
committed by GitHub
parent 842d2fdd03
commit 956126fdec
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/dnsrecords.go
+17 -4
View File
@@ -555,13 +555,26 @@ func (man *SDnsRecordManager) QueryDns(projectId, name, kind string) (*SDnsRecor
).Join(zones, sqlchemy.Equals(recSQ.Field("dns_zone_id"), zones.Field("id")))
sq := rec.SubQuery()
q := sq.Query().Filter(
sqlchemy.OR(
filters := sqlchemy.OR(
sqlchemy.Equals(sq.Field("dns_name"), name),
// support *.example.com resolve
sqlchemy.Equals(sq.Field("dns_name"), "*."+name),
)
strs := strings.Split(name, ".")
if len(strs) > 2 {
strs[0] = "*"
filters = sqlchemy.OR(
sqlchemy.Equals(sq.Field("dns_name"), name),
// support *.example.com resolve
sqlchemy.Equals(sq.Field("dns_name"), "*."+name),
),
)
sqlchemy.Equals(sq.Field("dns_name"), strings.Join(strs, ".")),
)
}
q := sq.Query().Filter(filters).Desc(sq.Field("dns_name"))
ret := &SDnsRecord{}
return ret, q.First(ret)
}