add login fail warn &

add web client on/off & up admin peer filter & upgrade web client
lejianwen · Oct 14, 2024 · caef389 · caef389
1 parent 5ef6810
commit caef389
Show file tree

Hide file tree

Showing 20 changed files with 461 additions and 377 deletions.
diff --git a/README.md b/README.md
@@ -151,6 +151,8 @@
 
 ```yaml
 lang: "en"
+app:
+  web-client: 1  # 1:启用 0:禁用
 gin:
   api-addr: "0.0.0.0:21114"
   mode: "release"
@@ -180,27 +182,28 @@ logger:
 ### 环境变量
 变量名前缀是`RUSTDESK_API`，环境变量如果存在将覆盖配置文件中的配置
 
-| 变量名                                 | 说明                                   | 示例                          |
-|-------------------------------------|--------------------------------------|-----------------------------|
-| TZ                                  | 时区                                   | Asia/Shanghai               |
-| RUSTDESK_API_LANG                   | 语言                                   | `en`,`zh-CN`                |
-| -----GIN配置-----                     | ----------                           | ----------                  |
-| RUSTDESK_API_GIN_TRUST_PROXY        | 信任的代理IP列表，以`,`分割，默认信任所有              | 192.168.1.2,192.168.1.3     |
-| -----------GORM配置------------------ | ------------------------------------ | --------------------------- |
-| RUSTDESK_API_GORM_TYPE              | 数据库类型sqlite或者mysql，默认sqlite          | sqlite                      |
-| RUSTDESK_API_GORM_MAX_IDLE_CONNS    | 数据库最大空闲连接数                           | 10                          |
-| RUSTDESK_API_GORM_MAX_OPEN_CONNS    | 数据库最大打开连接数                           | 100                         |
-| RUSTDESK_API_RUSTDESK_PERSONAL      | 是否启用个人版API， 1:启用,0:不启用； 默认启用         | 1                           |
-| -----MYSQL配置-----                   | ----------                           | ----------                  |
-| RUSTDESK_API_MYSQL_USERNAME         | mysql用户名                             | root                        |
-| RUSTDESK_API_MYSQL_PASSWORD         | mysql密码                              | 111111                      |
-| RUSTDESK_API_MYSQL_ADDR             | mysql地址                              | 192.168.1.66:3306           |
-| RUSTDESK_API_MYSQL_DBNAME           | mysql数据库名                            | rustdesk                    |
-| -----RUSTDESK配置-----                | ---------------                      | ----------                  |
-| RUSTDESK_API_RUSTDESK_ID_SERVER     | Rustdesk的id服务器地址                     | 192.168.1.66:21116          |
-| RUSTDESK_API_RUSTDESK_RELAY_SERVER  | Rustdesk的relay服务器地址                  | 192.168.1.66:21117          |
-| RUSTDESK_API_RUSTDESK_API_SERVER    | Rustdesk的api服务器地址                    | http://192.168.1.66:21114   |
-| RUSTDESK_API_RUSTDESK_KEY           | Rustdesk的key                         | 123456789                   |
+| 变量名                                | 说明                                   | 示例                          |
+|------------------------------------|--------------------------------------|-----------------------------|
+| TZ                                 | 时区                                   | Asia/Shanghai               |
+| RUSTDESK_API_LANG                  | 语言                                   | `en`,`zh-CN`                |
+| RUSTDESK_API_APP_WEB_CLIENT        | 是否启用web-client; 1:启用,0:不启用; 默认启用     | 1                           |
+| -----GIN配置-----                    | ----------                           | ----------                  |
+| RUSTDESK_API_GIN_TRUST_PROXY       | 信任的代理IP列表，以`,`分割，默认信任所有              | 192.168.1.2,192.168.1.3     |
+| -----------GORM配置----------------  | ------------------------------------ | --------------------------- |
+| RUSTDESK_API_GORM_TYPE             | 数据库类型sqlite或者mysql，默认sqlite          | sqlite                      |
+| RUSTDESK_API_GORM_MAX_IDLE_CONNS   | 数据库最大空闲连接数                           | 10                          |
+| RUSTDESK_API_GORM_MAX_OPEN_CONNS   | 数据库最大打开连接数                           | 100                         |
+| RUSTDESK_API_RUSTDESK_PERSONAL     | 是否启用个人版API， 1:启用,0:不启用； 默认启用         | 1                           |
+| -----MYSQL配置-----                  | ----------                           | ----------                  |
+| RUSTDESK_API_MYSQL_USERNAME        | mysql用户名                             | root                        |
+| RUSTDESK_API_MYSQL_PASSWORD        | mysql密码                              | 111111                      |
+| RUSTDESK_API_MYSQL_ADDR            | mysql地址                              | 192.168.1.66:3306           |
+| RUSTDESK_API_MYSQL_DBNAME          | mysql数据库名                            | rustdesk                    |
+| -----RUSTDESK配置-----               | ---------------                      | ----------                  |
+| RUSTDESK_API_RUSTDESK_ID_SERVER    | Rustdesk的id服务器地址                     | 192.168.1.66:21116          |
+| RUSTDESK_API_RUSTDESK_RELAY_SERVER | Rustdesk的relay服务器地址                  | 192.168.1.66:21117          |
+| RUSTDESK_API_RUSTDESK_API_SERVER   | Rustdesk的api服务器地址                    | http://192.168.1.66:21114   |
+| RUSTDESK_API_RUSTDESK_KEY          | Rustdesk的key                         | 123456789                   |
 
 ### 运行
 

diff --git a/README_EN.md b/README_EN.md
@@ -157,6 +157,8 @@ installation are `admin` `admin`, please change the password immediately.
 
 ```yaml
 lang: "en"
