libretic/transfer.sh
6
0
Fork 0
mirror of https://github.com/dutchcoders/transfer.sh.git synced 2024-11-23 04:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

no need for abs path flag param

Browse source
This commit is contained in:
Andrea Spacca 2019-07-16 21:23:19 +02:00
parent 2e41852860
commit 58edf68fd7
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
server/handlers.go
View file

@ -157,9 +157,9 @@ func (s *Server) previewHandler(w http.ResponseWriter, r *http.Request) {
} }
relativeURL, _ := url.Parse(path.Join(s.proxyPath, token, filename)) relativeURL, _ := url.Parse(path.Join(s.proxyPath, token, filename))
resolvedURL := resolveURL(r, relativeURL, true) resolvedURL := resolveURL(r, relativeURL)
relativeURLGet, _ := url.Parse(path.Join(s.proxyPath, getPathPart, token, filename)) relativeURLGet, _ := url.Parse(path.Join(s.proxyPath, getPathPart, token, filename))
resolvedURLGet := resolveURL(r, relativeURLGet, true) resolvedURLGet := resolveURL(r, relativeURLGet)
var png []byte var png []byte
png, err = qrcode.Encode(resolvedURL, qrcode.High, 150) png, err = qrcode.Encode(resolvedURL, qrcode.High, 150)
if err != nil { if err != nil {
@ -499,15 +499,13 @@ func (s *Server) putHandler(w http.ResponseWriter, r *http.Request) {
relativeURL, _ := url.Parse(path.Join(s.proxyPath, token, filename)) relativeURL, _ := url.Parse(path.Join(s.proxyPath, token, filename))
deleteURL, _ := url.Parse(path.Join(s.proxyPath, token, filename, metadata.DeletionToken)) deleteURL, _ := url.Parse(path.Join(s.proxyPath, token, filename, metadata.DeletionToken))
w.Header().Set("X-Url-Delete", resolveURL(r, deleteURL, true)) w.Header().Set("X-Url-Delete", resolveURL(r, deleteURL))
fmt.Fprint(w, resolveURL(r, relativeURL, false)) fmt.Fprint(w, resolveURL(r, relativeURL))
} }
func resolveURL(r *http.Request, u *url.URL, absolutePath bool) string { func resolveURL(r *http.Request, u *url.URL) string {
if absolutePath { r.URL.Path = ""
r.URL.Path = ""
}
return getURL(r).ResolveReference(u).String() return getURL(r).ResolveReference(u).String()
} }