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

SSO using OpenID Connect #3899

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Conversation

Timshel
Copy link
Contributor

@Timshel Timshel commented Sep 18, 2023

This is based on previous PR (#2787, #2449 and #3154) with work done by @pinpox, @m4w0lf, @Sheap, @bmunro-peralex, @tribut and others I probably missed sorry.

This PR add support for OpenId Connect to handle authentication to an external SSO.
This introduce another way to control who can use the vault without having to use invitation or an LDAP.

A master password is still required and not controlled by the SSO (depending of your point of view this might be a feature ;). A key connector to remove this could be added but is not planned in this PR.

Usage

This should be agnostic to the SSO used as long as it support client secret authentication and expose an OpenID Connect Discovery endpoint. (I'm testing it with Keycloak at the moment, a demo test stack is avaible README.md)

Added some documentation at the root of the project SSO.md that could be later moved to the wiki.

I made some additionnal modification in my main branch to allow for easier testing (modified Docker image to use prebuilt patched front-end).

On front-end modification, I made patched versions available at Timshel/oidc_web_builds. Two versions are available :

  • One only restore the SSO login button
  • Other one additionally :
    • set #sso as the default redirect url and remove some unnecessary logic
    • allow organization invitation to survive sso redirection

Only the first one is expected to be merged since only change compatible with the non-sso version will be accepted.

Issues

As mentioned in the previous PR one of the main issue is the inability for the organization invitation to work with the SSO redirection. To fix it a patch to the front-end is needed.

⚠️⚠️ ⚠️ If you have issues or need help testing the PR ⚠️ ⚠️ ⚠️

Please open issues in Timshel/vaultwarden in order to keep the discussion here focused on merging this work.
Of course if you believe your issue is important mention this PR so a reference will be visible.

But please try to keep commenting in this PR to a minimum to keep it legible, the previous one has over 200 comments ...

@derfabianpeter
Copy link

Super happy to see this PR being worked on. We (ayedo.de) would be willing to offer a sponsoring to prioritize this PR if that helps! Just reach out.

@Timshel Timshel force-pushed the sso-support branch 2 times, most recently from c86e481 to d5f78b4 Compare September 28, 2023 17:06
@Timshel
Copy link
Contributor Author

Timshel commented Sep 28, 2023

Just added a configuration example for Gitlab which might be one of easiest way to test this PR :).

@AkechiShiro
Copy link

AkechiShiro commented Sep 29, 2023

Hi @Timshel, thanks for your amazing and prolonged work on this feature, is this PR close to be in a ready merge-able state or is there a lot of work left?
I see the latest commit is about documentation, so, all issues mentioned at the beginning were fixed in some way or another ? Or there are still issue to fix ?

@Timshel
Copy link
Contributor Author

Timshel commented Sep 29, 2023

Mainly waiting for maintainer review/feedback now :).

@ruben-herold
Copy link

@Timshel thx for your work!!! Hope this will be integrated soon

@pellux-network
Copy link

Hoping this gets merged soon!

@AkechiShiro
Copy link

AkechiShiro commented Oct 4, 2023

Tagging some maintainers for review on this PR, if they have the available time resource to do so @BlackDex @dani-garcia

EDIT: I don't understand the thumbs-down, because tagging maintainers doesn't mean they have time to handle the PR or review it, it's just a way to mention them, if they don't answer/go MIA, or whatever, feel free to fork on this PR and maintain your own forks, no one is entitled to do any work, they don't want to.

@BlackDex
Copy link
Collaborator

BlackDex commented Oct 4, 2023

I do not have much time actually.

Also, I'm a bit puzzled with all the different SSO PR's.
And I am a bit hesitant to merge one if that for some reason could break the other or has a totally different way of working.
I'm not sure what to do here because i see people want something like this, but there are multiple ways of getting this working it looks like.

One way would be to create a semi-supported release branch which contains SSO support, but that could get messy keeping it up-to-date. What do you think @dani-garcia ?

@Timshel
Copy link
Contributor Author

Timshel commented Oct 4, 2023

? As mentioned this is the continuation of the previous PRs, it all rely on openidconnect. All of those PR are based on the previous ones when the previous PR owner stopped maintaining it.

I can´t speak for the owner of previous PRs but I believe this make all the others redundant. You could probably close the previous one referencing this one and encourage their owner to reopen if something is missing.

Thanks @bmunro-peralex for closing his PR to make things more legible and of course for his work which is present in this PR :).

@xoxys
Copy link
Contributor

xoxys commented Oct 4, 2023

