Ecosystem/ai-gateway
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 fix: admin custom channel id failed (#56)

Browse Source
This commit is contained in:
Buer 2024-01-26 17:13:04 +08:00 committed by GitHub
parent 99929f15d5
commit 8646ee77ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
controller/relay-utils.go
View File

@ -13,7 +13,6 @@ import (
providersBase "one-api/providers/base"
"one-api/types"
"reflect"
"strconv"
"github.com/gin-gonic/gin"
"github.com/go-playground/validator/v10"
@ -55,9 +54,9 @@ func GetValidFieldName(err error, obj interface{}) string {
}
func fetchChannel(c *gin.Context, modelName string) (channel *model.Channel, fail bool) {
channelId, ok := c.Get("channelId")
if ok {
channel, fail = fetchChannelById(c, channelId.(int))
channelId := c.GetInt("channelId")
if channelId > 0 {
channel, fail = fetchChannelById(c, channelId)
if fail {
return
}
@ -73,13 +72,8 @@ func fetchChannel(c *gin.Context, modelName string) (channel *model.Channel, fai
return
}
func fetchChannelById(c *gin.Context, channelId any) (*model.Channel, bool) {
id, err := strconv.Atoi(channelId.(string))
if err != nil {
common.AbortWithMessage(c, http.StatusBadRequest, "无效的渠道 Id")
return nil, true
}
channel, err := model.GetChannelById(id, true)
func fetchChannelById(c *gin.Context, channelId int) (*model.Channel, bool) {
channel, err := model.GetChannelById(channelId, true)
if err != nil {
common.AbortWithMessage(c, http.StatusBadRequest, "无效的渠道 Id")
return nil, true

12
middleware/auth.go
View File

@ -1,12 +1,13 @@
package middleware
import (
"github.com/gin-contrib/sessions"
"github.com/gin-gonic/gin"
"net/http"
"one-api/common"
"one-api/model"
"strings"
"github.com/gin-contrib/sessions"
"github.com/gin-gonic/gin"
)
func authHelper(c *gin.Context, minRole int) {
@ -108,7 +109,12 @@ func TokenAuth() func(c *gin.Context) {
c.Set("token_name", token.Name)
if len(parts) > 1 {
if model.IsAdmin(token.UserId) {
c.Set("channelId", parts[1])
channelId := common.String2Int(parts[1])
if channelId == 0 {
abortWithMessage(c, http.StatusForbidden, "无效的渠道 Id")
return
}
c.Set("channelId", channelId)
} else {
abortWithMessage(c, http.StatusForbidden, "普通用户不支持指定渠道")
return