mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 21:52:54 +00:00
Wim Van LaerandGitHub
e98aa10892
# Which Problems Are Solved - When no auth was present on a smtp configuration, the `auth` field was `nil` on the response while it should be `none`. - Scopes were not properly retrieved from the database resulting in all scopes being combined in one scope when retrieving the configuration. # How the Problems Are Solved - Set `auth` to `none` when no auth is configured - Use `database.TextArray[string]` as type to get the scopes from the database # Additional Changes # Additional Context
505 lines
15 KiB
Go
505 lines
15 KiB
Go
package query
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"errors"
|
|
"time"
|
|
|
|
sq "github.com/Masterminds/squirrel"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/query/projection"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
type SMTPConfigsSearchQueries struct {
|
|
SearchRequest
|
|
Queries []SearchQuery
|
|
}
|
|
|
|
type SMTPConfigs struct {
|
|
SearchResponse
|
|
Configs []*SMTPConfig
|
|
}
|
|
|
|
var (
|
|
smtpConfigsTable = table{
|
|
name: projection.SMTPConfigProjectionTable,
|
|
instanceIDCol: projection.SMTPConfigColumnInstanceID,
|
|
}
|
|
SMTPConfigColumnCreationDate = Column{
|
|
name: projection.SMTPConfigColumnCreationDate,
|
|
table: smtpConfigsTable,
|
|
}
|
|
SMTPConfigColumnChangeDate = Column{
|
|
name: projection.SMTPConfigColumnChangeDate,
|
|
table: smtpConfigsTable,
|
|
}
|
|
SMTPConfigColumnResourceOwner = Column{
|
|
name: projection.SMTPConfigColumnResourceOwner,
|
|
table: smtpConfigsTable,
|
|
}
|
|
SMTPConfigColumnInstanceID = Column{
|
|
name: projection.SMTPConfigColumnInstanceID,
|
|
table: smtpConfigsTable,
|
|
}
|
|
SMTPConfigColumnSequence = Column{
|
|
name: projection.SMTPConfigColumnSequence,
|
|
table: smtpConfigsTable,
|
|
}
|
|
SMTPConfigColumnID = Column{
|
|
name: projection.SMTPConfigColumnID,
|
|
table: smtpConfigsTable,
|
|
}
|
|
SMTPConfigColumnState = Column{
|
|
name: projection.SMTPConfigColumnState,
|
|
table: smtpConfigsTable,
|
|
}
|
|
SMTPConfigColumnDescription = Column{
|
|
name: projection.SMTPConfigColumnDescription,
|
|
table: smtpConfigsTable,
|
|
}
|
|
|
|
smtpConfigsSMTPTable = table{
|
|
name: projection.SMTPConfigTable,
|
|
instanceIDCol: projection.SMTPConfigColumnInstanceID,
|
|
}
|
|
SMTPConfigSMTPColumnInstanceID = Column{
|
|
name: projection.SMTPConfigColumnInstanceID,
|
|
table: smtpConfigsSMTPTable,
|
|
}
|
|
SMTPConfigSMTPColumnID = Column{
|
|
name: projection.SMTPConfigColumnID,
|
|
table: smtpConfigsSMTPTable,
|
|
}
|
|
SMTPConfigSMTPColumnTLS = Column{
|
|
name: projection.SMTPConfigSMTPColumnTLS,
|
|
table: smtpConfigsSMTPTable,
|
|
}
|
|
SMTPConfigSMTPColumnSenderAddress = Column{
|
|
name: projection.SMTPConfigSMTPColumnSenderAddress,
|
|
table: smtpConfigsSMTPTable,
|
|
}
|
|
SMTPConfigSMTPColumnSenderName = Column{
|
|
name: projection.SMTPConfigSMTPColumnSenderName,
|
|
table: smtpConfigsSMTPTable,
|
|
}
|
|
SMTPConfigSMTPColumnReplyToAddress = Column{
|
|
name: projection.SMTPConfigSMTPColumnReplyToAddress,
|
|
table: smtpConfigsSMTPTable,
|
|
}
|
|
SMTPConfigSMTPColumnHost = Column{
|
|
name: projection.SMTPConfigSMTPColumnHost,
|
|
table: smtpConfigsSMTPTable,
|
|
}
|
|
SMTPConfigSMTPColumnUser = Column{
|
|
name: projection.SMTPConfigSMTPColumnUser,
|
|
table: smtpConfigsSMTPTable,
|
|
}
|
|
SMTPConfigSMTPColumnPlainAuthPassword = Column{
|
|
name: projection.SMTPConfigSMTPColumnPlainAuthPassword,
|
|
table: smtpConfigsSMTPTable,
|
|
}
|
|
SMTPConfigSMTPColumnXOAuth2AuthClientCredentialsClientId = Column{
|
|
name: projection.SMTPConfigSMTPColumnXOAuth2AuthClientCredentialsClientId,
|
|
table: smtpConfigsSMTPTable,
|
|
}
|
|
SMTPConfigSMTPColumnXOAuth2AuthClientCredentialsClientSecret = Column{
|
|
name: projection.SMTPConfigSMTPColumnXOAuth2AuthClientCredentialsClientSecret,
|
|
table: smtpConfigsSMTPTable,
|
|
}
|
|
SMTPConfigSMTPColumnXOAuth2AuthTokenEndpoint = Column{
|
|
name: projection.SMTPConfigSMTPColumnXOAuth2AuthTokenEndpoint,
|
|
table: smtpConfigsSMTPTable,
|
|
}
|
|
SMTPConfigSMTPColumnXOAuth2AuthScope = Column{
|
|
name: projection.SMTPConfigSMTPColumnXOAuth2AuthScope,
|
|
table: smtpConfigsSMTPTable,
|
|
}
|
|
|
|
smtpConfigsHTTPTable = table{
|
|
name: projection.SMTPConfigHTTPTable,
|
|
instanceIDCol: projection.SMTPConfigHTTPColumnInstanceID,
|
|
}
|
|
SMTPConfigHTTPColumnInstanceID = Column{
|
|
name: projection.SMTPConfigHTTPColumnInstanceID,
|
|
table: smtpConfigsHTTPTable,
|
|
}
|
|
SMTPConfigHTTPColumnID = Column{
|
|
name: projection.SMTPConfigHTTPColumnID,
|
|
table: smtpConfigsHTTPTable,
|
|
}
|
|
SMTPConfigHTTPColumnEndpoint = Column{
|
|
name: projection.SMTPConfigHTTPColumnEndpoint,
|
|
table: smtpConfigsHTTPTable,
|
|
}
|
|
SMTPConfigHTTPColumnSigningKey = Column{
|
|
name: projection.SMTPConfigHTTPColumnSigningKey,
|
|
table: smtpConfigsHTTPTable,
|
|
}
|
|
)
|
|
|
|
type SMTPConfig struct {
|
|
CreationDate time.Time
|
|
ChangeDate time.Time
|
|
ResourceOwner string
|
|
AggregateID string
|
|
ID string
|
|
Sequence uint64
|
|
Description string
|
|
|
|
SMTPConfig *SMTP
|
|
HTTPConfig *HTTP
|
|
|
|
State domain.SMTPConfigState
|
|
}
|
|
|
|
func (h *SMTPConfig) decryptSigningKey(alg crypto.EncryptionAlgorithm) error {
|
|
if h.HTTPConfig == nil {
|
|
return nil
|
|
}
|
|
return h.HTTPConfig.decryptSigningKey(alg)
|
|
}
|
|
|
|
type SMTP struct {
|
|
TLS bool
|
|
SenderAddress string
|
|
SenderName string
|
|
ReplyToAddress string
|
|
Host string
|
|
User string
|
|
PlainAuth *PlainAuth
|
|
XOAuth2Auth *XOAuth2Auth
|
|
}
|
|
|
|
type PlainAuth struct {
|
|
Password *crypto.CryptoValue
|
|
}
|
|
|
|
func (a PlainAuth) isEmpty() bool {
|
|
return a.Password == nil
|
|
}
|
|
|
|
type XOAuth2Auth struct {
|
|
TokenEndpoint string
|
|
Scopes []string
|
|
ClientCredentials *XOAuthClientCredentials
|
|
}
|
|
|
|
func (a XOAuth2Auth) isEmpty() bool {
|
|
return a.ClientCredentials == nil && a.TokenEndpoint == "" && len(a.Scopes) == 0
|
|
}
|
|
|
|
type XOAuthClientCredentials struct {
|
|
ClientId string
|
|
ClientSecret *crypto.CryptoValue
|
|
}
|
|
|
|
func (a XOAuthClientCredentials) isEmpty() bool {
|
|
return a.ClientId == "" && a.ClientSecret == nil
|
|
}
|
|
|
|
func (q *Queries) SMTPConfigActive(ctx context.Context, resourceOwner string) (config *SMTPConfig, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
stmt, scan := prepareSMTPConfigQuery()
|
|
query, args, err := stmt.Where(sq.Eq{
|
|
SMTPConfigColumnResourceOwner.identifier(): resourceOwner,
|
|
SMTPConfigColumnInstanceID.identifier(): resourceOwner,
|
|
SMTPConfigColumnState.identifier(): domain.SMTPConfigStateActive,
|
|
}).ToSql()
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-3m9sl", "Errors.Query.SQLStatement")
|
|
}
|
|
|
|
err = q.client.QueryRowContext(ctx, func(row *sql.Row) error {
|
|
config, err = scan(row)
|
|
return err
|
|
}, query, args...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if err := config.decryptSigningKey(q.smtpEncryptionAlgorithm); err != nil {
|
|
return nil, err
|
|
}
|
|
return config, nil
|
|
}
|
|
|
|
func (q *Queries) SMTPConfigByID(ctx context.Context, instanceID, id string) (config *SMTPConfig, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
stmt, scan := prepareSMTPConfigQuery()
|
|
query, args, err := stmt.Where(sq.Eq{
|
|
SMTPConfigColumnInstanceID.identifier(): instanceID,
|
|
SMTPConfigColumnID.identifier(): id,
|
|
}).ToSql()
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-8f8gw", "Errors.Query.SQLStatement")
|
|
}
|
|
|
|
err = q.client.QueryRowContext(ctx, func(row *sql.Row) error {
|
|
config, err = scan(row)
|
|
return err
|
|
}, query, args...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if err := config.decryptSigningKey(q.smtpEncryptionAlgorithm); err != nil {
|
|
return nil, err
|
|
}
|
|
return config, err
|
|
}
|
|
|
|
func prepareSMTPConfigQuery() (sq.SelectBuilder, func(*sql.Row) (*SMTPConfig, error)) {
|
|
return sq.Select(
|
|
SMTPConfigColumnCreationDate.identifier(),
|
|
SMTPConfigColumnChangeDate.identifier(),
|
|
SMTPConfigColumnResourceOwner.identifier(),
|
|
SMTPConfigColumnSequence.identifier(),
|
|
SMTPConfigColumnID.identifier(),
|
|
SMTPConfigColumnState.identifier(),
|
|
SMTPConfigColumnDescription.identifier(),
|
|
|
|
SMTPConfigSMTPColumnID.identifier(),
|
|
SMTPConfigSMTPColumnTLS.identifier(),
|
|
SMTPConfigSMTPColumnSenderAddress.identifier(),
|
|
SMTPConfigSMTPColumnSenderName.identifier(),
|
|
SMTPConfigSMTPColumnReplyToAddress.identifier(),
|
|
SMTPConfigSMTPColumnHost.identifier(),
|
|
SMTPConfigSMTPColumnUser.identifier(),
|
|
SMTPConfigSMTPColumnPlainAuthPassword.identifier(),
|
|
SMTPConfigSMTPColumnXOAuth2AuthClientCredentialsClientId.identifier(),
|
|
SMTPConfigSMTPColumnXOAuth2AuthClientCredentialsClientSecret.identifier(),
|
|
SMTPConfigSMTPColumnXOAuth2AuthTokenEndpoint.identifier(),
|
|
SMTPConfigSMTPColumnXOAuth2AuthScope.identifier(),
|
|
|
|
SMTPConfigHTTPColumnID.identifier(),
|
|
SMTPConfigHTTPColumnEndpoint.identifier(),
|
|
SMTPConfigHTTPColumnSigningKey.identifier(),
|
|
).
|
|
From(smtpConfigsTable.identifier()).
|
|
LeftJoin(join(SMTPConfigSMTPColumnID, SMTPConfigColumnID)).
|
|
LeftJoin(join(SMTPConfigHTTPColumnID, SMTPConfigColumnID)).
|
|
PlaceholderFormat(sq.Dollar),
|
|
func(row *sql.Row) (*SMTPConfig, error) {
|
|
config := new(SMTPConfig)
|
|
var (
|
|
smtpConfig = sqlSmtpConfig{}
|
|
httpConfig = sqlHTTPConfig{}
|
|
)
|
|
err := row.Scan(
|
|
&config.CreationDate,
|
|
&config.ChangeDate,
|
|
&config.ResourceOwner,
|
|
&config.Sequence,
|
|
&config.ID,
|
|
&config.State,
|
|
&config.Description,
|
|
&smtpConfig.id,
|
|
&smtpConfig.tls,
|
|
&smtpConfig.senderAddress,
|
|
&smtpConfig.senderName,
|
|
&smtpConfig.replyToAddress,
|
|
&smtpConfig.host,
|
|
&smtpConfig.user,
|
|
&smtpConfig.plainAuthPassword,
|
|
&smtpConfig.xoauth2AuthClientCredentialsClientId,
|
|
&smtpConfig.xoauth2AuthClientClientCredentialsSecret,
|
|
&smtpConfig.xoauth2AuthTokenEndpoint,
|
|
&smtpConfig.xoauth2AuthScope,
|
|
&httpConfig.id,
|
|
&httpConfig.endpoint,
|
|
&httpConfig.signingKey,
|
|
)
|
|
if err != nil {
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return nil, zerrors.ThrowNotFound(err, "QUERY-fwofw", "Errors.SMTPConfig.NotFound")
|
|
}
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-9k87F", "Errors.Internal")
|
|
}
|
|
|
|
smtpConfig.set(config)
|
|
httpConfig.setSMTP(config)
|
|
|
|
return config, nil
|
|
}
|
|
}
|
|
|
|
func prepareSMTPConfigsQuery() (sq.SelectBuilder, func(*sql.Rows) (*SMTPConfigs, error)) {
|
|
return sq.Select(
|
|
SMTPConfigColumnCreationDate.identifier(),
|
|
SMTPConfigColumnChangeDate.identifier(),
|
|
SMTPConfigColumnResourceOwner.identifier(),
|
|
SMTPConfigColumnSequence.identifier(),
|
|
SMTPConfigColumnID.identifier(),
|
|
SMTPConfigColumnState.identifier(),
|
|
SMTPConfigColumnDescription.identifier(),
|
|
|
|
SMTPConfigSMTPColumnID.identifier(),
|
|
SMTPConfigSMTPColumnTLS.identifier(),
|
|
SMTPConfigSMTPColumnSenderAddress.identifier(),
|
|
SMTPConfigSMTPColumnSenderName.identifier(),
|
|
SMTPConfigSMTPColumnReplyToAddress.identifier(),
|
|
SMTPConfigSMTPColumnHost.identifier(),
|
|
SMTPConfigSMTPColumnUser.identifier(),
|
|
SMTPConfigSMTPColumnPlainAuthPassword.identifier(),
|
|
SMTPConfigSMTPColumnXOAuth2AuthClientCredentialsClientId.identifier(),
|
|
SMTPConfigSMTPColumnXOAuth2AuthClientCredentialsClientSecret.identifier(),
|
|
SMTPConfigSMTPColumnXOAuth2AuthTokenEndpoint.identifier(),
|
|
SMTPConfigSMTPColumnXOAuth2AuthScope.identifier(),
|
|
|
|
SMTPConfigHTTPColumnID.identifier(),
|
|
SMTPConfigHTTPColumnEndpoint.identifier(),
|
|
SMTPConfigHTTPColumnSigningKey.identifier(),
|
|
|
|
countColumn.identifier(),
|
|
).From(smtpConfigsTable.identifier()).
|
|
LeftJoin(join(SMTPConfigSMTPColumnID, SMTPConfigColumnID)).
|
|
LeftJoin(join(SMTPConfigHTTPColumnID, SMTPConfigColumnID)).
|
|
PlaceholderFormat(sq.Dollar),
|
|
func(rows *sql.Rows) (*SMTPConfigs, error) {
|
|
configs := &SMTPConfigs{Configs: []*SMTPConfig{}}
|
|
for rows.Next() {
|
|
config := new(SMTPConfig)
|
|
var (
|
|
smtpConfig = sqlSmtpConfig{}
|
|
httpConfig = sqlHTTPConfig{}
|
|
)
|
|
err := rows.Scan(
|
|
&config.CreationDate,
|
|
&config.ChangeDate,
|
|
&config.ResourceOwner,
|
|
&config.Sequence,
|
|
&config.ID,
|
|
&config.State,
|
|
&config.Description,
|
|
&smtpConfig.id,
|
|
&smtpConfig.tls,
|
|
&smtpConfig.senderAddress,
|
|
&smtpConfig.senderName,
|
|
&smtpConfig.replyToAddress,
|
|
&smtpConfig.host,
|
|
&smtpConfig.user,
|
|
&smtpConfig.plainAuthPassword,
|
|
&smtpConfig.xoauth2AuthClientCredentialsClientId,
|
|
&smtpConfig.xoauth2AuthClientClientCredentialsSecret,
|
|
&smtpConfig.xoauth2AuthTokenEndpoint,
|
|
&smtpConfig.xoauth2AuthScope,
|
|
&httpConfig.id,
|
|
&httpConfig.endpoint,
|
|
&httpConfig.signingKey,
|
|
&configs.Count,
|
|
)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-9k87F", "Errors.Internal")
|
|
}
|
|
|
|
smtpConfig.set(config)
|
|
httpConfig.setSMTP(config)
|
|
|
|
configs.Configs = append(configs.Configs, config)
|
|
}
|
|
return configs, nil
|
|
}
|
|
}
|
|
|
|
func (q *Queries) SearchSMTPConfigs(ctx context.Context, queries *SMTPConfigsSearchQueries) (configs *SMTPConfigs, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
query, scan := prepareSMTPConfigsQuery()
|
|
stmt, args, err := queries.toQuery(query).
|
|
Where(sq.Eq{
|
|
SMTPConfigColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(),
|
|
}).ToSql()
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInvalidArgument(err, "QUERY-sZ7Cx", "Errors.Query.InvalidRequest")
|
|
}
|
|
|
|
err = q.client.QueryContext(ctx, func(rows *sql.Rows) error {
|
|
configs, err = scan(rows)
|
|
return err
|
|
}, stmt, args...)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-tOpKN", "Errors.Internal")
|
|
}
|
|
for i := range configs.Configs {
|
|
if err := configs.Configs[i].decryptSigningKey(q.smtpEncryptionAlgorithm); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
configs.State, err = q.latestState(ctx, smsConfigsTable)
|
|
return configs, err
|
|
}
|
|
|
|
type sqlSmtpConfig struct {
|
|
id sql.NullString
|
|
tls sql.NullBool
|
|
senderAddress sql.NullString
|
|
senderName sql.NullString
|
|
replyToAddress sql.NullString
|
|
host sql.NullString
|
|
user sql.NullString
|
|
plainAuthPassword *crypto.CryptoValue
|
|
xoauth2AuthClientCredentialsClientId sql.NullString
|
|
xoauth2AuthClientClientCredentialsSecret *crypto.CryptoValue
|
|
xoauth2AuthTokenEndpoint sql.NullString
|
|
xoauth2AuthScope database.TextArray[string]
|
|
}
|
|
|
|
func (c sqlSmtpConfig) set(smtpConfig *SMTPConfig) {
|
|
if !c.id.Valid {
|
|
return
|
|
}
|
|
|
|
plainAuth := &PlainAuth{
|
|
Password: c.plainAuthPassword,
|
|
}
|
|
if plainAuth.isEmpty() {
|
|
plainAuth = nil
|
|
}
|
|
|
|
xoauth2Auth := &XOAuth2Auth{
|
|
TokenEndpoint: c.xoauth2AuthTokenEndpoint.String,
|
|
Scopes: []string(c.xoauth2AuthScope),
|
|
ClientCredentials: &XOAuthClientCredentials{
|
|
ClientId: c.xoauth2AuthClientCredentialsClientId.String,
|
|
ClientSecret: c.xoauth2AuthClientClientCredentialsSecret,
|
|
},
|
|
}
|
|
if xoauth2Auth.ClientCredentials.isEmpty() {
|
|
xoauth2Auth.ClientCredentials = nil
|
|
}
|
|
if xoauth2Auth.isEmpty() {
|
|
xoauth2Auth = nil
|
|
}
|
|
|
|
smtpConfig.SMTPConfig = &SMTP{
|
|
TLS: c.tls.Bool,
|
|
SenderAddress: c.senderAddress.String,
|
|
SenderName: c.senderName.String,
|
|
ReplyToAddress: c.replyToAddress.String,
|
|
Host: c.host.String,
|
|
User: c.user.String,
|
|
PlainAuth: plainAuth,
|
|
XOAuth2Auth: xoauth2Auth,
|
|
}
|
|
}
|
|
|
|
func (c sqlHTTPConfig) setSMTP(smtpConfig *SMTPConfig) {
|
|
if !c.id.Valid {
|
|
return
|
|
}
|
|
smtpConfig.HTTPConfig = &HTTP{
|
|
Endpoint: c.endpoint.String,
|
|
signingKey: c.signingKey,
|
|
}
|
|
}
|