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

internal/db/models/log_dao.go

@@ -36,8 +36,21 @@ func init() {
 // 创建管理员日志
 func (this *LogDAO) CreateLog(adminType string, adminId int64, level string, description string, action string, ip string) error {
 	op := NewLogOperator()
+	op.Level = level
+	op.Description = description
+	op.Action = action
+	op.Ip = ip
 	op.Type = adminType
-	op.AdminId, op.Level, op.Description, op.Action, op.Ip = adminId, level, description, action, ip
+
+	switch adminType {
+	case "admin":
+		op.AdminId = adminId
+	case "user":
+		op.UserId = adminId
+	case "provider":
+		op.ProviderId = adminId
+	}
+
 	op.Day = timeutil.Format("Ymd")
 	op.Type = LogTypeAdmin
 	err := this.Save(op)

internal/db/models/user_dao.go

@@ -179,3 +179,17 @@ func (this *UserDAO) ListEnabledUserIds(offset, size int64) ([]int64, error) {
 	}
 	return result, nil
 }
+
+// 检查用户名、密码
+func (this *UserDAO) CheckUserPassword(username string, encryptedPassword string) (int64, error) {
+	if len(username) == 0 || len(encryptedPassword) == 0 {
+		return 0, nil
+	}
+	return this.Query().
+		Attr("username", username).
+		Attr("password", encryptedPassword).
+		Attr("state", UserStateEnabled).
+		Attr("isOn", true).
+		ResultPk().
+		FindInt64Col(0)
+}

internal/db/models/user_node_dao.go

@@ -0,0 +1,234 @@
+package models
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeAPI/internal/errors"
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/iwind/TeaGo/Tea"
+	"github.com/iwind/TeaGo/dbs"
+	"github.com/iwind/TeaGo/maps"
+	"github.com/iwind/TeaGo/rands"
+	"github.com/iwind/TeaGo/types"
+	"strconv"
+)
+
+const (
+	UserNodeStateEnabled  = 1 // 已启用
+	UserNodeStateDisabled = 0 // 已禁用
+)
+
+type UserNodeDAO dbs.DAO
+
+func NewUserNodeDAO() *UserNodeDAO {
+	return dbs.NewDAO(&UserNodeDAO{
+		DAOObject: dbs.DAOObject{
+			DB:     Tea.Env,
+			Table:  "edgeUserNodes",
+			Model:  new(UserNode),
+			PkName: "id",
+		},
+	}).(*UserNodeDAO)
+}
+
+var SharedUserNodeDAO *UserNodeDAO
+
+func init() {
+	dbs.OnReady(func() {
+		SharedUserNodeDAO = NewUserNodeDAO()
+	})
+}
+
+// 启用条目
+func (this *UserNodeDAO) EnableUserNode(id uint32) error {
+	_, err := this.Query().
+		Pk(id).
+		Set("state", UserNodeStateEnabled).
+		Update()
+	return err
+}
+
+// 禁用条目
+func (this *UserNodeDAO) DisableUserNode(id int64) error {
+	_, err := this.Query().
+		Pk(id).
+		Set("state", UserNodeStateDisabled).
+		Update()
+	return err
+}
+
+// 查找启用中的条目
+func (this *UserNodeDAO) FindEnabledUserNode(id int64) (*UserNode, error) {
+	result, err := this.Query().
+		Pk(id).
+		Attr("state", UserNodeStateEnabled).
+		Find()
+	if result == nil {
+		return nil, err
+	}
+	return result.(*UserNode), err
+}
+
+// 根据主键查找名称
+func (this *UserNodeDAO) FindUserNodeName(id int64) (string, error) {
+	return this.Query().
+		Pk(id).
+		Result("name").
+		FindStringCol("")
+}
+
+// 列出所有可用用户节点
+func (this *UserNodeDAO) FindAllEnabledUserNodes() (result []*UserNode, err error) {
+	_, err = this.Query().
+		State(UserNodeStateEnabled).
+		Desc("order").
+		AscPk().
+		Slice(&result).
+		FindAll()
+	return
+}
+
+// 计算用户节点数量
+func (this *UserNodeDAO) CountAllEnabledUserNodes() (int64, error) {
+	return this.Query().
+		State(UserNodeStateEnabled).
+		Count()
+}
+
+// 列出单页的用户节点
+func (this *UserNodeDAO) ListEnabledUserNodes(offset int64, size int64) (result []*UserNode, err error) {
+	_, err = this.Query().
+		State(UserNodeStateEnabled).
+		Offset(offset).
+		Limit(size).
+		Desc("order").
+		DescPk().
+		Slice(&result).
+		FindAll()
+	return
+}
+
+// 根据主机名和端口获取ID
+func (this *UserNodeDAO) FindEnabledUserNodeIdWithAddr(protocol string, host string, port int) (int64, error) {
+	addr := maps.Map{
+		"protocol":  protocol,
+		"host":      host,
+		"portRange": strconv.Itoa(port),
+	}
+	addrJSON, err := json.Marshal(addr)
+	if err != nil {
+		return 0, err
+	}
+
+	one, err := this.Query().
+		State(UserNodeStateEnabled).
+		Where("JSON_CONTAINS(accessAddrs, :addr)").
+		Param("addr", string(addrJSON)).
+		ResultPk().
+		Find()
+	if err != nil {
+		return 0, err
+	}
+	if one == nil {
+		return 0, nil
+	}
+	return int64(one.(*UserNode).Id), nil
+}
+
+// 创建用户节点
+func (this *UserNodeDAO) CreateUserNode(name string, description string, httpJSON []byte, httpsJSON []byte, accessAddrsJSON []byte, isOn bool) (nodeId int64, err error) {
+	uniqueId, err := this.genUniqueId()
+	if err != nil {
+		return 0, err
+	}
+	secret := rands.String(32)
+	err = NewApiTokenDAO().CreateAPIToken(uniqueId, secret, NodeRoleUser)
+	if err != nil {
+		return
+	}
+
+	op := NewUserNodeOperator()
+	op.IsOn = isOn
+	op.UniqueId = uniqueId
+	op.Secret = secret
+	op.Name = name
+	op.Description = description
+
+	if len(httpJSON) > 0 {
+		op.Http = httpJSON
+	}
+	if len(httpsJSON) > 0 {
+		op.Https = httpsJSON
+	}
+	if len(accessAddrsJSON) > 0 {
+		op.AccessAddrs = accessAddrsJSON
+	}
+
+	op.State = NodeStateEnabled
+	err = this.Save(op)
+	if err != nil {
+		return
+	}
+
+	return types.Int64(op.Id), nil
+}
+
+// 修改用户节点
+func (this *UserNodeDAO) UpdateUserNode(nodeId int64, name string, description string, httpJSON []byte, httpsJSON []byte, accessAddrsJSON []byte, isOn bool) error {
+	if nodeId <= 0 {
+		return errors.New("invalid nodeId")
+	}
+
+	op := NewUserNodeOperator()
+	op.Id = nodeId
+	op.Name = name
+	op.Description = description
+	op.IsOn = isOn
+
+	if len(httpJSON) > 0 {
+		op.Http = httpJSON
+	} else {
+		op.Http = "null"
+	}
+	if len(httpsJSON) > 0 {
+		op.Https = httpsJSON
+	} else {
+		op.Https = "null"
+	}
+	if len(accessAddrsJSON) > 0 {
+		op.AccessAddrs = accessAddrsJSON
+	} else {
+		op.AccessAddrs = "null"
+	}
+
+	err := this.Save(op)
+	return err
+}
+
+// 根据唯一ID获取节点信息
+func (this *UserNodeDAO) FindEnabledUserNodeWithUniqueId(uniqueId string) (*UserNode, error) {
+	result, err := this.Query().
+		Attr("uniqueId", uniqueId).
+		Attr("state", UserNodeStateEnabled).
+		Find()
+	if result == nil {
+		return nil, err
+	}
+	return result.(*UserNode), err
+}
+
+// 生成唯一ID
+func (this *UserNodeDAO) genUniqueId() (string, error) {
+	for {
+		uniqueId := rands.HexString(32)
+		ok, err := this.Query().
+			Attr("uniqueId", uniqueId).
+			Exist()
+		if err != nil {
+			return "", err
+		}
+		if ok {
+			continue
+		}
+		return uniqueId, nil
+	}
+}

