opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-05-17 23:16:11 +08:00
Code Issues Projects Releases Wiki Activity

fix(gw): no backlink when listing root dir

Browse Source 
Closes #9071
This commit is contained in:
Marcin Rataj
2022-07-18 23:41:55 +02:00
committed by Jorropo
parent 839b0848ae
commit a6687744c7
5 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/dir-index-html/dir-index.html
View File

@ -3,7 +3,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="description" content="A directory of files hosted on the distributed, decentralized web using IPFS"> <meta name="description" content="A directory of content-addressed files hosted on IPFS">
<meta property="og:title" content="Files on IPFS"> <meta property="og:title" content="Files on IPFS">
<meta property="og:description" content="{{ .Path }}"> <meta property="og:description" content="{{ .Path }}">
<meta property="og:type" content="website"> <meta property="og:type" content="website">
@ -62,6 +62,7 @@
</div> </div>
<div class="table-responsive"> <div class="table-responsive">
<table> <table>
{{ if .BackLink }}
<tr> <tr>
<td class="type-icon"> <td class="type-icon">
<div class="ipfs-_blank">&nbsp;</div> <div class="ipfs-_blank">&nbsp;</div>
@ -72,6 +73,7 @@
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>
{{ end }}
{{ range .Listing }} {{ range .Listing }}
<tr> <tr>
<td class="type-icon"> <td class="type-icon">

4
assets/dir-index-html/src/dir-index.html
View File

@ -3,7 +3,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="description" content="A directory of files hosted on the distributed, decentralized web using IPFS"> <meta name="description" content="A directory of content-addressed files hosted on IPFS">
<meta property="og:title" content="Files on IPFS"> <meta property="og:title" content="Files on IPFS">
<meta property="og:description" content="{{ .Path }}"> <meta property="og:description" content="{{ .Path }}">
<meta property="og:type" content="website"> <meta property="og:type" content="website">
@ -61,6 +61,7 @@
</div> </div>
<div class="table-responsive"> <div class="table-responsive">
<table> <table>
{{ if .BackLink }}
<tr> <tr>
<td class="type-icon"> <td class="type-icon">
<div class="ipfs-_blank">&nbsp;</div> <div class="ipfs-_blank">&nbsp;</div>
@ -71,6 +72,7 @@
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>
{{ end }}
{{ range .Listing }} {{ range .Listing }}
<tr> <tr>
<td class="type-icon"> <td class="type-icon">

6
core/corehttp/gateway_handler_unixfs_dir.go
View File

