Merge pull request #3841 from micbar/improve-logging

fix nil pointer and improve logging
cs3org · May 2, 2023 · 62f956f · 62f956f
2 parents 7d29aef + 6be420d
commit 62f956f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/changelog/unreleased/fix-nil-pointer.md b/changelog/unreleased/fix-nil-pointer.md
@@ -0,0 +1,5 @@
+Bugfix: Fix nil pointer and improve logging
+
+We fixed a nil pointer error due to a wrong log statement and improved the logging in the json public share manager.
+
+https://github.com/cs3org/reva/pull/3841
diff --git a/internal/grpc/services/storageprovider/storageprovider.go b/internal/grpc/services/storageprovider/storageprovider.go
@@ -728,7 +728,7 @@ func (s *service) Stat(ctx context.Context, req *provider.StatRequest) (*provide
 
 	span.SetAttributes(attribute.KeyValue{
 		Key:   "reference",
-		Value: attribute.StringValue(req.Ref.String()),
+		Value: attribute.StringValue(req.GetRef().String()),
 	})
 
 	md, err := s.storage.GetMD(ctx, req.GetRef(), req.GetArbitraryMetadataKeys(), req.GetFieldMask().GetPaths())

diff --git a/pkg/publicshare/manager/json/json.go b/pkg/publicshare/manager/json/json.go
@@ -523,12 +523,20 @@ func (m *manager) ListPublicShares(ctx context.Context, u *user.User, filters []
 				log.Error().
 					Err(err).
 					Interface("resource_id", local.ResourceId).
-					Msg("ListShares: could not stat resource")
+					Msg("ListShares: an error occurred during stat on the resource")
 				continue
 			}
 			if sRes.Status.Code != rpc.Code_CODE_OK {
+				if sRes.Status.Code == rpc.Code_CODE_NOT_FOUND {
+					log.Debug().
+						Str("message", sRes.Status.Message).
+						Interface("status", sRes.Status).
+						Interface("resource_id", local.ResourceId).
+						Msg("ListShares: Resource not found")
+					continue
+				}
 				log.Error().
-					Err(err).
+					Str("message", sRes.Status.Message).
 					Interface("status", sRes.Status).
 					Interface("resource_id", local.ResourceId).
 					Msg("ListShares: could not stat resource")

diff --git a/pkg/storage/utils/decomposedfs/node/permissions.go b/pkg/storage/utils/decomposedfs/node/permissions.go
@@ -146,7 +146,7 @@ func (p *Permissions) AssemblePermissions(ctx context.Context, n *Node) (ap prov
 			// continue with next segment
 		}
 		if cn, err = cn.Parent(); err != nil {
-			return ap, errors.Wrap(err, "Decomposedfs: error getting parent "+cn.ParentID)
+			return ap, errors.Wrap(err, "Decomposedfs: error getting parent for node "+cn.ID)
 		}
 	}