From 14c58aea77910b2e15dfe53e856f1382491b4058 Mon Sep 17 00:00:00 2001 From: Seefs Date: Wed, 24 Dec 2025 15:52:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81=E5=B0=8F=E5=86=99bear?= =?UTF-8?q?er=E5=92=8CBearer=E5=90=8E=E5=B8=A6=E5=A4=9A=E4=B8=AA=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC=20&&=20=E4=BF=AE=E5=A4=8D=20WSS=E9=A2=84=E6=89=A3?= =?UTF-8?q?=E8=B4=B9=E9=94=99=E8=AF=AF=E6=8F=90=E5=8F=96key=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- middleware/auth.go | 8 ++++++-- service/quota.go | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/middleware/auth.go b/middleware/auth.go index 1396b2d5a..a3b41b186 100644 --- a/middleware/auth.go +++ b/middleware/auth.go @@ -218,10 +218,14 @@ func TokenAuth() func(c *gin.Context) { } key := c.Request.Header.Get("Authorization") 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" { 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-") parts = strings.Split(key, "-") key = parts[0] diff --git a/service/quota.go b/service/quota.go index 0da8dafd3..23ae60c1f 100644 --- a/service/quota.go +++ b/service/quota.go @@ -95,7 +95,7 @@ func PreWssConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usag 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 { return err }