Files
zitadel/internal/query/org_domain.go
Livio Spring 9c50087550 fix(actions v1): return org metadata again (#11040)
# Which Problems Are Solved

The latest fix to the organization v2beta service unintentionally
prevented actions v1 to retrieve organization metadata because of an
additional permission check.

# How the Problems Are Solved

- Implicitly allow the actions v1 org metadata query.
- V1 endpoints doing the same query also no longer require the
additional permission check as they already do the corresponding check
in the API. (same for organization domains).

# Additional Changes

None

# Additional Context

Reported by customers after the deployment of v4.6.3
2025-11-05 15:44:46 +00:00

194 lines
5.2 KiB
Go

package query
import (
"context"
"database/sql"
"time"
sq "github.com/Masterminds/squirrel"
"github.com/zitadel/zitadel/internal/api/authz"
"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 Domain struct {
CreationDate time.Time
ChangeDate time.Time
Sequence uint64
Domain string
OrgID string
IsVerified bool
IsPrimary bool
ValidationType domain.OrgDomainValidationType
}
type Domains struct {
SearchResponse
Domains []*Domain
}
type OrgDomainSearchQueries struct {
SearchRequest
Queries []SearchQuery
}
func (q *OrgDomainSearchQueries) toQuery(query sq.SelectBuilder) sq.SelectBuilder {
query = q.SearchRequest.toQuery(query)
for _, q := range q.Queries {
query = q.toQuery(query)
}
return query
}
func NewOrgDomainDomainSearchQuery(method TextComparison, value string) (SearchQuery, error) {
return NewTextQuery(OrgDomainDomainCol, value, method)
}
func NewOrgDomainOrgIDSearchQuery(value string) (SearchQuery, error) {
return NewTextQuery(OrgDomainOrgIDCol, value, TextEquals)
}
func NewOrgDomainVerifiedSearchQuery(verified bool) (SearchQuery, error) {
return NewBoolQuery(OrgDomainIsVerifiedCol, verified)
}
func (q *Queries) SearchOrgDomains(ctx context.Context, queries *OrgDomainSearchQueries, withOwnerRemoved, withPermissionCheck bool) (domains *Domains, err error) {
ctx, span := tracing.NewSpan(ctx)
defer func() { span.EndWithError(err) }()
query, scan := prepareDomainsQuery()
eq := sq.Eq{OrgDomainInstanceIDCol.identifier(): authz.GetInstance(ctx).InstanceID()}
if !withOwnerRemoved {
eq[OrgDomainOwnerRemovedCol.identifier()] = false
}
if withPermissionCheck {
// We always use the permission v2 check and don't check the feature flag, since it's stable enough to work
// in this case and using the old checks only adds more latency, but no benefit.
query = orgDomainPermissionCheckV2(ctx, query, queries)
}
stmt, args, err := queries.toQuery(query).Where(eq).ToSql()
if err != nil {
return nil, zerrors.ThrowInvalidArgument(err, "QUERY-ZRfj1", "Errors.Query.SQLStatement")
}
err = q.client.QueryContext(ctx, func(rows *sql.Rows) error {
domains, err = scan(rows)
return err
}, stmt, args...)
if err != nil {
return nil, zerrors.ThrowInternal(err, "QUERY-M6mYN", "Errors.Internal")
}
domains.State, err = q.latestState(ctx, orgDomainsTable)
return domains, err
}
func prepareDomainsQuery() (sq.SelectBuilder, func(*sql.Rows) (*Domains, error)) {
return sq.Select(
OrgDomainCreationDateCol.identifier(),
OrgDomainChangeDateCol.identifier(),
OrgDomainSequenceCol.identifier(),
OrgDomainDomainCol.identifier(),
OrgDomainOrgIDCol.identifier(),
OrgDomainIsVerifiedCol.identifier(),
OrgDomainIsPrimaryCol.identifier(),
OrgDomainValidationTypeCol.identifier(),
countColumn.identifier(),
).From(orgDomainsTable.identifier()).
PlaceholderFormat(sq.Dollar),
func(rows *sql.Rows) (*Domains, error) {
domains := make([]*Domain, 0)
var count uint64
for rows.Next() {
domain := new(Domain)
err := rows.Scan(
&domain.CreationDate,
&domain.ChangeDate,
&domain.Sequence,
&domain.Domain,
&domain.OrgID,
&domain.IsVerified,
&domain.IsPrimary,
&domain.ValidationType,
&count,
)
if err != nil {
return nil, err
}
domains = append(domains, domain)
}
if err := rows.Close(); err != nil {
return nil, zerrors.ThrowInternal(err, "QUERY-rKd6k", "Errors.Query.CloseRows")
}
return &Domains{
Domains: domains,
SearchResponse: SearchResponse{
Count: count,
},
}, nil
}
}
var (
orgDomainsTable = table{
name: projection.OrgDomainTable,
instanceIDCol: projection.OrgDomainInstanceIDCol,
}
OrgDomainCreationDateCol = Column{
name: projection.OrgDomainCreationDateCol,
table: orgDomainsTable,
}
OrgDomainChangeDateCol = Column{
name: projection.OrgDomainChangeDateCol,
table: orgDomainsTable,
}
OrgDomainSequenceCol = Column{
name: projection.OrgDomainSequenceCol,
table: orgDomainsTable,
}
OrgDomainDomainCol = Column{
name: projection.OrgDomainDomainCol,
table: orgDomainsTable,
}
OrgDomainOrgIDCol = Column{
name: projection.OrgDomainOrgIDCol,
table: orgDomainsTable,
}
OrgDomainInstanceIDCol = Column{
name: projection.OrgDomainInstanceIDCol,
table: orgDomainsTable,
}
OrgDomainIsVerifiedCol = Column{
name: projection.OrgDomainIsVerifiedCol,
table: orgDomainsTable,
}
OrgDomainIsPrimaryCol = Column{
name: projection.OrgDomainIsPrimaryCol,
table: orgDomainsTable,
}
OrgDomainValidationTypeCol = Column{
name: projection.OrgDomainValidationTypeCol,
table: orgDomainsTable,
}
OrgDomainOwnerRemovedCol = Column{
name: projection.OrgDomainOwnerRemovedCol,
table: orgDomainsTable,
}
)
func orgDomainPermissionCheckV2(ctx context.Context, query sq.SelectBuilder, queries *OrgDomainSearchQueries) sq.SelectBuilder {
join, args := PermissionClause(
ctx,
OrgDomainOrgIDCol,
domain.PermissionOrgRead,
SingleOrgPermissionOption(queries.Queries),
)
return query.JoinClause(join, args...)
}