TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-12-26 23:16:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复用户可能无法添加黑白名单IP的Bug

Browse Source
This commit is contained in:
刘祥超
2022-03-10 15:59:00 +08:00
parent 94287f5857
commit 9e7beb39c0
5 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/db/models/ssl_policy_dao.go
View File

@@ -281,9 +281,9 @@ func (this *SSLPolicyDAO) UpdatePolicy(tx *dbs.Tx, policyId int64, http2Enabled
}
// CheckUserPolicy 检查是否为用户所属策略
func (this *SSLPolicyDAO) CheckUserPolicy(tx *dbs.Tx, policyId int64, userId int64) error {
func (this *SSLPolicyDAO) CheckUserPolicy(tx *dbs.Tx, userId int64, policyId int64) error {
if policyId <= 0 || userId <= 0 {
return errors.New("not found")
return ErrNotFound
}
ok, err := this.Query(tx).
State(SSLPolicyStateEnabled).
@@ -294,7 +294,14 @@ func (this *SSLPolicyDAO) CheckUserPolicy(tx *dbs.Tx, policyId int64, userId int
return err
}
if !ok {
return errors.New("not found")
// 是否为当前用户的某个服务所用
exists, err := SharedServerDAO.ExistEnabledUserServerWithSSLPolicyId(tx, userId, policyId)
if err != nil {
return err
}
if !exists {
return ErrNotFound
}
}
return nil
}