Skip to content

fix(initializeSession): only log HMAC problem to critical logs if indeed critical #58975

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

Open
szaimen wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −1
Open

fix(initializeSession): only log HMAC problem to critical logs if indeed critical #58975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/private/Security/Crypto.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ private function decryptWithoutSecret(string $authenticatedCiphertext, string $p
}
} else {
if (!hash_equals($this->calculateHMAC($parts[0] . $parts[1], $hmacKey), $hmac)) {
throw new Exception('HMAC does not match.');
throw new \RuntimeException('HMAC does not match.');
}
}

Expand Down
9 changes: 9 additions & 0 deletions lib/private/Session/CryptoSessionData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@ protected function initializeSession() {
512,
JSON_THROW_ON_ERROR,
);
} catch (\RuntimeException $e) {
// Even though this might be critical in general, we are automatically trying again and will likely succeed.
// We only log to info to not spam the logs with a well-known problem the admin cannot do anything about.
// See https://github.com/nextcloud/server/issues/42157
logger('core')->info('Could not decrypt or decode encrypted session data', [
'exception' => $e,
]);
$this->sessionValues = [];
$this->regenerateId(true, false);
} catch (\Exception $e) {
logger('core')->critical('Could not decrypt or decode encrypted session data', [
'exception' => $e,
Expand Down
Loading