nicoeri/filebrowser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: static paths

Browse Source 
License: MIT
Signed-off-by: Henrique Dias <hacdias@gmail.com>
This commit is contained in:
Henrique Dias 2018-12-29 08:52:09 +00:00
parent 531703d007
commit c585ef92fe
2 changed files with 72 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
http/http.go
View File

@ -5,12 +5,7 @@ import (
"log" "log"
"net/http" "net/http"
"strconv" "strconv"
"strings"
"text/template"
"github.com/filebrowser/filebrowser/auth"
"github.com/GeertJohan/go.rice"
"github.com/filebrowser/filebrowser/types" "github.com/filebrowser/filebrowser/types"
"github.com/gorilla/mux" "github.com/gorilla/mux"
) )
@ -29,72 +24,11 @@ type Env struct {
Store *types.Store Store *types.Store
} }
func (e *Env) getHandlers() (http.Handler, http.Handler) {
box := rice.MustFindBox("../frontend/dist")
handler := http.FileServer(box.HTTPBox())
baseURL := strings.TrimSuffix(e.Settings.BaseURL, "/")
staticURL := strings.TrimPrefix(baseURL+"/static", "/")
// TODO: baseurl must always not have the trailing slash
data := map[string]interface{}{
"BaseURL": baseURL,
"Version": types.Version,
"StaticURL": staticURL,
"Signup": e.Settings.Signup,
"ReCaptcha": false,
}
if e.Settings.AuthMethod == auth.MethodJSONAuth {
auther := e.Auther.(*auth.JSONAuth)
if auther.ReCaptcha != nil {
data["ReCaptcha"] = auther.ReCaptcha.Key != "" && auther.ReCaptcha.Secret != ""
data["ReCaptchaHost"] = auther.ReCaptcha.Host
data["ReCaptchaKey"] = auther.ReCaptcha.Key
}
}
index := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodGet {
httpErr(w, r, http.StatusNotFound, nil)
return
}
w.Header().Set("x-frame-options", "SAMEORIGIN")
w.Header().Set("x-xss-protection", "1; mode=block")
w.Header().Set("Content-Type", "text/html; charset=utf-8")
index := template.Must(template.New("index").Delims("[{[", "]}]").Parse(box.MustString("/index.html")))
err := index.Execute(w, data)
if err != nil {
httpErr(w, r, http.StatusInternalServerError, err)
}
})
static := http.StripPrefix("/static", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if !strings.HasSuffix(r.URL.Path, ".js") {
handler.ServeHTTP(w, r)
return
}
w.Header().Set("Content-Type", "application/javascript; charset=utf-8")
index := template.Must(template.New("index").Delims("[{[", "]}]").Parse(box.MustString(r.URL.Path)))
err := index.Execute(w, data)
if err != nil {
httpErr(w, r, http.StatusInternalServerError, err)
}
}))
return index, static
}
// Handler ... // Handler ...
func Handler(e *Env) http.Handler { func Handler(e *Env) http.Handler {
r := mux.NewRouter() r := mux.NewRouter()
index, static := e.getHandlers() index, static := e.getStaticHandlers()
r.PathPrefix("/static").Handler(static) r.PathPrefix("/static").Handler(static)
r.NotFoundHandler = index r.NotFoundHandler = index

71
http/static.go Normal file
View File

@ -0,0 +1,71 @@
package http
import (
"net/http"
"strings"
"text/template"
"github.com/GeertJohan/go.rice"
"github.com/filebrowser/filebrowser/auth"
"github.com/filebrowser/filebrowser/types"
)
func (e *Env) getStaticHandlers() (http.Handler, http.Handler) {
box := rice.MustFindBox("../frontend/dist")
handler := http.FileServer(box.HTTPBox())
baseURL := strings.TrimSuffix(e.Settings.BaseURL, "/")
staticURL := strings.TrimPrefix(baseURL+"/static", "/")
// TODO: baseurl must always not have the trailing slash
data := map[string]interface{}{
"BaseURL": baseURL,
"Version": types.Version,
"StaticURL": staticURL,
"Signup": e.Settings.Signup,
"ReCaptcha": false,
}
if e.Settings.AuthMethod == auth.MethodJSONAuth {
auther := e.Auther.(*auth.JSONAuth)
if auther.ReCaptcha != nil {
data["ReCaptcha"] = auther.ReCaptcha.Key != "" && auther.ReCaptcha.Secret != ""
data["ReCaptchaHost"] = auther.ReCaptcha.Host
data["ReCaptchaKey"] = auther.ReCaptcha.Key
}
}
handleWithData := func(w http.ResponseWriter, r *http.Request, file string, contentType string) {
w.Header().Set("Content-Type", contentType)
index := template.Must(template.New("index").Delims("[{[", "]}]").Parse(box.MustString(file)))
err := index.Execute(w, data)
if err != nil {
httpErr(w, r, http.StatusInternalServerError, err)
}
}
index := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Method != http.MethodGet {
httpErr(w, r, http.StatusNotFound, nil)
return
}
w.Header().Set("x-frame-options", "SAMEORIGIN")
w.Header().Set("x-xss-protection", "1; mode=block")
handleWithData(w, r, "index.html", "text/html; charset=utf-8")
})
static := http.StripPrefix("/static", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if !strings.HasSuffix(r.URL.Path, ".js") {
handler.ServeHTTP(w, r)
return
}
handleWithData(w, r, strings.TrimPrefix(r.URL.Path, "/"), "application/javascript; charset=utf-8")
}))
return index, static
}