FIX: re-init history so that it can be saved; only add publisher if h…

…istroy is zero
Solar-Punk-Ltd · May 7, 2024 · f7b7560 · f7b7560
1 parent 5ae2d9d
commit f7b7560
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/pkg/api/dynamicaccess_test.go b/pkg/api/dynamicaccess_test.go
@@ -845,7 +845,7 @@ func TestDacGrantees(t *testing.T) {
 	})
 
 	t.Run("get-grantees-unauthorized", func(t *testing.T) {
-		jsonhttptest.Request(t, client, http.MethodGet, "/grantee/fc4e9fe978991257b897d987bc4ff13058b66ef45a53189a0b4fe84bb3346396", http.StatusUnauthorized,
+		jsonhttptest.Request(t, client, http.MethodGet, "/grantee/fc4e9fe978991257b897d987bc4ff13058b66ef45a53189a0b4fe84bb3346396", http.StatusNotFound,
 			jsonhttptest.WithExpectedJSONResponse(jsonhttp.StatusResponse{
 				Message: "granteelist not found",
 				Code:    http.StatusNotFound,

diff --git a/pkg/dynamicaccess/controller.go b/pkg/dynamicaccess/controller.go
@@ -199,9 +199,11 @@ func (c *controller) HandleGrantees(
 	var granteesToAdd []*ecdsa.PublicKey
 	// generate new access key and new act
 	if len(removeList) != 0 || encryptedglref.IsZero() {
-		err = c.accessLogic.AddPublisher(ctx, act, publisher)
-		if err != nil {
-			return swarm.ZeroAddress, swarm.ZeroAddress, swarm.ZeroAddress, swarm.ZeroAddress, err
+		if historyref.IsZero() {
+			err = c.accessLogic.AddPublisher(ctx, act, publisher)
+			if err != nil {
+				return swarm.ZeroAddress, swarm.ZeroAddress, swarm.ZeroAddress, swarm.ZeroAddress, err
+			}
 		}
 		granteesToAdd = gl.Get()
 	} else {
@@ -229,6 +231,13 @@ func (c *controller) HandleGrantees(
 	if err != nil {
 		return swarm.ZeroAddress, swarm.ZeroAddress, swarm.ZeroAddress, swarm.ZeroAddress, err
 	}
+	// need to re-initialize history, because Lookup loads the forks causing the manifest save to skip the root node
+	if !historyref.IsZero() {
+		h, err = NewHistoryReference(ls, historyref)
+		if err != nil {
+			return swarm.ZeroAddress, swarm.ZeroAddress, swarm.ZeroAddress, swarm.ZeroAddress, err
+		}
+	}
 
 	mtdt := map[string]string{"encryptedglref": eglref.String()}
 	err = h.Add(ctx, actref, nil, &mtdt)