Skip to content

GitLab

Commit 373260d3 authored by Knut Ahlers's avatar Knut Ahlers
Browse files
Options

Fix: dnslink domain resolving was broken; Add: no caching for those 

fixes #1234
fixes #1267
parent 5c94a68a
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
core/corehttp/ipns_hostname.go
View file @ 373260d3
...@@ -5,6 +5,7 @@ import ( ...@@ -5,6 +5,7 @@ import (
"path" "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 +21,11 @@ func IPNSHostnameOption() ServeOption { ...@@ -20,8 +21,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 = path.Join("/ipns/", host) + r.URL.Path
}
} }
childMux.ServeHTTP(w, r) childMux.ServeHTTP(w, r)
}) })
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment