daxi20/bird-lg-go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Increase consistency of path escaping and support IPv6 addresses instead of hostnames

Browse Source
This commit is contained in:
Henri
2021-04-06 21:43:58 +02:00
parent f77a8a28fe
commit 874089117b
5 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/webserver.go
View File

@@ -71,12 +71,7 @@ func webBackendCommunicator(endpoint string, command string) func(w http.Respons
split := strings.SplitN(r.URL.Path[1:], "/", 3)
var urlCommands string
if len(split) >= 3 {
tmp, err := url.PathUnescape(split[2])
if err != nil {
serverError(w, r)
return
}
urlCommands = tmp
urlCommands = split[2]
}
var backendCommand string
@@ -87,12 +82,7 @@ func webBackendCommunicator(endpoint string, command string) func(w http.Respons
}
backendCommand = strings.TrimSpace(backendCommand)
escapedServers, err := url.PathUnescape(split[1])
if err != nil {
serverError(w, r)
return
}
servers := strings.Split(escapedServers, "+")
servers := strings.Split(split[1], "+")
var responses []string = batchRequest(servers, endpoint, backendCommand)
var content string
@@ -182,7 +172,7 @@ func webServerStart() {
// redirect main page to all server summary
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, "/summary/"+strings.Join(setting.servers, "+"), 302)
http.Redirect(w, r, "/summary/"+url.PathEscape(strings.Join(setting.servers, "+")), 302)
})
// serve static pages using the AssetFS and bindata