[oauth2] Store hashed secret instead of encrypted #47635
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
julien-nc
added
enhancement
3. to review
|
/compile |
|
/backport to stable30 |
|
/backport to stable29 |
|
/backport to stable28 |
|
/backport to stable27 |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| @@ -138,7 +138,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
julien-nc
force-pushed
the
fix/noid/oauth2-store-secret-hash
branch
from
cd765c2 to
43ae7d2
Compare
AndyScherzinger
approved these changes
Sep 2, 2024
ChristophWurst
approved these changes
Sep 2, 2024
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
julien-nc
force-pushed
the
fix/noid/oauth2-store-secret-hash
branch
from
43ae7d2 to
120e7e8
Compare
|
/compile |
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
|
The backport to # Switch to the target branch and update it
git checkout stable27
git pull origin stable27
# Create the new backport branch
git checkout -b backport/47635/stable27
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 034917b7 120e7e83 5b98abcf
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/47635/stable27Error: Failed to clone repository: Failed to checkout branches: Updating 1cc7851..09b8aea
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
|
The backport to # Switch to the target branch and update it
git checkout stable28
git pull origin stable28
# Create the new backport branch
git checkout -b backport/47635/stable28
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 034917b7 120e7e83 5b98abcf
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/47635/stable28Error: Failed to clone repository: Failed to checkout branches: Updating 1cc7851..09b8aea
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
|
The backport to # Switch to the target branch and update it
git checkout stable29
git pull origin stable29
# Create the new backport branch
git checkout -b backport/47635/stable29
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 034917b7 120e7e83 5b98abcf
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/47635/stable29Error: Failed to clone repository: Failed to checkout branches: Updating 1cc7851..09b8aea
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
|
The backport to # Switch to the target branch and update it
git checkout stable30
git pull origin stable30
# Create the new backport branch
git checkout -b backport/47635/stable30
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 034917b7 120e7e83 5b98abcf
# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/47635/stable30Error: Failed to clone repository: Failed to checkout branches: Updating 1cc7851..09b8aea
Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports. |
This was referenced Sep 3, 2024
8 tasks
8 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Store the oauth2 secrets as hash instead of encrypting them. Then they can be validated but not recovered.
UI adjustment: