mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-31 11:32:15 +00:00
3fc0ef2506
# Which Problems Are Solved - Some mail providers (e.g.: MS Exchange) have deprecated plain auth # How the Problems Are Solved Adds XOauth2 auth option to SMPT - SMTP config now can contain XOAuth2 auth config - Proto files are updated to have a oneof for configuration selection. Old fields for configuring plain auth are still available not to create a breaking change. These can be removed in the future. - Columns are added to the database to persist the config # Additional Changes none # Additional Context Replace this example with links to related issues, discussions, discord threads, or other sources with more context. Use the Closing #issue syntax for issues that are resolved with this PR. - Closes #8042 --------- Co-authored-by: Copilot <[email protected]> Co-authored-by: Tim Möhlmann <[email protected]>
102 lines
2.9 KiB
Go
102 lines
2.9 KiB
Go
package handlers
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/notification/channels/email"
|
|
"github.com/zitadel/zitadel/internal/notification/channels/smtp"
|
|
"github.com/zitadel/zitadel/internal/notification/channels/webhook"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
// GetActiveEmailConfig reads the iam SMTP provider config
|
|
func (n *NotificationQueries) GetActiveEmailConfig(ctx context.Context) (*email.Config, error) {
|
|
config, err := n.SMTPConfigActive(ctx, authz.GetInstance(ctx).InstanceID())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
provider := &email.Provider{
|
|
ID: config.ID,
|
|
Description: config.Description,
|
|
}
|
|
|
|
if config.SMTPConfig != nil {
|
|
return smtpToEmailConfig(config.SMTPConfig, provider, n.SMTPPasswordCrypto)
|
|
}
|
|
|
|
if config.HTTPConfig != nil {
|
|
return &email.Config{
|
|
ProviderConfig: provider,
|
|
WebhookConfig: &webhook.Config{
|
|
CallURL: config.HTTPConfig.Endpoint,
|
|
Method: http.MethodPost,
|
|
Headers: nil,
|
|
SigningKey: config.HTTPConfig.SigningKey,
|
|
},
|
|
}, nil
|
|
}
|
|
return nil, zerrors.ThrowNotFound(err, "QUERY-KPQleOckOV", "Errors.SMTPConfig.NotFound")
|
|
}
|
|
|
|
func smtpToEmailConfig(qs *query.SMTP, provider *email.Provider, passCrypto crypto.EncryptionAlgorithm) (*email.Config, error) {
|
|
config := &email.Config{
|
|
ProviderConfig: provider,
|
|
SMTPConfig: &smtp.Config{
|
|
From: qs.SenderAddress,
|
|
FromName: qs.SenderName,
|
|
ReplyToAddress: qs.ReplyToAddress,
|
|
Tls: qs.TLS,
|
|
SMTP: smtp.SMTP{
|
|
Host: qs.Host,
|
|
},
|
|
},
|
|
}
|
|
|
|
if qs.XOAuth2Auth != nil {
|
|
config.SMTPConfig.SMTP.XOAuth2Auth = &smtp.XOAuth2AuthConfig{
|
|
User: qs.User,
|
|
TokenEndpoint: qs.XOAuth2Auth.TokenEndpoint,
|
|
Scopes: qs.XOAuth2Auth.Scopes,
|
|
}
|
|
if qs.XOAuth2Auth.ClientCredentials != nil {
|
|
clientSecret, err := crypto.DecryptString(qs.XOAuth2Auth.ClientCredentials.ClientSecret, passCrypto)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
config.SMTPConfig.SMTP.XOAuth2Auth.ClientCredentialsAuth = &smtp.OAuth2ClientCredentials{
|
|
ClientId: qs.XOAuth2Auth.ClientCredentials.ClientId,
|
|
ClientSecret: clientSecret,
|
|
}
|
|
}
|
|
}
|
|
|
|
if qs.PlainAuth != nil {
|
|
config.SMTPConfig.SMTP.PlainAuth = &smtp.PlainAuthConfig{
|
|
User: qs.User,
|
|
}
|
|
|
|
if qs.PlainAuth.Password != nil {
|
|
password, err := crypto.DecryptString(qs.PlainAuth.Password, passCrypto)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
config.SMTPConfig.SMTP.PlainAuth.Password = password
|
|
}
|
|
}
|
|
|
|
// if no auth is configured but there is a user, use plain auth without a password
|
|
if qs.User != "" &&
|
|
config.SMTPConfig.SMTP.PlainAuth == nil &&
|
|
config.SMTPConfig.SMTP.XOAuth2Auth == nil {
|
|
config.SMTPConfig.SMTP.PlainAuth = &smtp.PlainAuthConfig{
|
|
User: qs.User,
|
|
}
|
|
}
|
|
|
|
return config, nil
|
|
}
|