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

Do not override stored credentials when login in with SAML #37717

Merged

Conversation

artonge
Copy link
Contributor

@artonge artonge commented Apr 13, 2023

When login in with SAML, the password from $event->getPassword() is null.

This PR makes sure that this null value won't be used to override the stored password even though it is different.
This PR also allow for the password and user to be updated even though they were not set before.

Followup of: #32016

When login in with SAML, the password from `$event->getPassword()` is `null`.

This PR makes sure that this `null` value won't be used to override the stored password even though it is different.

This PR also allow for the password and user to be updated even though they were not set before.

Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge
Copy link
Contributor Author

artonge commented Apr 13, 2023

/backport to stable26

@artonge
Copy link
Contributor Author

artonge commented Apr 13, 2023

/backport to stable25

@artonge
Copy link
Contributor Author

artonge commented Apr 13, 2023

/backport to stable24

@blizzz
Copy link
Member

blizzz commented Apr 14, 2023

can we have a simple unit test?

Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge artonge requested review from a team and ArtificialOwl and removed request for a team April 19, 2023 09:54
@artonge artonge requested a review from a team April 20, 2023 16:01
@artonge artonge merged commit c0076d9 into master Apr 24, 2023
@artonge artonge deleted the artonge/fix/dont_override_stored_credentials_with_saml branch April 24, 2023 09:30
@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin/stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable24 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable24
git pull origin/stable24

# Create the new backport branch
git checkout -b fix/foo-stable24

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

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