Why not finally add at least one way to support OIDC? You can also flag it as preview feature or something like this to get feedback from the community, but not getting this feature into Vaultwarden after multiple PRs were provided by the community without a review or without getting merged for months until the authors then gave up feels wrong to me for an open source project.

@BlackDex
Copy link
Collaborator

BlackDex commented Oct 4, 2023

Why not finally add at least one way to support OIDC? You can also flag it as preview feature or something like this to get feedback from the community, but not getting this feature into Vaultwarden after multiple PRs were provided by the community without a review or without getting merged for months until the authors then gave up feels wrong to me for an open source project.

Well, because One way could be a different way then the others, or could cause a lot of other changes needed to be done if they do not match, or maybe even could overlap and do something totally different. 49 FIles are changed, so I'm not going to be happy if there needs to be major rework done because of adding this feature which is not fully working/supported.

You have to keep in mind that this could break other code in some way. But as said before, i do not have much time to check and validate this. And this is a huge PR and a lot of testing needs to be done, and i this is not specifically on my prio list for now actually. That is why i mentioned a special branch, which builds this version with a different tag and not fully supported in terms of issues with the login from my side.

@Timshel
Copy link
Contributor Author

Timshel commented Oct 4, 2023

Well, because One way could be a different way then the others, or could cause a lot of other changes needed to be done if they do not match, or maybe even could overlap and do something totally different.

@BlackDex I'll insist but there is no other way (At least not in the currently opened PRs). All those PR are based on the previous ones. They got more refined each time as someone picked-it up.

@tschuyebuhl
Copy link

is there any way one can help with testing? or anything that can be done to help get this merged?

@isaiah-v
Copy link

isaiah-v commented Oct 4, 2023

I've been watching the progress of this feature. I can't wait for it, but out of curiosity, how does decryption work with this feature? Is it still client side? How do you now decrypt without knowing the password?

@Timshel
Copy link
Contributor Author

Timshel commented Oct 4, 2023

@isaiah-v as mentioned a master password is still required. There is no change on this point.

@Timshel
Copy link
Contributor Author

Timshel commented Oct 6, 2023

@BlackDex thinking on it I don´t think the semi-supported branch is a good idea.

Main issue for people running this branch is that there might be some change in the migrations that might force to correct DB state manually. Even if it's not difficult (cf Timshel/vaultwarden#db-migration), integrating in a separate branch would not help with this.

Additionally unless you grant me commit rights it means that this would make it more complicated for me to support it and if you have no time for review I can't see how you would semi-support it.

It's important to note that the SSO_ENABLED config act as feature flag, the impact on the non sso version is quite low so merging this should have a low risk for the non sso users.

In the end if people are not running it at the moment it might be because they are waiting for an easier way to run this (but I made updates on main@Timshel/vaultwarden to make it easier) but I would expect it's mainly because they are waiting for it to be reviewed, a solution without any review would not be worth much ...

Since I'm running this myself I will maintain this branch/PR, and will continue to update main@Timshel/vaultwarden with anything I can think of to help people running it. As mentioned before if you have any question don't hesitate but please open it on Timshel/vaultwarden to prevent spamming here (of course mention this PR if you think your issue is important).

In my opinion the next step is for it to be reviewed and then integrated (maybe without being promoted at first).

@AkechiShiro
Copy link

I will definitely try to host the branch of your fork that contains sso-support and see if I run into any issues, I will report them on your repo @Timshel

@dandanthedev
Copy link

+1, please merge!

@griefie
Copy link

griefie commented Oct 10, 2023

It seems that there is a lot of hesitation on investing time into reviewing this and i can understand this. However - the longer the delay the bigger the diff guys. The branch clearly works and simply needs a bit more love. Besides it already looks like a lot of work went into this and the older preceding branches. Why not make it a beta build? Even 2.0.0-beta? The closer it is to the main stream, the quicker will be the feedback and the improvement. Let's not forget this is open source, where ideas thrive and not corporate where ideas die ;)

@derfabianpeter
Copy link

We're still happy to sponsor this PR if it helps

@Timshel
Copy link
Contributor Author

Timshel commented Oct 11, 2023

Rebased and added the @BlackDex suggestion in #3154 (comment) to make the SSO button visible when running the docker-compose.

@FreeMinded
Copy link

@BlackDex @Timshel could you give us status update on this, please.

@sandervandegeijn
Copy link

sandervandegeijn commented Oct 3, 2024

Holding on to the pentest quote as well, got a scoping meeting on November 7th. I'm on holiday, so I've got time to help test stuff.