+app:
+  web-client: 1  # web client route 1:open 0:close  
 gin:
   api-addr: "0.0.0.0:21114"
   mode: "release"
@@ -186,27 +188,28 @@ logger:
 ### Environment Variables
 The prefix for variable names is `RUSTDESK_API`. If environment variables exist, they will override the configurations in the configuration file.
 
-| Variable Name                      | Description                                               | Example                        |
-|------------------------------------|-----------------------------------------------------------|--------------------------------|
-| TZ                                 | timezone                                                  | Asia/Shanghai                  |
-| RUSTDESK_API_LANG                  | Language                                                  | `en`,`zh-CN`                   |
-| ----- GIN Configuration -----      | ---------------------------------------                   | ------------------------------ |
-| RUSTDESK_API_GIN_TRUST_PROXY       | Trusted proxy IPs, separated by commas.                   | 192.168.1.2,192.168.1.3        |
-| ----- GORM Configuration -----     | ---------------------------------------                   | ------------------------------ |
-| RUSTDESK_API_GORM_TYPE             | Database type (`sqlite` or `mysql`). Default is `sqlite`. | sqlite                         |
-| RUSTDESK_API_GORM_MAX_IDLE_CONNS   | Maximum idle connections                                  | 10                             |
-| RUSTDESK_API_GORM_MAX_OPEN_CONNS   | Maximum open connections                                  | 100                            |
-| RUSTDESK_API_RUSTDESK_PERSONAL     | Open Personal Api 1:Enable,0:Disable                      | 1                              |
-| ----- MYSQL Configuration -----    | ---------------------------------------                   | ------------------------------ |
-| RUSTDESK_API_MYSQL_USERNAME        | MySQL username                                            | root                           |
-| RUSTDESK_API_MYSQL_PASSWORD        | MySQL password                                            | 111111                         |
-| RUSTDESK_API_MYSQL_ADDR            | MySQL address                                             | 192.168.1.66:3306              |
-| RUSTDESK_API_MYSQL_DBNAME          | MySQL database name                                       | rustdesk                       |
-| ----- RUSTDESK Configuration ----- | ---------------------------------------                   | ------------------------------ |
-| RUSTDESK_API_RUSTDESK_ID_SERVER    | Rustdesk ID server address                                | 192.168.1.66:21116             |
-| RUSTDESK_API_RUSTDESK_RELAY_SERVER | Rustdesk relay server address                             | 192.168.1.66:21117             |
-| RUSTDESK_API_RUSTDESK_API_SERVER   | Rustdesk API server address                               | http://192.168.1.66:21114      |
-| RUSTDESK_API_RUSTDESK_KEY          | Rustdesk key                                              | 123456789                      |
+| Variable Name                      | Description                                               | Example                       |
+|------------------------------------|-----------------------------------------------------------|-------------------------------|
+| TZ                                 | timezone                                                  | Asia/Shanghai                 |
+| RUSTDESK_API_LANG                  | Language                                                  | `en`,`zh-CN`                  |
+| RUSTDESK_API_APP_WEB_CLIENT        | web client on/off; 1: on, 0 off, deault 1                 | 1                             |
+| ----- GIN Configuration -----      | ---------------------------------------                   | ----------------------------- |
+| RUSTDESK_API_GIN_TRUST_PROXY       | Trusted proxy IPs, separated by commas.                   | 192.168.1.2,192.168.1.3       |
+| ----- GORM Configuration -----     | ---------------------------------------                   | ----------------------------- |
+| RUSTDESK_API_GORM_TYPE             | Database type (`sqlite` or `mysql`). Default is `sqlite`. | sqlite                        |
+| RUSTDESK_API_GORM_MAX_IDLE_CONNS   | Maximum idle connections                                  | 10                            |
+| RUSTDESK_API_GORM_MAX_OPEN_CONNS   | Maximum open connections                                  | 100                           |
+| RUSTDESK_API_RUSTDESK_PERSONAL     | Open Personal Api 1:Enable,0:Disable                      | 1                             |
+| ----- MYSQL Configuration -----    | ---------------------------------------                   | ----------------------------- |
+| RUSTDESK_API_MYSQL_USERNAME        | MySQL username                                            | root                          |
+| RUSTDESK_API_MYSQL_PASSWORD        | MySQL password                                            | 111111                        |
+| RUSTDESK_API_MYSQL_ADDR            | MySQL address                                             | 192.168.1.66:3306             |
+| RUSTDESK_API_MYSQL_DBNAME          | MySQL database name                                       | rustdesk                      |
+| ----- RUSTDESK Configuration ----- | ---------------------------------------                   | ----------------------------- |
+| RUSTDESK_API_RUSTDESK_ID_SERVER    | Rustdesk ID server address                                | 192.168.1.66:21116            |
+| RUSTDESK_API_RUSTDESK_RELAY_SERVER | Rustdesk relay server address                             | 192.168.1.66:21117            |
+| RUSTDESK_API_RUSTDESK_API_SERVER   | Rustdesk API server address                               | http://192.168.1.66:21114     |
+| RUSTDESK_API_RUSTDESK_KEY          | Rustdesk key                                              | 123456789                     |
 
 ### Installation Steps
 

