opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-01 19:24:14 +08:00
Code Issues Projects Releases Wiki Activity

address comments from CR

Browse Source
This commit is contained in:
Jeromy
2015-04-19 11:17:06 -07:00
parent 3d80b9d27d
commit e3255f46e1
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/commands/publish.go
View File

@ -107,9 +107,15 @@ Publish an <ipfs-path> to another public key (not implemented):
} }
func publish(n *core.IpfsNode, k crypto.PrivKey, ref path.Path) (*IpnsEntry, error) { func publish(n *core.IpfsNode, k crypto.PrivKey, ref path.Path) (*IpnsEntry, error) {
// First, verify the path exists
_, err := n.Resolver.ResolvePath(ref)
if err != nil {
return nil, err
}
pub := nsys.NewRoutingPublisher(n.Routing) pub := nsys.NewRoutingPublisher(n.Routing)
err := pub.Publish(n.Context(), k, ref) err = pub.Publish(n.Context(), k, ref)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
core/corehttp/ipns_hostname.go
View File

@ -19,8 +19,8 @@ func IPNSHostnameOption() ServeOption {
defer cancel() defer cancel()
host := strings.SplitN(r.Host, ":", 2)[0] host := strings.SplitN(r.Host, ":", 2)[0]
if k, err := n.Namesys.Resolve(ctx, host); err == nil { if p, err := n.Namesys.Resolve(ctx, host); err == nil {
r.URL.Path = "/ipfs/" + k.String() + r.URL.Path r.URL.Path = "/ipfs/" + p.String() + r.URL.Path
} }
childMux.ServeHTTP(w, r) childMux.ServeHTTP(w, r)
}) })

17
path/path.go
View File

@ -49,11 +49,13 @@ func FromSegments(seg ...string) Path {
} }
func ParsePath(txt string) (Path, error) { func ParsePath(txt string) (Path, error) {
kp, err := ParseKeyToPath(txt)
if err == nil {
return kp, nil
}
parts := strings.Split(txt, "/") parts := strings.Split(txt, "/")
if len(parts) == 1 {
kp, err := ParseKeyToPath(txt)
if err == nil {
return kp, nil
}
}
if len(parts) < 3 { if len(parts) < 3 {
return "", ErrBadPath return "", ErrBadPath
} }
@ -66,7 +68,7 @@ func ParsePath(txt string) (Path, error) {
return "", ErrBadPath return "", ErrBadPath
} }
_, err = ParseKeyToPath(parts[2]) _, err := ParseKeyToPath(parts[2])
if err != nil { if err != nil {
return "", err return "", err
} }
@ -86,3 +88,8 @@ func ParseKeyToPath(txt string) (Path, error) {
} }
return FromKey(u.Key(chk)), nil return FromKey(u.Key(chk)), nil
} }
func (p *Path) IsValid() error {
_, err := ParsePath(p.String())
return err
}