fix: act expose headers (#5024)

bosi95 · web-flow · commit dab9aa173f1e · 2025-03-06T03:08:56.000+03:00
diff --git a/pkg/api/accesscontrol.go b/pkg/api/accesscontrol.go
@@ -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) {
 	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,
diff --git a/pkg/api/bytes.go b/pkg/api/bytes.go
@@ -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")
@@ -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,
 	})
diff --git a/pkg/api/bzz.go b/pkg/api/bzz.go
@@ -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")
@@ -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,
diff --git a/pkg/api/chunk.go b/pkg/api/chunk.go
@@ -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")
@@ -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})
 }
 
diff --git a/pkg/api/dirs.go b/pkg/api/dirs.go
@@ -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")
@@ -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,
 	})
diff --git a/pkg/api/feed.go b/pkg/api/feed.go
@@ -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")
@@ -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})
 }
diff --git a/pkg/api/soc.go b/pkg/api/soc.go
@@ -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")
@@ -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})
 }

Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,9 @@ func (s Service) chunkUploadHandler(w http.ResponseWriter, r http.Request) {`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`reference := chunk.Address()`
	`188`	`+ historyReference := swarm.ZeroAddress`
`188`	`189`	`if headers.Act {`
`189`		`- reference, err = s.actEncryptionHandler(r.Context(), w, putter, reference, headers.HistoryAddress)`
	`190`	`+ reference, historyReference, err = s.actEncryptionHandler(r.Context(), putter, reference, headers.HistoryAddress)`
`190`	`191`	`if err != nil {`
`191`	`192`	`logger.Debug("access control upload failed", "error", err)`
`192`	`193`	`logger.Error(nil, "access control upload failed")`
`@@ -217,6 +218,10 @@ func (s Service) chunkUploadHandler(w http.ResponseWriter, r http.Request) {`
`217`	`218`	`}`
`218`	`219`
`219`	`220`	`w.Header().Set(AccessControlExposeHeaders, SwarmTagHeader)`
	`221`	`+ if headers.Act {`
	`222`	`+ w.Header().Set(SwarmActHistoryAddressHeader, historyReference.String())`
	`223`	`+ w.Header().Add(AccessControlExposeHeaders, SwarmActHistoryAddressHeader)`
	`224`	`+ }`
`220`	`225`	`jsonhttp.Created(w, chunkAddressResponse{Reference: reference})`
`221`	`226`	`}`
`222`	`227`
Original file line number	Diff line number	Diff line change
`@@ -280,8 +280,9 @@ func (s Service) feedPostHandler(w http.ResponseWriter, r http.Request) {`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`encryptedReference := ref`
	`283`	`+ historyReference := swarm.ZeroAddress`
`283`	`284`	`if headers.Act {`
`284`		`- encryptedReference, err = s.actEncryptionHandler(r.Context(), w, putter, ref, headers.HistoryAddress)`
	`285`	`+ encryptedReference, historyReference, err = s.actEncryptionHandler(r.Context(), putter, ref, headers.HistoryAddress)`
`285`	`286`	`if err != nil {`
`286`	`287`	`logger.Debug("access control upload failed", "error", err)`
`287`	`288`	`logger.Error(nil, "access control upload failed")`
`@@ -307,5 +308,9 @@ func (s Service) feedPostHandler(w http.ResponseWriter, r http.Request) {`
`307`	`308`	`return`
`308`	`309`	`}`
`309`	`310`
	`311`	`+ if headers.Act {`
	`312`	`+ w.Header().Set(SwarmActHistoryAddressHeader, historyReference.String())`
	`313`	`+ w.Header().Set(AccessControlExposeHeaders, SwarmActHistoryAddressHeader)`
	`314`	`+ }`
`310`	`315`	`jsonhttp.Created(w, feedReferenceResponse{Reference: encryptedReference})`
`311`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -181,8 +181,9 @@ func (s Service) socUploadHandler(w http.ResponseWriter, r http.Request) {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`reference := sch.Address()`
	`184`	`+ historyReference := swarm.ZeroAddress`
`184`	`185`	`if headers.Act {`
`185`		`- reference, err = s.actEncryptionHandler(r.Context(), w, putter, reference, headers.HistoryAddress)`
	`186`	`+ reference, historyReference, err = s.actEncryptionHandler(r.Context(), putter, reference, headers.HistoryAddress)`
`186`	`187`	`if err != nil {`
`187`	`188`	`logger.Debug("access control upload failed", "error", err)`
`188`	`189`	`logger.Error(nil, "access control upload failed")`
`@@ -207,6 +208,10 @@ func (s Service) socUploadHandler(w http.ResponseWriter, r http.Request) {`
`207`	`208`	`jsonhttp.InternalServerError(ow, "done split failed")`
`208`	`209`	`return`
`209`	`210`	`}`
	`211`	`+ if headers.Act {`
	`212`	`+ w.Header().Set(SwarmActHistoryAddressHeader, historyReference.String())`
	`213`	`+ w.Header().Set(AccessControlExposeHeaders, SwarmActHistoryAddressHeader)`
	`214`	`+ }`
`210`	`215`
`211`	`216`	`jsonhttp.Created(w, socPostResponse{Reference: reference})`
`212`	`217`	`}`