安装时如果数据库地址填写的是公网IP,则提示会影响系统运行性能

This commit is contained in:
刘祥超
2022-06-08 11:00:03 +08:00
parent 039ce26f58
commit 700836903f
6 changed files with 81 additions and 18 deletions

View File

@@ -134,3 +134,23 @@ func NextIP(prevIP net.IP) net.IP {
} }
return ip return ip
} }
// IsLocalIP 判断是否为本地IP
// ip 是To4()或者To16()的结果
func IsLocalIP(ip net.IP) bool {
if ip == nil {
return false
}
if ip[0] == 127 ||
ip[0] == 10 ||
(ip[0] == 172 && ip[1]&0xf0 == 16) ||
(ip[0] == 192 && ip[1] == 168) {
return true
}
if ip.String() == "::1" {
return true
}
return false
}

View File

@@ -0,0 +1,39 @@
// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved. Official site: https://goedge.cn .
package setup
import (
"github.com/TeaOSLab/EdgeAdmin/internal/utils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"net"
)
// CheckLocalIPAction 检查IP是否为局域网IP
type CheckLocalIPAction struct {
actionutils.ParentAction
}
func (this *CheckLocalIPAction) RunPost(params struct {
Host string
}) {
var ip = net.ParseIP(params.Host)
if ip == nil {
// 默认为true
this.Data["isLocal"] = true
this.Success()
}
var ipObj = ip.To4()
if ipObj == nil {
ipObj = ip.To16()
}
if ipObj == nil {
// 默认为true
this.Data["isLocal"] = true
this.Success()
}
this.Data["isLocal"] = utils.IsLocalIP(ipObj)
this.Success()
}

View File

@@ -14,6 +14,7 @@ func init() {
Post("/install", new(InstallAction)). Post("/install", new(InstallAction)).
Post("/status", new(StatusAction)). Post("/status", new(StatusAction)).
Post("/detectDB", new(DetectDBAction)). Post("/detectDB", new(DetectDBAction)).
Post("/checkLocalIP", new(CheckLocalIPAction)).
EndAll() EndAll()
}) })
} }

View File

@@ -3,6 +3,7 @@ package helpers
import ( import (
"github.com/TeaOSLab/EdgeAdmin/internal/events" "github.com/TeaOSLab/EdgeAdmin/internal/events"
nodes "github.com/TeaOSLab/EdgeAdmin/internal/rpc" nodes "github.com/TeaOSLab/EdgeAdmin/internal/rpc"
"github.com/TeaOSLab/EdgeAdmin/internal/utils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs"
"github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/lists"
@@ -66,7 +67,7 @@ func checkIPWithoutCache(config *systemconfigs.SecurityConfig, ipAddr string) bo
return false return false
} }
} }
if config.AllowLocal && isLocalIP(ip) { if config.AllowLocal && utils.IsLocalIP(ip) {
return true return true
} }
@@ -105,18 +106,3 @@ func checkIPWithoutCache(config *systemconfigs.SecurityConfig, ipAddr string) bo
return true return true
} }
// 判断是否为本地IP
func isLocalIP(ip net.IP) bool {
if ip[0] == 127 ||
ip[0] == 10 ||
(ip[0] == 172 && ip[1]&0xf0 == 16) ||
(ip[0] == 192 && ip[1] == 168) {
return true
}
if ip.String() == "::1" {
return true
}
return false
}

View File

@@ -149,8 +149,9 @@
<tr> <tr>
<td class="title">MySQL主机地址 *</td> <td class="title">MySQL主机地址 *</td>
<td> <td>
<input type="text" name="host" maxlength="100" placeholder="比如 192.168.1.100" style="width:16em" ref="dbHost" v-model="localDB.host"/> <input type="text" name="host" maxlength="100" placeholder="比如 192.168.1.100" style="width:16em" ref="dbHost" v-model="localDB.host" @change="checkDBIP" @input="localDB.isLocal = true"/>
<p class="comment" v-if="localDBHost.length > 0 && localDBHost == localDB.host"><span class="blue">已经自动填入从当前服务器发现的MySQL数据库信息。</span></p> <p class="comment" v-if="localDBHost.length > 0 && localDBHost == localDB.host"><span class="blue">已经自动填入从当前服务器发现的MySQL数据库信息。</span></p>
<p class="comment" v-if="!localDB.isLocal"><span class="red">当前地址不是局域网IP可能会严重影响系统运行性能请优先选择局域网IP。</span></p>
</td> </td>
</tr> </tr>
<tr> <tr>

View File

@@ -57,7 +57,7 @@ Tea.context(function () {
// 数据库 // 数据库
this.dbInfo = {} this.dbInfo = {}
this.localDB = {"host": "", "port": "", "username": "", "port": ""} this.localDB = {"host": "", "port": "", "username": "", "port": "", "isLocal": true}
this.localDBHost = "" this.localDBHost = ""
this.dbRequesting = false this.dbRequesting = false
@@ -65,10 +65,26 @@ Tea.context(function () {
this.$post(".detectDB") this.$post(".detectDB")
.success(function (resp) { .success(function (resp) {
this.localDB = resp.data.localDB this.localDB = resp.data.localDB
this.localDB["isLocal"] = true
this.localDBHost = this.localDB.host this.localDBHost = this.localDB.host
}) })
} }
this.checkDBIP = function () {
this.localDB["isLocal"] = true
if (this.localDB.host.length == 0) {
return
}
this.$post(".checkLocalIP")
.params({
host: this.localDB.host
})
.success(function (resp) {
this.localDB["isLocal"] = resp.data.isLocal
this.$forceUpdate()
})
}
this.dbSubmit = function () { this.dbSubmit = function () {
this.dbRequesting = true this.dbRequesting = true
} }