coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-25 04:17:44 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge pull request #7339 from ipfs/fix/dir-listing-404

Browse Source 
fix: support directory listings even if a 404 page is present
This commit is contained in:
Steven Allen 2020-05-20 20:09:03 -07:00 committed by GitHub
commit edcd118a88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/corehttp/gateway_handler.go
View File

@ -307,10 +307,6 @@ func (i *gatewayHandler) getOrHeadHandler(w http.ResponseWriter, r *http.Request
return
}
if i.servePretty404IfPresent(w, r, parsedPath) {
return
}
// storage for directory listing
var dirListing []directoryItem
dirit := dir.Entries()

6
core/corehttp/gateway_test.go
View File

@ -267,8 +267,8 @@ func TestPretty404(t *testing.T) {
{"/nope", "*/*", http.StatusNotFound, "Custom 404"},
{"/nope", "application/json", http.StatusNotFound, "ipfs resolve -r /ipns/example.net/nope: no link named \"nope\" under QmcmnF7XG5G34RdqYErYDwCKNFQ6jb8oKVR21WAJgubiaj\n"},
{"/deeper/nope", "text/html", http.StatusNotFound, "Deep custom 404"},
{"/deeper/", "text/html", http.StatusNotFound, "Deep custom 404"},
{"/deeper", "text/html", http.StatusNotFound, "Deep custom 404"},
{"/deeper/", "text/html", http.StatusOK, ""},
{"/deeper", "text/html", http.StatusOK, ""},
{"/nope/nope", "text/html", http.StatusNotFound, "Custom 404"},
} {
var c http.Client
@ -293,7 +293,7 @@ func TestPretty404(t *testing.T) {
t.Fatalf("error reading response from %s: %s", test.path, err)
}
if string(body) != test.text {
if test.text != "" && string(body) != test.text {
t.Fatalf("unexpected response body from %s: got %q, expected %q", test.path, body, test.text)
}
}