diff --git a/cmd/frps-multiuser/cmd.go b/cmd/frps-multiuser/cmd.go
index 7e84bc3..a3557d3 100644
--- a/cmd/frps-multiuser/cmd.go
+++ b/cmd/frps-multiuser/cmd.go
@@ -10,7 +10,6 @@ import (
"log"
"os"
"path/filepath"
- "strconv"
"strings"
)
@@ -103,24 +102,14 @@ func ParseConfigFile(file string) (controller.CommonInfo, map[string]controller.
log.Printf("fail to get [common] section from file %s : %v", file, err)
return common, nil, nil, nil, nil, iniFile, err
}
- pluginAddr := commonSection.Key("plugin_addr").Value()
- if len(pluginAddr) != 0 {
- common.PluginAddr = pluginAddr
- } else {
- common.PluginAddr = "0.0.0.0"
- }
- pluginPort := commonSection.Key("plugin_port").Value()
- if len(pluginPort) != 0 {
- port, err := strconv.Atoi(pluginPort)
- if err != nil {
- return common, nil, nil, nil, nil, iniFile, err
- }
- common.PluginPort = port
- } else {
- common.PluginPort = 7200
- }
+ common.PluginAddr = commonSection.Key("plugin_addr").MustString("0.0.0.0")
+ common.PluginPort = commonSection.Key("plugin_port").MustInt(7200)
common.User = commonSection.Key("admin_user").Value()
common.Pwd = commonSection.Key("admin_pwd").Value()
+ common.DashboardAddr = commonSection.Key("dashboard_addr").MustString("127.0.0.1")
+ common.DashboardPort = commonSection.Key("dashboard_port").MustInt(7500)
+ common.DashboardUser = commonSection.Key("dashboard_user").Value()
+ common.DashboardPwd = commonSection.Key("dashboard_pwd").Value()
portsSection, err := iniFile.GetSection("ports")
if err != nil {
diff --git a/config/frps-multiuser.ini b/config/frps-multiuser.ini
index 812c268..0f721f5 100644
--- a/config/frps-multiuser.ini
+++ b/config/frps-multiuser.ini
@@ -1,9 +1,16 @@
; basic options
[common]
+; frps config info
plugin_addr = 127.0.0.1
plugin_port = 7200
-admin_user = admin
-admin_pwd = admin
+admin_user = admin
+admin_pwd = admin
+
+; frp dashboard config info
+dashboard_addr = 127.0.0.1
+dashboard_port = 7500
+dashboard_user = admin
+dashboard_pwd = admin
; user tokens
[users]
diff --git a/pkg/server/controller/controller.go b/pkg/server/controller/controller.go
index 0bd20dc..8fe549b 100644
--- a/pkg/server/controller/controller.go
+++ b/pkg/server/controller/controller.go
@@ -1,16 +1,19 @@
package controller
import (
+ "encoding/base64"
"encoding/json"
"errors"
"fmt"
plugin "github.com/fatedier/frp/pkg/plugin/server"
ginI18n "github.com/gin-contrib/i18n"
"github.com/gin-gonic/gin"
+ "io"
"log"
"net/http"
"regexp"
"sort"
+ "strconv"
"strings"
)
@@ -21,6 +24,7 @@ const (
SaveError = 3
UserFormatError = 4
TokenFormatError = 5
+ FrpServerError = 6
)
var UserFormatReg = regexp.MustCompile("^\\w+$")
@@ -38,10 +42,14 @@ type HTTPError struct {
}
type CommonInfo struct {
- PluginAddr string
- PluginPort int
- User string
- Pwd string
+ PluginAddr string
+ PluginPort int
+ User string
+ Pwd string
+ DashboardAddr string
+ DashboardPort int
+ DashboardUser string
+ DashboardPwd string
}
type TokenInfo struct {
@@ -67,6 +75,11 @@ type OperationResponse struct {
Message string `json:"message"`
}
+type ProxyResponse struct {
+ OperationResponse
+ Data string `json:"data"`
+}
+
type TokenSearch struct {
TokenInfo
Page int `form:"page"`
@@ -632,3 +645,45 @@ func (c *HandleController) MakeEnableTokensFunc() func(context *gin.Context) {
context.JSON(http.StatusOK, &response)
}
}
+
+func (c *HandleController) MakeProxyFunc() func(context *gin.Context) {
+ return func(context *gin.Context) {
+ res := ProxyResponse{}
+ host := c.CommonInfo.DashboardAddr
+ port := c.CommonInfo.DashboardPort
+ requestUrl := "http://" + host + ":" + strconv.Itoa(port) + context.Param("serverApi")
+ request, _ := http.NewRequest("GET", requestUrl, nil)
+ username := c.CommonInfo.DashboardUser
+ if len(strings.TrimSpace(username)) != 0 {
+ password := c.CommonInfo.DashboardPwd
+ auth := []byte(username + ":" + password)
+ request.Header.Add("Authorization", "Basic "+base64.StdEncoding.EncodeToString(auth))
+ }
+ response, err := http.DefaultClient.Do(request)
+
+ if err != nil {
+ res.Code = FrpServerError
+ res.Success = false
+ res.Message = err.Error()
+ context.JSON(http.StatusOK, &res)
+ return
+ }
+
+ res.Code = response.StatusCode
+ body, err := io.ReadAll(response.Body)
+
+ if err != nil {
+ res.Success = false
+ res.Message = err.Error()
+ } else {
+ if res.Code == http.StatusOK {
+ res.Success = true
+ res.Data = string(body)
+ } else {
+ res.Success = false
+ res.Message = string(body)
+ }
+ }
+ context.JSON(http.StatusOK, &res)
+ }
+}
diff --git a/pkg/server/controller/op.go b/pkg/server/controller/op.go
index ddbc0f2..43e1aff 100644
--- a/pkg/server/controller/op.go
+++ b/pkg/server/controller/op.go
@@ -54,6 +54,7 @@ func (c *HandleController) Register(rootDir string, engine *gin.Engine) {
group.POST("/remove", c.MakeRemoveTokensFunc())
group.POST("/disable", c.MakeDisableTokensFunc())
group.POST("/enable", c.MakeEnableTokensFunc())
+ group.GET("/proxy/*serverApi", c.MakeProxyFunc())
}
func (c *HandleController) HandleLogin(content *plugin.LoginContent) plugin.Response {