perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't redirect to absolute URL (fixes #166)

Browse Source
This commit is contained in:
Jakob Borg 2014-04-30 22:10:13 +02:00
parent 0d55cf4be5
commit ac74ee1468
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/syncthing/gui.go
View File

@ -25,6 +25,8 @@ var (
configInSync = true configInSync = true
guiErrors = []guiError{} guiErrors = []guiError{}
guiErrorsMut sync.Mutex guiErrorsMut sync.Mutex
static = embeddedStatic()
staticFunc = static.(func(http.ResponseWriter, *http.Request))
) )
const ( const (
@ -53,7 +55,7 @@ func startGUI(cfg GUIConfiguration, m *Model) {
if len(cfg.User) > 0 && len(cfg.Password) > 0 { if len(cfg.User) > 0 && len(cfg.Password) > 0 {
mr.Use(basic(cfg.User, cfg.Password)) mr.Use(basic(cfg.User, cfg.Password))
} }
mr.Use(embeddedStatic()) mr.Use(static)
mr.Use(martini.Recovery()) mr.Use(martini.Recovery())
mr.Use(restMiddleware) mr.Use(restMiddleware)
mr.Action(router.Handle) mr.Action(router.Handle)
@ -66,7 +68,8 @@ func startGUI(cfg GUIConfiguration, m *Model) {
} }
func getRoot(w http.ResponseWriter, r *http.Request) { func getRoot(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, "/index.html", 302) r.URL.Path = "/index.html"
staticFunc(w, r)
} }
func restMiddleware(w http.ResponseWriter, r *http.Request) { func restMiddleware(w http.ResponseWriter, r *http.Request) {

3
cmd/syncthing/gui_embedded.go
View File

@ -4,7 +4,6 @@ package main
import ( import (
"fmt" "fmt"
"log"
"mime" "mime"
"net/http" "net/http"
"path/filepath" "path/filepath"
@ -16,7 +15,7 @@ import (
func embeddedStatic() interface{} { func embeddedStatic() interface{} {
var modt = time.Now().UTC().Format(http.TimeFormat) var modt = time.Now().UTC().Format(http.TimeFormat)
return func(res http.ResponseWriter, req *http.Request, log *log.Logger) { return func(res http.ResponseWriter, req *http.Request) {
file := req.URL.Path file := req.URL.Path
if file[0] == '/' { if file[0] == '/' {