TrueCloudLab/frostfs-s3-gw
17
3
Fork 20
Code Issues 26 Pull requests 9 Projects Releases 35 Packages 1 Activity Actions

bugfix/607-support_trailer_headers #620

Merged
alexvanin merged 5 commits from dkirillov/frostfs-s3-gw:bugfix/607-support_trailer_headers into master 2025-02-04 11:50:32 +00:00
Conversation 0 Commits 5 Files changed 9 +949 -124
dkirillov commented 2025-02-03 15:27:00 +00:00
Member
Copy link

close #607

close #607
dkirillov self-assigned this 2025-02-03 15:27:00 +00:00
dkirillov added 5 commits 2025-02-03 15:27:00 +00:00 
Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
[#607] Support sigV4a streaming with trailers
All checks were successful
/ DCO (pull_request) Successful in 32s
Details
/ Vulncheck (pull_request) Successful in 1m6s
Details
/ Builds (pull_request) Successful in 1m34s
Details
/ OCI image (pull_request) Successful in 2m2s
Details
/ Lint (pull_request) Successful in 2m10s
Details
/ Tests (pull_request) Successful in 1m17s
Details
/ Vulncheck (push) Successful in 1m6s
Details
/ Builds (push) Successful in 1m6s
Details
/ Lint (push) Successful in 1m57s
Details
/ Tests (push) Successful in 1m20s
Details
/ OCI image (push) Successful in 2m10s
Details
a53e50b324 
Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
dkirillov changed title from WIP: bugfix/607-support_trailer_headers to bugfix/607-support_trailer_headers 2025-02-04 06:22:01 +00:00
requested reviews from storage-services-committers, storage-services-developers 2025-02-04 06:22:01 +00:00
alexvanin reviewed 2025-02-04 09:59:41 +00:00
api/handler/s3v4aReader.go
@ -172,0 +203,4 @@
}
switch {
case slices.Contains(c.trailerHeaders, string(k[:len(k)-1])):
alexvanin commented 2025-02-04 08:51:45 +00:00
Owner
Copy link

Can we assume that k always has at least the length of one, so this code will never panic?

Can we assume that `k` always has at least the length of one, so this code will never panic?
dkirillov commented 2025-02-04 10:06:29 +00:00
Author
Member
Copy link

Yes. The following code should prevent as from panic

Lines 187 to 194 in dkirillov/frostfs-s3-gw@a53e50b
k, err = c.reader.ReadBytes(':')
if err != nil {
if err == io.EOF {
break
}
c.err = errMalformedTrailerHeaders
return c.err
}

we got error if we couldn't meet : that lead to breaking the loop

Yes. The following code should prevent as from panic https://git.frostfs.info/dkirillov/frostfs-s3-gw/src/commit/a53e50b324d9d335ab89d290dbfee4256db0ef1e/api/handler/s3v4aReader.go#L187-L194 we got error if we couldn't meet `:` that lead to breaking the loop
api/handler/s3v4aReader.go
@ -172,0 +206,4 @@
case slices.Contains(c.trailerHeaders, string(k[:len(k)-1])):
c.buffer = append(append(c.buffer, k...), v...) // todo use copy
case string(k) == "x-amz-trailer-signature:":
n, err := hex.Decode(v[:], bytes.TrimRight(v[:], "*\n"))
alexvanin commented 2025-02-04 08:58:10 +00:00
Owner
Copy link

Didn't know bytes.TrimRight supports wildcard * 👍

Didn't know `bytes.TrimRight` supports wildcard `*` 👍
dkirillov commented 2025-02-04 10:03:26 +00:00
Author
Member
Copy link

It doesn't. It's literally * character

It doesn't. It's literally `*` character
👀 2
fyrchik commented 2025-02-04 10:04:44 +00:00
Owner
Copy link

Hm, wait, is it some kind of a wildcard or just a *?

Hm, wait, is it some kind of a wildcard or just a `*`?
dkirillov commented 2025-02-04 10:59:42 +00:00
Author
Member
Copy link

Just *

Just `*`
alexvanin approved these changes 2025-02-04 11:48:50 +00:00
alexvanin merged commit a53e50b324 into master 2025-02-04 11:50:32 +00:00
alexvanin deleted branch bugfix/607-support_trailer_headers 2025-02-04 11:50:38 +00:00
alexvanin added this to the v0.32.5 milestone 2025-02-04 11:51:33 +00:00
alexvanin modified the milestone from v0.32.5 to v0.33.0 2025-02-04 11:51:37 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
alexvanin
Labels
Clear labels   
P0

Highest

  
P1

High

  
P2

Medium

  
P3

Low

  
good first issue

Good for newcomers

  
Infrastructure

Infrastructure, Automation, CI/CD or DevOps related stuff

  
blocked

The issue or PR is blocked by something

  
bug

Something is not working

  
config

Configuration format update or breaking change

  
discussion

Talking about something in order to reach a decision or to exchange ideas

  
documentation

Documentation related

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
go

Language features adoption

  
help wanted

Extra attention is needed

  
internal

   
invalid

Something is wrong

  
kludge

This is a kludge and we know it

  
observability

Related to metrics, tracing and logs

  
perfomance

Perfomance related

  
question

More information is needed

  
refactoring

Refactoring

  
wontfix

This won't be fixed

No labels
P0
P1
P2
P3
good first issue
Infrastructure
blocked
bug
config
discussion
documentation
duplicate
enhancement
go
help wanted
internal
invalid
kludge
observability
perfomance
question
refactoring
wontfix
Milestone
Clear milestone
No items
No milestone
v0.33.0
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
dkirillov
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: TrueCloudLab/frostfs-s3-gw#620
No description provided.
Delete branch "dkirillov/frostfs-s3-gw:bugfix/607-support_trailer_headers"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?