Skip to content

fix(gw): blocked content produces http error 410#497

Merged
lidel merged 1 commit intomainfrom
fix/gw-error-content-block
Oct 28, 2023
Merged

fix(gw): blocked content produces http error 410#497
lidel merged 1 commit intomainfrom
fix/gw-error-content-block

Conversation

@lidel
Copy link
Copy Markdown
Member

@lidel lidel commented Oct 28, 2023

This quick and dirty minimum we need right now to make content blocking from ipfs/kubo#10161 return HTTP 410 on rule match, and have tests that guard this pass.

  • End-to-end test in kubo/test/cli/content_blocking_test.go (feat: built-in content blocking based on IPIP-383 kubo#10161)
  • We may want to refine this in future PR, but its enough for tests to pass and RC to ship.
  • This should be merged with merge commit, so we have the same commit in the main branch, and we are not blocked by incompatible peering commits that follow.

@codecov
Copy link
Copy Markdown

codecov bot commented Oct 28, 2023

Codecov Report

Merging #497 (182e86f) into main (07d1493) will increase coverage by 0.09%.
The diff coverage is 66.66%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #497      +/-   ##
==========================================
+ Coverage   65.82%   65.92%   +0.09%     
==========================================
  Files         206      206              
  Lines       25372    25378       +6     
==========================================
+ Hits        16702    16731      +29     
+ Misses       7196     7180      -16     
+ Partials     1474     1467       -7     
Files Coverage Δ
gateway/errors.go 85.47% <66.66%> (-1.02%) ⬇️

... and 16 files with indirect coverage changes

lidel added a commit to ipfs/kubo that referenced this pull request Oct 28, 2023
this is the minimum we need right now to make
content blocking from
ipfs/kubo#10161
return HTTP 410 on rule match
@lidel lidel force-pushed the fix/gw-error-content-block branch from 72da286 to 182e86f Compare October 28, 2023 02:15
lidel added a commit to ipfs/kubo that referenced this pull request Oct 28, 2023
requires ipfs/boxo#497
which is based on top of the boxo already used in kubo master
to avoid issues caused by ilater commits in boxo main
@lidel lidel marked this pull request as ready for review October 28, 2023 02:28
@lidel lidel requested a review from hacdias as a code owner October 28, 2023 02:28
@lidel
Copy link
Copy Markdown
Member Author

lidel commented Oct 28, 2023

I'm merging this to have 182e86f in main boxo branch directly after a50f784.
This allows us to land ipfs/kubo#10161 into Kubo master without havign to deal with changes after a50f784.

@lidel lidel merged commit 341c7da into main Oct 28, 2023
@lidel lidel deleted the fix/gw-error-content-block branch October 28, 2023 02:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant