mirror of
https://github.com/ipfs/kubo.git
synced 2025-06-30 18:13:54 +08:00
Merge pull request #1272 from Luzifer/fix/dnslink
Fix: dnslink domain resolving was broken; Add: no caching for those
This commit is contained in:
@ -2,9 +2,9 @@ package corehttp
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"path"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
isd "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-is-domain"
|
||||||
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
|
"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
|
||||||
"github.com/ipfs/go-ipfs/core"
|
"github.com/ipfs/go-ipfs/core"
|
||||||
)
|
)
|
||||||
@ -20,8 +20,11 @@ func IPNSHostnameOption() ServeOption {
|
|||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
host := strings.SplitN(r.Host, ":", 2)[0]
|
host := strings.SplitN(r.Host, ":", 2)[0]
|
||||||
if p, err := n.Namesys.Resolve(ctx, host); err == nil {
|
if len(host) > 0 && isd.IsDomain(host) {
|
||||||
r.URL.Path = path.Join(p.String(), r.URL.Path)
|
name := "/ipns/" + host
|
||||||
|
if _, err := n.Namesys.Resolve(ctx, name); err == nil {
|
||||||
|
r.URL.Path = name + r.URL.Path
|
||||||
|
}
|
||||||
}
|
}
|
||||||
childMux.ServeHTTP(w, r)
|
childMux.ServeHTTP(w, r)
|
||||||
})
|
})
|
||||||
|
Reference in New Issue
Block a user