[用户节点]可以管理用户节点

internal/rpc/services/service_admin.go

@@ -47,7 +47,7 @@ func (this *AdminService) LoginAdmin(ctx context.Context, req *pb.LoginAdminRequ
 	}
 
 	return &pb.LoginAdminResponse{
-		AdminId: int64(adminId),
+		AdminId: adminId,
 		IsOk:    true,
 	}, nil
 }

internal/rpc/services/service_base.go

@@ -57,12 +57,18 @@ func (this *BaseService) ValidateAdminAndUser(ctx context.Context, reqUserId int
 	return
 }
 
-// 校验节点
+// 校验边缘节点
 func (this *BaseService) ValidateNode(ctx context.Context) (nodeId int64, err error) {
 	_, nodeId, err = rpcutils.ValidateRequest(ctx, rpcutils.UserTypeNode)
 	return
 }
 
+// 校验用户节点
+func (this *BaseService) ValidateUser(ctx context.Context) (userId int64, err error) {
+	_, userId, err = rpcutils.ValidateRequest(ctx, rpcutils.UserTypeUser)
+	return
+}
+
 // 返回成功
 func (this *BaseService) Success() (*pb.RPCSuccess, error) {
 	return &pb.RPCSuccess{}, nil

internal/rpc/services/service_ssl_policy.go

@@ -47,7 +47,8 @@ func (this *SSLPolicyService) UpdateSSLPolicy(ctx context.Context, req *pb.Updat
 // 查找Policy
 func (this *SSLPolicyService) FindEnabledSSLPolicyConfig(ctx context.Context, req *pb.FindEnabledSSLPolicyConfigRequest) (*pb.FindEnabledSSLPolicyConfigResponse, error) {
 	// 校验请求
-	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	// 这里不使用validateAdminAndUser()，是因为我们允许用户ID为0的时候也可以调用
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin, rpcutils.UserTypeUser)
 	if err != nil {
 		return nil, err
 	}

internal/rpc/services/service_sys_setting.go

@@ -14,7 +14,7 @@ type SysSettingService struct {
 // 更改配置
 func (this *SysSettingService) UpdateSysSetting(ctx context.Context, req *pb.UpdateSysSettingRequest) (*pb.RPCSuccess, error) {
 	// 校验请求
-	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin, rpcutils.UserTypeUser)
 	if err != nil {
 		return nil, err
 	}
@@ -30,7 +30,7 @@ func (this *SysSettingService) UpdateSysSetting(ctx context.Context, req *pb.Upd
 // 读取配置
 func (this *SysSettingService) ReadSysSetting(ctx context.Context, req *pb.ReadSysSettingRequest) (*pb.ReadSysSettingResponse, error) {
 	// 校验请求
-	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin, rpcutils.UserTypeUser)
 	if err != nil {
 		return nil, err
 	}

internal/rpc/services/service_user.go

@@ -3,6 +3,8 @@ package services
 import (
 	"context"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
+	"github.com/TeaOSLab/EdgeAPI/internal/utils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
 
@@ -137,3 +139,38 @@ func (this *UserService) CheckUsername(ctx context.Context, req *pb.CheckUsernam
 	}
 	return &pb.CheckUsernameResponse{Exists: b}, nil
 }
+
+// 登录
+func (this *UserService) LoginUser(ctx context.Context, req *pb.LoginUserRequest) (*pb.LoginUserResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(req.Username) == 0 || len(req.Password) == 0 {
+		return &pb.LoginUserResponse{
+			UserId:  0,
+			IsOk:    false,
+			Message: "请输入正确的用户名密码",
+		}, nil
+	}
+
+	userId, err := models.SharedUserDAO.CheckUserPassword(req.Username, req.Password)
+	if err != nil {
+		utils.PrintError(err)
+		return nil, err
+	}
+
+	if userId <= 0 {
+		return &pb.LoginUserResponse{
+			UserId:  0,
+			IsOk:    false,
+			Message: "请输入正确的用户名密码",
+		}, nil
+	}
+
+	return &pb.LoginUserResponse{
+		UserId: userId,
+		IsOk:   true,
+	}, nil
+}

internal/rpc/services/service_user_node.go

@@ -0,0 +1,227 @@
+package services
+
+import (
+	"context"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	"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 UserNodeService struct {
+	BaseService
+}
+
+// 创建用户节点
+func (this *UserNodeService) CreateUserNode(ctx context.Context, req *pb.CreateUserNodeRequest) (*pb.CreateUserNodeResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	nodeId, err := models.SharedUserNodeDAO.CreateUserNode(req.Name, req.Description, req.HttpJSON, req.HttpsJSON, req.AccessAddrsJSON, req.IsOn)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.CreateUserNodeResponse{NodeId: nodeId}, nil
+}
+
+// 修改用户节点
+func (this *UserNodeService) UpdateUserNode(ctx context.Context, req *pb.UpdateUserNodeRequest) (*pb.RPCSuccess, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedUserNodeDAO.UpdateUserNode(req.NodeId, req.Name, req.Description, req.HttpJSON, req.HttpsJSON, req.AccessAddrsJSON, req.IsOn)
+	if err != nil {
+		return nil, err
+	}
+
+	return this.Success()
+}
+
+// 删除用户节点
+func (this *UserNodeService) DeleteUserNode(ctx context.Context, req *pb.DeleteUserNodeRequest) (*pb.RPCSuccess, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedUserNodeDAO.DisableUserNode(req.NodeId)
+	if err != nil {
+		return nil, err
+	}
+
+	return this.Success()
+}
+
+// 列出所有可用用户节点
+func (this *UserNodeService) FindAllEnabledUserNodes(ctx context.Context, req *pb.FindAllEnabledUserNodesRequest) (*pb.FindAllEnabledUserNodesResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	nodes, err := models.SharedUserNodeDAO.FindAllEnabledUserNodes()
+	if err != nil {
+		return nil, err
+	}
+
+	result := []*pb.UserNode{}
+	for _, node := range nodes {
+		accessAddrs, err := node.DecodeAccessAddrStrings()
+		if err != nil {
+			return nil, err
+		}
+
+		result = append(result, &pb.UserNode{
+			Id:              int64(node.Id),
+			IsOn:            node.IsOn == 1,
+			UniqueId:        node.UniqueId,
+			Secret:          node.Secret,
+			Name:            node.Name,
+			Description:     node.Description,
+			HttpJSON:        []byte(node.Http),
+			HttpsJSON:       []byte(node.Https),
+			AccessAddrsJSON: []byte(node.AccessAddrs),
+			AccessAddrs:     accessAddrs,
+		})
+	}
+
+	return &pb.FindAllEnabledUserNodesResponse{Nodes: result}, nil
+}
+
+// 计算用户节点数量
+func (this *UserNodeService) CountAllEnabledUserNodes(ctx context.Context, req *pb.CountAllEnabledUserNodesRequest) (*pb.RPCCountResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	count, err := models.SharedUserNodeDAO.CountAllEnabledUserNodes()
+	if err != nil {
+		return nil, err
+	}
+
+	return this.SuccessCount(count)
+}
+
+// 列出单页的用户节点
+func (this *UserNodeService) ListEnabledUserNodes(ctx context.Context, req *pb.ListEnabledUserNodesRequest) (*pb.ListEnabledUserNodesResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	nodes, err := models.SharedUserNodeDAO.ListEnabledUserNodes(req.Offset, req.Size)
+	if err != nil {
+		return nil, err
+	}
+
+	result := []*pb.UserNode{}
+	for _, node := range nodes {
+		accessAddrs, err := node.DecodeAccessAddrStrings()
+		if err != nil {
+			return nil, err
+		}
+
+		result = append(result, &pb.UserNode{
+			Id:              int64(node.Id),
+			IsOn:            node.IsOn == 1,
+			UniqueId:        node.UniqueId,
+			Secret:          node.Secret,
+			Name:            node.Name,
+			Description:     node.Description,
+			HttpJSON:        []byte(node.Http),
+			HttpsJSON:       []byte(node.Https),
+			AccessAddrsJSON: []byte(node.AccessAddrs),
+			AccessAddrs:     accessAddrs,
+		})
+	}
+
+	return &pb.ListEnabledUserNodesResponse{Nodes: result}, nil
+}
+
+// 根据ID查找节点
+func (this *UserNodeService) FindEnabledUserNode(ctx context.Context, req *pb.FindEnabledUserNodeRequest) (*pb.FindEnabledUserNodeResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	node, err := models.SharedUserNodeDAO.FindEnabledUserNode(req.NodeId)
+	if err != nil {
+		return nil, err
+	}
+
+	if node == nil {
+		return &pb.FindEnabledUserNodeResponse{Node: nil}, nil
+	}
+
+	accessAddrs, err := node.DecodeAccessAddrStrings()
+	if err != nil {
+		return nil, err
+	}
+
+	result := &pb.UserNode{
+		Id:              int64(node.Id),
+		IsOn:            node.IsOn == 1,
+		UniqueId:        node.UniqueId,
+		Secret:          node.Secret,
+		Name:            node.Name,
+		Description:     node.Description,
+		HttpJSON:        []byte(node.Http),
+		HttpsJSON:       []byte(node.Https),
+		AccessAddrsJSON: []byte(node.AccessAddrs),
+		AccessAddrs:     accessAddrs,
+	}
+	return &pb.FindEnabledUserNodeResponse{Node: result}, nil
+}
+
+// 获取当前用户节点的版本
+func (this *UserNodeService) FindCurrentUserNode(ctx context.Context, req *pb.FindCurrentUserNodeRequest) (*pb.FindCurrentUserNodeResponse, error) {
+	_, err := this.ValidateUser(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	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 := models.SharedUserNodeDAO.FindEnabledUserNodeWithUniqueId(nodeId)
+	if err != nil {
+		return nil, err
+	}
+
+	if node == nil {
+		return &pb.FindCurrentUserNodeResponse{Node: nil}, nil
+	}
+
+	accessAddrs, err := node.DecodeAccessAddrStrings()
+	if err != nil {
+		return nil, err
+	}
+
+	result := &pb.UserNode{
+		Id:              int64(node.Id),
+		IsOn:            node.IsOn == 1,
+		UniqueId:        node.UniqueId,
+		Secret:          node.Secret,
+		Name:            node.Name,
+		Description:     node.Description,
+		HttpJSON:        []byte(node.Http),
+		HttpsJSON:       []byte(node.Https),
+		AccessAddrsJSON: []byte(node.AccessAddrs),
+		AccessAddrs:     accessAddrs,
+	}
+	return &pb.FindCurrentUserNodeResponse{Node: result}, nil
+}

internal/rpc/utils/utils.go

@@ -115,6 +115,7 @@ func ValidateRequest(ctx context.Context, userTypes ...UserType) (userType UserT
 			return UserTypeCluster, 0, errors.New("context: not found cluster with id '" + nodeId + "'")
 		}
 		nodeUserId = clusterId
+	case UserTypeUser:
 	}
 
 	if nodeUserId > 0 {