fix: fix static assets url generation (#965)

This commit is contained in:
Oleg Lobanov 2020-05-31 22:24:18 +02:00
parent 6e5405eeed
commit ba47e3b2fe
No known key found for this signature in database
GPG key ID: 7CC64E41212621B0
5 changed files with 13 additions and 13 deletions

View file

@ -4,6 +4,7 @@ import (
"crypto/rand"
"encoding/base64"
"net/http"
"path"
"strconv"
"strings"
"time"
@ -56,7 +57,7 @@ var sharePostHandler = withPermShare(func(w http.ResponseWriter, r *http.Request
var err error
s, err = d.store.Share.GetPermanent(r.URL.Path, d.user.ID)
if err == nil {
w.Write([]byte(d.server.BaseURL + "/share/" + s.Hash))
w.Write([]byte(path.Join(d.server.BaseURL, "/share/", s.Hash)))
return 0, nil
}
}

View file

@ -5,6 +5,7 @@ import (
"log"
"net/http"
"os"
"path"
"path/filepath"
"strings"
"text/template"
@ -19,8 +20,6 @@ import (
func handleWithStaticData(w http.ResponseWriter, r *http.Request, d *data, box *rice.Box, file, contentType string) (int, error) {
w.Header().Set("Content-Type", contentType)
staticURL := strings.TrimPrefix(d.server.BaseURL+"/static", "/")
auther, err := d.store.Auth.Get(d.settings.AuthMethod)
if err != nil {
return http.StatusInternalServerError, err
@ -31,7 +30,7 @@ func handleWithStaticData(w http.ResponseWriter, r *http.Request, d *data, box *
"DisableExternal": d.settings.Branding.DisableExternal,
"BaseURL": d.server.BaseURL,
"Version": version.Version,
"StaticURL": staticURL,
"StaticURL": path.Join(d.server.BaseURL, "/static"),
"Signup": d.settings.Signup,
"NoAuth": d.settings.AuthMethod == auth.MethodNoAuth,
"AuthMethod": d.settings.AuthMethod,

View file

@ -43,7 +43,7 @@ func errToStatus(err error) int {
// This is an addaptation if http.StripPrefix in which we don't
// return 404 if the page doesn't have the needed prefix.
func stripPrefix(prefix string, h http.Handler) http.Handler {
if prefix == "" {
if prefix == "" || prefix == "/" {
return h
}