Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: act expose headers #5024

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+41 −13
Open

fix: act expose headers #5024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions pkg/api/accesscontrol.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,32 +154,30 @@ func (s *Service) actDecryptionHandler() func(h http.Handler) http.Handler {
// uploads the encrypted reference, history and kvs to the store.
func (s *Service) actEncryptionHandler(
ctx context.Context,
w http.ResponseWriter,
putter storer.PutterSession,
reference swarm.Address,
historyRootHash swarm.Address,
) (swarm.Address, error) {
) (swarm.Address, swarm.Address, error) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider using named return values for clarity.
(encryptedRef, historyRef swarm.Address, err error)

publisherPublicKey := &s.publicKey
ls := loadsave.New(s.storer.Download(true), s.storer.Cache(), requestPipelineFactory(ctx, putter, false, redundancy.NONE), redundancy.DefaultLevel)
storageReference, historyReference, encryptedReference, err := s.accesscontrol.UploadHandler(ctx, ls, reference, publisherPublicKey, historyRootHash)
if err != nil {
return swarm.ZeroAddress, err
return swarm.ZeroAddress, swarm.ZeroAddress, err
}
// only need to upload history and kvs if a new history is created,
// meaning that the publisher uploaded to the history for the first time
if !historyReference.Equal(historyRootHash) {
err = putter.Done(storageReference)
if err != nil {
return swarm.ZeroAddress, fmt.Errorf("done split key-value store failed: %w", err)
return swarm.ZeroAddress, swarm.ZeroAddress, fmt.Errorf("done split key-value store failed: %w", err)
}
err = putter.Done(historyReference)
if err != nil {
return swarm.ZeroAddress, fmt.Errorf("done split history failed: %w", err)
return swarm.ZeroAddress, swarm.ZeroAddress, fmt.Errorf("done split history failed: %w", err)
}
}

w.Header().Set(SwarmActHistoryAddressHeader, historyReference.String())
return encryptedReference, nil
return encryptedReference, historyReference, nil
}

// actListGranteesHandler is a middleware that decrypts the given address and returns the list of grantees,
Expand Down
7 changes: 6 additions & 1 deletion pkg/api/bytes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,9 @@ func (s *Service) bytesUploadHandler(w http.ResponseWriter, r *http.Request) {
}

