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

Merge pull request #79 from KirillovDenis/feature/65-allow_no_sign_requests

Browse source 
[#65] Allow no sign requests
This commit is contained in:
Roman Khimov 2021-06-15 10:23:46 +03:00 committed by GitHub
commit a59d7bc5d8
3 changed files with 28 additions and 15 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, errors.New("unsupported request: wrong length of Authorization header field") return nil, ErrNoAuthorizationHeader
} }
sms1 := c.reg.getSubmatches(authHeaderField[0]) sms1 := c.reg.getSubmatches(authHeaderField[0])

22
api/layer/layer.go
View file

@ -130,18 +130,22 @@ func (n *layer) GetBucketInfo(ctx context.Context, name string) (*BucketInfo, er
return nil, err return nil, err
} }
list, err := n.containerList(ctx) containerID := new(cid.ID)
if err != nil { if err := containerID.Parse(name); err != nil {
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
} }
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 // ListBuckets returns all user containers. Name of the bucket is a container

17
api/user-auth.go
View file

@ -19,15 +19,22 @@ 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 {
log.Error("failed to pass authentication", zap.Error(err)) if err == auth.ErrNoAuthorizationHeader {
WriteErrorResponse(r.Context(), w, GetAPIError(ErrAccessDenied), r.URL) log.Debug("couldn't receive bearer token, using neofs-key")
return 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( h.ServeHTTP(w, r.WithContext(ctx))
context.WithValue(r.Context(), BearerTokenKey, token)))
}) })
}) })
} }