test: range request for ?format=raw

ipfs · Mar 14, 2023 · cddce62 · cddce62
1 parent 4b64f5d
commit cddce62
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/docs/examples/kubo-as-a-library/go.mod b/docs/examples/kubo-as-a-library/go.mod
@@ -7,7 +7,7 @@ go 1.18
 replace github.com/ipfs/kubo => ./../../..
 
 require (
-	github.com/ipfs/go-libipfs v0.6.2-0.20230309100404-db8b79eb52d9
+	github.com/ipfs/go-libipfs v0.6.2-0.20230314105346-2eb8fb694a8f
 	github.com/ipfs/interface-go-ipfs-core v0.11.0
 	github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
 	github.com/libp2p/go-libp2p v0.26.2

diff --git a/docs/examples/kubo-as-a-library/go.sum b/docs/examples/kubo-as-a-library/go.sum
@@ -569,8 +569,8 @@ github.com/ipfs/go-ipld-legacy v0.1.1 h1:BvD8PEuqwBHLTKqlGFTHSwrwFOMkVESEvwIYwR2
 github.com/ipfs/go-ipld-legacy v0.1.1/go.mod h1:8AyKFCjgRPsQFf15ZQgDB8Din4DML/fOmKZkkFkrIEg=
 github.com/ipfs/go-ipns v0.3.0 h1:ai791nTgVo+zTuq2bLvEGmWP1M0A6kGTXUsgv/Yq67A=
 github.com/ipfs/go-ipns v0.3.0/go.mod h1:3cLT2rbvgPZGkHJoPO1YMJeh6LtkxopCkKFcio/wE24=
-github.com/ipfs/go-libipfs v0.6.2-0.20230309100404-db8b79eb52d9 h1:e7GyGBmss/k/stuzpawdBtVJl6fmcTNK/zZ9wMFT9W8=
-github.com/ipfs/go-libipfs v0.6.2-0.20230309100404-db8b79eb52d9/go.mod h1:uC9VqJdOglX/UMYH4vX3R64ab0TqEj1qVsT4ncEQTFM=
+github.com/ipfs/go-libipfs v0.6.2-0.20230314105346-2eb8fb694a8f h1:8zqV+SdJ6bj/x5USvhiCRbDt+Nlai2Dxb3tWKTntIdc=
+github.com/ipfs/go-libipfs v0.6.2-0.20230314105346-2eb8fb694a8f/go.mod h1:uC9VqJdOglX/UMYH4vX3R64ab0TqEj1qVsT4ncEQTFM=
 github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
 github.com/ipfs/go-log v1.0.2/go.mod h1:1MNjMxe0u6xvJZgeqbJ8vdo2TKaGwZ1a0Bpza+sr2Sk=
 github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A=

diff --git a/go.mod b/go.mod
@@ -45,7 +45,7 @@ require (
 	github.com/ipfs/go-ipld-git v0.1.1
 	github.com/ipfs/go-ipld-legacy v0.1.1
 	github.com/ipfs/go-ipns v0.3.0
-	github.com/ipfs/go-libipfs v0.6.2-0.20230309100404-db8b79eb52d9
+	github.com/ipfs/go-libipfs v0.6.2-0.20230314105346-2eb8fb694a8f
 	github.com/ipfs/go-log v1.0.5
 	github.com/ipfs/go-log/v2 v2.5.1
 	github.com/ipfs/go-merkledag v0.9.0

diff --git a/go.sum b/go.sum
@@ -591,8 +591,8 @@ github.com/ipfs/go-ipld-legacy v0.1.1 h1:BvD8PEuqwBHLTKqlGFTHSwrwFOMkVESEvwIYwR2
 github.com/ipfs/go-ipld-legacy v0.1.1/go.mod h1:8AyKFCjgRPsQFf15ZQgDB8Din4DML/fOmKZkkFkrIEg=
 github.com/ipfs/go-ipns v0.3.0 h1:ai791nTgVo+zTuq2bLvEGmWP1M0A6kGTXUsgv/Yq67A=
 github.com/ipfs/go-ipns v0.3.0/go.mod h1:3cLT2rbvgPZGkHJoPO1YMJeh6LtkxopCkKFcio/wE24=
-github.com/ipfs/go-libipfs v0.6.2-0.20230309100404-db8b79eb52d9 h1:e7GyGBmss/k/stuzpawdBtVJl6fmcTNK/zZ9wMFT9W8=
-github.com/ipfs/go-libipfs v0.6.2-0.20230309100404-db8b79eb52d9/go.mod h1:uC9VqJdOglX/UMYH4vX3R64ab0TqEj1qVsT4ncEQTFM=
+github.com/ipfs/go-libipfs v0.6.2-0.20230314105346-2eb8fb694a8f h1:8zqV+SdJ6bj/x5USvhiCRbDt+Nlai2Dxb3tWKTntIdc=
+github.com/ipfs/go-libipfs v0.6.2-0.20230314105346-2eb8fb694a8f/go.mod h1:uC9VqJdOglX/UMYH4vX3R64ab0TqEj1qVsT4ncEQTFM=
 github.com/ipfs/go-log v0.0.1/go.mod h1:kL1d2/hzSpI0thNYjiKfjanbVNU+IIGA/WnNESY9leM=
 github.com/ipfs/go-log v1.0.2/go.mod h1:1MNjMxe0u6xvJZgeqbJ8vdo2TKaGwZ1a0Bpza+sr2Sk=
 github.com/ipfs/go-log v1.0.3/go.mod h1:OsLySYkwIbiSUR/yBTdv1qPtcE4FW3WPWk/ewz9Ru+A=

diff --git a/test/sharness/t0117-gateway-block.sh b/test/sharness/t0117-gateway-block.sh
@@ -29,6 +29,21 @@ FILE_CID=bafkreihhpc5y2pqvl5rbe5uuyhqjouybfs3rvlmisccgzue2kkt5zq6upq # ./dir/asc
     test_cmp expected_block curl_ipfs_dir_block_accept_output
     '
 
+    test_expect_success "GET for application/vnd.ipld.raw with single range request includes correct bytes" '
+    echo -n "application" > expected_file_block_single_range &&
+    curl -sX GET -H "Accept: application/vnd.ipld.raw" -H "Range: bytes=6-16" "http://127.0.0.1:$GWAY_PORT/ipfs/$FILE_CID" -o curl_ipfs_file_block_single_range &&
+    test_cmp expected_file_block_single_range curl_ipfs_file_block_single_range
+    '
+
+    test_expect_success "GET for application/vnd.ipld.raw with multiple range request includes correct bytes" '
+    curl -sX GET -H "Accept: application/vnd.ipld.raw" -H "Range: bytes=6-16,0-4" "http://127.0.0.1:$GWAY_PORT/ipfs/$FILE_CID" -o curl_ipfs_file_block_multiple_range &&
+    test_should_contain "Content-Range: bytes 6-16/31" curl_ipfs_file_block_multiple_range &&
+    test_should_contain "Content-Type: application/vnd.ipld.raw" curl_ipfs_file_block_multiple_range &&
+    test_should_contain "application" curl_ipfs_file_block_multiple_range &&
+    test_should_contain "Content-Range: bytes 0-4/31" curl_ipfs_file_block_multiple_range &&
+    test_should_contain "hello" curl_ipfs_file_block_multiple_range
+    '
+
 # Make sure expected HTTP headers are returned with the block bytes
 
     test_expect_success "GET response for application/vnd.ipld.raw has expected Content-Type" '