Browse Source

no need for abs path flag param

tags/v1.1.1
Andrea Spacca 4 years ago
parent
commit
58edf68fd7
1 changed files with 6 additions and 8 deletions
  1. +6
    -8
      server/handlers.go

+ 6
- 8
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))
resolvedURL := resolveURL(r, relativeURL, true)
resolvedURL := resolveURL(r, relativeURL)
relativeURLGet, _ := url.Parse(path.Join(s.proxyPath, getPathPart, token, filename))
resolvedURLGet := resolveURL(r, relativeURLGet, true)
resolvedURLGet := resolveURL(r, relativeURLGet)
var png []byte
png, err = qrcode.Encode(resolvedURL, qrcode.High, 150)
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))
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 {
if absolutePath {
r.URL.Path = ""
}
func resolveURL(r *http.Request, u *url.URL) string {
r.URL.Path = ""

return getURL(r).ResolveReference(u).String()
}


Loading…
Cancel
Save