diff --git a/.beagle.yml b/.beagle.yml index 47adb7c5646b3ca4c7ef4dd72f4113e4770d5e3a..3804ab16802ac8ae4e885fbf693ff72e9e7eae54 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 fe53500af1defe7a1a19a4a10ae408a3163c1327..efcd3a9be7c57005b00de1debb07df40d569abc1 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")