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

[#65] Added NoAuthorizationHeader error

Browse source 
Signed-off-by: Denis Kirillov <denis@nspcc.ru>
This commit is contained in:
Denis Kirillov 2021-06-11 19:29:55 +03:00
parent 8185b71462
commit 4df647baac
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/auth/center.go
View file

@ -44,6 +44,8 @@ type (
prs int prs int
) )
var ErrNoAuthorizationHeader = errors.New("no authorization header")
func (p prs) Read(_ []byte) (n int, err error) { func (p prs) Read(_ []byte) (n int, err error) {
panic("implement me") panic("implement me")
} }
@ -70,7 +72,7 @@ func (c *center) Authenticate(r *http.Request) (*token.BearerToken, error) {
authHeaderField := r.Header["Authorization"] authHeaderField := r.Header["Authorization"]
if len(authHeaderField) != 1 { if len(authHeaderField) != 1 {
return nil, nil return nil, ErrNoAuthorizationHeader
} }
sms1 := c.reg.getSubmatches(authHeaderField[0]) sms1 := c.reg.getSubmatches(authHeaderField[0])

10
api/user-auth.go
View file

@ -19,17 +19,17 @@ var BearerTokenKey = KeyWrapper("__context_bearer_token_key")
func AttachUserAuth(router *mux.Router, center auth.Center, log *zap.Logger) { func AttachUserAuth(router *mux.Router, center auth.Center, log *zap.Logger) {
router.Use(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) {
var ctx context.Context
token, err := center.Authenticate(r) token, err := center.Authenticate(r)
if err != nil { if err != nil {
if err == auth.ErrNoAuthorizationHeader {
log.Debug("couldn't receive bearer token, using neofs-key")
ctx = r.Context()
} else {
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
} }
var ctx context.Context
if token == nil {
log.Info("couldn't receive bearer token, switch to use neofs-key")
ctx = r.Context()
} else { } else {
ctx = context.WithValue(r.Context(), BearerTokenKey, token) ctx = context.WithValue(r.Context(), BearerTokenKey, token)
} }