Skip to content

[stable25] Catch Exceptions when loading storage data of users #36155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PVince81 merged 2 commits into from
Jan 18, 2023
Merged

[stable25] Catch Exceptions when loading storage data of users #36155

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eac6d9f
Catch Exceptions when loading storage data of users
come-nc Jan 12, 2023
f3d7292
Tear down in catch of an Exception
come-nc Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Catch Exceptions when loading storage data of users 
This avoids having the whole userlist crashing because a user external
 storage fails to load. With this change only the problematic user
 storage/quota information will be empty.

Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc @backportbot-nextcloud
come-nc authored and backportbot-nextcloud[bot] committed Jan 16, 2023
commit eac6d9f36f08d1666cd7205726e4016a7d9268bd
10 changes: 10 additions & 0 deletions apps/provisioning_api/lib/Controller/AUserData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,16 @@ protected function fillStorageInfo(string $userId): array {
self::USER_FIELD_QUOTA => $quota !== false ? $quota : 'none',
'used' => 0
];
} catch (\Exception $e) {
\OC::$server->get(\Psr\Log\LoggerInterface::class)->error(
"Could not load storage info for {user}",
[
'app' => 'provisioning_api',
'user' => $userId,
'exception' => $e,
]
);
return [];
}
return $data;
}
Expand Down