pogpp/frostfs-s3-gw
1
0
Fork 0
forked from TrueCloudLab/frostfs-s3-gw
Code Pull requests Activity

[#65] Allow no sign requests

Browse source 
Signed-off-by: Denis Kirillov <denis@nspcc.ru>
This commit is contained in:
Denis Kirillov 2021-06-11 14:52:03 +03:00
parent 12b92a31c6
commit 8185b71462
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/auth/center.go
View file

@ -70,7 +70,7 @@ func (c *center) Authenticate(r *http.Request) (*token.BearerToken, error) {
authHeaderField := r.Header["Authorization"]
if len(authHeaderField) != 1 {
return nil, errors.New("unsupported request: wrong length of Authorization header field")
return nil, nil
}
sms1 := c.reg.getSubmatches(authHeaderField[0])

12
api/layer/layer.go
View file

@ -130,18 +130,12 @@ func (n *layer) GetBucketInfo(ctx context.Context, name string) (*BucketInfo, er
return nil, err
}
list, err := n.containerList(ctx)
if err != nil {
containerID := new(cid.ID)
if err := containerID.Parse(name); err != nil {
return nil, err
}
for _, bkt := range list {
if bkt.Name == name {
return bkt, nil
}
}
return nil, status.Error(codes.NotFound, "bucket not found")
return n.containerInfo(ctx, containerID)
}
// ListBuckets returns all user containers. Name of the bucket is a container

11
api/user-auth.go
View file

@ -26,8 +26,15 @@ func AttachUserAuth(router *mux.Router, center auth.Center, log *zap.Logger) {
return
}
h.ServeHTTP(w, r.WithContext(
context.WithValue(r.Context(), BearerTokenKey, token)))
var ctx context.Context
if token == nil {
log.Info("couldn't receive bearer token, switch to use neofs-key")
ctx = r.Context()
} else {
ctx = context.WithValue(r.Context(), BearerTokenKey, token)
}
h.ServeHTTP(w, r.WithContext(ctx))
})
})
}