mirror of
https://github.com/zitadel/zitadel.git
synced 2025-03-01 06:07:22 +00:00

# 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>
323 lines
7.1 KiB
Go
323 lines
7.1 KiB
Go
package idpintent
|
|
|
|
import (
|
|
"context"
|
|
"net/url"
|
|
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
const (
|
|
StartedEventType = instanceEventTypePrefix + "started"
|
|
SucceededEventType = instanceEventTypePrefix + "succeeded"
|
|
SAMLSucceededEventType = instanceEventTypePrefix + "saml.succeeded"
|
|
SAMLRequestEventType = instanceEventTypePrefix + "saml.requested"
|
|
LDAPSucceededEventType = instanceEventTypePrefix + "ldap.succeeded"
|
|
FailedEventType = instanceEventTypePrefix + "failed"
|
|
)
|
|
|
|
type StartedEvent struct {
|
|
eventstore.BaseEvent `json:"-"`
|
|
|
|
SuccessURL *url.URL `json:"successURL"`
|
|
FailureURL *url.URL `json:"failureURL"`
|
|
IDPID string `json:"idpId"`
|
|
IDPArguments map[string]any `json:"idpArguments,omitempty"`
|
|
}
|
|
|
|
func NewStartedEvent(
|
|
ctx context.Context,
|
|
aggregate *eventstore.Aggregate,
|
|
successURL,
|
|
failureURL *url.URL,
|
|
idpID string,
|
|
idpArguments map[string]any,
|
|
) *StartedEvent {
|
|
return &StartedEvent{
|
|
BaseEvent: *eventstore.NewBaseEventForPush(
|
|
ctx,
|
|
aggregate,
|
|
StartedEventType,
|
|
),
|
|
SuccessURL: successURL,
|
|
FailureURL: failureURL,
|
|
IDPID: idpID,
|
|
IDPArguments: idpArguments,
|
|
}
|
|
}
|
|
|
|
func (e *StartedEvent) Payload() any {
|
|
return e
|
|
}
|
|
|
|
func (e *StartedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return nil
|
|
}
|
|
|
|
func StartedEventMapper(event eventstore.Event) (eventstore.Event, error) {
|
|
e := &StartedEvent{
|
|
BaseEvent: *eventstore.BaseEventFromRepo(event),
|
|
}
|
|
|
|
err := event.Unmarshal(e)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "IDP-Sf3f1", "unable to unmarshal event")
|
|
}
|
|
|
|
return e, nil
|
|
}
|
|
|
|
type SucceededEvent struct {
|
|
eventstore.BaseEvent `json:"-"`
|
|
|
|
IDPUser []byte `json:"idpUser"`
|
|
IDPUserID string `json:"idpUserId,omitempty"`
|
|
IDPUserName string `json:"idpUserName,omitempty"`
|
|
UserID string `json:"userId,omitempty"`
|
|
|
|
IDPAccessToken *crypto.CryptoValue `json:"idpAccessToken,omitempty"`
|
|
IDPIDToken string `json:"idpIdToken,omitempty"`
|
|
}
|
|
|
|
func NewSucceededEvent(
|
|
ctx context.Context,
|
|
aggregate *eventstore.Aggregate,
|
|
idpUser []byte,
|
|
idpUserID,
|
|
idpUserName,
|
|
userID string,
|
|
idpAccessToken *crypto.CryptoValue,
|
|
idpIDToken string,
|
|
) *SucceededEvent {
|
|
return &SucceededEvent{
|
|
BaseEvent: *eventstore.NewBaseEventForPush(
|
|
ctx,
|
|
aggregate,
|
|
SucceededEventType,
|
|
),
|
|
IDPUser: idpUser,
|
|
IDPUserID: idpUserID,
|
|
IDPUserName: idpUserName,
|
|
UserID: userID,
|
|
IDPAccessToken: idpAccessToken,
|
|
IDPIDToken: idpIDToken,
|
|
}
|
|
}
|
|
|
|
func (e *SucceededEvent) Payload() interface{} {
|
|
return e
|
|
}
|
|
|
|
func (e *SucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return nil
|
|
}
|
|
|
|
func SucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
|
|
e := &SucceededEvent{
|
|
BaseEvent: *eventstore.BaseEventFromRepo(event),
|
|
}
|
|
|
|
err := event.Unmarshal(e)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "IDP-HBreq", "unable to unmarshal event")
|
|
}
|
|
|
|
return e, nil
|
|
}
|
|
|
|
type SAMLSucceededEvent struct {
|
|
eventstore.BaseEvent `json:"-"`
|
|
|
|
IDPUser []byte `json:"idpUser"`
|
|
IDPUserID string `json:"idpUserId,omitempty"`
|
|
IDPUserName string `json:"idpUserName,omitempty"`
|
|
UserID string `json:"userId,omitempty"`
|
|
|
|
Assertion *crypto.CryptoValue `json:"assertion,omitempty"`
|
|
}
|
|
|
|
func NewSAMLSucceededEvent(
|
|
ctx context.Context,
|
|
aggregate *eventstore.Aggregate,
|
|
idpUser []byte,
|
|
idpUserID,
|
|
idpUserName,
|
|
userID string,
|
|
assertion *crypto.CryptoValue,
|
|
) *SAMLSucceededEvent {
|
|
return &SAMLSucceededEvent{
|
|
BaseEvent: *eventstore.NewBaseEventForPush(
|
|
ctx,
|
|
aggregate,
|
|
SAMLSucceededEventType,
|
|
),
|
|
IDPUser: idpUser,
|
|
IDPUserID: idpUserID,
|
|
IDPUserName: idpUserName,
|
|
UserID: userID,
|
|
Assertion: assertion,
|
|
}
|
|
}
|
|
|
|
func (e *SAMLSucceededEvent) Payload() interface{} {
|
|
return e
|
|
}
|
|
|
|
func (e *SAMLSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return nil
|
|
}
|
|
|
|
func SAMLSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
|
|
e := &SAMLSucceededEvent{
|
|
BaseEvent: *eventstore.BaseEventFromRepo(event),
|
|
}
|
|
|
|
err := event.Unmarshal(e)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "IDP-l4tw23y6lq", "unable to unmarshal event")
|
|
}
|
|
|
|
return e, nil
|
|
}
|
|
|
|
type SAMLRequestEvent struct {
|
|
eventstore.BaseEvent `json:"-"`
|
|
|
|
RequestID string `json:"requestId"`
|
|
}
|
|
|
|
func NewSAMLRequestEvent(
|
|
ctx context.Context,
|
|
aggregate *eventstore.Aggregate,
|
|
requestID string,
|
|
) *SAMLRequestEvent {
|
|
return &SAMLRequestEvent{
|
|
BaseEvent: *eventstore.NewBaseEventForPush(
|
|
ctx,
|
|
aggregate,
|
|
SAMLRequestEventType,
|
|
),
|
|
RequestID: requestID,
|
|
}
|
|
}
|
|
|
|
func (e *SAMLRequestEvent) Payload() interface{} {
|
|
return e
|
|
}
|
|
|
|
func (e *SAMLRequestEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return nil
|
|
}
|
|
|
|
func SAMLRequestEventMapper(event eventstore.Event) (eventstore.Event, error) {
|
|
e := &SAMLRequestEvent{
|
|
BaseEvent: *eventstore.BaseEventFromRepo(event),
|
|
}
|
|
|
|
err := event.Unmarshal(e)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "IDP-l85678vwlf", "unable to unmarshal event")
|
|
}
|
|
|
|
return e, nil
|
|
}
|
|
|
|
type LDAPSucceededEvent struct {
|
|
eventstore.BaseEvent `json:"-"`
|
|
|
|
IDPUser []byte `json:"idpUser"`
|
|
IDPUserID string `json:"idpUserId,omitempty"`
|
|
IDPUserName string `json:"idpUserName,omitempty"`
|
|
UserID string `json:"userId,omitempty"`
|
|
|
|
EntryAttributes map[string][]string `json:"user,omitempty"`
|
|
}
|
|
|
|
func NewLDAPSucceededEvent(
|
|
ctx context.Context,
|
|
aggregate *eventstore.Aggregate,
|
|
idpUser []byte,
|
|
idpUserID,
|
|
idpUserName,
|
|
userID string,
|
|
attributes map[string][]string,
|
|
) *LDAPSucceededEvent {
|
|
return &LDAPSucceededEvent{
|
|
BaseEvent: *eventstore.NewBaseEventForPush(
|
|
ctx,
|
|
aggregate,
|
|
LDAPSucceededEventType,
|
|
),
|
|
IDPUser: idpUser,
|
|
IDPUserID: idpUserID,
|
|
IDPUserName: idpUserName,
|
|
UserID: userID,
|
|
EntryAttributes: attributes,
|
|
}
|
|
}
|
|
|
|
func (e *LDAPSucceededEvent) Payload() interface{} {
|
|
return e
|
|
}
|
|
|
|
func (e *LDAPSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return nil
|
|
}
|
|
|
|
func LDAPSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
|
|
e := &LDAPSucceededEvent{
|
|
BaseEvent: *eventstore.BaseEventFromRepo(event),
|
|
}
|
|
|
|
err := event.Unmarshal(e)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "IDP-HBreq", "unable to unmarshal event")
|
|
}
|
|
|
|
return e, nil
|
|
}
|
|
|
|
type FailedEvent struct {
|
|
eventstore.BaseEvent `json:"-"`
|
|
|
|
Reason string `json:"reason,omitempty"`
|
|
}
|
|
|
|
func NewFailedEvent(
|
|
ctx context.Context,
|
|
aggregate *eventstore.Aggregate,
|
|
reason string,
|
|
) *FailedEvent {
|
|
return &FailedEvent{
|
|
BaseEvent: *eventstore.NewBaseEventForPush(
|
|
ctx,
|
|
aggregate,
|
|
FailedEventType,
|
|
),
|
|
Reason: reason,
|
|
}
|
|
}
|
|
|
|
func (e *FailedEvent) Payload() interface{} {
|
|
return e
|
|
}
|
|
|
|
func (e *FailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return nil
|
|
}
|
|
|
|
func FailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
|
|
e := &FailedEvent{
|
|
BaseEvent: *eventstore.BaseEventFromRepo(event),
|
|
}
|
|
|
|
err := event.Unmarshal(e)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "IDP-Sfer3", "unable to unmarshal event")
|
|
}
|
|
|
|
return e, nil
|
|
}
|