From 0c66bdd6ad880f29610f8c1c52d10be71ddafd1c Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Mon, 18 Oct 2021 13:18:47 +0200 Subject: [PATCH 1/2] feat(public-token): get public-token from query string retrieving public-token also from the query-string --- proxy/pkg/middleware/public_share_auth.go | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/proxy/pkg/middleware/public_share_auth.go b/proxy/pkg/middleware/public_share_auth.go index 32e0fc004..4ea667c1d 100644 --- a/proxy/pkg/middleware/public_share_auth.go +++ b/proxy/pkg/middleware/public_share_auth.go @@ -1,6 +1,7 @@ package middleware import ( + "fmt" "net/http" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" @@ -20,8 +21,12 @@ func PublicShareAuth(opts ...Option) func(next http.Handler) http.Handler { return func(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - // Currently we only want to authenticate app open request coming from public shares. shareToken := r.Header.Get(headerShareToken) + if shareToken == "" { + shareToken = r.URL.Query().Get(headerShareToken) + } + + // Currently we only want to authenticate app open request coming from public shares. if shareToken == "" { // Don't authenticate next.ServeHTTP(w, r) @@ -49,6 +54,8 @@ func PublicShareAuth(opts ...Option) func(next http.Handler) http.Handler { return } + fmt.Println("########################################################", authResp.Token) + r.Header.Add(headerRevaAccessToken, authResp.Token) next.ServeHTTP(w, r) }) From 03de49e59b22c9b9b14182b1090e56acccd98ced Mon Sep 17 00:00:00 2001 From: Florian Schade Date: Mon, 18 Oct 2021 15:48:09 +0200 Subject: [PATCH 2/2] remove dev leftover --- proxy/pkg/middleware/public_share_auth.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/proxy/pkg/middleware/public_share_auth.go b/proxy/pkg/middleware/public_share_auth.go index 4ea667c1d..3cf200e17 100644 --- a/proxy/pkg/middleware/public_share_auth.go +++ b/proxy/pkg/middleware/public_share_auth.go @@ -1,7 +1,6 @@ package middleware import ( - "fmt" "net/http" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" @@ -54,8 +53,6 @@ func PublicShareAuth(opts ...Option) func(next http.Handler) http.Handler { return } - fmt.Println("########################################################", authResp.Token) - r.Header.Add(headerRevaAccessToken, authResp.Token) next.ServeHTTP(w, r) })