fix(OCISDEV-877): skip public shares with nil resource_id in ListPublicShares

Author: f-firas

pkg/publicshare/manager/json/json.go

@@ -523,6 +523,14 @@ func (m *manager) ListPublicShares(ctx context.Context, u *user.User, filters []
 			continue
 		}
 
+		if local.ResourceId == nil {
+			log.Warn().
+				Str("share_id", local.PublicShare.GetId().GetOpaqueId()).
+				Str("share_token", local.Token).
+				Msg("ListPublicShares: skipping share with nil resource_id")
+			continue
+		}
+
 		key := strings.Join([]string{local.ResourceId.StorageId, local.ResourceId.OpaqueId}, "!")
 		if _, hit := cache[key]; !hit && !publicshare.IsCreatedByUser(&local.PublicShare, u) {
 			sRes, err := client.Stat(ctx, &provider.StatRequest{Ref: &provider.Reference{ResourceId: local.ResourceId}})

pkg/publicshare/manager/json/json_test.go

@@ -20,6 +20,7 @@ package json_test
 
 import (
 	"context"
+	encjson "encoding/json"
 	"os"
 	"path/filepath"
 	"sync"
@@ -130,6 +131,41 @@ var _ = Describe("Json", func() {
 			})
 		})
 
+		Describe("ListPublicShares", func() {
+			It("skips shares whose persisted resource_id is nil instead of panicking", func() {
+				// Create one valid share so the manager has a healthy row to compare against.
+				validShare, err := m.CreatePublicShare(ctx, user1, sharedResource, &link.Grant{
+					Permissions: &link.PublicSharePermissions{
+						Permissions: &providerv1beta1.ResourcePermissions{},
+					},
+				})
+				Expect(err).ToNot(HaveOccurred())
+
+				// Inject a corrupt row directly into the persistence file: the share's stored
+				// JSON has no `resource_id`, so after unmarshal `local.ResourceId` is nil.
+				// This mirrors the production state described in OCISDEV-862.
+				raw, err := os.ReadFile(tmpFile.Name())
+				Expect(err).ToNot(HaveOccurred())
+
+				db := map[string]interface{}{}
+				Expect(encjson.Unmarshal(raw, &db)).To(Succeed())
+
+				db["corrupt-share-id"] = map[string]interface{}{
+					"share":    `{"id":{"opaque_id":"corrupt-share-id"},"token":"corrupt-token"}`,
+					"password": "",
+				}
+				patched, err := encjson.Marshal(db)
+				Expect(err).ToNot(HaveOccurred())
+				Expect(os.WriteFile(tmpFile.Name(), patched, 0644)).To(Succeed())
+
+				// Listing must not panic and must return the valid share.
+				shares, err := m.ListPublicShares(ctx, user1, []*link.ListPublicSharesRequest_Filter{}, false)
+				Expect(err).ToNot(HaveOccurred())
+				Expect(len(shares)).To(Equal(1))
+				Expect(shares[0].Id.OpaqueId).To(Equal(validShare.Id.OpaqueId))
+			})
+		})
+
 		Describe("Load", func() {
 			It("loads shares including state and mountpoint information", func() {
 				existingShare, err := m.CreatePublicShare(ctx, user1, sharedResource, &link.Grant{