internal/db/models/user_node_dao_test.go

@@ -0,0 +1,5 @@
+package models
+
+import (
+	_ "github.com/go-sql-driver/mysql"
+)

internal/db/models/user_node_model.go

@@ -0,0 +1,42 @@
+package models
+
+// API节点
+type UserNode struct {
+	Id          uint32 `field:"id"`          // ID
+	IsOn        uint8  `field:"isOn"`        // 是否启用
+	UniqueId    string `field:"uniqueId"`    // 唯一ID
+	Secret      string `field:"secret"`      // 密钥
+	Name        string `field:"name"`        // 名称
+	Description string `field:"description"` // 描述
+	Http        string `field:"http"`        // 监听的HTTP配置
+	Https       string `field:"https"`       // 监听的HTTPS配置
+	AccessAddrs string `field:"accessAddrs"` // 外部访问地址
+	Order       uint32 `field:"order"`       // 排序
+	State       uint8  `field:"state"`       // 状态
+	CreatedAt   uint64 `field:"createdAt"`   // 创建时间
+	AdminId     uint32 `field:"adminId"`     // 管理员ID
+	Weight      uint32 `field:"weight"`      // 权重
+	Status      string `field:"status"`      // 运行状态
+}
+
+type UserNodeOperator struct {
+	Id          interface{} // ID
+	IsOn        interface{} // 是否启用
+	UniqueId    interface{} // 唯一ID
+	Secret      interface{} // 密钥
+	Name        interface{} // 名称
+	Description interface{} // 描述
+	Http        interface{} // 监听的HTTP配置
+	Https       interface{} // 监听的HTTPS配置
+	AccessAddrs interface{} // 外部访问地址
+	Order       interface{} // 排序
+	State       interface{} // 状态
+	CreatedAt   interface{} // 创建时间
+	AdminId     interface{} // 管理员ID
+	Weight      interface{} // 权重
+	Status      interface{} // 运行状态
+}
+
+func NewUserNodeOperator() *UserNodeOperator {
+	return &UserNodeOperator{}
+}