encryptedReference := reference
historyReference := swarm.ZeroAddress
if headers.Act {
encryptedReference, err = s.actEncryptionHandler(r.Context(), w, putter, reference, headers.HistoryAddress)
encryptedReference, historyReference, err = s.actEncryptionHandler(r.Context(), putter, reference, headers.HistoryAddress)
if err != nil {
logger.Debug("access control upload failed", "error", err)
logger.Error(nil, "access control upload failed")
Expand Down Expand Up @@ -154,6 +155,10 @@ func (s *Service) bytesUploadHandler(w http.ResponseWriter, r *http.Request) {
span.LogFields(olog.Bool("success", true))

w.Header().Set(AccessControlExposeHeaders, SwarmTagHeader)
if headers.Act {
w.Header().Set(SwarmActHistoryAddressHeader, historyReference.String())
w.Header().Add(AccessControlExposeHeaders, SwarmActHistoryAddressHeader)
}
jsonhttp.Created(w, bytesPostResponse{
Reference: encryptedReference,
})
Expand Down
7 changes: 6 additions & 1 deletion pkg/api/bzz.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,9 @@ func (s *Service) fileUploadHandler(
logger.Debug("store", "manifest_reference", manifestReference)

reference := manifestReference
historyReference := swarm.ZeroAddress
if act {
reference, err = s.actEncryptionHandler(r.Context(), w, putter, reference, historyAddress)
reference, historyReference, err = s.actEncryptionHandler(r.Context(), putter, reference, historyAddress)
if err != nil {
logger.Debug("access control upload failed", "error", err)
logger.Error(nil, "access control upload failed")
Expand Down Expand Up @@ -303,6 +304,10 @@ func (s *Service) fileUploadHandler(
}
w.Header().Set(ETagHeader, fmt.Sprintf("%q", reference.String()))
w.Header().Set(AccessControlExposeHeaders, SwarmTagHeader)
if act {
w.Header().Set(SwarmActHistoryAddressHeader, historyReference.String())
w.Header().Add(AccessControlExposeHeaders, SwarmActHistoryAddressHeader)
}

jsonhttp.Created(w, bzzUploadResponse{
Reference: reference,
Expand Down
7 changes: 6 additions & 1 deletion pkg/api/chunk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,9 @@ func (s *Service) chunkUploadHandler(w http.ResponseWriter, r *http.Request) {
}

reference := chunk.Address()
historyReference := swarm.ZeroAddress
if headers.Act {
reference, err = s.actEncryptionHandler(r.Context(), w, putter, reference, headers.HistoryAddress)
reference, historyReference, err = s.actEncryptionHandler(r.Context(), putter, reference, headers.HistoryAddress)
if err != nil {
logger.Debug("access control upload failed", "error", err)
logger.Error(nil, "access control upload failed")
Expand Down Expand Up @@ -217,6 +218,10 @@ func (s *Service) chunkUploadHandler(w http.ResponseWriter, r *http.Request) {
}

w.Header().Set(AccessControlExposeHeaders, SwarmTagHeader)
if headers.Act {
w.Header().Set(SwarmActHistoryAddressHeader, historyReference.String())
w.Header().Add(AccessControlExposeHeaders, SwarmActHistoryAddressHeader)
}
jsonhttp.Created(w, chunkAddressResponse{Reference: reference})
}

Expand Down
7 changes: 6 additions & 1 deletion pkg/api/dirs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,9 @@ func (s *Service) dirUploadHandler(
}

encryptedReference := reference
historyReference := swarm.ZeroAddress
if act {
encryptedReference, err = s.actEncryptionHandler(r.Context(), w, putter, reference, historyAddress)
encryptedReference, historyReference, err = s.actEncryptionHandler(r.Context(), putter, reference, historyAddress)
if err != nil {
logger.Debug("access control upload failed", "error", err)
logger.Error(nil, "access control upload failed")
Expand Down Expand Up @@ -135,6 +136,10 @@ func (s *Service) dirUploadHandler(
span.LogFields(olog.Bool("success", true))
}
w.Header().Set(AccessControlExposeHeaders, SwarmTagHeader)
if act {
w.Header().Set(SwarmActHistoryAddressHeader, historyReference.String())
w.Header().Add(AccessControlExposeHeaders, SwarmActHistoryAddressHeader)
}
jsonhttp.Created(w, bzzUploadResponse{
Reference: encryptedReference,
})
Expand Down
7 changes: 6 additions & 1 deletion pkg/api/feed.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,9 @@ func (s *Service) feedPostHandler(w http.ResponseWriter, r *http.Request) {
}

encryptedReference := ref
historyReference := swarm.ZeroAddress
if headers.Act {
encryptedReference, err = s.actEncryptionHandler(r.Context(), w, putter, ref, headers.HistoryAddress)
encryptedReference, historyReference, err = s.actEncryptionHandler(r.Context(), putter, ref, headers.HistoryAddress)
if err != nil {
logger.Debug("access control upload failed", "error", err)
logger.Error(nil, "access control upload failed")
Expand All @@ -307,5 +308,9 @@ func (s *Service) feedPostHandler(w http.ResponseWriter, r *http.Request) {
return
}

if headers.Act {
w.Header().Set(SwarmActHistoryAddressHeader, historyReference.String())
w.Header().Set(AccessControlExposeHeaders, SwarmActHistoryAddressHeader)
}
jsonhttp.Created(w, feedReferenceResponse{Reference: encryptedReference})
}
7 changes: 6 additions & 1 deletion pkg/api/soc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,9 @@ func (s *Service) socUploadHandler(w http.ResponseWriter, r *http.Request) {
}

reference := sch.Address()
historyReference := swarm.ZeroAddress
if headers.Act {
reference, err = s.actEncryptionHandler(r.Context(), w, putter, reference, headers.HistoryAddress)
reference, historyReference, err = s.actEncryptionHandler(r.Context(), putter, reference, headers.HistoryAddress)
if err != nil {
logger.Debug("access control upload failed", "error", err)
logger.Error(nil, "access control upload failed")
Expand All @@ -207,6 +208,10 @@ func (s *Service) socUploadHandler(w http.ResponseWriter, r *http.Request) {
jsonhttp.InternalServerError(ow, "done split failed")
return
}
if headers.Act {
w.Header().Set(SwarmActHistoryAddressHeader, historyReference.String())
w.Header().Set(AccessControlExposeHeaders, SwarmActHistoryAddressHeader)
}

jsonhttp.Created(w, socPostResponse{Reference: reference})
}
Expand Down
Loading