[#66] Use gate key to form object owner #68

Merged
dkirillov merged 1 commits from dkirillov/frostfs-http-gw:feature/66-use_gate_key_to_form_object_owner into master 2023-08-08 09:18:58 +00:00
2 changed files with 6 additions and 6 deletions

View File

@ -17,6 +17,7 @@ This document outlines major changes between releases.
- Update prometheus to v1.15.0 (#35)
- Update go version to 1.19 (#50)
- Finish rebranding (#2)
- Use gate key to form object owner (#66)
### Removed
- Drop `tree.service` param (now endpoints from `peers` section are used) (#59)

View File

@ -145,17 +145,17 @@ func (u *Uploader) Upload(req *fasthttp.RequestCtx) {
timestamp.SetValue(strconv.FormatInt(time.Now().Unix(), 10))
attributes = append(attributes, *timestamp)
}
id, bt := u.fetchOwnerAndBearerToken(ctx)
obj := object.New()
obj.SetContainerID(*idCnr)
obj.SetOwnerID(id)
obj.SetOwnerID(u.ownerID)
obj.SetAttributes(attributes...)
var prm pool.PrmObjectPut
prm.SetHeader(*obj)
prm.SetPayload(file)
bt := u.fetchBearerToken(ctx)
if bt != nil {
prm.UseBearer(*bt)
}
@ -200,12 +200,11 @@ func (u *Uploader) handlePutFrostFSErr(r *fasthttp.RequestCtx, err error) {
response.Error(r, msg, statusCode)
}
func (u *Uploader) fetchOwnerAndBearerToken(ctx context.Context) (*user.ID, *bearer.Token) {
func (u *Uploader) fetchBearerToken(ctx context.Context) *bearer.Token {
if tkn, err := tokens.LoadBearerToken(ctx); err == nil && tkn != nil {
issuer := bearer.ResolveIssuer(*tkn)
return &issuer, tkn
return tkn
}
return u.ownerID, nil
return nil
}
type putResponse struct {