forked from TrueCloudLab/frostfs-s3-gw
Merge pull request #79 from KirillovDenis/feature/65-allow_no_sign_requests
[#65] Allow no sign requests
This commit is contained in:
commit
a59d7bc5d8
3 changed files with 28 additions and 15 deletions
|
@ -44,6 +44,8 @@ type (
|
|||
prs int
|
||||
)
|
||||
|
||||
var ErrNoAuthorizationHeader = errors.New("no authorization header")
|
||||
|
||||
func (p prs) Read(_ []byte) (n int, err error) {
|
||||
panic("implement me")
|
||||
}
|
||||
|
@ -70,7 +72,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, ErrNoAuthorizationHeader
|
||||
}
|
||||
|
||||
sms1 := c.reg.getSubmatches(authHeaderField[0])
|
||||
|
|
|
@ -130,18 +130,22 @@ func (n *layer) GetBucketInfo(ctx context.Context, name string) (*BucketInfo, er
|
|||
return nil, err
|
||||
}
|
||||
|
||||
list, err := n.containerList(ctx)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for _, bkt := range list {
|
||||
if bkt.Name == name {
|
||||
return bkt, nil
|
||||
containerID := new(cid.ID)
|
||||
if err := containerID.Parse(name); err != nil {
|
||||
list, err := n.containerList(ctx)
|
||||
if 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 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
|
||||
|
|
|
@ -19,15 +19,22 @@ var BearerTokenKey = KeyWrapper("__context_bearer_token_key")
|
|||
func AttachUserAuth(router *mux.Router, center auth.Center, log *zap.Logger) {
|
||||
router.Use(func(h http.Handler) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
var ctx context.Context
|
||||
token, err := center.Authenticate(r)
|
||||
if err != nil {
|
||||
log.Error("failed to pass authentication", zap.Error(err))
|
||||
WriteErrorResponse(r.Context(), w, GetAPIError(ErrAccessDenied), r.URL)
|
||||
return
|
||||
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))
|
||||
WriteErrorResponse(r.Context(), w, GetAPIError(ErrAccessDenied), r.URL)
|
||||
return
|
||||
}
|
||||
} else {
|
||||
ctx = context.WithValue(r.Context(), BearerTokenKey, token)
|
||||
}
|
||||
|
||||
h.ServeHTTP(w, r.WithContext(
|
||||
context.WithValue(r.Context(), BearerTokenKey, token)))
|
||||
h.ServeHTTP(w, r.WithContext(ctx))
|
||||
})
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue