dag: cbor input-enc

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>

core/coredag/dagtransl.go

@@ -20,6 +20,7 @@ type InputEncParsers map[string]FormatParsers
 var DefaultInputEncParsers = InputEncParsers{
 	"json": defaultJSONParsers,
 	"raw":  defaultRawParsers,
+	"cbor": defaultCborParsers,
 }
 
 var defaultJSONParsers = FormatParsers{
@@ -32,6 +33,11 @@ var defaultRawParsers = FormatParsers{
 	"dag-cbor": cborRawParser,
 }
 
+var defaultCborParsers = FormatParsers{
+	"cbor":     cborRawParser,
+	"dag-cbor": cborRawParser,
+}
+
 // ParseInputs uses DefaultInputEncParsers to parse io.Reader described by
 // input encoding and format to an instance of ipld Node
 func ParseInputs(ienc, format string, r io.Reader, mhType uint64, mhLen int) ([]node.Node, error) {

test/sharness/t0053-dag.sh

@@ -118,6 +118,12 @@ test_dag_cmd() {
 		test_fsh echo $HASH
 	'
 
+	test_expect_success "non-canonical cbor input is normalized with input-enc cbor" '
+		HASH=$(cat ../t0053-dag-data/non-canon.cbor | ipfs dag put --format=cbor --input-enc=cbor) &&
+		test $HASH = "zdpuAmxF8q6iTUtkB3xtEYzmc5Sw762qwQJftt5iW8NTWLtjC" ||
+		test_fsh echo $HASH
+	'
+
 	test_expect_success "add an ipld with pin" '
 		PINHASH=$(printf {\"foo\":\"bar\"} | ipfs dag put --pin=true)
 	'