Skip to content

A
apaas-meshproxy
Commit 9eba25a6 authored by 张亚松's avatar 张亚松
Browse files
Options

修改验证token逻辑

parent a26302e8
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 8 deletions
.beagle.yml
View file @ 9eba25a6
...@@ -30,7 +30,7 @@ pipeline: ...@@ -30,7 +30,7 @@ pipeline:
base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3.12 base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3.12
dockerfile: build/dockerfile dockerfile: build/dockerfile
repo: wod/apaas-meshproxy repo: wod/apaas-meshproxy
version: v3.0.4 version: v3.0.5
channel: alpha channel: alpha
args: "TARGETOS=linux,TARGETARCH=amd64" args: "TARGETOS=linux,TARGETARCH=amd64"
registry: registry.cn-qingdao.aliyuncs.com registry: registry.cn-qingdao.aliyuncs.com
...@@ -47,8 +47,8 @@ pipeline: ...@@ -47,8 +47,8 @@ pipeline:
dns: 223.5.5.5 dns: 223.5.5.5
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.4-alpha source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.5-alpha
target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.4 target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.5
registry: registry.cn-qingdao.aliyuncs.com registry: registry.cn-qingdao.aliyuncs.com
secrets: secrets:
- source: REGISTRY_USER_ALIYUN - source: REGISTRY_USER_ALIYUN
...@@ -63,7 +63,7 @@ pipeline: ...@@ -63,7 +63,7 @@ pipeline:
dns: 223.5.5.5 dns: 223.5.5.5
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /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 target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0
registry: registry.cn-qingdao.aliyuncs.com registry: registry.cn-qingdao.aliyuncs.com
secrets: secrets:
...@@ -83,7 +83,7 @@ pipeline: ...@@ -83,7 +83,7 @@ pipeline:
base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3.12-arm64 base: registry.cn-qingdao.aliyuncs.com/wod/alpine:3.12-arm64
dockerfile: build/dockerfile dockerfile: build/dockerfile
repo: wod/apaas-meshproxy repo: wod/apaas-meshproxy
version: v3.0.4 version: v3.0.5
channel: alpha-arm64 channel: alpha-arm64
args: "TARGETOS=linux,TARGETARCH=arm64" args: "TARGETOS=linux,TARGETARCH=arm64"
registry: registry.cn-qingdao.aliyuncs.com registry: registry.cn-qingdao.aliyuncs.com
...@@ -100,8 +100,8 @@ pipeline: ...@@ -100,8 +100,8 @@ pipeline:
dns: 223.5.5.5 dns: 223.5.5.5
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
source: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.4-alpha-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.4-arm64 target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0.5-arm64
registry: registry.cn-qingdao.aliyuncs.com registry: registry.cn-qingdao.aliyuncs.com
secrets: secrets:
- source: REGISTRY_USER_ALIYUN - source: REGISTRY_USER_ALIYUN
...@@ -116,7 +116,7 @@ pipeline: ...@@ -116,7 +116,7 @@ pipeline:
dns: 223.5.5.5 dns: 223.5.5.5
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /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 target: registry.cn-qingdao.aliyuncs.com/wod/apaas-meshproxy:v3.0-arm64
registry: registry.cn-qingdao.aliyuncs.com registry: registry.cn-qingdao.aliyuncs.com
secrets: secrets:
......
src/handler/proxyhandler.go
View file @ 9eba25a6
...@@ -42,6 +42,11 @@ func Proxy(c *gin.Context) { ...@@ -42,6 +42,11 @@ func Proxy(c *gin.Context) {
if apaasToken == "" { if apaasToken == "" {
apaasToken = c.GetHeader("Authorization") apaasToken = c.GetHeader("Authorization")
} }
if strings.HasPrefix("apaasToken", "Bearer ") {
apaasToken = strings.TrimPrefix(apaasToken, "Bearer ")
}
fmt.Println("apaasToken:", apaasToken) fmt.Println("apaasToken:", apaasToken)
if apaasToken == "" { if apaasToken == "" {
c.JSON(403, "Get Authorization Token failed") c.JSON(403, "Get Authorization Token failed")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment