show hash if not in original url

Change the template handler to pass the hash to the directory listing template if the original url doesn't contain the hash. The directory listing template will display the hash in grey under the original url if the hash is passed to it. License: MIT Signed-off-by: Jack Loughran <[email protected]>
ipfs · Dec 11, 2018 · b19ca86 · b19ca86
1 parent d3a488e
commit b19ca86
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 18 deletions.
diff --git a/assets/bindata.go b/assets/bindata.go
diff --git a/core/corehttp/gateway_handler.go b/core/corehttp/gateway_handler.go
@@ -344,11 +344,17 @@ func (i *gatewayHandler) getOrHeadHandler(ctx context.Context, w http.ResponseWr
 		}
 	}
 
+	var hash string
+	if !strings.Contains(originalUrlPath, "ipfs") {
+		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/core/corehttp/gateway_indexPage.go b/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/core/corehttp/gateway_test.go b/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) {