fixing putHandler for --writable http gateway

I disabled this a long time ago and never refactored it. About time.

License: MIT
Signed-off-by: Henry <cryptix@riseup.net>

core/corehttp/gateway_handler.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"net/http"
 	gopath "path"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -17,6 +18,7 @@ import (
 	"github.com/ipfs/go-ipfs/importer"
 	chunk "github.com/ipfs/go-ipfs/importer/chunk"
 	dag "github.com/ipfs/go-ipfs/merkledag"
+	dagutils "github.com/ipfs/go-ipfs/merkledag/utils"
 	path "github.com/ipfs/go-ipfs/path"
 	"github.com/ipfs/go-ipfs/routing"
 	uio "github.com/ipfs/go-ipfs/unixfs/io"
@@ -273,116 +275,82 @@ func (i *gatewayHandler) postHandler(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, ipfsPathPrefix+k.String(), http.StatusCreated)
 }
 
-func (i *gatewayHandler) putEmptyDirHandler(w http.ResponseWriter, r *http.Request) {
-	newnode := uio.NewEmptyDirectory()
-
-	key, err := i.node.DAG.Add(newnode)
-	if err != nil {
-		webError(w, "Could not recursively add new node", err, http.StatusInternalServerError)
-		return
-	}
-
-	i.addUserHeaders(w) // ok, _now_ write user's headers.
-	w.Header().Set("IPFS-Hash", key.String())
-	http.Redirect(w, r, ipfsPathPrefix+key.String()+"/", http.StatusCreated)
-}
-
 func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
