lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-17 23:06:30 -05:00
Code Issues Releases Wiki Activity

[app/dns] Add tests for idn support (#2213)

Browse Source 
Co-authored-by: kallydev <kallydev@gmail.com>

Co-authored-by: kallydev <kallydev@gmail.com>
This commit is contained in:
Vigilans 2022-12-15 10:26:53 +08:00 committed by GitHub
parent a1ee432d29
commit 32475d9239
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/dns/dns_test.go
View File

@ -18,6 +18,7 @@ import (
"github.com/v2fly/v2ray-core/v5/common" "github.com/v2fly/v2ray-core/v5/common"
"github.com/v2fly/v2ray-core/v5/common/net" "github.com/v2fly/v2ray-core/v5/common/net"
"github.com/v2fly/v2ray-core/v5/common/serial" "github.com/v2fly/v2ray-core/v5/common/serial"
"github.com/v2fly/v2ray-core/v5/common/strmatcher"
feature_dns "github.com/v2fly/v2ray-core/v5/features/dns" feature_dns "github.com/v2fly/v2ray-core/v5/features/dns"
"github.com/v2fly/v2ray-core/v5/proxy/freedom" "github.com/v2fly/v2ray-core/v5/proxy/freedom"
"github.com/v2fly/v2ray-core/v5/testing/servers/udp" "github.com/v2fly/v2ray-core/v5/testing/servers/udp"
@ -104,6 +105,16 @@ func (*staticHandler) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
case q.Name == "Mijia\\ Cloud." && q.Qtype == dns.TypeA: case q.Name == "Mijia\\ Cloud." && q.Qtype == dns.TypeA:
rr, _ := dns.NewRR("Mijia\\ Cloud. IN A 127.0.0.1") rr, _ := dns.NewRR("Mijia\\ Cloud. IN A 127.0.0.1")
ans.Answer = append(ans.Answer, rr) ans.Answer = append(ans.Answer, rr)
case q.Name == "xn--vi8h.ws." /* 🍕.ws */ && q.Qtype == dns.TypeA:
rr, err := dns.NewRR("xn--vi8h.ws. IN A 208.100.42.200")
common.Must(err)
ans.Answer = append(ans.Answer, rr)
case q.Name == "xn--l8jaaa.com." /* ああああ.com */ && q.Qtype == dns.TypeA:
rr, err := dns.NewRR("xn--l8jaaa.com. IN AAAA a:a:a:a::aaaa")
common.Must(err)
ans.Answer = append(ans.Answer, rr)
} }
} }
w.WriteMsg(ans) w.WriteMsg(ans)
@ -251,6 +262,28 @@ func TestUDPServer(t *testing.T) {
} }
} }
{
ips, err := client.LookupIP(common.Must2(strmatcher.ToDomain("🍕.ws")).(string))
if err != nil {
t.Fatal("unexpected error: ", err)
}
if r := cmp.Diff(ips, []net.IP{{208, 100, 42, 200}}); r != "" {
t.Fatal(r)
}
}
{
ips, err := client.LookupIP(common.Must2(strmatcher.ToDomain("ああああ.com")).(string))
if err != nil {
t.Fatal("unexpected error: ", err)
}
if r := cmp.Diff(ips, []net.IP{{0, 0xa, 0, 0xa, 0, 0xa, 0, 0xa, 0, 0, 0, 0, 0, 0, 0xaa, 0xaa}}); r != "" {
t.Fatal(r)
}
}
dnsServer.Shutdown() dnsServer.Shutdown()
{ {

2
common/strmatcher/matchers.go
View File

@ -176,7 +176,7 @@ func ToDomain(pattern string) (string, error) {
} }
if !isASCII { if !isASCII {
var err error var err error
pattern, err = idna.New().ToASCII(pattern) pattern, err = idna.Punycode.ToASCII(pattern)
if err != nil { if err != nil {
return "", err return "", err
} }