Merge pull request ipfs/kubo#5830 from jackloughran/feat/gateway/alwa…

…ys-show-hash Show hash on gateway This commit was moved from ipfs/kubo@f98652c
ipfs · Jan 5, 2019 · 4f38e82 · 4f38e82
2 parents 072ba7d + b16fca0
commit 4f38e82
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/gateway/core/corehttp/gateway_handler.go b/gateway/core/corehttp/gateway_handler.go
@@ -347,11 +347,17 @@ func (i *gatewayHandler) getOrHeadHandler(ctx context.Context, w http.ResponseWr
 		}
 	}
 
+	var hash string
+	if !strings.HasPrefix(originalUrlPath, ipfsPathPrefix) {
+		hash = resolvedPath.Cid().String()
+	}
+
 	// See comment above where originalUrlPath is declared.
 	tplData := listingTemplateData{
 		Listing:  dirListing,
 		Path:     originalUrlPath,
 		BackLink: backLink,
+		Hash:     hash,
 	}
 	err = listingTemplate.Execute(w, tplData)
 	if err != nil {

diff --git a/gateway/core/corehttp/gateway_indexPage.go b/gateway/core/corehttp/gateway_indexPage.go
@@ -14,6 +14,7 @@ type listingTemplateData struct {
 	Listing  []directoryItem
 	Path     string
 	BackLink string
+	Hash     string
 }
 
 type directoryItem struct {

diff --git a/gateway/core/corehttp/gateway_test.go b/gateway/core/corehttp/gateway_test.go
@@ -405,6 +405,9 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
 	if !strings.Contains(s, "<a href=\"/foo%3F%20%23%3C%27/file.txt\">") {
 		t.Fatalf("expected file in directory listing")
 	}
+	if !strings.Contains(s, dagn2.Cid().String()) {
+		t.Fatalf("expected hash in directory listing")
+	}
 
 	// make request to directory listing at root
 	req, err = http.NewRequest("GET", ts.URL, nil)
@@ -435,6 +438,9 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
 	if !strings.Contains(s, "<a href=\"/file.txt\">") {
 		t.Fatalf("expected file in directory listing")
 	}
+	if !strings.Contains(s, dagn1.Cid().String()) {
+		t.Fatalf("expected hash in directory listing")
+	}
 
 	// make request to directory listing
 	req, err = http.NewRequest("GET", ts.URL+"/foo%3F%20%23%3C%27/bar/", nil)
@@ -465,6 +471,9 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
 	if !strings.Contains(s, "<a href=\"/foo%3F%20%23%3C%27/bar/file.txt\">") {
 		t.Fatalf("expected file in directory listing")
 	}
+	if !strings.Contains(s, dagn3.Cid().String()) {
+		t.Fatalf("expected hash in directory listing")
+	}
 
 	// make request to directory listing with prefix
 	req, err = http.NewRequest("GET", ts.URL, nil)
@@ -496,6 +505,9 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
 	if !strings.Contains(s, "<a href=\"/good-prefix/file.txt\">") {
 		t.Fatalf("expected file in directory listing")
 	}
+	if !strings.Contains(s, dagn1.Cid().String()) {
+		t.Fatalf("expected hash in directory listing")
+	}
 
 	// make request to directory listing with illegal prefix
 	req, err = http.NewRequest("GET", ts.URL, nil)
@@ -535,6 +547,9 @@ func TestIPNSHostnameBacklinks(t *testing.T) {
 	if !strings.Contains(s, "<a href=\"/file.txt\">") {
 		t.Fatalf("expected file in directory listing")
 	}
+	if !strings.Contains(s, dagn1.Cid().String()) {
+		t.Fatalf("expected hash in directory listing")
+	}
 }
 
 func TestCacheControlImmutable(t *testing.T) {