[集群]增加TOA相关设置

This commit is contained in:
GoEdgeLab
2020-12-02 14:25:14 +08:00
parent 0c8e3e5c47
commit c83a05a123
6 changed files with 151 additions and 3 deletions

View File

@@ -27,9 +27,9 @@ func (this *HealthAction) RunGet(params struct {
return
}
var config *serverconfigs.HealthCheckConfig = nil
if len(configResp.HealthCheckConfig) > 0 {
if len(configResp.HealthCheckJSON) > 0 {
config = &serverconfigs.HealthCheckConfig{}
err = json.Unmarshal(configResp.HealthCheckConfig, config)
err = json.Unmarshal(configResp.HealthCheckJSON, config)
if err != nil {
this.ErrorPage(err)
return

View File

@@ -2,6 +2,7 @@ package settings
import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/dns"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/cluster/settings/toa"
clusters "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/clusters/clusterutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
"github.com/iwind/TeaGo"
@@ -18,7 +19,12 @@ func init() {
GetPost("/healthRunPopup", new(HealthRunPopupAction)).
// DNS
GetPost("/dns", new(dns.IndexAction)).
Prefix("/clusters/cluster/settings/dns").
GetPost("", new(dns.IndexAction)).
// TOA
Prefix("/clusters/cluster/settings/toa").
GetPost("", new(toa.IndexAction)).
EndAll()
})

View File

@@ -0,0 +1,82 @@
package toa
import (
"encoding/json"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/actions"
)
type IndexAction struct {
actionutils.ParentAction
}
func (this *IndexAction) Init() {
this.Nav("", "setting", "")
this.SecondMenu("toa")
}
func (this *IndexAction) RunGet(params struct {
ClusterId int64
}) {
toaResp, err := this.RPC().NodeClusterRPC().FindEnabledNodeClusterTOA(this.AdminContext(), &pb.FindEnabledNodeClusterTOARequest{NodeClusterId: params.ClusterId})
if err != nil {
this.ErrorPage(err)
return
}
if len(toaResp.ToaJSON) == 0 {
this.Data["toa"] = nodeconfigs.DefaultTOAConfig()
} else {
config := &nodeconfigs.TOAConfig{}
err = json.Unmarshal(toaResp.ToaJSON, config)
if err != nil {
this.ErrorPage(err)
return
}
this.Data["toa"] = config
}
this.Show()
}
func (this *IndexAction) RunPost(params struct {
ClusterId int64
IsOn bool
AutoSetup bool
OptionType uint8
MinQueueId uint8
MaxQueueId uint8
Must *actions.Must
CSRF *actionutils.CSRF
}) {
defer this.CreateLogInfo("修改集群 %d 的TOA设置", params.ClusterId)
config := &nodeconfigs.TOAConfig{
IsOn: params.IsOn,
Debug: false, // 暂时不允许打开调试
OptionType: params.OptionType,
MinQueueId: params.MinQueueId,
MaxQueueId: params.MaxQueueId,
AutoSetup: params.AutoSetup,
}
configJSON, err := json.Marshal(config)
if err != nil {
this.ErrorPage(err)
return
}
_, err = this.RPC().NodeClusterRPC().UpdateNodeClusterTOA(this.AdminContext(), &pb.UpdateNodeClusterTOARequest{
NodeClusterId: params.ClusterId,
ToaJSON: configJSON,
})
if err != nil {
this.ErrorPage(err)
return
}
this.Success()
}

View File

@@ -87,5 +87,10 @@ func (this *ClusterHelper) createSettingMenu(clusterId string, selectedItem stri
"url": "/clusters/cluster/settings/dns?clusterId=" + clusterId,
"isActive": selectedItem == "dns",
})
items = append(items, maps.Map{
"name": "TOA设置",
"url": "/clusters/cluster/settings/toa?clusterId=" + clusterId,
"isActive": selectedItem == "toa",
})
return
}

View File

@@ -0,0 +1,52 @@
{$layout}
{$template "/left_menu"}
<div class="right-box">
<tip-icon content="TCP Option Address(TOA)可以在TCP选项中传递客户端IP多用在源站需要获取客户端真实IP的场景。<br/><br/>如需修改配置,请在专业人士指导下操作。"></tip-icon>
<form method="post" class="ui form" data-tea-action="$" data-tea-success="success">
<input type="hidden" name="clusterId" :value="clusterId"/>
<csrf-token></csrf-token>
<table class="ui table selectable definition">
<tr>
<td class="title">是否启用TOA</td>
<td>
<checkbox name="isOn" v-model="toa.isOn"></checkbox>
<p class="comment">在启用之前请确保当前集群下所有节点服务器已经安装TOA模块和libnetfilter_queue并启用了IPTables。</p>
</td>
</tr>
<tbody v-show="toa.isOn">
<tr>
<td>是否自动配置</td>
<td>
<checkbox name="autoSetup" v-model="toa.autoSetup"></checkbox>
<p class="comment">TOA功能需要节点服务器安装并开启了IPTables并将网络数据包转发到NFQueue中。如果选中了自动配置则每次在启动时都会自动尝试配置IPTables规则。</p>
</td>
</tr>
<tr>
<td class="title">选项类型数值</td>
<td>
<input type="text" name="optionType" v-model="toa.optionType" style="width:4em" maxlength="3"/>
<p class="comment">用来作为附加的TCP OPTION值通常是254即0xfe</p>
</td>
</tr>
<tr>
<td>NFQueue队列开始ID</td>
<td>
<input type="text" name="minQueueId" v-model="toa.minQueueId" style="width:4em" maxlength="3"/>
<p class="comment">不能超过255。</p>
</td>
</tr>
<tr>
<td>NFQueue队列结束ID</td>
<td>
<input type="text" name="maxQueueId" v-model="toa.maxQueueId" style="width:4em" maxlength="3"/>
<p class="comment">不能超过255。</p>
</td>
</tr>
</tbody>
</table>
<submit-btn></submit-btn>
</form>
</div>

View File

@@ -0,0 +1,3 @@
Tea.context(function () {
this.success = NotifyReloadSuccess("保存成功")
})