diff --git a/conf/config.yaml b/conf/config.yaml
@@ -1,4 +1,6 @@
 lang: "zh-CN"
+app:
+  web-client: 1  # 1:启用 0:禁用
 gin:
   api-addr: "0.0.0.0:21114"
   mode: "release" #release,debug,test
@@ -16,7 +18,7 @@ mysql:
 rustdesk:
   id-server: "192.168.1.66:21116"
   relay-server: "192.168.1.66:21117"
-  api-server: "http://192.168.1.66:21114"
+  api-server: "http://127.0.0.1:21114"
   key: "123456789"
   personal: 1
 logger:

diff --git a/config/config.go b/config/config.go
@@ -14,8 +14,13 @@ const (
 	DefaultConfig = "conf/config.yaml"
 )
 
+type App struct {
+	WebClient int `mapstructure:"web-client"`
+}
+
 type Config struct {
 	Lang     string `mapstructure:"lang"`
+	App      App
 	Gorm     Gorm
 	Mysql    Mysql
 	Gin      Gin

diff --git a/http/controller/admin/login.go b/http/controller/admin/login.go
@@ -7,6 +7,7 @@ import (
 	adResp "Gwen/http/response/admin"
 	"Gwen/model"
 	"Gwen/service"
+	"fmt"
 	"github.com/gin-gonic/gin"
 )
 
@@ -28,18 +29,21 @@ func (ct *Login) Login(c *gin.Context) {
 	f := &admin.Login{}
 	err := c.ShouldBindJSON(f)
 	if err != nil {
+		global.Logger.Warn(fmt.Sprintf("Login Fail: %s %s %s", "ParamsError", c.RemoteIP(), c.ClientIP()))
 		response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 
 	errList := global.Validator.ValidStruct(c, f)
 	if len(errList) > 0 {
+		global.Logger.Warn(fmt.Sprintf("Login Fail: %s %s %s", "ParamsError", c.RemoteIP(), c.ClientIP()))
 		response.Fail(c, 101, errList[0])
 		return
 	}
 	u := service.AllService.UserService.InfoByUsernamePassword(f.Username, f.Password)
 
 	if u.Id == 0 {
+		global.Logger.Warn(fmt.Sprintf("Login Fail: %s %s %s", "UsernameOrPasswordError", c.RemoteIP(), c.ClientIP()))
 		response.Fail(c, 101, response.TranslateMsg(c, "UsernameOrPasswordError"))
 		return
 	}

diff --git a/http/controller/admin/peer.go b/http/controller/admin/peer.go
@@ -96,6 +96,12 @@ func (ct *Peer) List(c *gin.Context) {
 			lt := time.Now().Unix() + int64(query.TimeAgo)
 			tx.Where("last_online_time > ?", lt)
 		}
+		if query.Id != "" {
+			tx.Where("id like ?", "%"+query.Id+"%")
+		}
+		if query.Hostname != "" {
+			tx.Where("hostname like ?", "%"+query.Hostname+"%")
+		}
 	})
 	response.Success(c, res)
 }

