Merge pull request #1274 from nextcloud/fix/log-errors

fix: Avoid variable access on unhandled exception and lower log level for expected permission check failures
nextcloud · Aug 5, 2024 · a4fba06 · a4fba06
2 parents 0123c60 + b174d50
commit a4fba06
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/lib/Service/PermissionsService.php b/lib/Service/PermissionsService.php
@@ -553,7 +553,7 @@ private function checkPermission(Table|View|Context $element, string $nodeType,
 				}
 			} catch (NotFoundError $e) {
 			}
-			$this->logger->error($e->getMessage(), ['exception' => $e]);
+			$this->logger->info($e->getMessage(), ['exception' => $e]);
 		}
 
 		return false;
@@ -580,7 +580,7 @@ private function checkPermissionById(int $elementId, string $nodeType, string $p
 					}
 				} catch (NotFoundError $e) {
 				}
-				$this->logger->error($e->getMessage(), ['exception' => $e]);
+				$this->logger->info($e->getMessage(), ['exception' => $e]);
 			}
 		}
 		return false;

diff --git a/lib/Service/ViewService.php b/lib/Service/ViewService.php
@@ -374,10 +374,9 @@ private function enhanceView(View $view, string $userId): void {
 							$manageTableShare = $this->shareService->getSharedPermissionsIfSharedWithMe($view->getTableId(), 'table', $userId);
 						} catch (NotFoundError) {
 							$manageTableShare = $this->permissionsService->getPermissionArrayForNodeFromContexts($view->getTableId(), 'table', $userId);
-						} finally {
-							if ($manageTableShare->manage) {
-								$permissions->manageTable = true;
-							}
+						}
+						if ($manageTableShare->manage) {
+							$permissions->manageTable = true;
 						}
 					} catch (NotFoundError $e) {
 					} catch (\Exception $e) {