fix(postage_api): check if batch exists for stamp issuer

ethersphere · Nov 2, 2023 · 5225470 · 5225470
1 parent 9afd792
commit 5225470
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 27 deletions.
diff --git a/pkg/api/postage.go b/pkg/api/postage.go
@@ -176,36 +176,54 @@ type bucketData struct {
 func (s *Service) postageGetStampsHandler(w http.ResponseWriter, r *http.Request) {
 	logger := s.logger.WithName("get_stamps").Build()
 
+	queries := struct {
+		All bool `map:"all"`
+	}{}
+	if response := s.mapStructure(r.URL.Query(), &queries); response != nil {
+		response("invalid query params", logger, w)
+		return
+	}
+
 	resp := postageStampsResponse{}
 	stampIssuers := s.post.StampIssuers()
 	resp.Stamps = make([]postageStampResponse, 0, len(stampIssuers))
 	for _, v := range stampIssuers {
+		exists, err := s.batchStore.Exists(v.ID())
+		if err != nil {
+			logger.Debug("get stamp issuer: check batch failed", "batch_id", hex.EncodeToString(v.ID()), "error", err)
+			logger.Error(nil, "get stamp issuer: check batch failed")
+			jsonhttp.InternalServerError(w, "unable to check batch")
+			return
+		}
+
 		batchTTL, err := s.estimateBatchTTLFromID(v.ID())
 		if err != nil {
 			logger.Debug("get stamp issuer: estimate batch expiration failed", "batch_id", hex.EncodeToString(v.ID()), "error", err)
 			logger.Error(nil, "get stamp issuer: estimate batch expiration failed")
 			jsonhttp.InternalServerError(w, "unable to estimate batch expiration")
 			return
 		}
-		resp.Stamps = append(resp.Stamps, postageStampResponse{
-			BatchID:       v.ID(),
-			Utilization:   v.Utilization(),
-			Usable:        s.post.IssuerUsable(v),
-			Label:         v.Label(),
-			Depth:         v.Depth(),
-			Amount:        bigint.Wrap(v.Amount()),
-			BucketDepth:   v.BucketDepth(),
-			BlockNumber:   v.BlockNumber(),
-			ImmutableFlag: v.ImmutableFlag(),
-			Exists:        true,
-			BatchTTL:      batchTTL,
-		})
+		if exists {
+			resp.Stamps = append(resp.Stamps, postageStampResponse{
+				BatchID:       v.ID(),
+				Utilization:   v.Utilization(),
+				Usable:        exists && s.post.IssuerUsable(v),
+				Label:         v.Label(),
+				Depth:         v.Depth(),
+				Amount:        bigint.Wrap(v.Amount()),
+				BucketDepth:   v.BucketDepth(),
+				BlockNumber:   v.BlockNumber(),
+				ImmutableFlag: v.ImmutableFlag(),
+				Exists:        exists,
+				BatchTTL:      batchTTL,
+			})
+		}
 	}
 
 	jsonhttp.OK(w, resp)
 }
 
-func (s *Service) postageGetAllStampsHandler(w http.ResponseWriter, _ *http.Request) {
+func (s *Service) postageGetAllBatchesHandler(w http.ResponseWriter, _ *http.Request) {
 	logger := s.logger.WithName("get_batches").Build()
 
 	batches := make([]postageBatchResponse, 0)
@@ -263,7 +281,7 @@ func (s *Service) postageGetStampBucketsHandler(w http.ResponseWriter, r *http.R
 		case errors.Is(err, postage.ErrNotUsable):
 			jsonhttp.BadRequest(w, "batch not usable")
 		case errors.Is(err, postage.ErrNotFound):
-			jsonhttp.NotFound(w, "cannot get batch")
+			jsonhttp.NotFound(w, "issuer does not exist")
 		default:
 			jsonhttp.InternalServerError(w, "get issuer failed")
 		}
@@ -305,13 +323,20 @@ func (s *Service) postageGetStampHandler(w http.ResponseWriter, r *http.Request)
 		case errors.Is(err, postage.ErrNotUsable):
 			jsonhttp.BadRequest(w, "batch not usable")
 		case errors.Is(err, postage.ErrNotFound):
-			jsonhttp.NotFound(w, "unable to get stamp issuer")
+			jsonhttp.NotFound(w, "issuer does not exist")
 		default:
 			jsonhttp.InternalServerError(w, "get issuer failed")
 		}
 		return
 	}
 
+	exists, err := s.batchStore.Exists(paths.BatchID)
+	if err != nil {
+		logger.Debug("exist check failed", "batch_id", hexBatchID, "error", err)
+		logger.Error(nil, "exist check failed")
+		jsonhttp.InternalServerError(w, "unable to check batch")
+		return
+	}
 	batchTTL, err := s.estimateBatchTTLFromID(paths.BatchID)
 	if err != nil {
 		logger.Debug("estimate batch expiration failed", "batch_id", hexBatchID, "error", err)
@@ -325,10 +350,10 @@ func (s *Service) postageGetStampHandler(w http.ResponseWriter, r *http.Request)
 		Depth:         issuer.Depth(),
 		BucketDepth:   issuer.BucketDepth(),
 		ImmutableFlag: issuer.ImmutableFlag(),
-		Exists:        true,
+		Exists:        exists,
 		BatchTTL:      batchTTL,
 		Utilization:   issuer.Utilization(),
-		Usable:        s.post.IssuerUsable(issuer),
+		Usable:        exists && s.post.IssuerUsable(issuer),
 		Label:         issuer.Label(),
 		Amount:        bigint.Wrap(issuer.Amount()),
 		BlockNumber:   issuer.BlockNumber(),

diff --git a/pkg/api/postage_test.go b/pkg/api/postage_test.go
@@ -263,7 +263,7 @@ func TestPostageGetStamps(t *testing.T) {
 
 		jsonhttptest.Request(t, ts, http.MethodGet, "/stamps/"+hex.EncodeToString(eb.ID), http.StatusNotFound,
 			jsonhttptest.WithExpectedJSONResponse(&jsonhttp.StatusResponse{
-				Message: "unable to get stamp issuer",
+				Message: "issuer does not exist",
 				Code:    404,
 			}),
 		)

diff --git a/pkg/api/router.go b/pkg/api/router.go
@@ -549,7 +549,7 @@ func (s *Service) mountBusinessDebug(restricted bool) {
 
 	handle("/batches", web.ChainHandlers(
 		web.FinalHandler(jsonhttp.MethodHandler{
-			"GET": http.HandlerFunc(s.postageGetAllStampsHandler),
+			"GET": http.HandlerFunc(s.postageGetAllBatchesHandler),
 		})),
 	)
 

diff --git a/pkg/postage/mock/service.go b/pkg/postage/mock/service.go
@@ -5,7 +5,6 @@
 package mock
 
 import (
-	"bytes"
 	"context"
 	"math/big"
 	"sync"
@@ -55,12 +54,7 @@ type mockPostage struct {
 func (m *mockPostage) HandleStampExpiry(ctx context.Context, id []byte) error {
 	m.issuerLock.Lock()
 	defer m.issuerLock.Unlock()
-
-	for k, v := range m.issuersMap {
-		if bytes.Equal(id, v.ID()) {
-			delete(m.issuersMap, k)
-		}
-	}
+	delete(m.issuersMap, string(id))
 	return nil
 }