mirror of
https://github.com/zitadel/zitadel.git
synced 2025-03-01 20:51:44 +00:00
8f88c4cf5b
# Which Problems Are Solved Some OAuth2 and OIDC providers require the use of PKCE for all their clients. While ZITADEL already recommended the same for its clients, it did not yet support the option on the IdP configuration. # How the Problems Are Solved - A new boolean `use_pkce` is added to the add/update generic OAuth/OIDC endpoints. - A new checkbox is added to the generic OAuth and OIDC provider templates. - The `rp.WithPKCE` option is added to the provider if the use of PKCE has been set. - The `rp.WithCodeChallenge` and `rp.WithCodeVerifier` options are added to the OIDC/Auth BeginAuth and CodeExchange function. - Store verifier or any other persistent argument in the intent or auth request. - Create corresponding session object before creating the intent, to be able to store the information. - (refactored session structs to use a constructor for unified creation and better overview of actual usage) Here's a screenshot showing the URI including the PKCE params:  # Additional Changes None. # Additional Context - Closes #6449 - This PR replaces the existing PR (#8228) of @doncicuto. The base he did was cherry picked. Thank you very much for that! --------- Co-authored-by: Miguel Cabrerizo <doncicuto@gmail.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
134 lines
3.5 KiB
Go
134 lines
3.5 KiB
Go
package command
|
|
|
|
import (
|
|
"net/url"
|
|
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/idpintent"
|
|
)
|
|
|
|
type IDPIntentWriteModel struct {
|
|
eventstore.WriteModel
|
|
|
|
SuccessURL *url.URL
|
|
FailureURL *url.URL
|
|
IDPID string
|
|
IDPArguments map[string]any
|
|
IDPUser []byte
|
|
IDPUserID string
|
|
IDPUserName string
|
|
UserID string
|
|
|
|
IDPAccessToken *crypto.CryptoValue
|
|
IDPIDToken string
|
|
|
|
IDPEntryAttributes map[string][]string
|
|
|
|
RequestID string
|
|
Assertion *crypto.CryptoValue
|
|
|
|
State domain.IDPIntentState
|
|
}
|
|
|
|
func NewIDPIntentWriteModel(id, resourceOwner string) *IDPIntentWriteModel {
|
|
return &IDPIntentWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: id,
|
|
ResourceOwner: resourceOwner,
|
|
},
|
|
}
|
|
}
|
|
|
|
func (wm *IDPIntentWriteModel) Reduce() error {
|
|
for _, event := range wm.Events {
|
|
switch e := event.(type) {
|
|
case *idpintent.StartedEvent:
|
|
wm.reduceStartedEvent(e)
|
|
case *idpintent.SucceededEvent:
|
|
wm.reduceOAuthSucceededEvent(e)
|
|
case *idpintent.SAMLSucceededEvent:
|
|
wm.reduceSAMLSucceededEvent(e)
|
|
case *idpintent.SAMLRequestEvent:
|
|
wm.reduceSAMLRequestEvent(e)
|
|
case *idpintent.LDAPSucceededEvent:
|
|
wm.reduceLDAPSucceededEvent(e)
|
|
case *idpintent.FailedEvent:
|
|
wm.reduceFailedEvent(e)
|
|
}
|
|
}
|
|
return wm.WriteModel.Reduce()
|
|
}
|
|
|
|
func (wm *IDPIntentWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner(wm.ResourceOwner).
|
|
AddQuery().
|
|
AggregateTypes(idpintent.AggregateType).
|
|
AggregateIDs(wm.AggregateID).
|
|
EventTypes(
|
|
idpintent.StartedEventType,
|
|
idpintent.SucceededEventType,
|
|
idpintent.SAMLSucceededEventType,
|
|
idpintent.SAMLRequestEventType,
|
|
idpintent.LDAPSucceededEventType,
|
|
idpintent.FailedEventType,
|
|
).
|
|
Builder()
|
|
}
|
|
|
|
func (wm *IDPIntentWriteModel) reduceStartedEvent(e *idpintent.StartedEvent) {
|
|
wm.SuccessURL = e.SuccessURL
|
|
wm.FailureURL = e.FailureURL
|
|
wm.IDPID = e.IDPID
|
|
wm.IDPArguments = e.IDPArguments
|
|
wm.State = domain.IDPIntentStateStarted
|
|
}
|
|
|
|
func (wm *IDPIntentWriteModel) reduceSAMLSucceededEvent(e *idpintent.SAMLSucceededEvent) {
|
|
wm.UserID = e.UserID
|
|
wm.IDPUser = e.IDPUser
|
|
wm.IDPUserID = e.IDPUserID
|
|
wm.IDPUserName = e.IDPUserName
|
|
wm.Assertion = e.Assertion
|
|
wm.State = domain.IDPIntentStateSucceeded
|
|
}
|
|
|
|
func (wm *IDPIntentWriteModel) reduceLDAPSucceededEvent(e *idpintent.LDAPSucceededEvent) {
|
|
wm.UserID = e.UserID
|
|
wm.IDPUser = e.IDPUser
|
|
wm.IDPUserID = e.IDPUserID
|
|
wm.IDPUserName = e.IDPUserName
|
|
wm.IDPEntryAttributes = e.EntryAttributes
|
|
wm.State = domain.IDPIntentStateSucceeded
|
|
}
|
|
|
|
func (wm *IDPIntentWriteModel) reduceOAuthSucceededEvent(e *idpintent.SucceededEvent) {
|
|
wm.UserID = e.UserID
|
|
wm.IDPUser = e.IDPUser
|
|
wm.IDPUserID = e.IDPUserID
|
|
wm.IDPUserName = e.IDPUserName
|
|
wm.IDPAccessToken = e.IDPAccessToken
|
|
wm.IDPIDToken = e.IDPIDToken
|
|
wm.State = domain.IDPIntentStateSucceeded
|
|
}
|
|
|
|
func (wm *IDPIntentWriteModel) reduceSAMLRequestEvent(e *idpintent.SAMLRequestEvent) {
|
|
wm.RequestID = e.RequestID
|
|
}
|
|
|
|
func (wm *IDPIntentWriteModel) reduceFailedEvent(e *idpintent.FailedEvent) {
|
|
wm.State = domain.IDPIntentStateFailed
|
|
}
|
|
|
|
func IDPIntentAggregateFromWriteModel(wm *eventstore.WriteModel) *eventstore.Aggregate {
|
|
return &eventstore.Aggregate{
|
|
Type: idpintent.AggregateType,
|
|
Version: idpintent.AggregateVersion,
|
|
ID: wm.AggregateID,
|
|
ResourceOwner: wm.ResourceOwner,
|
|
InstanceID: wm.InstanceID,
|
|
}
|
|
}
|