-	// TODO(cryptix): either ask mildred about the flow of this or rewrite it
+	rootPath, err := path.ParsePath(r.URL.Path)
-	webErrorWithCode(w, "Sorry, PUT is bugged right now, closing request", errors.New("handler disabled"), http.StatusInternalServerError)
+	if err != nil {
+		webError(w, "putHandler: ipfs path not valid", err, http.StatusBadRequest)
 		return
-	urlPath := r.URL.Path
+	}
-	pathext := urlPath[5:]
+
-	var err error
+	rsegs := rootPath.Segments()
-	if urlPath == ipfsPathPrefix+"QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn/" {
+	if rsegs[0] == ipnsPathPrefix {
-		i.putEmptyDirHandler(w, r)
+		webError(w, "putHandler: updating named entries not supported", errors.New("WritableGateway: ipns put not supported"), http.StatusBadRequest)
 		return
 	}
 
 	var newnode *dag.Node
-	if pathext[len(pathext)-1] == '/' {
+	if rsegs[len(rsegs)-1] == "QmUNLLsPACCz1vLxQVkXqqLX5R1X345qqfHbsf67hvA3Nn" {
 		newnode = uio.NewEmptyDirectory()
 	} else {
-		newnode, err = i.newDagFromReader(r.Body)
+		putNode, err := i.newDagFromReader(r.Body)
 		if err != nil {
-			webError(w, "Could not create DAG from request", err, http.StatusInternalServerError)
+			webError(w, "putHandler: Could not create DAG from request", err, http.StatusInternalServerError)
 			return
 		}
+		newnode = putNode
 	}
 
-	ctx, cancel := context.WithCancel(i.node.Context())
+	var newPath string
-	defer cancel()
+	if len(rsegs) > 1 {
+		newPath = strings.Join(rsegs[2:], "/")
+	}
 
-	ipfsNode, err := core.Resolve(ctx, i.node, path.Path(urlPath))
+	var newkey key.Key
+	rnode, err := core.Resolve(i.node.Context(), i.node, rootPath)
+	switch ev := err.(type) {
+	case path.ErrNoLink:
+		// ev.Node < node where resolve failed
+		// ev.Name < new link
+		// but we need to patch from the root
+		rnode, err := i.node.DAG.Get(i.node.Context(), key.B58KeyDecode(rsegs[1]))
 		if err != nil {
-		// FIXME HTTP error code
+			webError(w, "putHandler: Could not create DAG from request", err, http.StatusInternalServerError)
-		webError(w, "Could not resolve name", err, http.StatusInternalServerError)
 			return
 		}
 
-	k, err := ipfsNode.Key()
+		e := dagutils.NewDagEditor(i.node.DAG, rnode)
+		err = e.InsertNodeAtPath(i.node.Context(), newPath, newnode, uio.NewEmptyDirectory)
 		if err != nil {
-		webError(w, "Could not get key from resolved node", err, http.StatusInternalServerError)
+			webError(w, "putHandler: InsertNodeAtPath failed", err, http.StatusInternalServerError)
 			return
 		}
 
-	h, components, err := path.SplitAbsPath(path.FromKey(k))
+		newkey, err = e.GetNode().Key()
 		if err != nil {
-		webError(w, "Could not split path", err, http.StatusInternalServerError)
+			webError(w, "putHandler: could not get key of edited node", err, http.StatusInternalServerError)
 			return
 		}
 
-	if len(components) < 1 {
+	case nil:
-		err = fmt.Errorf("Cannot override existing object")
+		// object set-data case
-		webError(w, "http gateway", err, http.StatusBadRequest)
+		rnode.Data = newnode.Data
-		return
-	}
 
-	tctx, cancel := context.WithTimeout(ctx, time.Minute)
+		newkey, err = i.node.DAG.Add(rnode)
-	defer cancel()
-	// TODO(cryptix): could this be core.Resolve() too?
-	rootnd, err := i.node.Resolver.DAG.Get(tctx, key.Key(h))
 		if err != nil {
-		webError(w, "Could not resolve root object", err, http.StatusBadRequest)
+			nnk, _ := newnode.Key()
+			rk, _ := rnode.Key()
+			webError(w, fmt.Sprintf("putHandler: Could not add newnode(%q) to root(%q)", nnk.B58String(), rk.B58String()), err, http.StatusInternalServerError)
 			return
 		}
-
+	default:
-	// resolving path components into merkledag nodes. if a component does not
+		log.Warningf("putHandler: unhandled resolve error %T", ev)
-	// resolve, create empty directories (which will be linked and populated below.)
+		webError(w, "could not resolve root DAG", ev, http.StatusInternalServerError)
-	pathNodes, err := i.node.Resolver.ResolveLinks(tctx, rootnd, components[:len(components)-1])
-	if _, ok := err.(path.ErrNoLink); ok {
-		// Create empty directories, links will be made further down the code
-		for len(pathNodes) < len(components) {
-			pathNodes = append(pathNodes, uio.NewDirectory(i.node.DAG).GetNode())
-		}
-	} else if err != nil {
-		webError(w, "Could not resolve parent object", err, http.StatusBadRequest)
-		return
-	}
-
-	for i := len(pathNodes) - 1; i >= 0; i-- {
-		newnode, err = pathNodes[i].UpdateNodeLink(components[i], newnode)
-		if err != nil {
-			webError(w, "Could not update node links", err, http.StatusInternalServerError)
-			return
-		}
-	}
-
-	if err := i.node.DAG.AddRecursive(newnode); err != nil {
-		webError(w, "Could not add recursively new node", err, http.StatusInternalServerError)
-		return
-	}
-
-	// Redirect to new path
-	key, err := newnode.Key()
-	if err != nil {
-		webError(w, "Could not get key of new node", err, http.StatusInternalServerError)
 		return
 	}
 
 	i.addUserHeaders(w) // ok, _now_ write user's headers.
-	w.Header().Set("IPFS-Hash", key.String())
+	w.Header().Set("IPFS-Hash", newkey.String())
-	http.Redirect(w, r, ipfsPathPrefix+key.String()+"/"+strings.Join(components, "/"), http.StatusCreated)
+	http.Redirect(w, r, filepath.Join(ipfsPathPrefix, newkey.String(), newPath), http.StatusCreated)
 }
 
 func (i *gatewayHandler) deleteHandler(w http.ResponseWriter, r *http.Request) {

path/resolver.go

@@ -22,12 +22,12 @@ var ErrNoComponents = errors.New(
 
 // ErrNoLink is returned when a link is not found in a path
 type ErrNoLink struct {
-	name string
+	Name string
-	node mh.Multihash
+	Node mh.Multihash
 }
 
 func (e ErrNoLink) Error() string {
-	return fmt.Sprintf("no link named %q under %s", e.name, e.node.B58String())
+	return fmt.Sprintf("no link named %q under %s", e.Name, e.Node.B58String())
 }
 
 // Resolver provides path resolution to IPFS
@@ -124,7 +124,7 @@ func (s *Resolver) ResolveLinks(ctx context.Context, ndd *merkledag.Node, names
 
 		if next == "" {
 			n, _ := nd.Multihash()
-			return result, ErrNoLink{name: name, node: n}
+			return result, ErrNoLink{Name: name, Node: n}
 		}
 
 		if nlink.Node == nil {

test/sharness/t0111-gateway-writeable.sh

@@ -14,9 +14,10 @@ test_launch_ipfs_daemon
 
 port=$PORT_GWAY
 
-test_expect_success "ipfs daemon listening to TCP port $port" '
+# TODO(cryptix): netstat not avail on testing system?
-  test_wait_open_tcp_port_10_sec "$PORT_GWAY"
+#test_expect_success "ipfs daemon listening to TCP port $port" '
-'
+#  test_wait_open_tcp_port_10_sec "$PORT_GWAY"
+#'
 
 test_expect_success "HTTP gateway gives access to sample file" '
   curl -s -o welcome "http://localhost:$PORT_GWAY/ipfs/$HASH_WELCOME_DOCS/readme" &&
@@ -44,7 +45,7 @@ test_expect_success "HTTP PUT empty directory" '
   curl -svX PUT "$URL" 2>curl_putEmpty.out &&
   cat curl_putEmpty.out &&
   grep "Ipfs-Hash: $HASH_EMPTY_DIR" curl_putEmpty.out &&
-  grep "Location: /ipfs/$HASH_EMPTY_DIR/" curl_putEmpty.out &&
+  grep "Location: /ipfs/$HASH_EMPTY_DIR" curl_putEmpty.out &&
   grep "HTTP/1.1 201 Created" curl_putEmpty.out
 '