@BlackDex
Copy link
Collaborator

BlackDex commented Oct 3, 2024

Not sure what you expect from me here. I have already posted my comments.

Also, me saying that i like the Playwright stuff does kinda indicate that it is good to open it again, or leave it with this PR, which ever comes first. It might need some more attention or fine-tuning later on. But if we not make that a breaking check (as i already mentioned in my previous comment) then it can be used to test.

And, first we need to release a new stable version before we will merge this at all. Since it now looks like that the testing tagged image does solve the issues with the native clients, i do feel it would be safe to release a new stable version shortly, unless people come with a major issue.

SSO.md Outdated Show resolved Hide resolved
SSO.md Outdated Show resolved Hide resolved
src/api/identity.rs Outdated Show resolved Hide resolved
src/db/models/user.rs Show resolved Hide resolved
SSO.md Show resolved Hide resolved
src/db/models/user.rs Show resolved Hide resolved
@Timshel
Copy link
Contributor Author

Timshel commented Oct 7, 2024

@micolous thx for the review :).

Releases should be building, ⚠️ they will include the following breaking change:

  • SSO_PKCE is now on by default, if you are running Zitadel you'll probably need to set it to false since it's incompatible with CLIENT_SECRET
  • On first SSO login if the provider does not return the email verification status log in will be blocked.
    Check the documentation for more details.

SSO.md Outdated Show resolved Hide resolved
SSO.md Outdated Show resolved Hide resolved
SSO.md Outdated Show resolved Hide resolved
src/api/identity.rs Show resolved Hide resolved
src/config.rs Outdated Show resolved Hide resolved
src/api/identity.rs Outdated Show resolved Hide resolved
SSO.md Show resolved Hide resolved
@Timshel Timshel force-pushed the sso-support branch 2 times, most recently from 915a0ac to 410feac Compare October 14, 2024 14:02
@titouan-joseph
Copy link

@micolous thx for the review :).

Releases should be building, ⚠️ they will include the following breaking change:

  • SSO_PKCE is now on by default, if you are running Zitadel you'll probably need to set it to false since it's incompatible with CLIENT_SECRET
  • On first SSO login if the provider does not return the email verification status log in will be blocked.
    Check the documentation for more details.

Hi @Timshel,

I'm amazed by the fact that we should disabled PKCE with zitadel, they implemented the PKCE flow.
I have tried with grafana and the PKCE configuration and it was working properly.

@Timshel
Copy link
Contributor Author

Timshel commented Oct 17, 2024

@titouan-joseph I have not tested again recently but last time I checked using PKCE was not supported when using client secret, the issue on the subject is still open: zitadel/zitadel#7110.

Since the client is server side it's written with the expectation to use client id and secret. Since pkce is not supported in this case the documentation mention that you might need to disable it.

I'm aware that it's/was possible to run with PKCE activated and with an empty secret, but it's not really intended/supported, so it will not be mentioned in the doc.

@Felitendo
Copy link

Is it possible to migrate a normal Account into a SSO account?

@derSoerrn95
Copy link

What's missing for it to be accepted?

@titouan-joseph
Copy link

@titouan-joseph I have not tested again recently but last time I checked using PKCE was not supported when using client secret, the issue on the subject is still open: zitadel/zitadel#7110.

Since the client is server side it's written with the expectation to use client id and secret. Since pkce is not supported in this case the documentation mention that you might need to disable it.

I'm aware that it's/was possible to run with PKCE activated and with an empty secret, but it's not really intended/supported, so it will not be mentioned in the doc.

Ok ok, thank you for your response.

I see, yes if it's backend side, we don't have to use PKCE flow, right.

From what I've seen, with zitadel and integrations with other tools, it's common to set a secret client to null.

@sandervandegeijn
Copy link

We will get the final quote for the pentest this week or next week. We have adjusted the scope because of another pentest done recently on Vaultwarden. Is there any timeline for the merge I can communicate to the pentest partner?

@BlackDex
Copy link
Collaborator

I think we have tackled the sync issues with the clients 🤞🏻 which makes it more likely to have this merged soon.

It also depends on @Timshel if he thinks it's fine as-is currently and able to act upon issues linked to this.
Then we can have this in testing for a while.

@Timshel
Copy link
Contributor Author

Timshel commented Nov 11, 2024

It also depends on @Timshel if he thinks it's fine as-is currently and able to act upon issues linked to this.

@BlackDex It is and I will.

@almereyda

This comment was marked as off-topic.

@polymo1

This comment was marked as off-topic.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.