putHandler: addressed CR from @jbenet

License: MIT Signed-off-by: Henry <[email protected]>
ipfs · Oct 31, 2015 · 273670a · 273670a
1 parent b8b4e45
commit 273670a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/core/corehttp/gateway_handler.go b/core/corehttp/gateway_handler.go
@@ -6,7 +6,6 @@ import (
 	"io"
 	"net/http"
 	gopath "path"
-	"path/filepath"
 	"strings"
 	"time"
 
@@ -276,6 +275,10 @@ func (i *gatewayHandler) postHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
+	// TODO(cryptix): move me to ServeHTTP and pass into all handlers
+	ctx, cancel := context.WithCancel(i.node.Context())
+	defer cancel()
+
 	rootPath, err := path.ParsePath(r.URL.Path)
 	if err != nil {
 		webError(w, "putHandler: ipfs path not valid", err, http.StatusBadRequest)
@@ -306,20 +309,20 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
 	}
 
 	var newkey key.Key
-	rnode, err := core.Resolve(i.node.Context(), i.node, rootPath)
+	rnode, err := core.Resolve(ctx, 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]))
+		rnode, err := i.node.DAG.Get(ctx, key.B58KeyDecode(rsegs[1]))
 		if err != nil {
 			webError(w, "putHandler: Could not create DAG from request", err, http.StatusInternalServerError)
 			return
 		}
 
 		e := dagutils.NewDagEditor(i.node.DAG, rnode)
-		err = e.InsertNodeAtPath(i.node.Context(), newPath, newnode, uio.NewEmptyDirectory)
+		err = e.InsertNodeAtPath(ctx, newPath, newnode, uio.NewEmptyDirectory)
 		if err != nil {
 			webError(w, "putHandler: InsertNodeAtPath failed", err, http.StatusInternalServerError)
 			return
@@ -350,7 +353,7 @@ func (i *gatewayHandler) putHandler(w http.ResponseWriter, r *http.Request) {
 
 	i.addUserHeaders(w) // ok, _now_ write user's headers.
 	w.Header().Set("IPFS-Hash", newkey.String())
-	http.Redirect(w, r, filepath.Join(ipfsPathPrefix, newkey.String(), newPath), http.StatusCreated)
+	http.Redirect(w, r, gopath.Join(ipfsPathPrefix, newkey.String(), newPath), http.StatusCreated)
 }
 
 func (i *gatewayHandler) deleteHandler(w http.ResponseWriter, r *http.Request) {

diff --git a/test/sharness/t0111-gateway-writeable.sh b/test/sharness/t0111-gateway-writeable.sh
@@ -14,10 +14,10 @@ test_launch_ipfs_daemon
 
 port=$PORT_GWAY
 
-# TODO(cryptix): netstat not avail on testing system?
-#test_expect_success "ipfs daemon listening to TCP port $port" '
-#  test_wait_open_tcp_port_10_sec "$PORT_GWAY"
-#'
+test_expect_success "ipfs daemon up" '
+  pollEndpoint -ep=/version -v -tout=1s -tries=60 2>poll_apierr > poll_apiout ||
+  test_fsh cat poll_apierr || test_fsh cat poll_apiout
+'
 
 test_expect_success "HTTP gateway gives access to sample file" '
   curl -s -o welcome "http://localhost:$PORT_GWAY/ipfs/$HASH_WELCOME_DOCS/readme" &&