From 9eba25a6d6f02fc562295849b41578d615f704fc Mon Sep 17 00:00:00 2001 From: zhangyasong Date: Tue, 22 Mar 2022 18:57:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AA=8C=E8=AF=81token?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .beagle.yml | 16 ++++++++-------- src/handler/proxyhandler.go | 5 +++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.beagle.yml b/.beagle.yml index 47adb7c..3804ab1 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -30,7 +30,7 @@ pipeline: base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3.12 dockerfile: build/dockerfile repo: wod/apaas-meshproxy - version: v3.0.4 + version: v3.0.5 channel: alpha args: "TARGETOS=linux,TARGETARCH=amd64" registry: registry.cn-qingdao.aliyuncs.com @@ -47,8 +47,8 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.4-alpha - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.4 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.5-alpha + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.5 registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -63,7 +63,7 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.4 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.5 target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0 registry: registry.cn-qingdao.aliyuncs.com secrets: @@ -83,7 +83,7 @@ pipeline: base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3.12-arm64 dockerfile: build/dockerfile repo: wod/apaas-meshproxy - version: v3.0.4 + version: v3.0.5 channel: alpha-arm64 args: "TARGETOS=linux,TARGETARCH=arm64" registry: registry.cn-qingdao.aliyuncs.com @@ -100,8 +100,8 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.4-alpha-arm64 - target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.4-arm64 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.5-alpha-arm64 + target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.5-arm64 registry: registry.cn-qingdao.aliyuncs.com secrets: - source: REGISTRY_USER_ALIYUN @@ -116,7 +116,7 @@ pipeline: dns: 223.5.5.5 volumes: - /var/run/docker.sock:/var/run/docker.sock - source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.4-arm64 + source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.5-arm64 target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0-arm64 registry: registry.cn-qingdao.aliyuncs.com secrets: diff --git a/src/handler/proxyhandler.go b/src/handler/proxyhandler.go index fe53500..efcd3a9 100644 --- a/src/handler/proxyhandler.go +++ b/src/handler/proxyhandler.go @@ -42,6 +42,11 @@ func Proxy(c *gin.Context) { if apaasToken == "" { apaasToken = c.GetHeader("Authorization") } + + if strings.HasPrefix("apaasToken", "Bearer ") { + apaasToken = strings.TrimPrefix(apaasToken, "Bearer ") + } + fmt.Println("apaasToken:", apaasToken) if apaasToken == "" { c.JSON(403, "Get Authorization Token failed") -- 2.26.0