diff --git a/http/controller/admin/rustdesk.go b/http/controller/admin/rustdesk.go
@@ -9,9 +9,9 @@ import (
 type Rustdesk struct {
 }
 
-// ServerConfig 服务配置
+// ServerConfig RUSTDESK服务配置
 // @Tags ADMIN
-// @Summary 服务配置
+// @Summary RUSTDESK服务配置
 // @Description 服务配置,给webclient提供api-server
 // @Accept  json
 // @Produce  json
@@ -28,3 +28,19 @@ func (r *Rustdesk) ServerConfig(c *gin.Context) {
 	}
 	response.Success(c, cf)
 }
+
+// AppConfig APP服务配置
+// @Tags ADMIN
+// @Summary APP服务配置
+// @Description APP服务配置
+// @Accept  json
+// @Produce  json
+// @Success 200 {object} response.Response
+// @Failure 500 {object} response.Response
+// @Router /admin/app-config [get]
+// @Security token
+func (r *Rustdesk) AppConfig(c *gin.Context) {
+	response.Success(c, &gin.H{
+		"web_client": global.Config.App.WebClient,
+	})
+}
diff --git a/http/controller/api/ab.go b/http/controller/api/ab.go
@@ -8,7 +8,6 @@ import (
 	"Gwen/model"
 	"Gwen/service"
 	"encoding/json"
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"net/http"
 	"strconv"
@@ -402,7 +401,7 @@ func (a *Ab) PeerAdd(c *gin.Context) {
 		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-	fmt.Println(f)
+	//fmt.Println(f)
 	u := service.AllService.UserService.CurUser(c)
 	f.UserId = u.Id
 	ab := f.ToAddressBook()

diff --git a/http/controller/api/login.go b/http/controller/api/login.go
@@ -8,6 +8,7 @@ import (
 	"Gwen/model"
 	"Gwen/service"
 	"encoding/json"
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"net/http"
 )
@@ -30,19 +31,22 @@ func (l *Login) Login(c *gin.Context) {
 	err := c.ShouldBindJSON(f)
 	//fmt.Println(f)
 	if err != nil {
+		global.Logger.Warn(fmt.Sprintf("Login Fail: %s %s %s", "ParamsError", c.RemoteIP(), c.ClientIP()))
 		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
 
 	errList := global.Validator.ValidStruct(c, f)
 	if len(errList) > 0 {
+		global.Logger.Warn(fmt.Sprintf("Login Fail: %s %s %s", "ParamsError", c.RemoteIP(), c.ClientIP()))
 		response.Error(c, errList[0])
 		return
 	}
 
 	u := service.AllService.UserService.InfoByUsernamePassword(f.Username, f.Password)
 
 	if u.Id == 0 {
+		global.Logger.Warn(fmt.Sprintf("Login Fail: %s %s %s", "UsernameOrPasswordError", c.RemoteIP(), c.ClientIP()))
 		response.Error(c, response.TranslateMsg(c, "UsernameOrPasswordError"))
 		return
 	}

diff --git a/http/controller/api/peer.go b/http/controller/api/peer.go
@@ -22,25 +22,35 @@ type Peer struct {
 // @Success 200 {string} string "SYSINFO_UPDATED,ID_NOT_FOUND"
 // @Failure 500 {object} response.ErrorResponse
 // @Router /sysinfo [post]
-// @Security BearerAuth
 func (p *Peer) SysInfo(c *gin.Context) {
 	f := &requstform.PeerForm{}
 	err := c.ShouldBindBodyWith(f, binding.JSON)
 	if err != nil {
 		response.Error(c, response.TranslateMsg(c, "ParamsError")+err.Error())
 		return
 	}
-
+	fpe := f.ToPeer()
 	pe := service.AllService.PeerService.FindById(f.Id)
-	if pe == nil || pe.RowId == 0 {
+	if pe.RowId == 0 {
 		pe = f.ToPeer()
+		pe.UserId = service.AllService.UserService.FindLatestUserIdFromLoginLogByUuid(pe.Uuid)
 		err = service.AllService.PeerService.Create(pe)
 		if err != nil {
 			response.Error(c, response.TranslateMsg(c, "OperationFailed")+err.Error())
 			return
 		}
+	} else {
+		if pe.UserId == 0 {
+			pe.UserId = service.AllService.UserService.FindLatestUserIdFromLoginLogByUuid(pe.Uuid)
+		}
+		fpe.RowId = pe.RowId
+		fpe.UserId = pe.UserId
+		err = service.AllService.PeerService.Update(fpe)
+		if err != nil {
+			response.Error(c, response.TranslateMsg(c, "OperationFailed")+err.Error())
+			return
+		}
 	}
-
 	//SYSINFO_UPDATED 上传成功
 	//ID_NOT_FOUND 下次心跳会上传
 	//直接响应文本

diff --git a/http/middleware/rustauth.go b/http/middleware/rustauth.go
@@ -7,7 +7,7 @@ import (
 
 func RustAuth() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		//fmt.Println(c.Request.Header)
+		//fmt.Println(c.Request.URL, c.Request.Header)
 		//获取HTTP_AUTHORIZATION
 		token := c.GetHeader("Authorization")
 		if token == "" {

diff --git a/http/request/admin/peer.go b/http/request/admin/peer.go
@@ -35,5 +35,7 @@ func (f *PeerForm) ToPeer() *model.Peer {
 
 type PeerQuery struct {
 	PageQuery
-	TimeAgo int `json:"time_ago" form:"time_ago"`
+	TimeAgo  int    `json:"time_ago" form:"time_ago"`
+	Id       string `json:"id" form:"id"`
+	Hostname string `json:"hostname" form:"hostname"`
 }
diff --git a/http/router/admin.go b/http/router/admin.go
@@ -30,6 +30,7 @@ func Init(g *gin.Engine) {
 
 	rs := &admin.Rustdesk{}
 	adg.GET("/server-config", rs.ServerConfig)
+	adg.GET("/app-config", rs.AppConfig)
 
 	//访问静态文件
 	//g.StaticFS("/upload", http.Dir(global.Config.Gin.ResourcesPath+"/upload"))

diff --git a/http/router/api.go b/http/router/api.go
@@ -47,17 +47,11 @@ func ApiInit(g *gin.Engine) {
 		frg.POST("/sysinfo", pe.SysInfo)
 	}
 
-	{
-		w := &api.WebClient{}
-		frg.POST("/shared-peer", w.SharedPeer)
+	if global.Config.App.WebClient == 1 {
+		WebClientRoutes(frg)
 	}
 
 	frg.Use(middleware.RustAuth())
-	{
-		w := &api.WebClient{}
-		frg.POST("/server-config", w.ServerConfig)
-	}
-
 	{
 		u := &api.User{}
 		frg.GET("/user/info", u.Info)
@@ -115,3 +109,14 @@ func PersonalRoutes(frg *gin.RouterGroup) {
 	}
 
 }
+
+func WebClientRoutes(frg *gin.RouterGroup) {
+	w := &api.WebClient{}
+	{
+		frg.POST("/shared-peer", w.SharedPeer)
+	}
+	{
+		frg.POST("/server-config", middleware.RustAuth(), w.ServerConfig)
+	}
+
+}
diff --git a/http/router/router.go b/http/router/router.go
@@ -10,7 +10,13 @@ import (
 func WebInit(g *gin.Engine) {
 	i := &web.Index{}
 	g.GET("/", i.Index)
-	g.GET("/webclient-config/index.js", i.ConfigJs)
-	g.StaticFS("/webclient", http.Dir(global.Config.Gin.ResourcesPath+"/web"))
+
+	if global.Config.App.WebClient == 1 {
+		g.GET("/webclient-config/index.js", i.ConfigJs)
+	}
+
+	if global.Config.App.WebClient == 1 {
+		g.StaticFS("/webclient", http.Dir(global.Config.Gin.ResourcesPath+"/web"))
+	}
 	g.StaticFS("/_admin", http.Dir(global.Config.Gin.ResourcesPath+"/admin"))
 }
diff --git a/lib/orm/sqlite.go b/lib/orm/sqlite.go
@@ -16,6 +16,7 @@ type SqliteConfig struct {
 
 func NewSqlite(sqliteConf *SqliteConfig) *gorm.DB {
 	db, err := gorm.Open(sqlite.Open("./data/rustdeskapi.db"), &gorm.Config{
+		DisableForeignKeyConstraintWhenMigrating: true,
 		Logger: logger.New(
 			global.Logger, // io writer
 			logger.Config{

diff --git a/resources/web/js/dist/index.js b/resources/web/js/dist/index.js