@ -152,11 +152,13 @@ func (i *gatewayHandler) serveDirectory(ctx context.Context, w http.ResponseWrit
// don't go further up than /ipfs/$hash/ // don't go further up than /ipfs/$hash/
pathSplit := path.SplitList(contentPath.String()) pathSplit := path.SplitList(contentPath.String())
switch { switch {
// keep backlink // skip backlink when listing a content root
case len(pathSplit) == 3: // url: /ipfs/$hash case len(pathSplit) == 3: // url: /ipfs/$hash
backLink = ""
// keep backlink // skip backlink when listing a content root
case len(pathSplit) == 4 && pathSplit[3] == "": // url: /ipfs/$hash/ case len(pathSplit) == 4 && pathSplit[3] == "": // url: /ipfs/$hash/
backLink = ""
// add the correct link depending on whether the path ends with a slash // add the correct link depending on whether the path ends with a slash
default: default:

4
core/corehttp/gateway_test.go
View File

@ -529,8 +529,8 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
if !matchPathOrBreadcrumbs(s, "/") { if !matchPathOrBreadcrumbs(s, "/") {
t.Fatalf("expected a path in directory listing") t.Fatalf("expected a path in directory listing")
} }
if !strings.Contains(s, "<a href=\"/\">") { if strings.Contains(s, "<a href=\"/\">") {
t.Fatalf("expected backlink in directory listing") t.Fatalf("expected no backlink in directory listing of the root CID")
} }
if !strings.Contains(s, "<a href=\"/file.txt\">") { if !strings.Contains(s, "<a href=\"/file.txt\">") {
t.Fatalf("expected file in directory listing") t.Fatalf("expected file in directory listing")

22
test/sharness/t0115-gateway-dir-listing.sh
View File

@ -37,10 +37,10 @@ test_expect_success "Add the test directory" '
## Test dir listing on path gateway (eg. 127.0.0.1:8080/ipfs/) ## Test dir listing on path gateway (eg. 127.0.0.1:8080/ipfs/)
## ============================================================================ ## ============================================================================
test_expect_success "path gw: backlink on root CID should point at self" ' test_expect_success "path gw: backlink on root CID should be hidden" '
curl -sD - http://127.0.0.1:$GWAY_PORT/ipfs/${DIR_CID}/ > list_response && curl -sD - http://127.0.0.1:$GWAY_PORT/ipfs/${DIR_CID}/ > list_response &&
test_should_contain "Index of" list_response && test_should_contain "Index of" list_response &&
test_should_contain "<a href=\"/ipfs/$DIR_CID/\">..</a>" list_response test_should_not_contain "<a href=\"/ipfs/$DIR_CID/\">..</a>" list_response
' '
test_expect_success "path gw: Etag should be present" ' test_expect_success "path gw: Etag should be present" '
@ -53,7 +53,7 @@ test_expect_success "path gw: breadcrumbs should point at /ipfs namespace mounte
test_should_contain "/ipfs/<a href=\"/ipfs/$DIR_CID\">$DIR_CID</a>/<a href=\"/ipfs/$DIR_CID/%C4%85\">ą</a>/<a href=\"/ipfs/$DIR_CID/%C4%85/%C4%99\">ę</a>" list_response test_should_contain "/ipfs/<a href=\"/ipfs/$DIR_CID\">$DIR_CID</a>/<a href=\"/ipfs/$DIR_CID/%C4%85\">ą</a>/<a href=\"/ipfs/$DIR_CID/%C4%85/%C4%99\">ę</a>" list_response
' '
test_expect_success "path gw: backlink should point at parent directory" ' test_expect_success "path gw: backlink on subdirectory should point at parent directory" '
test_should_contain "<a href=\"/ipfs/$DIR_CID/%C4%85/%C4%99/..\">..</a>" list_response test_should_contain "<a href=\"/ipfs/$DIR_CID/%C4%85/%C4%99/..\">..</a>" list_response
' '
@ -72,10 +72,10 @@ test_expect_success "path gw: hash column should be a CID link with filename par
DIR_HOSTNAME="${DIR_CID}.ipfs.localhost" DIR_HOSTNAME="${DIR_CID}.ipfs.localhost"
# note: we skip DNS lookup by running curl with --resolve $DIR_HOSTNAME:127.0.0.1 # note: we skip DNS lookup by running curl with --resolve $DIR_HOSTNAME:127.0.0.1
test_expect_success "path gw: backlink on root CID should point origin root" ' test_expect_success "path gw: backlink on root CID should be hidden" '
curl -sD - --resolve $DIR_HOSTNAME:$GWAY_PORT:127.0.0.1 http://$DIR_HOSTNAME:$GWAY_PORT/ > list_response && curl -sD - --resolve $DIR_HOSTNAME:$GWAY_PORT:127.0.0.1 http://$DIR_HOSTNAME:$GWAY_PORT/ > list_response &&
test_should_contain "Index of" list_response && test_should_contain "Index of" list_response &&
test_should_contain "<a href=\"/\">..</a>" list_response test_should_not_contain "<a href=\"/\">..</a>" list_response
' '
test_expect_success "path gw: Etag should be present" ' test_expect_success "path gw: Etag should be present" '
@ -84,6 +84,10 @@ test_expect_success "path gw: Etag should be present" '
test_should_contain "Etag: \"DirIndex-" list_response test_should_contain "Etag: \"DirIndex-" list_response
' '
test_expect_success "path gw: backlink on subdirectory should point at parent directory" '
test_should_contain "<a href=\"/%C4%85/%C4%99/..\">..</a>" list_response
'
test_expect_success "subdomain gw: breadcrumbs should leverage path-based router mounted on the parent domain" ' test_expect_success "subdomain gw: breadcrumbs should leverage path-based router mounted on the parent domain" '
test_should_contain "/ipfs/<a href=\"//localhost:$GWAY_PORT/ipfs/$DIR_CID\">$DIR_CID</a>/<a href=\"//localhost:$GWAY_PORT/ipfs/$DIR_CID/%C4%85\">ą</a>/<a href=\"//localhost:$GWAY_PORT/ipfs/$DIR_CID/%C4%85/%C4%99\">ę</a>" list_response test_should_contain "/ipfs/<a href=\"//localhost:$GWAY_PORT/ipfs/$DIR_CID\">$DIR_CID</a>/<a href=\"//localhost:$GWAY_PORT/ipfs/$DIR_CID/%C4%85\">ą</a>/<a href=\"//localhost:$GWAY_PORT/ipfs/$DIR_CID/%C4%85/%C4%99\">ę</a>" list_response
' '
@ -111,10 +115,10 @@ test_launch_ipfs_daemon
# (go tests and sharness tests should be kept in sync) # (go tests and sharness tests should be kept in sync)
# - we skip DNS lookup by running curl with --resolve $DNSLINK_HOSTNAME:127.0.0.1 # - we skip DNS lookup by running curl with --resolve $DNSLINK_HOSTNAME:127.0.0.1
test_expect_success "dnslink gw: backlink on root CID should point origin root" ' test_expect_success "dnslink gw: backlink on root CID should be hidden" '
curl -v -sD - --resolve $DNSLINK_HOSTNAME:$GWAY_PORT:127.0.0.1 http://$DNSLINK_HOSTNAME:$GWAY_PORT/ > list_response && curl -v -sD - --resolve $DNSLINK_HOSTNAME:$GWAY_PORT:127.0.0.1 http://$DNSLINK_HOSTNAME:$GWAY_PORT/ > list_response &&
test_should_contain "Index of" list_response && test_should_contain "Index of" list_response &&
test_should_contain "<a href=\"/\">..</a>" list_response test_should_not_contain "<a href=\"/\">..</a>" list_response
' '
test_expect_success "dnslink gw: Etag should be present" ' test_expect_success "dnslink gw: Etag should be present" '
@ -123,6 +127,10 @@ test_expect_success "dnslink gw: Etag should be present" '
test_should_contain "Etag: \"DirIndex-" list_response test_should_contain "Etag: \"DirIndex-" list_response
' '
test_expect_success "dnslink gw: backlink on subdirectory should point at parent directory" '
test_should_contain "<a href=\"/%C4%85/%C4%99/..\">..</a>" list_response
'
test_expect_success "dnslink gw: breadcrumbs should point at content root mounted at dnslink origin" ' test_expect_success "dnslink gw: breadcrumbs should point at content root mounted at dnslink origin" '
test_should_contain "/ipns/<a href=\"//$DNSLINK_HOSTNAME:$GWAY_PORT/\">website.example.com</a>/<a href=\"//$DNSLINK_HOSTNAME:$GWAY_PORT/%C4%85\">ą</a>/<a href=\"//$DNSLINK_HOSTNAME:$GWAY_PORT/%C4%85/%C4%99\">ę</a>" list_response test_should_contain "/ipns/<a href=\"//$DNSLINK_HOSTNAME:$GWAY_PORT/\">website.example.com</a>/<a href=\"//$DNSLINK_HOSTNAME:$GWAY_PORT/%C4%85\">ą</a>/<a href=\"//$DNSLINK_HOSTNAME:$GWAY_PORT/%C4%85/%C4%99\">ę</a>" list_response
' '