internal/db/models/user_node_model_ext.go

@@ -0,0 +1,95 @@
+package models
+
+import (
+	"encoding/json"
+	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
+)
+
+// 解析HTTP配置
+func (this *UserNode) DecodeHTTP() (*serverconfigs.HTTPProtocolConfig, error) {
+	if !IsNotNull(this.Http) {
+		return nil, nil
+	}
+	config := &serverconfigs.HTTPProtocolConfig{}
+	err := json.Unmarshal([]byte(this.Http), config)
+	if err != nil {
+		return nil, err
+	}
+
+	err = config.Init()
+	if err != nil {
+		return nil, err
+	}
+
+	return config, nil
+}
+
+// 解析HTTPS配置
+func (this *UserNode) DecodeHTTPS() (*serverconfigs.HTTPSProtocolConfig, error) {
+	if !IsNotNull(this.Https) {
+		return nil, nil
+	}
+	config := &serverconfigs.HTTPSProtocolConfig{}
+	err := json.Unmarshal([]byte(this.Https), config)
+	if err != nil {
+		return nil, err
+	}
+
+	err = config.Init()
+	if err != nil {
+		return nil, err
+	}
+
+	if config.SSLPolicyRef != nil {
+		policyId := config.SSLPolicyRef.SSLPolicyId
+		if policyId > 0 {
+			sslPolicy, err := SharedSSLPolicyDAO.ComposePolicyConfig(policyId)
+			if err != nil {
+				return nil, err
+			}
+			if sslPolicy != nil {
+				config.SSLPolicy = sslPolicy
+			}
+		}
+	}
+
+	err = config.Init()
+	if err != nil {
+		return nil, err
+	}
+
+	return config, nil
+}
+
+// 解析访问地址
+func (this *UserNode) DecodeAccessAddrs() ([]*serverconfigs.NetworkAddressConfig, error) {
+	if !IsNotNull(this.AccessAddrs) {
+		return nil, nil
+	}
+
+	addrConfigs := []*serverconfigs.NetworkAddressConfig{}
+	err := json.Unmarshal([]byte(this.AccessAddrs), &addrConfigs)
+	if err != nil {
+		return nil, err
+	}
+	for _, addrConfig := range addrConfigs {
+		err = addrConfig.Init()
+		if err != nil {
+			return nil, err
+		}
+	}
+	return addrConfigs, nil
+}
+
+// 解析访问地址，并返回字符串形式
+func (this *UserNode) DecodeAccessAddrStrings() ([]string, error) {
+	addrs, err := this.DecodeAccessAddrs()
+	if err != nil {
+		return nil, err
+	}
+	result := []string{}
+	for _, addr := range addrs {
+		result = append(result, addr.FullAddresses()...)
+	}
+	return result, nil
+}