X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/08793025fb951153ce374f8eb4f984ee21f6a2bc..f054bc3d7d3d26962e62c2ea7c27214b08e85bb6:/services/keep-web/handler.go diff --git a/services/keep-web/handler.go b/services/keep-web/handler.go index a37cfb70b3..4b17e8648e 100644 --- a/services/keep-web/handler.go +++ b/services/keep-web/handler.go @@ -165,7 +165,7 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { h.serveStatus(w, r) return } else if len(pathParts) >= 1 && strings.HasPrefix(pathParts[0], "c=") { - // /c=ID/PATH... + // /c=ID[/PATH...] targetID = parseCollectionIDFromURL(pathParts[0][2:]) stripParts = 1 } else if len(pathParts) >= 2 && pathParts[0] == "collections" { @@ -251,15 +251,13 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { forceReload = true } - var collection map[string]interface{} + var collection *arvados.Collection tokenResult := make(map[string]int) - found := false for _, arv.ApiToken = range tokens { var err error collection, err = h.Config.Cache.Get(arv, targetID, forceReload) if err == nil { // Success - found = true break } if srvErr, ok := err.(arvadosclient.APIServerError); ok { @@ -275,7 +273,7 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { statusCode, statusText = http.StatusInternalServerError, err.Error() return } - if !found { + if collection == nil { if pathToken || !credentialsOK { // Either the URL is a "secret sharing link" // that didn't work out (and asking the client @@ -316,34 +314,37 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { basename := targetPath[len(targetPath)-1] applyContentDispositionHdr(w, r, basename, attachment) - j, err := json.Marshal(collection) - if err != nil { - panic(err) - } - var coll arvados.Collection - err = json.Unmarshal(j, &coll) - if err != nil { - panic(err) - } - fs := coll.FileSystem(&arvados.Client{ + fs := collection.FileSystem(&arvados.Client{ APIHost: arv.ApiServer, AuthToken: arv.ApiToken, Insecure: arv.ApiInsecure, }, kc) openPath := "/" + strings.Join(targetPath, "/") if f, err := fs.Open(openPath); os.IsNotExist(err) { + // Requested non-existent path statusCode = http.StatusNotFound } else if err != nil { + // Some other (unexpected) error statusCode, statusText = http.StatusInternalServerError, err.Error() } else if stat, err := f.Stat(); err != nil { + // Can't get Size/IsDir (shouldn't happen with a collectionFS!) statusCode, statusText = http.StatusInternalServerError, err.Error() } else if stat.IsDir() && !strings.HasSuffix(r.URL.Path, "/") { + // If client requests ".../dirname", redirect to + // ".../dirname/". This way, relative links in the + // listing for "dirname" can always be "fnm", never + // "dirname/fnm". h.seeOtherWithCookie(w, r, basename+"/", credentialsOK) } else if stat.IsDir() { - h.serveDirectory(w, r, &coll, fs, openPath) + h.serveDirectory(w, r, collection.Name, fs, openPath, stripParts) } else { http.ServeContent(w, r, basename, stat.ModTime(), f) - if int64(w.WroteBodyBytes()) != stat.Size() { + if r.Header.Get("Range") == "" && int64(w.WroteBodyBytes()) != stat.Size() { + // If we wrote fewer bytes than expected, it's + // too late to change the real response code + // or send an error message to the client, but + // at least we can try to put some useful + // debugging info in the logs. n, err := f.Read(make([]byte, 1024)) statusCode, statusText = http.StatusInternalServerError, fmt.Sprintf("f.Size()==%d but only wrote %d bytes; read(1024) returns %d, %s", stat.Size(), w.WroteBodyBytes(), n, err) @@ -352,25 +353,54 @@ func (h *handler) ServeHTTP(wOrig http.ResponseWriter, r *http.Request) { } var dirListingTemplate = ` -{{ .Collection.Name }} + + + {{ .Collection.Name }} + + -

{{ .Collection.Name }}

+

{{ .CollectionName }}

This collection of data files is being shared with you through Arvados. You can download individual files listed below. To download the entire collection with wget, try:

-
$ wget --mirror --no-parent --no-host --cut-dirs=3 {{ .Request.URL }}
+
$ wget --mirror --no-parent --no-host --cut-dirs={{ .StripParts }} https://{{ .Request.Host }}{{ .Request.URL }}

File Listing

+{{if .Files}} +{{else}} +

(No files; this collection is empty.)

+{{end}} +
-

About Arvados

+ About Arvados: Arvados is a free and open source software bioinformatics platform. To learn more, visit arvados.org. Arvados is not responsible for the files listed on this page. @@ -380,8 +410,13 @@ the entire collection with wget, try:

` -func (h *handler) serveDirectory(w http.ResponseWriter, r *http.Request, collection *arvados.Collection, fs http.FileSystem, base string) { - var files []string +type fileListEnt struct { + Name string + Size int64 +} + +func (h *handler) serveDirectory(w http.ResponseWriter, r *http.Request, collectionName string, fs http.FileSystem, base string, stripParts int) { + var files []fileListEnt var walk func(string) error if !strings.HasSuffix(base, "/") { base = base + "/" @@ -406,7 +441,10 @@ func (h *handler) serveDirectory(w http.ResponseWriter, r *http.Request, collect return err } } else { - files = append(files, path+ent.Name()) + files = append(files, fileListEnt{ + Name: path + ent.Name(), + Size: ent.Size(), + }) } } return nil @@ -415,17 +453,26 @@ func (h *handler) serveDirectory(w http.ResponseWriter, r *http.Request, collect http.Error(w, err.Error(), http.StatusInternalServerError) return } - tmpl, err := template.New("dir").Parse(dirListingTemplate) + + funcs := template.FuncMap{ + "nbsp": func(s string) template.HTML { + return template.HTML(strings.Replace(s, " ", " ", -1)) + }, + } + tmpl, err := template.New("dir").Funcs(funcs).Parse(dirListingTemplate) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } - sort.Strings(files) + sort.Slice(files, func(i, j int) bool { + return files[i].Name < files[j].Name + }) w.WriteHeader(http.StatusOK) tmpl.Execute(w, map[string]interface{}{ - "Collection": collection, - "Files": files, - "Request": r, + "CollectionName": collectionName, + "Files": files, + "Request": r, + "StripParts": stripParts, }) }