opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-02 20:32:58 +08:00
Code Issues Projects Releases Wiki Activity

gateway: use CID as an ETag strong validator

Browse Source 
* Always use the fully resolved CID from api.ResolveNode
  as the ETag (also for IPNS).

* Format the result as a valid "Strong Validator"
  (double quotes around the encoded CID).

Fixes #3868

License: MIT
Signed-off-by: Remco Bloemen <remco@2π.com>
This commit is contained in:
Remco Bloemen
2017-04-18 16:22:53 +01:00
parent db43aab00b
commit 8db6f86de6
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/corehttp/gateway_handler.go
View File

@ -183,7 +183,16 @@ func (i *gatewayHandler) getOrHeadHandler(ctx context.Context, w http.ResponseWr
return return
} }
etag := gopath.Base(urlPath) // Resolve path to the final DAG node for the ETag
dagnode, err := i.api.ResolveNode(ctx, parsedPath)
if err != nil {
// Unixfs().Cat() also calls ResolveNode, so it should not fail here.
webError(w, "could not resolve ipfs path", err, http.StatusBadRequest)
return
}
// Check etag send back to us
etag := "\"" + dagnode.Cid().String() + "\""
if r.Header.Get("If-None-Match") == etag { if r.Header.Get("If-None-Match") == etag {
w.WriteHeader(http.StatusNotModified) w.WriteHeader(http.StatusNotModified)
return return
@ -191,6 +200,7 @@ func (i *gatewayHandler) getOrHeadHandler(ctx context.Context, w http.ResponseWr
i.addUserHeaders(w) // ok, _now_ write user's headers. i.addUserHeaders(w) // ok, _now_ write user's headers.
w.Header().Set("X-IPFS-Path", urlPath) w.Header().Set("X-IPFS-Path", urlPath)
w.Header().Set("Etag", etag)
// set 'allowed' headers // set 'allowed' headers
w.Header().Set("Access-Control-Allow-Headers", "X-Stream-Output, X-Chunked-Output") w.Header().Set("Access-Control-Allow-Headers", "X-Stream-Output, X-Chunked-Output")
@ -203,7 +213,6 @@ func (i *gatewayHandler) getOrHeadHandler(ctx context.Context, w http.ResponseWr
// TODO: break this out when we split /ipfs /ipns routes. // TODO: break this out when we split /ipfs /ipns routes.
modtime := time.Now() modtime := time.Now()
if strings.HasPrefix(urlPath, ipfsPathPrefix) { if strings.HasPrefix(urlPath, ipfsPathPrefix) {
w.Header().Set("Etag", etag)
w.Header().Set("Cache-Control", "public, max-age=29030400, immutable") w.Header().Set("Cache-Control", "public, max-age=29030400, immutable")
// set modtime to a really long time ago, since files are immutable and should stay cached // set modtime to a really long time ago, since files are immutable and should stay cached