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

address comments from the PR #45

Browse Source
This commit is contained in:
Jeromy
2014-09-15 20:32:37 +00:00
committed by Juan Batiz-Benet
parent 2aa2b8c6c7
commit d1f011244f
9 changed files with 66 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
namesys/routing.go
View File

@ -26,6 +26,11 @@ func NewRoutingResolver(route routing.IpfsRouting, dagservice *mdag.DAGService)
}
}
func (r *RoutingResolver) Matches(name string) bool {
_, err := mh.FromB58String(name)
return err == nil
}
func (r *RoutingResolver) Resolve(name string) (string, error) {
hash, err := mh.FromB58String(name)
if err != nil {
@ -36,13 +41,13 @@ func (r *RoutingResolver) Resolve(name string) (string, error) {
// use the routing system to get the name.
// /ipns/<name>
h, err := u.Hash([]byte("ipns:" + name))
h, err := u.Hash([]byte("/ipns/" + name))
if err != nil {
return "", err
}
inpsKey := u.Key(h)
val, err := r.routing.GetValue(inpsKey, time.Second*10)
ipnsKey := u.Key(h)
val, err := r.routing.GetValue(ipnsKey, time.Second*10)
if err != nil {
u.DOut("RoutingResolve get failed.\n")
return "", err
@ -70,7 +75,7 @@ func (r *RoutingResolver) Resolve(name string) (string, error) {
}
// check sig with pk
if ok, err := pk.Verify(entry.GetValue(), entry.GetSignature()); err != nil && ok {
if ok, err := pk.Verify(entry.GetValue(), entry.GetSignature()); err != nil || !ok {
return "", fmt.Errorf("Invalid value. Not signed by PrivateKey corresponding to %v", pk)
}