Skip to content

fix(loginflow): Log state token mismatch errors #42099

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

Draft
ChristophWurst wants to merge 1 commit into
base: master
Choose a base branch
from
+43 −2
Draft

fix(loginflow): Log state token mismatch errors #42099

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
18 changes: 17 additions & 1 deletion core/Controller/ClientFlowLoginController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
use OCP\Security\ICrypto;
use OCP\Security\ISecureRandom;
use OCP\Session\Exceptions\SessionNotAvailableException;
use function hash_equals;
use function OCP\Log\logger;

#[OpenAPI(scope: OpenAPI::SCOPE_IGNORE)]
class ClientFlowLoginController extends Controller {
Expand Down Expand Up @@ -71,9 +73,20 @@ private function getClientName(): string {
private function isValidToken(string $stateToken): bool {
$currentToken = $this->session->get(self::STATE_NAME);
if (!is_string($currentToken)) {
logger('core')->error('Client login flow state token is not set', [
'sessionToken' => $currentToken,
'requestToken' => $stateToken,
]);
return false;
}
return hash_equals($currentToken, $stateToken);
$hashEquals = hash_equals($currentToken, $stateToken);
if (!$hashEquals) {
logger('core')->error('Client login flow state token does not match', [
'sessionToken' => $currentToken,
'requestToken' => $stateToken,
]);
}
return $hashEquals;
}

private function stateTokenForbiddenResponse(): StandaloneTemplateResponse {
Expand Down Expand Up @@ -125,6 +138,9 @@ public function showAuthPickerPage(string $clientIdentifier = '', string $user =
ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS
);
$this->session->set(self::STATE_NAME, $stateToken);
logger('core')->error('Client login flow state token set', [
'token' => $stateToken,
]);

$csp = new ContentSecurityPolicy();
if ($client) {
Expand Down
27 changes: 26 additions & 1 deletion core/Controller/ClientFlowLoginV2Controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
use OCP\IUserSession;
use OCP\Security\ISecureRandom;
use OCP\Server;
use Psr\Log\LoggerInterface;
use function OCP\Log\logger;

/**
* @psalm-import-type CoreLoginFlowV2Credentials from ResponseDefinitions
Expand Down Expand Up @@ -95,6 +97,11 @@ public function landing(string $token, $user = '', int $direct = 0): Response {
}

$this->session->set(self::TOKEN_NAME, $token);
logger('core')->debug('Client login flow state token set on landing page', [
'sessionId' => $this->session->getId(),
'sessionToken' => $token,
'user' => $user,
]);

return new RedirectResponse(
$this->urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.showAuthPickerPage', ['user' => $user, 'direct' => $direct])
Expand All @@ -120,6 +127,11 @@ public function showAuthPickerPage(string $user = '', int $direct = 0): Standalo
ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS
);
$this->session->set(self::STATE_NAME, $stateToken);
logger('core')->debug('Client login flow state token set on auth picker page', [
'sessionId' => $this->session->getId(),
'sessionToken' => $stateToken,
'user' => $user,
]);

return new StandaloneTemplateResponse(
$this->appName,
Expand Down Expand Up @@ -309,9 +321,22 @@ public function init(): JSONResponse {
private function isValidStateToken(string $stateToken): bool {
$currentToken = $this->session->get(self::STATE_NAME);
if (!is_string($stateToken) || !is_string($currentToken)) {
logger('core')->error('Client login flow state token is not set', [
'sessionId' => $this->session->getId(),
'sessionToken' => $currentToken,
'requestToken' => $stateToken,
]);
return false;
}
return hash_equals($currentToken, $stateToken);
$hashEquals = hash_equals($currentToken, $stateToken);
if (!$hashEquals) {
logger('core')->error('Client login flow state token does not match', [
'sessionId' => $this->session->getId(),
'sessionToken' => $currentToken,
'requestToken' => $stateToken,
]);
}
return $hashEquals;
}

private function stateTokenMissingResponse(): StandaloneTemplateResponse {
Expand Down
Loading