Fix the error handling and prevent the nil pointer error

cs3org · Aug 1, 2023 · 619af52 · 619af52
1 parent 8e6c45f
commit 619af52
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/changelog/unreleased/fix-error-handling.md b/changelog/unreleased/fix-error-handling.md
@@ -0,0 +1,6 @@
+Bugfix: Fix the error handling
+
+Fix the error handling and prevent the nil pointer error
+
+https://github.com/owncloud/ocis/issues/6929
+https://github.com/cs3org/reva/pull/4093
diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/public.go
@@ -414,9 +414,17 @@ func (h *Handler) updatePublicShare(w http.ResponseWriter, r *http.Request, shar
 		response.WriteOCSError(w, r, response.MetaServerError.StatusCode, "missing resource information", fmt.Errorf("error getting resource information"))
 		return
 	}
+	if statRes.GetStatus().GetCode() != rpc.Code_CODE_OK {
+		if statRes.GetStatus().GetCode() == rpc.Code_CODE_NOT_FOUND {
+			response.WriteOCSError(w, r, response.MetaNotFound.StatusCode, "update public share: resource not found", err)
+			return
+		}
+		response.WriteOCSError(w, r, response.MetaServerError.StatusCode, "grpc stat request failed for stat when updating a public share", err)
+		return
+	}
 
 	// empty permissions mean internal link here - NOT denial. Hence we need an extra check
-	if !sufficientPermissions(statRes.Info.PermissionSet, newPermissions, true) {
+	if !sufficientPermissions(statRes.GetInfo().GetPermissionSet(), newPermissions, true) {
 		response.WriteOCSError(w, r, http.StatusForbidden, "no share permission", nil)
 		return
 	}