fix(gw): negative entity-bytes beyond file size (#10320)
fix: https://github.com/ipfs/boxo/pull/523 tests: https://github.com/ipfs/gateway-conformance/releases/tag/v0.5.0
Marcin Rataj committed
Jan 25, 2024 at 18:53 UTC
262151f2ed14a83d7f33a7dbe50b5e03bc37cd7e
8 files changed
+18
-13
.github/workflows/gateway-conformance.yml
+4
-4
@@ -41,7 +41,7 @@ jobs:
41
steps:
42
# 1. Download the gateway-conformance fixtures
43
- name: Download gateway-conformance fixtures
44
- uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@v0.4
44
+ uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@v0.5
45
with:
46
output: fixtures
47
@@ -96,7 +96,7 @@ jobs:
96
97
# 6. Run the gateway-conformance tests
98
- name: Run gateway-conformance tests
99
- uses: ipfs/gateway-conformance/.github/actions/test@v0.4
99
+ uses: ipfs/gateway-conformance/.github/actions/test@v0.5
100
with:
101
gateway-url: http://127.0.0.1:8080
102
json: output.json
@@ -129,7 +129,7 @@ jobs:
129
steps:
130
# 1. Download the gateway-conformance fixtures
131
- name: Download gateway-conformance fixtures
132
- uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@v0.4
132
+ uses: ipfs/gateway-conformance/.github/actions/extract-fixtures@v0.5
133
with:
134
output: fixtures
135
@@ -202,7 +202,7 @@ jobs:
202
203
# 9. Run the gateway-conformance tests over libp2p
204
- name: Run gateway-conformance tests over libp2p
205
- uses: ipfs/gateway-conformance/.github/actions/test@v0.4
205
+ uses: ipfs/gateway-conformance/.github/actions/test@v0.5
206
with:
207
gateway-url: http://127.0.0.1:8092
208
json: output.json
Rules.mk
+5
@@ -66,6 +66,10 @@ clean:
66
rm -rf $(CLEAN)
67
.PHONY: clean
68
69
+mod_tidy:
70
+ @find . -name go.mod -execdir $(GOCC) mod tidy \;
71
+.PHONY: mod_tidy
72
+
73
coverage: $(COVERAGE)
74
.PHONY: coverage
75
@@ -119,6 +123,7 @@ help:
123
@echo ' build - Build binary at ./cmd/ipfs/ipfs'
124
@echo ' nofuse - Build binary with no fuse support'
125
@echo ' install - Build binary and install into $$GOBIN'
126
+ @echo ' mod_tidy - Remove unused dependencis from go.mod files'
127
# @echo ' dist_install - TODO: c.f. ./cmd/ipfs/dist/README.md'
128
@echo ''
129
@echo 'CLEANING TARGETS:'
docs/examples/kubo-as-a-library/go.mod
+1
-1
@@ -7,7 +7,7 @@ go 1.20
7
replace github.com/ipfs/kubo => ./../../..
8
9
require (
10
- github.com/ipfs/boxo v0.17.1-0.20240124092521-3d57bce7998c
10
+ github.com/ipfs/boxo v0.17.1-0.20240125173442-bf34cd0777d8
11
github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
12
github.com/libp2p/go-libp2p v0.32.2
13
github.com/multiformats/go-multiaddr v0.12.1
docs/examples/kubo-as-a-library/go.sum
+2
-2
@@ -260,8 +260,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c h1:7Uy
260
github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c/go.mod h1:6EekK/jo+TynwSE/ZOiOJd4eEvRXoavEC3vquKtv4yI=
261
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
262
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
263
-github.com/ipfs/boxo v0.17.1-0.20240124092521-3d57bce7998c h1:A18UHDQ4V2Ai6/YsrH7kfGjA1r5SrwjQR1Lqiq68YQU=
264
-github.com/ipfs/boxo v0.17.1-0.20240124092521-3d57bce7998c/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
263
+github.com/ipfs/boxo v0.17.1-0.20240125173442-bf34cd0777d8 h1:/d+3/JOYsHS4Uo+6WIxu2oHHlM5WjWOySYItN9V+YHs=
264
+github.com/ipfs/boxo v0.17.1-0.20240125173442-bf34cd0777d8/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
265
github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
266
github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
267
github.com/ipfs/go-block-format v0.0.3/go.mod h1:4LmD4ZUw0mhO+JSKdpWwrzATiEfM7WWgQ8H5l6P8MVk=
go.mod
+1
-1
@@ -17,7 +17,7 @@ require (
17
github.com/hashicorp/go-multierror v1.1.1
18
github.com/ipfs-shipyard/nopfs v0.0.12
19
github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c
20
- github.com/ipfs/boxo v0.17.1-0.20240124092521-3d57bce7998c
20
+ github.com/ipfs/boxo v0.17.1-0.20240125173442-bf34cd0777d8
21
github.com/ipfs/go-block-format v0.2.0
22
github.com/ipfs/go-cid v0.4.1
23
github.com/ipfs/go-cidutil v0.1.0
go.sum
+2
-2
@@ -325,8 +325,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c h1:7Uy
325
github.com/ipfs-shipyard/nopfs/ipfs v0.13.2-0.20231027223058-cde3b5ba964c/go.mod h1:6EekK/jo+TynwSE/ZOiOJd4eEvRXoavEC3vquKtv4yI=
326
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
327
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
328
-github.com/ipfs/boxo v0.17.1-0.20240124092521-3d57bce7998c h1:A18UHDQ4V2Ai6/YsrH7kfGjA1r5SrwjQR1Lqiq68YQU=
329
-github.com/ipfs/boxo v0.17.1-0.20240124092521-3d57bce7998c/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
328
+github.com/ipfs/boxo v0.17.1-0.20240125173442-bf34cd0777d8 h1:/d+3/JOYsHS4Uo+6WIxu2oHHlM5WjWOySYItN9V+YHs=
329
+github.com/ipfs/boxo v0.17.1-0.20240125173442-bf34cd0777d8/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
330
github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
331
github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
332
github.com/ipfs/go-bitswap v0.11.0 h1:j1WVvhDX1yhG32NTC9xfxnqycqYIlhzEzLXG/cU1HyQ=
test/dependencies/go.mod
+1
-1
@@ -103,7 +103,7 @@ require (
103
github.com/hexops/gotextdiff v1.0.3 // indirect
104
github.com/inconshreveable/mousetrap v1.1.0 // indirect
105
github.com/ipfs/bbloom v0.0.4 // indirect
106
- github.com/ipfs/boxo v0.17.1-0.20240124092521-3d57bce7998c // indirect
106
+ github.com/ipfs/boxo v0.17.1-0.20240125173442-bf34cd0777d8 // indirect
107
github.com/ipfs/go-block-format v0.2.0 // indirect
108
github.com/ipfs/go-cid v0.4.1 // indirect
109
github.com/ipfs/go-datastore v0.6.0 // indirect
test/dependencies/go.sum
+2
-2
@@ -342,8 +342,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
342
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
343
github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
344
github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
345
-github.com/ipfs/boxo v0.17.1-0.20240124092521-3d57bce7998c h1:A18UHDQ4V2Ai6/YsrH7kfGjA1r5SrwjQR1Lqiq68YQU=
346
-github.com/ipfs/boxo v0.17.1-0.20240124092521-3d57bce7998c/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
345
+github.com/ipfs/boxo v0.17.1-0.20240125173442-bf34cd0777d8 h1:/d+3/JOYsHS4Uo+6WIxu2oHHlM5WjWOySYItN9V+YHs=
346
+github.com/ipfs/boxo v0.17.1-0.20240125173442-bf34cd0777d8/go.mod h1:pIZgTWdm3k3pLF9Uq6MB8JEcW07UDwNJjlXW1HELW80=
347
github.com/ipfs/go-block-format v0.2.0 h1:ZqrkxBA2ICbDRbK8KJs/u0O3dlp6gmAuuXUJNiW1Ycs=
348
github.com/ipfs/go-block-format v0.2.0/go.mod h1:+jpL11nFx5A/SPpsoBn6Bzkra/zaArfSmsknbPMYgzM=
349
github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=