Fix panic in extractCidString.

License: MIT
Signed-off-by: Kevin Atkinson <[email protected]>

Author: kevina

core/commands/cmdenv/cidbase.go

@@ -1,6 +1,8 @@
 package cmdenv
 
 import (
+	"errors"
+
 	path "gx/ipfs/QmZErC2Ay6WuGi96CPg316PwitdwgLo6RxZRqVjJjRj2MR/go-path"
 	cmds "gx/ipfs/QmaAP56JAwdjwisPTu4yx17whcjTr6y5JCSCF77Y1rahWV/go-ipfs-cmds"
 	cidenc "gx/ipfs/QmdPQx9fvN5ExVwMhRmh7YpCQJzJrFhd1AjVBwJmRMFJeX/go-cidutil/cidenc"
@@ -62,7 +64,10 @@ func CidBaseDefined(req *cmds.Request) bool {
 // the base encoder is returned.  If you don't care about the error
 // condiation it is safe to ignore the error returned.
 func CidEncoderFromPath(enc cidenc.Encoder, p string) (cidenc.Encoder, error) {
-	v := extractCidString(p)
+	v, err := extractCidString(p)
+	if err != nil {
+		return enc, err
+	}
 	if cidVer(v) == 0 {
 		return cidenc.Encoder{Base: enc.Base, Upgrade: false}, nil
 	}
@@ -73,13 +78,16 @@ func CidEncoderFromPath(enc cidenc.Encoder, p string) (cidenc.Encoder, error) {
 	return cidenc.Encoder{Base: e, Upgrade: true}, nil
 }
 
-func extractCidString(p string) string {
-	segs := path.FromString(p).Segments()
-	v := segs[0]
-	if v == "ipfs" || v == "ipld" && len(segs) > 0 {
-		v = segs[1]
+func extractCidString(str string) (string, error) {
+	p, err := path.ParsePath(str)
+	if err != nil {
+		return "", err
+	}
+	segs := p.Segments()
+	if segs[0] == "ipfs" || segs[0] == "ipld" {
+		return segs[1], nil
 	}
-	return v
+	return "", errors.New("no CID found")
 }
 
 func cidVer(v string) int {

core/commands/cmdenv/cidbase_test.go

@@ -0,0 +1,31 @@
+package cmdenv
+
+import (
+	"testing"
+)
+
+func TestExtractCidString(t *testing.T) {
+	test := func(path string, cid string) {
+		res, err := extractCidString(path)
+		if err != nil || res != cid {
+			t.Errorf("extractCidString(%s) failed", path)
+		}
+	}
+	testFailure := func(path string) {
+		_, err := extractCidString(path)
+		if err == nil {
+			t.Errorf("extractCidString(%s) should of failed", path)
+		}
+	}
+	p := "QmRqVG8VGdKZ7KARqR96MV7VNHgWvEQifk94br5HpURpfu"
+	test(p, p)
+	test("/ipfs/"+p, p)
+	testFailure("/ipns/" + p)
+
+	p = "zb2rhfkM4FjkMLaUnygwhuqkETzbYXnUDf1P9MSmdNjW1w1Lk"
+	test(p, p)
+	test("/ipfs/"+p, p)
+	test("/ipld/"+p, p)
+
+	testFailure("/ipfs")
+}