mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-15 12:27:59 +00:00
3d071fc505
# Which Problems Are Solved ZITADEL currently selects the instance context based on a HTTP header (see https://github.com/zitadel/zitadel/issues/8279#issue-2399959845 and checks it against the list of instance domains. Let's call it instance or API domain. For any context based URL (e.g. OAuth, OIDC, SAML endpoints, links in emails, ...) the requested domain (instance domain) will be used. Let's call it the public domain. In cases of proxied setups, all exposed domains (public domains) require the domain to be managed as instance domain. This can either be done using the "ExternalDomain" in the runtime config or via system API, which requires a validation through CustomerPortal on zitadel.cloud. # How the Problems Are Solved - Two new headers / header list are added: - `InstanceHostHeaders`: an ordered list (first sent wins), which will be used to match the instance. (For backward compatibility: the `HTTP1HostHeader`, `HTTP2HostHeader` and `forwarded`, `x-forwarded-for`, `x-forwarded-host` are checked afterwards as well) - `PublicHostHeaders`: an ordered list (first sent wins), which will be used as public host / domain. This will be checked against a list of trusted domains on the instance. - The middleware intercepts all requests to the API and passes a `DomainCtx` object with the hosts and protocol into the context (previously only a computed `origin` was passed) - HTTP / GRPC server do not longer try to match the headers to instances themself, but use the passed `http.DomainContext` in their interceptors. - The `RequestedHost` and `RequestedDomain` from authz.Instance are removed in favor of the `http.DomainContext` - When authenticating to or signing out from Console UI, the current `http.DomainContext(ctx).Origin` (already checked by instance interceptor for validity) is used to compute and dynamically add a `redirect_uri` and `post_logout_redirect_uri`. - Gateway passes all configured host headers (previously only did `x-zitadel-*`) - Admin API allows to manage trusted domain # Additional Changes None # Additional Context - part of #8279 - open topics: - "single-instance" mode - Console UI
422 lines
12 KiB
Go
422 lines
12 KiB
Go
package user
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"golang.org/x/text/language"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/http"
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
const (
|
|
humanEventPrefix = userEventTypePrefix + "human."
|
|
HumanAddedType = humanEventPrefix + "added"
|
|
HumanRegisteredType = humanEventPrefix + "selfregistered"
|
|
HumanInitialCodeAddedType = humanEventPrefix + "initialization.code.added"
|
|
HumanInitialCodeSentType = humanEventPrefix + "initialization.code.sent"
|
|
HumanInitializedCheckSucceededType = humanEventPrefix + "initialization.check.succeeded"
|
|
HumanInitializedCheckFailedType = humanEventPrefix + "initialization.check.failed"
|
|
HumanSignedOutType = humanEventPrefix + "signed.out"
|
|
)
|
|
|
|
type HumanAddedEvent struct {
|
|
eventstore.BaseEvent `json:"-"`
|
|
|
|
UserName string `json:"userName"`
|
|
userLoginMustBeDomain bool
|
|
|
|
FirstName string `json:"firstName,omitempty"`
|
|
LastName string `json:"lastName,omitempty"`
|
|
NickName string `json:"nickName,omitempty"`
|
|
DisplayName string `json:"displayName,omitempty"`
|
|
PreferredLanguage language.Tag `json:"preferredLanguage,omitempty"`
|
|
Gender domain.Gender `json:"gender,omitempty"`
|
|
|
|
EmailAddress domain.EmailAddress `json:"email,omitempty"`
|
|
|
|
PhoneNumber domain.PhoneNumber `json:"phone,omitempty"`
|
|
|
|
Country string `json:"country,omitempty"`
|
|
Locality string `json:"locality,omitempty"`
|
|
PostalCode string `json:"postalCode,omitempty"`
|
|
Region string `json:"region,omitempty"`
|
|
StreetAddress string `json:"streetAddress,omitempty"`
|
|
|
|
// New events only use EncodedHash. However, the secret field
|
|
// is preserved to handle events older than the switch to Passwap.
|
|
Secret *crypto.CryptoValue `json:"secret,omitempty"`
|
|
EncodedHash string `json:"encodedHash,omitempty"`
|
|
ChangeRequired bool `json:"changeRequired,omitempty"`
|
|
}
|
|
|
|
func (e *HumanAddedEvent) Payload() interface{} {
|
|
return e
|
|
}
|
|
|
|
func (e *HumanAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return []*eventstore.UniqueConstraint{NewAddUsernameUniqueConstraint(e.UserName, e.Aggregate().ResourceOwner, e.userLoginMustBeDomain)}
|
|
}
|
|
|
|
func (e *HumanAddedEvent) AddAddressData(
|
|
country,
|
|
locality,
|
|
postalCode,
|
|
region,
|
|
streetAddress string,
|
|
) {
|
|
e.Country = country
|
|
e.Locality = locality
|
|
e.PostalCode = postalCode
|
|
e.Region = region
|
|
e.StreetAddress = streetAddress
|
|
}
|
|
|
|
func (e *HumanAddedEvent) AddPhoneData(
|
|
phoneNumber domain.PhoneNumber,
|
|
) {
|
|
e.PhoneNumber = phoneNumber
|
|
}
|
|
|
|
func (e *HumanAddedEvent) AddPasswordData(
|
|
encoded string,
|
|
changeRequired bool,
|
|
) {
|
|
e.EncodedHash = encoded
|
|
e.ChangeRequired = changeRequired
|
|
}
|
|
|
|
func NewHumanAddedEvent(
|
|
ctx context.Context,
|
|
aggregate *eventstore.Aggregate,
|
|
|
|
userName,
|
|
firstName,
|
|
lastName,
|
|
nickName,
|
|
displayName string,
|
|
preferredLanguage language.Tag,
|
|
gender domain.Gender,
|
|
emailAddress domain.EmailAddress,
|
|
userLoginMustBeDomain bool,
|
|
) *HumanAddedEvent {
|
|
return &HumanAddedEvent{
|
|
BaseEvent: *eventstore.NewBaseEventForPush(
|
|
ctx,
|
|
aggregate,
|
|
HumanAddedType,
|
|
),
|
|
UserName: userName,
|
|
FirstName: firstName,
|
|
LastName: lastName,
|
|
NickName: nickName,
|
|
DisplayName: displayName,
|
|
PreferredLanguage: preferredLanguage,
|
|
Gender: gender,
|
|
EmailAddress: emailAddress,
|
|
userLoginMustBeDomain: userLoginMustBeDomain,
|
|
}
|
|
}
|
|
|
|
func HumanAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
|
|
humanAdded := &HumanAddedEvent{
|
|
BaseEvent: *eventstore.BaseEventFromRepo(event),
|
|
}
|
|
err := event.Unmarshal(humanAdded)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "USER-vGlhy", "unable to unmarshal human added")
|
|
}
|
|
|
|
return humanAdded, nil
|
|
}
|
|
|
|
type HumanRegisteredEvent struct {
|
|
eventstore.BaseEvent `json:"-"`
|
|
UserName string `json:"userName"`
|
|
userLoginMustBeDomain bool
|
|
FirstName string `json:"firstName,omitempty"`
|
|
LastName string `json:"lastName,omitempty"`
|
|
NickName string `json:"nickName,omitempty"`
|
|
DisplayName string `json:"displayName,omitempty"`
|
|
PreferredLanguage language.Tag `json:"preferredLanguage,omitempty"`
|
|
Gender domain.Gender `json:"gender,omitempty"`
|
|
EmailAddress domain.EmailAddress `json:"email,omitempty"`
|
|
PhoneNumber domain.PhoneNumber `json:"phone,omitempty"`
|
|
Country string `json:"country,omitempty"`
|
|
Locality string `json:"locality,omitempty"`
|
|
PostalCode string `json:"postalCode,omitempty"`
|
|
Region string `json:"region,omitempty"`
|
|
StreetAddress string `json:"streetAddress,omitempty"`
|
|
|
|
// New events only use EncodedHash. However, the secret field
|
|
// is preserved to handle events older than the switch to Passwap.
|
|
Secret *crypto.CryptoValue `json:"secret,omitempty"` // legacy
|
|
EncodedHash string `json:"encodedHash,omitempty"`
|
|
ChangeRequired bool `json:"changeRequired,omitempty"`
|
|
|
|
UserAgentID string `json:"userAgentID,omitempty"`
|
|
}
|
|
|
|
func (e *HumanRegisteredEvent) Payload() interface{} {
|
|
return e
|
|
}
|
|
|
|
func (e *HumanRegisteredEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return []*eventstore.UniqueConstraint{NewAddUsernameUniqueConstraint(e.UserName, e.Aggregate().ResourceOwner, e.userLoginMustBeDomain)}
|
|
}
|
|
|
|
func (e *HumanRegisteredEvent) AddAddressData(
|
|
country,
|
|
locality,
|
|
postalCode,
|
|
region,
|
|
streetAddress string,
|
|
) {
|
|
e.Country = country
|
|
e.Locality = locality
|
|
e.PostalCode = postalCode
|
|
e.Region = region
|
|
e.StreetAddress = streetAddress
|
|
}
|
|
|
|
func (e *HumanRegisteredEvent) AddPhoneData(
|
|
phoneNumber domain.PhoneNumber,
|
|
) {
|
|
e.PhoneNumber = phoneNumber
|
|
}
|
|
|
|
func (e *HumanRegisteredEvent) AddPasswordData(
|
|
encoded string,
|
|
changeRequired bool,
|
|
) {
|
|
e.EncodedHash = encoded
|
|
e.ChangeRequired = changeRequired
|
|
}
|
|
|
|
func NewHumanRegisteredEvent(
|
|
ctx context.Context,
|
|
aggregate *eventstore.Aggregate,
|
|
|
|
userName,
|
|
firstName,
|
|
lastName,
|
|
nickName,
|
|
displayName string,
|
|
preferredLanguage language.Tag,
|
|
gender domain.Gender,
|
|
emailAddress domain.EmailAddress,
|
|
userLoginMustBeDomain bool,
|
|
userAgentID string,
|
|
) *HumanRegisteredEvent {
|
|
return &HumanRegisteredEvent{
|
|
BaseEvent: *eventstore.NewBaseEventForPush(
|
|
ctx,
|
|
aggregate,
|
|
HumanRegisteredType,
|
|
),
|
|
UserName: userName,
|
|
FirstName: firstName,
|
|
LastName: lastName,
|
|
NickName: nickName,
|
|
DisplayName: displayName,
|
|
PreferredLanguage: preferredLanguage,
|
|
Gender: gender,
|
|
EmailAddress: emailAddress,
|
|
userLoginMustBeDomain: userLoginMustBeDomain,
|
|
UserAgentID: userAgentID,
|
|
}
|
|
}
|
|
|
|
func HumanRegisteredEventMapper(event eventstore.Event) (eventstore.Event, error) {
|
|
humanRegistered := &HumanRegisteredEvent{
|
|
BaseEvent: *eventstore.BaseEventFromRepo(event),
|
|
}
|
|
err := event.Unmarshal(humanRegistered)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "USER-3Vm9s", "unable to unmarshal human registered")
|
|
}
|
|
|
|
return humanRegistered, nil
|
|
}
|
|
|
|
type HumanInitialCodeAddedEvent struct {
|
|
eventstore.BaseEvent `json:"-"`
|
|
Code *crypto.CryptoValue `json:"code,omitempty"`
|
|
Expiry time.Duration `json:"expiry,omitempty"`
|
|
TriggeredAtOrigin string `json:"triggerOrigin,omitempty"`
|
|
AuthRequestID string `json:"authRequestID,omitempty"`
|
|
}
|
|
|
|
func (e *HumanInitialCodeAddedEvent) Payload() interface{} {
|
|
return e
|
|
}
|
|
|
|
func (e *HumanInitialCodeAddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return nil
|
|
}
|
|
|
|
func (e *HumanInitialCodeAddedEvent) TriggerOrigin() string {
|
|
return e.TriggeredAtOrigin
|
|
}
|
|
|
|
func NewHumanInitialCodeAddedEvent(
|
|
ctx context.Context,
|
|
aggregate *eventstore.Aggregate,
|
|
code *crypto.CryptoValue,
|
|
expiry time.Duration,
|
|
authRequestID string,
|
|
) *HumanInitialCodeAddedEvent {
|
|
return &HumanInitialCodeAddedEvent{
|
|
BaseEvent: *eventstore.NewBaseEventForPush(
|
|
ctx,
|
|
aggregate,
|
|
HumanInitialCodeAddedType,
|
|
),
|
|
Code: code,
|
|
Expiry: expiry,
|
|
TriggeredAtOrigin: http.DomainContext(ctx).Origin(),
|
|
AuthRequestID: authRequestID,
|
|
}
|
|
}
|
|
|
|
func HumanInitialCodeAddedEventMapper(event eventstore.Event) (eventstore.Event, error) {
|
|
humanRegistered := &HumanInitialCodeAddedEvent{
|
|
BaseEvent: *eventstore.BaseEventFromRepo(event),
|
|
}
|
|
err := event.Unmarshal(humanRegistered)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "USER-bM9se", "unable to unmarshal human initial code added")
|
|
}
|
|
|
|
return humanRegistered, nil
|
|
}
|
|
|
|
type HumanInitialCodeSentEvent struct {
|
|
eventstore.BaseEvent `json:"-"`
|
|
}
|
|
|
|
func (e *HumanInitialCodeSentEvent) Payload() interface{} {
|
|
return nil
|
|
}
|
|
|
|
func (e *HumanInitialCodeSentEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return nil
|
|
}
|
|
|
|
func NewHumanInitialCodeSentEvent(ctx context.Context, aggregate *eventstore.Aggregate) *HumanInitialCodeSentEvent {
|
|
return &HumanInitialCodeSentEvent{
|
|
BaseEvent: *eventstore.NewBaseEventForPush(
|
|
ctx,
|
|
aggregate,
|
|
HumanInitialCodeSentType,
|
|
),
|
|
}
|
|
}
|
|
|
|
func HumanInitialCodeSentEventMapper(event eventstore.Event) (eventstore.Event, error) {
|
|
return &HumanInitialCodeSentEvent{
|
|
BaseEvent: *eventstore.BaseEventFromRepo(event),
|
|
}, nil
|
|
}
|
|
|
|
type HumanInitializedCheckSucceededEvent struct {
|
|
eventstore.BaseEvent `json:"-"`
|
|
}
|
|
|
|
func (e *HumanInitializedCheckSucceededEvent) Payload() interface{} {
|
|
return nil
|
|
}
|
|
|
|
func (e *HumanInitializedCheckSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return nil
|
|
}
|
|
|
|
func NewHumanInitializedCheckSucceededEvent(ctx context.Context, aggregate *eventstore.Aggregate) *HumanInitializedCheckSucceededEvent {
|
|
return &HumanInitializedCheckSucceededEvent{
|
|
BaseEvent: *eventstore.NewBaseEventForPush(
|
|
ctx,
|
|
aggregate,
|
|
HumanInitializedCheckSucceededType,
|
|
),
|
|
}
|
|
}
|
|
|
|
func HumanInitializedCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
|
|
return &HumanInitializedCheckSucceededEvent{
|
|
BaseEvent: *eventstore.BaseEventFromRepo(event),
|
|
}, nil
|
|
}
|
|
|
|
type HumanInitializedCheckFailedEvent struct {
|
|
eventstore.BaseEvent `json:"-"`
|
|
}
|
|
|
|
func (e *HumanInitializedCheckFailedEvent) Payload() interface{} {
|
|
return nil
|
|
}
|
|
|
|
func (e *HumanInitializedCheckFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return nil
|
|
}
|
|
|
|
func NewHumanInitializedCheckFailedEvent(ctx context.Context, aggregate *eventstore.Aggregate) *HumanInitializedCheckFailedEvent {
|
|
return &HumanInitializedCheckFailedEvent{
|
|
BaseEvent: *eventstore.NewBaseEventForPush(
|
|
ctx,
|
|
aggregate,
|
|
HumanInitializedCheckFailedType,
|
|
),
|
|
}
|
|
}
|
|
|
|
func HumanInitializedCheckFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
|
|
return &HumanInitializedCheckFailedEvent{
|
|
BaseEvent: *eventstore.BaseEventFromRepo(event),
|
|
}, nil
|
|
}
|
|
|
|
type HumanSignedOutEvent struct {
|
|
eventstore.BaseEvent `json:"-"`
|
|
|
|
UserAgentID string `json:"userAgentID"`
|
|
}
|
|
|
|
func (e *HumanSignedOutEvent) Payload() interface{} {
|
|
return e
|
|
}
|
|
|
|
func (e *HumanSignedOutEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
|
|
return nil
|
|
}
|
|
|
|
func NewHumanSignedOutEvent(
|
|
ctx context.Context,
|
|
aggregate *eventstore.Aggregate,
|
|
userAgentID string,
|
|
) *HumanSignedOutEvent {
|
|
return &HumanSignedOutEvent{
|
|
BaseEvent: *eventstore.NewBaseEventForPush(
|
|
ctx,
|
|
aggregate,
|
|
HumanSignedOutType,
|
|
),
|
|
UserAgentID: userAgentID,
|
|
}
|
|
}
|
|
|
|
func HumanSignedOutEventMapper(event eventstore.Event) (eventstore.Event, error) {
|
|
signedOut := &HumanSignedOutEvent{
|
|
BaseEvent: *eventstore.BaseEventFromRepo(event),
|
|
}
|
|
err := event.Unmarshal(signedOut)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "USER-WFS3g", "unable to unmarshal human signed out")
|
|
}
|
|
|
|
return signedOut, nil
|
|
}
|