extern/frp
1
1
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2024-12-15 19:21:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #186 from vashstorm/bugfix

Browse Source 
add auth for reload api
This commit is contained in:
fatedier 2016-12-20 05:20:54 -06:00 committed by GitHub
commit 0573ddcd84
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cmd/frps/main.go
View File

@ -15,6 +15,7 @@
package main
import (
"encoding/base64"
"encoding/json"
"fmt"
"io/ioutil"
@ -68,7 +69,18 @@ func main() {
// reload check
if args["--reload"] != nil {
if args["--reload"].(bool) {
resp, err := http.Get("http://" + server.BindAddr + ":" + fmt.Sprintf("%d", server.DashboardPort) + "/api/reload")
req, err := http.NewRequest("GET", "http://"+server.BindAddr+":"+fmt.Sprintf("%d", server.DashboardPort)+"/api/reload", nil)
if err != nil {
fmt.Printf("frps reload error: %v\n", err)
os.Exit(1)
}
authStr := "Basic " + base64.StdEncoding.EncodeToString([]byte(server.DashboardUsername+":"+server.DashboardPassword))
req.Header.Add("Authorization", authStr)
defaultClient := &http.Client{}
resp, err := defaultClient.Do(req)
if err != nil {
fmt.Printf("frps reload error: %v\n", err)
os.Exit(1)

3
src/models/server/dashboard.go
View File

@ -34,7 +34,8 @@ func RunDashboardServer(addr string, port int64) (err error) {
// url router
mux := http.NewServeMux()
// api, see dashboard_api.go
mux.HandleFunc("/api/reload", apiReload)
// mux.HandleFunc("/api/reload", apiReload)
mux.HandleFunc("/api/reload", use(apiReload, basicAuth))
mux.HandleFunc("/api/proxies", apiProxies)
// view, see dashboard_view.go