fyrchik/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity

Fixes of usage auth package

Browse source 
Signed-off-by: Evgeniy Kulikov <kim@nspcc.ru>
This commit is contained in:
Evgeniy Kulikov 2020-11-24 10:00:49 +03:00
parent 1fecf6a7ac
commit e3b1e8f369
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/router.go
View file

@ -6,8 +6,8 @@ import (
"github.com/google/uuid" "github.com/google/uuid"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/nspcc-dev/neofs-s3-gate/api/auth"
"github.com/nspcc-dev/neofs-s3-gate/api/metrics" "github.com/nspcc-dev/neofs-s3-gate/api/metrics"
"github.com/nspcc-dev/neofs-s3-gate/auth"
"go.uber.org/zap" "go.uber.org/zap"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
) )
@ -160,7 +160,7 @@ func GetRequestID(v interface{}) string {
} }
} }
func Attach(r *mux.Router, m MaxClients, h Handler, center *auth.Center, log *zap.Logger) { func Attach(r *mux.Router, m MaxClients, h Handler, center auth.Center, log *zap.Logger) {
api := r.PathPrefix(SlashSeparator).Subrouter() api := r.PathPrefix(SlashSeparator).Subrouter()
api.Use( api.Use(

16
api/user-auth.go
View file

@ -4,22 +4,24 @@ import (
"net/http" "net/http"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/nspcc-dev/neofs-s3-gate/auth" sdk "github.com/nspcc-dev/cdn-neofs-sdk"
"github.com/nspcc-dev/neofs-s3-gate/api/auth"
"go.uber.org/zap" "go.uber.org/zap"
) )
func AttachUserAuth(router *mux.Router, center *auth.Center, log *zap.Logger) { func AttachUserAuth(router *mux.Router, center auth.Center, log *zap.Logger) {
uamw := func(h http.Handler) http.Handler { router.Use(func(h http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
bearerToken, err := center.AuthenticationPassed(r) token, err := center.Authenticate(r)
if err != nil { if err != nil {
log.Error("failed to pass authentication", zap.Error(err)) log.Error("failed to pass authentication", zap.Error(err))
WriteErrorResponse(r.Context(), w, GetAPIError(ErrAccessDenied), r.URL) WriteErrorResponse(r.Context(), w, GetAPIError(ErrAccessDenied), r.URL)
return return
} }
h.ServeHTTP(w, r.WithContext(auth.SetBearerToken(r.Context(), bearerToken)))
h.ServeHTTP(w, r.WithContext(
sdk.SetBearerToken(r.Context(), token)))
}) })
} })
router.Use(uamw)
} }