Merge pull request #6330 from ipfs/fix/obj-put-empty

object put: Allow empty objects

core/coreapi/object.go

@@ -73,17 +73,13 @@ func (api *ObjectAPI) Put(ctx context.Context, src io.Reader, opts ...caopts.Obj
 	switch options.InputEnc {
 	case "json":
 		node := new(Node)
-		err = json.Unmarshal(data, node)
+		decoder := json.NewDecoder(bytes.NewReader(data))
+		decoder.DisallowUnknownFields()
+		err = decoder.Decode(node)
 		if err != nil {
 			return nil, err
 		}
 
-		// check that we have data in the Node to add
-		// otherwise we will add the empty object without raising an error
-		if nodeEmpty(node) {
-			return nil, errors.New("no data or links in this node")
-		}
-
 		dagnode, err = deserializeNode(node, options.DataType)
 		if err != nil {
 			return nil, err
@@ -99,12 +95,6 @@ func (api *ObjectAPI) Put(ctx context.Context, src io.Reader, opts ...caopts.Obj
 			return nil, err
 		}
 
-		// check that we have data in the Node to add
-		// otherwise we will add the empty object without raising an error
-		if nodeEmpty(node) {
-			return nil, errors.New("no data or links in this node")
-		}
-
 		dagnode, err = deserializeNode(node, options.DataType)
 		if err != nil {
 			return nil, err
@@ -368,7 +358,3 @@ func deserializeNode(nd *Node, dataFieldEncoding string) (*dag.ProtoNode, error)
 
 	return dagnode, nil
 }
-
-func nodeEmpty(node *Node) bool {
-	return node.Data == "" && len(node.Links) == 0
-}

test/sharness/t0051-object.sh

@@ -111,11 +111,11 @@ test_object_cmd() {
     cat ../t0051-object-data/testPut.xml | ipfs object put --inputenc=xml > actual_putStdinOut
   '
 
-  test_expect_success "'ipfs object put broken.xml' should fail" '
+  test_expect_failure "'ipfs object put broken.xml' should fail" '
     test_expect_code 1 ipfs object put ../t0051-object-data/brokenPut.xml --inputenc=xml 2>actual_putBrokenErr >actual_putBroken
   '
 
-  test_expect_success "'ipfs object put broken.hxml' output looks good" '
+  test_expect_failure "'ipfs object put broken.hxml' output looks good" '
     touch expected_putBroken &&
     printf "Error: no data or links in this node\n" > expected_putBrokenErr &&
     test_cmp expected_putBroken actual_putBroken &&
@@ -170,7 +170,7 @@ test_object_cmd() {
 
   test_expect_success "'ipfs object put broken.hjson' output looks good" '
     touch expected_putBroken &&
-    printf "Error: no data or links in this node\n" > expected_putBrokenErr &&
+    printf "Error: json: unknown field \"this\"\n" > expected_putBrokenErr &&
     test_cmp expected_putBroken actual_putBroken &&
     test_cmp expected_putBrokenErr actual_putBrokenErr
   '