Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pkg/server: force shared assembled download to be inline 

Fixes #1084

Change-Id: I2358a7689eb6bdbd904711de4fb2039c306f1688
This commit is contained in:
mpl 2018-04-09 20:26:49 +02:00
parent 4b47f45535
commit 66225c7f6b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/server/download.go
View File

@ -66,7 +66,8 @@ type DownloadHandler struct {
// to get at a wholeref more efficiently. (e.g. blobpacked)
Search *search.Handler
ForceMIME string // optional
ForceMIME string // optional
forceInline bool // to force Content-Disposition to inline, when it was not set in the request
// pathByRef maps a file Ref to the path of the file, relative to its ancestor
// directory which was requested for download. It is populated by checkFiles, which
@ -329,7 +330,7 @@ func (dh *DownloadHandler) ServeFile(w http.ResponseWriter, r *http.Request, fil
return "file-" + file.String() + ext
}
if r.FormValue("inline") == "1" {
if r.FormValue("inline") == "1" || dh.forceInline {
// TODO(mpl): investigate why at least text files have an incorrect MIME.
if fi.mime == "application/octet-stream" {
// Since e.g. plain text files are seen as "application/octet-stream", we force

3
pkg/server/share.go
View File

@ -265,7 +265,8 @@ func (h *shareHandler) handleGetViaSharing(rw http.ResponseWriter, req *http.Req
return unauthorized(assembleNonTransitive, "Cannot assemble non-transitive share")
}
dh := &DownloadHandler{
Fetcher: h.fetcher,
Fetcher: h.fetcher,
forceInline: true,
// TODO(aa): It would be nice to specify a local cache here, as the UI handler does.
}
dh.ServeFile(rw, req, blobRef)