fix: 支持小写bearer和Bearer后带多个空格 && 修复 WSS预扣费错误提取key的问题
This commit is contained in:
@@ -218,10 +218,14 @@ func TokenAuth() func(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
key := c.Request.Header.Get("Authorization")
|
key := c.Request.Header.Get("Authorization")
|
||||||
parts := make([]string, 0)
|
parts := make([]string, 0)
|
||||||
key = strings.TrimPrefix(key, "Bearer ")
|
if strings.HasPrefix(key, "Bearer ") || strings.HasPrefix(key, "bearer ") {
|
||||||
|
key = strings.TrimSpace(key[7:])
|
||||||
|
}
|
||||||
if key == "" || key == "midjourney-proxy" {
|
if key == "" || key == "midjourney-proxy" {
|
||||||
key = c.Request.Header.Get("mj-api-secret")
|
key = c.Request.Header.Get("mj-api-secret")
|
||||||
key = strings.TrimPrefix(key, "Bearer ")
|
if strings.HasPrefix(key, "Bearer ") || strings.HasPrefix(key, "bearer ") {
|
||||||
|
key = strings.TrimSpace(key[7:])
|
||||||
|
}
|
||||||
key = strings.TrimPrefix(key, "sk-")
|
key = strings.TrimPrefix(key, "sk-")
|
||||||
parts = strings.Split(key, "-")
|
parts = strings.Split(key, "-")
|
||||||
key = parts[0]
|
key = parts[0]
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ func PreWssConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usag
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
token, err := model.GetTokenByKey(strings.TrimLeft(relayInfo.TokenKey, "sk-"), false)
|
token, err := model.GetTokenByKey(strings.TrimPrefix(relayInfo.TokenKey, "sk-"), false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user