Skip to content
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.

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

[stable29] [oauth2] Store hashed secret instead of encrypted #47700

Merged
merged 3 commits into from
Sep 4, 2024

Conversation

julien-nc
Copy link
Member

Manual backport of #47635

@julien-nc
Copy link
Member Author

/compile

@@ -156,7 +156,8 @@
}

try {
$storedClientSecret = $this->crypto->decrypt($client->getSecret());
$storedClientSecretHash = $client->getSecret();
$clientSecretHash = bin2hex($this->crypto->calculateHMAC($client_secret));

Check notice

Code scanning / Psalm

PossiblyNullArgument Note

Argument 1 of OCP\Security\ICrypto::calculateHMAC cannot be null, possibly null value provided
@blizzz blizzz mentioned this pull request Sep 3, 2024
@julien-nc julien-nc force-pushed the backport/47635/stable29 branch from 2509793 to 48cf4a9 Compare September 3, 2024 11:31
@julien-nc
Copy link
Member Author

/compile

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
@julien-nc julien-nc force-pushed the backport/47635/stable29 branch from a091a78 to a60b8c5 Compare September 4, 2024 08:57
@julien-nc
Copy link
Member Author

/compile

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@AndyScherzinger AndyScherzinger merged commit 4c1e61a into stable29 Sep 4, 2024
177 checks passed
@AndyScherzinger AndyScherzinger deleted the backport/47635/stable29 branch September 4, 2024 11:49
@blizzz blizzz mentioned this pull request Sep 4, 2024
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants