增加认证节点管理

internal/rpc/services/service_authority_key.go

@@ -5,7 +5,7 @@ package services
 import (
 	"context"
 	"encoding/json"
-	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models/authority"
 	rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
@@ -22,7 +22,7 @@ func (this *AuthorityKeyService) UpdateAuthorityKey(ctx context.Context, req *pb
 		return nil, err
 	}
 	var tx = this.NullTx()
-	err = models.SharedAuthorityKeyDAO.UpdateKey(tx, req.Value, req.DayFrom, req.DayTo, req.Hostname, req.MacAddresses)
+	err = authority.SharedAuthorityKeyDAO.UpdateKey(tx, req.Value, req.DayFrom, req.DayTo, req.Hostname, req.MacAddresses)
 	if err != nil {
 		return nil, err
 	}
@@ -36,7 +36,7 @@ func (this *AuthorityKeyService) ReadAuthorityKey(ctx context.Context, req *pb.R
 		return nil, err
 	}
 	var tx = this.NullTx()
-	key, err := models.SharedAuthorityKeyDAO.ReadKey(tx)
+	key, err := authority.SharedAuthorityKeyDAO.ReadKey(tx)
 	if err != nil {
 		return nil, err
 	}
@@ -68,7 +68,7 @@ func (this *AuthorityKeyService) ResetAuthorityKey(ctx context.Context, req *pb.
 	if err != nil {
 		return nil, err
 	}
-	err = models.SharedAuthorityKeyDAO.ResetKey(nil)
+	err = authority.SharedAuthorityKeyDAO.ResetKey(nil)
 	if err != nil {
 		return nil, err
 	}

internal/rpc/services/service_authority_node.go

@@ -0,0 +1,233 @@
+package services
+
+import (
+	"context"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models/authority"
+	"github.com/TeaOSLab/EdgeAPI/internal/errors"
+	rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	"google.golang.org/grpc/metadata"
+)
+
+type AuthorityNodeService struct {
+	BaseService
+}
+
+// CreateAuthorityNode 创建认证节点
+func (this *AuthorityNodeService) CreateAuthorityNode(ctx context.Context, req *pb.CreateAuthorityNodeRequest) (*pb.CreateAuthorityNodeResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	tx := this.NullTx()
+
+	nodeId, err := authority.SharedAuthorityNodeDAO.CreateAuthorityNode(tx, req.Name, req.Description, req.IsOn)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.CreateAuthorityNodeResponse{NodeId: nodeId}, nil
+}
+
+// UpdateAuthorityNode 修改认证节点
+func (this *AuthorityNodeService) UpdateAuthorityNode(ctx context.Context, req *pb.UpdateAuthorityNodeRequest) (*pb.RPCSuccess, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	tx := this.NullTx()
+
+	err = authority.SharedAuthorityNodeDAO.UpdateAuthorityNode(tx, req.NodeId, req.Name, req.Description, req.IsOn)
+	if err != nil {
+		return nil, err
+	}
+
+	return this.Success()
+}
+
+// DeleteAuthorityNode 删除认证节点
+func (this *AuthorityNodeService) DeleteAuthorityNode(ctx context.Context, req *pb.DeleteAuthorityNodeRequest) (*pb.RPCSuccess, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	tx := this.NullTx()
+
+	err = authority.SharedAuthorityNodeDAO.DisableAuthorityNode(tx, req.NodeId)
+	if err != nil {
+		return nil, err
+	}
+
+	return this.Success()
+}
+
+// FindAllEnabledAuthorityNodes 列出所有可用认证节点
+func (this *AuthorityNodeService) FindAllEnabledAuthorityNodes(ctx context.Context, req *pb.FindAllEnabledAuthorityNodesRequest) (*pb.FindAllEnabledAuthorityNodesResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	tx := this.NullTx()
+
+	nodes, err := authority.SharedAuthorityNodeDAO.FindAllEnabledAuthorityNodes(tx)
+	if err != nil {
+		return nil, err
+	}
+
+	result := []*pb.AuthorityNode{}
+	for _, node := range nodes {
+		result = append(result, &pb.AuthorityNode{
+			Id:          int64(node.Id),
+			IsOn:        node.IsOn == 1,
+			UniqueId:    node.UniqueId,
+			Secret:      node.Secret,
+			Name:        node.Name,
+			Description: node.Description,
+		})
+	}
+
+	return &pb.FindAllEnabledAuthorityNodesResponse{Nodes: result}, nil
+}
+
+// CountAllEnabledAuthorityNodes 计算认证节点数量
+func (this *AuthorityNodeService) CountAllEnabledAuthorityNodes(ctx context.Context, req *pb.CountAllEnabledAuthorityNodesRequest) (*pb.RPCCountResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	tx := this.NullTx()
+
+	count, err := authority.SharedAuthorityNodeDAO.CountAllEnabledAuthorityNodes(tx)
+	if err != nil {
+		return nil, err
+	}
+
+	return this.SuccessCount(count)
+}
+
+// ListEnabledAuthorityNodes 列出单页的认证节点
+func (this *AuthorityNodeService) ListEnabledAuthorityNodes(ctx context.Context, req *pb.ListEnabledAuthorityNodesRequest) (*pb.ListEnabledAuthorityNodesResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	tx := this.NullTx()
+
+	nodes, err := authority.SharedAuthorityNodeDAO.ListEnabledAuthorityNodes(tx, req.Offset, req.Size)
+	if err != nil {
+		return nil, err
+	}
+
+	result := []*pb.AuthorityNode{}
+	for _, node := range nodes {
+		result = append(result, &pb.AuthorityNode{
+			Id:          int64(node.Id),
+			IsOn:        node.IsOn == 1,
+			UniqueId:    node.UniqueId,
+			Secret:      node.Secret,
+			Name:        node.Name,
+			Description: node.Description,
+			StatusJSON:  []byte(node.Status),
+		})
+	}
+
+	return &pb.ListEnabledAuthorityNodesResponse{Nodes: result}, nil
+}
+
+// FindEnabledAuthorityNode 根据ID查找节点
+func (this *AuthorityNodeService) FindEnabledAuthorityNode(ctx context.Context, req *pb.FindEnabledAuthorityNodeRequest) (*pb.FindEnabledAuthorityNodeResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	tx := this.NullTx()
+
+	node, err := authority.SharedAuthorityNodeDAO.FindEnabledAuthorityNode(tx, req.NodeId)
+	if err != nil {
+		return nil, err
+	}
+
+	if node == nil {
+		return &pb.FindEnabledAuthorityNodeResponse{Node: nil}, nil
+	}
+
+	result := &pb.AuthorityNode{
+		Id:          int64(node.Id),
+		IsOn:        node.IsOn == 1,
+		UniqueId:    node.UniqueId,
+		Secret:      node.Secret,
+		Name:        node.Name,
+		Description: node.Description,
+	}
+	return &pb.FindEnabledAuthorityNodeResponse{Node: result}, nil
+}
+
+// FindCurrentAuthorityNode 获取当前认证节点的版本
+func (this *AuthorityNodeService) FindCurrentAuthorityNode(ctx context.Context, req *pb.FindCurrentAuthorityNodeRequest) (*pb.FindCurrentAuthorityNodeResponse, error) {
+	_, err := this.ValidateAuthority(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	tx := this.NullTx()
+
+	md, ok := metadata.FromIncomingContext(ctx)
+	if !ok {
+		return nil, errors.New("context: need 'nodeId'")
+	}
+	nodeIds := md.Get("nodeid")
+	if len(nodeIds) == 0 {
+		return nil, errors.New("invalid 'nodeId'")
+	}
+	nodeId := nodeIds[0]
+	node, err := authority.SharedAuthorityNodeDAO.FindEnabledAuthorityNodeWithUniqueId(tx, nodeId)
+	if err != nil {
+		return nil, err
+	}
+
+	if node == nil {
+		return &pb.FindCurrentAuthorityNodeResponse{Node: nil}, nil
+	}
+
+	result := &pb.AuthorityNode{
+		Id:          int64(node.Id),
+		IsOn:        node.IsOn == 1,
+		UniqueId:    node.UniqueId,
+		Secret:      node.Secret,
+		Name:        node.Name,
+		Description: node.Description,
+	}
+	return &pb.FindCurrentAuthorityNodeResponse{Node: result}, nil
+}
+
+// UpdateAuthorityNodeStatus 更新节点状态
+func (this *AuthorityNodeService) UpdateAuthorityNodeStatus(ctx context.Context, req *pb.UpdateAuthorityNodeStatusRequest) (*pb.RPCSuccess, error) {
+	// 校验节点
+	_, nodeId, err := this.ValidateNodeId(ctx, rpcutils.UserTypeAuthority)
+	if err != nil {
+		return nil, err
+	}
+
+	if req.NodeId > 0 {
+		nodeId = req.NodeId
+	}
+
+	if nodeId <= 0 {
+		return nil, errors.New("'nodeId' should be greater than 0")
+	}
+
+	tx := this.NullTx()
+
+	err = authority.SharedAuthorityNodeDAO.UpdateNodeStatus(tx, nodeId, req.StatusJSON)
+	if err != nil {
+		return nil, err
+	}
+	return this.Success()
+}

internal/rpc/services/service_base.go

@@ -21,7 +21,7 @@ import (
 type BaseService struct {
 }
 
-// 校验管理员
+// ValidateAdmin 校验管理员
 func (this *BaseService) ValidateAdmin(ctx context.Context, reqAdminId int64) (adminId int64, err error) {
 	_, reqUserId, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
 	if err != nil {
@@ -33,7 +33,7 @@ func (this *BaseService) ValidateAdmin(ctx context.Context, reqAdminId int64) (a
 	return reqUserId, nil
 }
 
-// 校验管理员和用户
+// ValidateAdminAndUser 校验管理员和用户
 func (this *BaseService) ValidateAdminAndUser(ctx context.Context, requireAdminId int64, requireUserId int64) (adminId int64, userId int64, err error) {
 	reqUserType, reqUserId, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin, rpcutils.UserTypeUser)
 	if err != nil {
@@ -70,25 +70,31 @@ func (this *BaseService) ValidateAdminAndUser(ctx context.Context, requireAdminI
 	return
 }
 
-// 校验边缘节点
+// ValidateNode 校验边缘节点
 func (this *BaseService) ValidateNode(ctx context.Context) (nodeId int64, err error) {
 	_, nodeId, err = rpcutils.ValidateRequest(ctx, rpcutils.UserTypeNode)
 	return
 }
 
-// 校验用户节点
+// ValidateUser 校验用户节点
 func (this *BaseService) ValidateUser(ctx context.Context) (userId int64, err error) {
 	_, userId, err = rpcutils.ValidateRequest(ctx, rpcutils.UserTypeUser)
 	return
 }
 
-// 校验监控节点
+// ValidateMonitor 校验监控节点
 func (this *BaseService) ValidateMonitor(ctx context.Context) (nodeId int64, err error) {
 	_, nodeId, err = rpcutils.ValidateRequest(ctx, rpcutils.UserTypeMonitor)
 	return
 }
 
-// 获取节点ID
+// ValidateAuthority 校验认证节点
+func (this *BaseService) ValidateAuthority(ctx context.Context) (nodeId int64, err error) {
+	_, nodeId, err = rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAuthority)
+	return
+}
+
+// ValidateNodeId 获取节点ID
 func (this *BaseService) ValidateNodeId(ctx context.Context, roles ...rpcutils.UserType) (role rpcutils.UserType, nodeIntId int64, err error) {
 	if ctx == nil {
 		err = errors.New("context should not be nil")
@@ -185,27 +191,27 @@ func (this *BaseService) ValidateNodeId(ctx context.Context, roles ...rpcutils.U
 	return
 }
 
-// 返回成功
+// Success 返回成功
 func (this *BaseService) Success() (*pb.RPCSuccess, error) {
 	return &pb.RPCSuccess{}, nil
 }
 
-// 返回数字
+// SuccessCount 返回数字
 func (this *BaseService) SuccessCount(count int64) (*pb.RPCCountResponse, error) {
 	return &pb.RPCCountResponse{Count: count}, nil
 }
 
-// 返回权限错误
+// PermissionError 返回权限错误
 func (this *BaseService) PermissionError() error {
 	return errors.New("Permission Denied")
 }
 
-// 空的数据库事务
+// NullTx 空的数据库事务
 func (this *BaseService) NullTx() *dbs.Tx {
 	return nil
 }
 
-// 获取当前的数据库
+// RunTx 在当前数据中执行一个事务
 func (this *BaseService) RunTx(callback func(tx *dbs.Tx) error) error {
 	db, err := dbs.Default()
 	if err != nil {