mirror of
https://github.com/TeaOSLab/EdgeAPI.git
synced 2026-01-05 15:05:47 +08:00
允许用户调用修改TCP/TLS接口;新增server.tcp.port功能;增加检查端口是否使用接口
This commit is contained in:
@@ -1232,16 +1232,42 @@ func (this *ServerDAO) FindEnabledServerIdWithReverseProxyId(tx *dbs.Tx, reverse
|
||||
}
|
||||
|
||||
// 检查端口是否被使用
|
||||
func (this *ServerDAO) CheckPortIsUsing(tx *dbs.Tx, clusterId int64, port int) (bool, error) {
|
||||
func (this *ServerDAO) CheckPortIsUsing(tx *dbs.Tx, clusterId int64, port int, excludeServerId int64, excludeProtocol string) (bool, error) {
|
||||
listen := maps.Map{
|
||||
"portRange": strconv.Itoa(port),
|
||||
}
|
||||
|
||||
return this.Query(tx).
|
||||
query := this.Query(tx).
|
||||
Attr("clusterId", clusterId).
|
||||
State(ServerStateEnabled).
|
||||
Where("(JSON_CONTAINS(http, :listen) OR JSON_CONTAINS(https, :listen) OR JSON_CONTAINS(tcp, :listen) OR JSON_CONTAINS(tls, :listen))").
|
||||
Param(":listen", string(listen.AsJSON())).
|
||||
State(ServerStateEnabled)
|
||||
protocols := []string{"http", "https", "tcp", "tls", "udp"}
|
||||
where := ""
|
||||
if excludeServerId <= 0 {
|
||||
conds := []string{}
|
||||
for _, p := range protocols {
|
||||
conds = append(conds, "JSON_CONTAINS("+p+", :listen, '$.listen')")
|
||||
}
|
||||
where = strings.Join(conds, " OR ")
|
||||
} else {
|
||||
conds := []string{}
|
||||
for _, p := range protocols {
|
||||
conds = append(conds, "JSON_CONTAINS("+p+", :listen, '$.listen')")
|
||||
}
|
||||
where1 := "(id!=:serverId AND (" + strings.Join(conds, " OR ") + "))"
|
||||
|
||||
conds = []string{}
|
||||
for _, p := range protocols {
|
||||
if p == excludeProtocol {
|
||||
continue
|
||||
}
|
||||
conds = append(conds, "JSON_CONTAINS("+p+", :listen, '$.listen')")
|
||||
}
|
||||
where2 := "(id=:serverId AND (" + strings.Join(conds, " OR ") + "))"
|
||||
where = where1 + " OR " + where2
|
||||
query.Param("serverId", excludeServerId)
|
||||
}
|
||||
return query.
|
||||
Where("("+where+")").
|
||||
Param("listen", string(listen.AsJSON())).
|
||||
Exist()
|
||||
}
|
||||
|
||||
|
||||
@@ -86,4 +86,23 @@ func TestServerDAO_FindAllEnabledServerIdsWithSSLPolicyIds(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Log("serverIds:", serverIds)
|
||||
}
|
||||
}
|
||||
|
||||
func TestServerDAO_CheckPortIsUsing(t *testing.T) {
|
||||
dbs.NotifyReady()
|
||||
var tx *dbs.Tx
|
||||
//{
|
||||
// isUsing, err := SharedServerDAO.CheckPortIsUsing(tx, 18, 1234, 0, "")
|
||||
// if err != nil {
|
||||
// t.Fatal(err)
|
||||
// }
|
||||
// t.Log("isUsing:", isUsing)
|
||||
//}
|
||||
{
|
||||
isUsing, err := SharedServerDAO.CheckPortIsUsing(tx, 18, 1234, 44, "tcp")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
t.Log("isUsing:", isUsing)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,6 +25,11 @@ var (
|
||||
Code: "server.tcp",
|
||||
Description: "用户可以添加TCP/TLS负载均衡服务",
|
||||
},
|
||||
{
|
||||
Name: "自定义负载均衡端口",
|
||||
Code: "server.tcp.port",
|
||||
Description: "用户可以自定义TCP端口",
|
||||
},
|
||||
{
|
||||
Name: "开启WAF",
|
||||
Code: "server.waf",
|
||||
|
||||
Reference in New Issue
Block a user