集群可以设置默认的WAF策略、缓存策略

2025-12-28 05:16:39 +08:00 · 2020-12-17 15:51:09 +08:00
parent eab294b1b6
commit 11c522a513
20 changed files with 3053 additions and 2443 deletions
--- a/pkg/rpc/protos/model_api_node.proto
+++ b/pkg/rpc/protos/model_api_node.proto
@@ -6,7 +6,7 @@ package pb;
 message APINode {
 	int64 id = 1;
 	bool isOn = 2;
-	int64 clusterId = 3;
+	int64 nodeClusterId = 3;
 	string uniqueId = 4;
 	string secret = 5;
 	string name = 6;
--- a/pkg/rpc/protos/model_node_cluster.proto
+++ b/pkg/rpc/protos/model_node_cluster.proto
@@ -13,4 +13,6 @@ message NodeCluster {
 	string secret = 7;
 	string dnsName = 8;
 	int64 dnsDomainId = 9;
+	int64 httpCachePolicyId = 10;
+	int64 httpFirewallPolicyId = 11;
 }
--- a/pkg/rpc/protos/model_user.proto
+++ b/pkg/rpc/protos/model_user.proto
@@ -3,6 +3,8 @@ option go_package = "./pb";

 package pb;

+import "model_node_cluster.proto";
+
 message User {
 	int64 id = 1;
 	string username = 2;
@@ -13,4 +15,5 @@ message User {
 	string remark = 7;
 	bool isOn = 8;
 	int64 createdAt = 9;
+	NodeCluster cluster = 10;
 }
--- a/pkg/rpc/protos/service_http_cache_policy.proto
+++ b/pkg/rpc/protos/service_http_cache_policy.proto
@@ -27,6 +27,9 @@ service HTTPCachePolicyService {

 	// 查找单个缓存策略配置
 	rpc findEnabledHTTPCachePolicyConfig (FindEnabledHTTPCachePolicyConfigRequest) returns (FindEnabledHTTPCachePolicyConfigResponse);
+
+	// 查找单个缓存策略信息
+	rpc findEnabledHTTPCachePolicy (FindEnabledHTTPCachePolicyRequest) returns (FindEnabledHTTPCachePolicyResponse);
 }

 // 获取所有可用策略
@@ -51,12 +54,12 @@ message CreateHTTPCachePolicyRequest {
 }

 message CreateHTTPCachePolicyResponse {
-	int64 cachePolicyId = 1;
+	int64 httpCachePolicyId = 1;
 }

 // 修改缓存策略
 message UpdateHTTPCachePolicyRequest {
-	int64 cachePolicyId = 1;
+	int64 httpCachePolicyId = 1;
 	bool isOn = 2;
 	string name = 3;
 	string description = 4;
@@ -69,7 +72,7 @@ message UpdateHTTPCachePolicyRequest {

 // 删除缓存策略
 message DeleteHTTPCachePolicyRequest {
-	int64 cachePolicyId = 1;
+	int64 httpCachePolicyId = 1;
 }

 // 计算缓存策略数量
@@ -83,14 +86,23 @@ message ListEnabledHTTPCachePoliciesRequest {
 }

 message ListEnabledHTTPCachePoliciesResponse {
-	bytes cachePoliciesJSON = 1;
+	bytes httpCachePoliciesJSON = 1;
 }

 // 查找单个缓存策略配置
 message FindEnabledHTTPCachePolicyConfigRequest {
-	int64 cachePolicyId = 1;
+	int64 httpCachePolicyId = 1;
 }

 message FindEnabledHTTPCachePolicyConfigResponse {
-	bytes cachePolicyJSON = 1;
+	bytes httpCachePolicyJSON = 1;
+}
+
+// 查找单个缓存策略信息
+message FindEnabledHTTPCachePolicyRequest {
+	int64 httpCachePolicyId = 1;
+}
+
+message FindEnabledHTTPCachePolicyResponse {
+	HTTPCachePolicy httpCachePolicy = 1;
 }
--- a/pkg/rpc/protos/service_http_firewall_policy.proto
+++ b/pkg/rpc/protos/service_http_firewall_policy.proto
@@ -23,19 +23,19 @@ service HTTPFirewallPolicyService {
 	rpc updateHTTPFirewallInboundConfig (UpdateHTTPFirewallInboundConfigRequest) returns (RPCSuccess);

 	// 计算可用的防火墙策略数量
-	rpc countAllEnabledFirewallPolicies (CountAllEnabledFirewallPoliciesRequest) returns (RPCCountResponse);
+	rpc countAllEnabledHTTPFirewallPolicies (CountAllEnabledHTTPFirewallPoliciesRequest) returns (RPCCountResponse);

 	// 列出单页的防火墙策略
-	rpc listEnabledFirewallPolicies (ListEnabledFirewallPoliciesRequest) returns (ListEnabledFirewallPoliciesResponse);
+	rpc listEnabledHTTPFirewallPolicies (ListEnabledHTTPFirewallPoliciesRequest) returns (ListEnabledHTTPFirewallPoliciesResponse);

 	// 删除某个防火墙策略
-	rpc deleteFirewallPolicy (DeleteFirewallPolicyRequest) returns (RPCSuccess);
+	rpc deleteHTTPFirewallPolicy (DeleteHTTPFirewallPolicyRequest) returns (RPCSuccess);

 	// 查找单个防火墙配置
-	rpc findEnabledFirewallPolicyConfig (FindEnabledFirewallPolicyConfigRequest) returns (FindEnabledFirewallPolicyConfigResponse);
+	rpc findEnabledHTTPFirewallPolicyConfig (FindEnabledHTTPFirewallPolicyConfigRequest) returns (FindEnabledHTTPFirewallPolicyConfigResponse);

 	// 获取防火墙的基本信息
-	rpc findEnabledFirewallPolicy (FindEnabledFirewallPolicyRequest) returns (FindEnabledFirewallPolicyResponse);
+	rpc findEnabledHTTPFirewallPolicy (FindEnabledHTTPFirewallPolicyRequest) returns (FindEnabledHTTPFirewallPolicyResponse);

 	// 导入策略数据
 	rpc importHTTPFirewallPolicy (ImportHTTPFirewallPolicyRequest) returns (RPCSuccess);
@@ -55,16 +55,16 @@ message CreateHTTPFirewallPolicyRequest {
 	bool isOn = 1;
 	string name = 2;
 	string description = 3;
-	repeated string firewallGroupCodes = 4;
+	repeated string httpFirewallGroupCodes = 4;
 }

 message CreateHTTPFirewallPolicyResponse {
-	int64 firewallPolicyId = 1;
+	int64 httpFirewallPolicyId = 1;
 }

 // 修改防火墙策略
 message UpdateHTTPFirewallPolicyRequest {
-	int64 firewallPolicyId = 1;
+	int64 httpFirewallPolicyId = 1;
 	bool isOn = 2;
 	string name = 3;
 	string description = 4;
@@ -74,56 +74,56 @@ message UpdateHTTPFirewallPolicyRequest {

 // 修改分组信息
 message UpdateHTTPFirewallPolicyGroupsRequest {
-	int64 firewallPolicyId = 1;
+	int64 httpFirewallPolicyId = 1;
 	bytes inboundJSON = 2;
 	bytes outboundJSON = 3;
 }

 // 修改inbound信息
 message UpdateHTTPFirewallInboundConfigRequest {
-	int64 firewallPolicyId = 1;
+	int64 httpFirewallPolicyId = 1;
 	bytes inboundJSON = 2;
 }

 // 计算可用的防火墙策略数量
-message CountAllEnabledFirewallPoliciesRequest {
+message CountAllEnabledHTTPFirewallPoliciesRequest {
 }

 // 列出单页的防火墙策略
-message ListEnabledFirewallPoliciesRequest {
+message ListEnabledHTTPFirewallPoliciesRequest {
 	int64 offset = 1;
 	int64 size = 2;
 }

-message ListEnabledFirewallPoliciesResponse {
-	repeated HTTPFirewallPolicy firewallPolicies = 1;
+message ListEnabledHTTPFirewallPoliciesResponse {
+	repeated HTTPFirewallPolicy httpFirewallPolicies = 1;
 }

 // 删除某个防火墙策略
-message DeleteFirewallPolicyRequest {
-	int64 firewallPolicyId = 1;
+message DeleteHTTPFirewallPolicyRequest {
+	int64 httpFirewallPolicyId = 1;
 }

 // 查找单个防火墙配置
-message FindEnabledFirewallPolicyConfigRequest {
-	int64 firewallPolicyId = 1;
+message FindEnabledHTTPFirewallPolicyConfigRequest {
+	int64 httpFirewallPolicyId = 1;
 }

-message FindEnabledFirewallPolicyConfigResponse {
-	bytes firewallPolicyJSON = 1;
+message FindEnabledHTTPFirewallPolicyConfigResponse {
+	bytes httpFirewallPolicyJSON = 1;
 }

 // 获取防火墙的基本信息
-message FindEnabledFirewallPolicyRequest {
-	int64 firewallPolicyId = 1;
+message FindEnabledHTTPFirewallPolicyRequest {
+	int64 httpFirewallPolicyId = 1;
 }

-message FindEnabledFirewallPolicyResponse {
-	HTTPFirewallPolicy firewallPolicy = 1;
+message FindEnabledHTTPFirewallPolicyResponse {
+	HTTPFirewallPolicy httpFirewallPolicy = 1;
 }

 // 导入策略数据
 message ImportHTTPFirewallPolicyRequest {
-	int64 firewallPolicyId = 1;
-	bytes firewallPolicyJSON = 2;
+	int64 httpFirewallPolicyId = 1;
+	bytes httpFirewallPolicyJSON = 2;
 }
--- a/pkg/rpc/protos/service_node.proto
+++ b/pkg/rpc/protos/service_node.proto
@@ -110,7 +110,7 @@ service NodeService {
 // 创建节点
 message CreateNodeRequest {
 	string name = 1;
-	int64 clusterId = 2;
+	int64 nodeClusterId = 2;
 	NodeLogin Login = 3;
 	int64 groupId = 4;
 	int64 dnsDomainId = 5;
@@ -142,7 +142,7 @@ message CountAllEnabledNodesRequest {
 message ListEnabledNodesMatchRequest {
 	int64 offset = 1;
 	int64 size = 2;
-	int64 clusterId = 3;
+	int64 nodeClusterId = 3;
 	int32 installState = 4;
 	int32 activeState = 5;
 	string keyword = 6;
@@ -156,7 +156,7 @@ message ListEnabledNodesMatchResponse {

 // 根据集群查找所有节点
 message FindAllEnabledNodesWithClusterIdRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 }

 message FindAllEnabledNodesWithClusterIdResponse {
@@ -172,7 +172,7 @@ message DeleteNodeRequest {
 message UpdateNodeRequest {
 	int64 nodeId = 1;
 	string name = 2;
-	int64 clusterId = 3;
+	int64 nodeClusterId = 3;
 	NodeLogin Login = 4;
 	int32 maxCPU = 5;
 	bool isOn = 6;
@@ -221,7 +221,7 @@ message UpdateNodeStatusRequest {

 // 同步集群中的节点版本
 message SyncNodesVersionWithClusterRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 }

 message SyncNodesVersionWithClusterResponse {
@@ -229,7 +229,7 @@ message SyncNodesVersionWithClusterResponse {

 // 计算匹配的节点数量
 message CountAllEnabledNodesMatchRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 	int32 installState = 2;
 	int32 activeState = 3;
 	string keyword = 4;
@@ -301,7 +301,7 @@ message FindAllEnabledNodesWithGrantIdResponse {

 // 列出所有未安装的节点
 message FindAllNotInstalledNodesWithClusterIdRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 }

 message FindAllNotInstalledNodesWithClusterIdResponse {
@@ -310,12 +310,12 @@ message FindAllNotInstalledNodesWithClusterIdResponse {

 // 计算需要升级的节点数量
 message CountAllUpgradeNodesWithClusterIdRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 }

 // 列出所有需要升级的节点
 message FindAllUpgradeNodesWithClusterIdRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 }

 message FindAllUpgradeNodesWithClusterIdResponse {
@@ -364,7 +364,7 @@ message NodeDNSInfo {
 	string name = 2;
 	string ipAddr = 3;
 	repeated DNSRoute routes = 4;
-	int64 clusterId = 5;
+	int64 nodeClusterId = 5;
 	int64 dnsDomainId = 6;
 	string dnsDomainName = 7;
 }
--- a/pkg/rpc/protos/service_node_cluster.proto
+++ b/pkg/rpc/protos/service_node_cluster.proto
@@ -76,6 +76,24 @@ service NodeClusterService {

 	// 修改集群的TOA设置
 	rpc updateNodeClusterTOA (UpdateNodeClusterTOARequest) returns (RPCSuccess);
+
+	// 计算使用某个缓存策略的集群数量
+	rpc countAllEnabledNodeClustersWithHTTPCachePolicyId (CountAllEnabledNodeClustersWithHTTPCachePolicyIdRequest) returns (RPCCountResponse);
+
+	// 查找使用缓存策略的所有集群
+	rpc findAllEnabledNodeClustersWithHTTPCachePolicyId (FindAllEnabledNodeClustersWithHTTPCachePolicyIdRequest) returns (FindAllEnabledNodeClustersWithHTTPCachePolicyIdResponse);
+
+	// 计算使用某个WAF策略的集群数量
+	rpc countAllEnabledNodeClustersWithHTTPFirewallPolicyId (CountAllEnabledNodeClustersWithHTTPFirewallPolicyIdRequest) returns (RPCCountResponse);
+
+	// 查找使用某个WAF策略的所有集群
+	rpc findAllEnabledNodeClustersWithHTTPFirewallPolicyId (FindAllEnabledNodeClustersWithHTTPFirewallPolicyIdRequest) returns (FindAllEnabledNodeClustersWithHTTPFirewallPolicyIdResponse);
+
+	// 修改集群的缓存策略
+	rpc updateNodeClusterHTTPCachePolicyId (UpdateNodeClusterHTTPCachePolicyIdRequest) returns (RPCSuccess);
+
+	// 修改集群的WAF策略
+	rpc updateNodeClusterHTTPFirewallPolicyId (UpdateNodeClusterHTTPFirewallPolicyIdRequest) returns (RPCSuccess);
 }

 // 获取所有集群的信息
@@ -103,28 +121,32 @@ message CreateNodeClusterRequest {
 	string installDir = 3;
 	int64 dnsDomainId = 4;
 	string dnsName = 5;
+	int64 httpCachePolicyId = 6;
+	int64 httpFirewallPolicyId = 7;
 }

 message CreateNodeClusterResponse {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 }

 // 修改集群
 message UpdateNodeClusterRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 	string name = 2;
 	int64 grantId = 3;
 	string installDir = 4;
+	int64 httpCachePolicyId = 5;
+	int64 httpFirewallPolicyId = 6;
 }

 // 删除集群
 message DeleteNodeClusterRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 }

 // 查找单个集群信息
 message FindEnabledNodeClusterRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 }

 message FindEnabledNodeClusterResponse {
@@ -133,7 +155,7 @@ message FindEnabledNodeClusterResponse {

 // 查找集群的API节点信息
 message FindAPINodesWithNodeClusterRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 }

 message FindAPINodesWithNodeClusterResponse {
@@ -158,7 +180,7 @@ message ListEnabledNodeClustersResponse {

 // 查找集群的健康检查配置
 message FindNodeClusterHealthCheckConfigRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 }

 message FindNodeClusterHealthCheckConfigResponse {
@@ -167,13 +189,13 @@ message FindNodeClusterHealthCheckConfigResponse {

 // 修改集群健康检查设置
 message UpdateNodeClusterHealthCheckRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 	bytes healthCheckJSON = 2;
 }

 // 执行健康检查
 message ExecuteNodeClusterHealthCheckRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 }

 message ExecuteNodeClusterHealthCheckResponse {
@@ -266,4 +288,44 @@ message FindEnabledNodeClusterTOAResponse {
 message UpdateNodeClusterTOARequest {
 	int64 nodeClusterId = 1;
 	bytes toaJSON = 2;
+}
+
+// 计算使用某个缓存策略的集群数量
+message CountAllEnabledNodeClustersWithHTTPCachePolicyIdRequest {
+	int64 httpCachePolicyId = 1;
+}
+
+// 查找使用缓存策略的所有集群
+message FindAllEnabledNodeClustersWithHTTPCachePolicyIdRequest {
+	int64 httpCachePolicyId = 1;
+}
+
+message FindAllEnabledNodeClustersWithHTTPCachePolicyIdResponse {
+	repeated NodeCluster nodeClusters = 1;
+}
+
+// 计算使用某个WAF策略的集群数量
+message CountAllEnabledNodeClustersWithHTTPFirewallPolicyIdRequest {
+	int64 httpFirewallPolicyId = 1;
+}
+
+// 查找使用某个WAF策略的所有集群
+message FindAllEnabledNodeClustersWithHTTPFirewallPolicyIdRequest {
+	int64 httpFirewallPolicyId = 1;
+}
+
+message FindAllEnabledNodeClustersWithHTTPFirewallPolicyIdResponse {
+	repeated NodeCluster nodeClusters = 1;
+}
+
+// 修改集群的缓存策略
+message UpdateNodeClusterHTTPCachePolicyIdRequest {
+	int64 nodeClusterId = 1;
+	int64 httpCachePolicyId = 2;
+}
+
+// 修改集群的WAF策略
+message UpdateNodeClusterHTTPFirewallPolicyIdRequest {
+	int64 nodeClusterId = 1;
+	int64 httpFirewallPolicyId = 2;
 }
--- a/pkg/rpc/protos/service_node_group.proto
+++ b/pkg/rpc/protos/service_node_group.proto
@@ -29,7 +29,7 @@ service NodeGroupService {

 // 创建分组
 message CreateNodeGroupRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 	string name = 2;
 }

@@ -50,7 +50,7 @@ message DeleteNodeGroupRequest {

 // 查询所有分组
 message FindAllEnabledNodeGroupsWithClusterIdRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 }

 message FindAllEnabledNodeGroupsWithClusterIdResponse {
--- a/pkg/rpc/protos/service_server.proto
+++ b/pkg/rpc/protos/service_server.proto
@@ -71,18 +71,6 @@ service ServerService {
 	// 查找使用某个SSL证书的所有服务
 	rpc findAllEnabledServersWithSSLCertId (FindAllEnabledServersWithSSLCertIdRequest) returns (FindAllEnabledServersWithSSLCertIdResponse);

-	// 计算使用某个缓存策略的服务数量
-	rpc countAllEnabledServersWithCachePolicyId (CountAllEnabledServersWithCachePolicyIdRequest) returns (RPCCountResponse);
-
-	// 查找使用某个缓存策略的所有服务
-	rpc findAllEnabledServersWithCachePolicyId (FindAllEnabledServersWithCachePolicyIdRequest) returns (FindAllEnabledServersWithCachePolicyIdResponse);
-
-	// 计算使用某个WAF策略的服务数量
-	rpc countAllEnabledServersWithHTTPFirewallPolicyId (CountAllEnabledServersWithHTTPFirewallPolicyIdRequest) returns (RPCCountResponse);
-
-	// 查找使用WAF策略的所有服务
-	rpc findAllEnabledServersWithHTTPFirewallPolicyId (FindAllEnabledServersWithHTTPFirewallPolicyIdRequest) returns (FindAllEnabledServersWithHTTPFirewallPolicyIdResponse);
-
 	// 计算运行在某个集群上的所有服务数量
 	rpc countAllEnabledServersWithNodeClusterId (CountAllEnabledServersWithNodeClusterIdRequest) returns (RPCCountResponse);

@@ -119,7 +107,7 @@ message CreateServerRequest {
 	bytes reverseProxyJSON = 16;
 	repeated int64 groupIds = 17;

-	int64 clusterId = 30;
+	int64 nodeClusterId = 30;
 	bytes includeNodesJSON = 31;
 	bytes excludeNodesJSON = 32;
 }
@@ -133,7 +121,7 @@ message UpdateServerBasicRequest {
 	int64 serverId = 1;
 	string name = 2;
 	string description = 3;
-	int64 clusterId = 4;
+	int64 nodeClusterId = 4;
 	bool isOn = 5;
 	repeated int64 groupIds = 6;
 }
@@ -272,34 +260,6 @@ message FindAllEnabledServersWithSSLCertIdResponse {
 	repeated Server servers = 1;
 }

-// 计算使用某个缓存策略的服务数量
-message CountAllEnabledServersWithCachePolicyIdRequest {
-	int64 cachePolicyId = 1;
-}
-
-// 查找使用某个缓存策略的所有服务
-message FindAllEnabledServersWithCachePolicyIdRequest {
-	int64 cachePolicyId = 1;
-}
-
-message FindAllEnabledServersWithCachePolicyIdResponse {
-	repeated Server servers = 1;
-}
-
-// 计算使用某个WAF策略的服务数量
-message CountAllEnabledServersWithHTTPFirewallPolicyIdRequest {
-	int64 firewallPolicyId = 1;
-}
-
-// 查找使用某个WAF策略的所有服务
-message FindAllEnabledServersWithHTTPFirewallPolicyIdRequest {
-	int64 firewallPolicyId = 1;
-}
-
-message FindAllEnabledServersWithHTTPFirewallPolicyIdResponse {
-	repeated Server servers = 1;
-}
-
 // 计算运行在某个集群上的所有服务数量
 message CountAllEnabledServersWithNodeClusterIdRequest {
 	int64 nodeClusterId = 1;
@@ -321,7 +281,7 @@ message NotifyServersChangeResponse {

 // 取得某个集群下的所有服务相关的DNS
 message FindAllEnabledServersDNSWithClusterIdRequest {
-	int64 clusterId = 1;
+	int64 nodeClusterId = 1;
 }

 message FindAllEnabledServersDNSWithClusterIdResponse {
--- a/pkg/rpc/protos/service_user.proto
+++ b/pkg/rpc/protos/service_user.proto
@@ -52,6 +52,7 @@ message CreateUserRequest {
 	string email = 6;
 	string remark = 7;
 	string source = 8;
+	int64 nodeClusterId = 9;
 }

 message CreateUserResponse {
@@ -69,6 +70,7 @@ message UpdateUserRequest {
 	string email = 7;
 	string remark = 8;
 	bool isOn = 9;
+	int64 nodeClusterId = 10;
 }

 // 删除用户