mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-15 04:18:01 +00:00
ba9b807854
* get key by id and cache them
* userinfo from events for v2 tokens
* improve keyset caching
* concurrent token and client checks
* client and project in single query
* logging and otel
* drop owner_removed column on apps and authN tables
* userinfo and project roles in go routines
* get oidc user info from projections and add actions
* add avatar URL
* some cleanup
* pull oidc work branch
* remove storage from server
* add config flag for experimental introspection
* legacy introspection flag
* drop owner_removed column on user projections
* drop owner_removed column on useer_metadata
* query userinfo unit test
* query introspection client test
* add user_grants to the userinfo query
* handle PAT scopes
* bring triggers back
* test instance keys query
* add userinfo unit tests
* unit test keys
* go mod tidy
* solve some bugs
* fix missing preferred login name
* do not run triggers in go routines, they seem to deadlock
* initialize the trigger handlers late with a sync.OnceValue
* Revert "do not run triggers in go routines, they seem to deadlock"
This reverts commit 2a03da2127
.
* add missing translations
* chore: update go version for linting
* pin oidc version
* parse a global time location for query test
* fix linter complains
* upgrade go lint
* fix more linting issues
---------
Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
244 lines
7.1 KiB
Go
244 lines
7.1 KiB
Go
package query
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
errs "errors"
|
|
"time"
|
|
|
|
sq "github.com/Masterminds/squirrel"
|
|
|
|
"github.com/zitadel/logging"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/api/call"
|
|
"github.com/zitadel/zitadel/internal/errors"
|
|
"github.com/zitadel/zitadel/internal/eventstore/handler/v2"
|
|
"github.com/zitadel/zitadel/internal/query/projection"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
)
|
|
|
|
type UserMetadataList struct {
|
|
SearchResponse
|
|
Metadata []*UserMetadata
|
|
}
|
|
|
|
type UserMetadata struct {
|
|
CreationDate time.Time `json:"creation_date,omitempty"`
|
|
ChangeDate time.Time `json:"change_date,omitempty"`
|
|
ResourceOwner string `json:"resource_owner,omitempty"`
|
|
Sequence uint64 `json:"sequence,omitempty"`
|
|
Key string `json:"key,omitempty"`
|
|
Value []byte `json:"value,omitempty"`
|
|
}
|
|
|
|
type UserMetadataSearchQueries struct {
|
|
SearchRequest
|
|
Queries []SearchQuery
|
|
}
|
|
|
|
var (
|
|
userMetadataTable = table{
|
|
name: projection.UserMetadataProjectionTable,
|
|
instanceIDCol: projection.UserMetadataColumnInstanceID,
|
|
}
|
|
UserMetadataUserIDCol = Column{
|
|
name: projection.UserMetadataColumnUserID,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataCreationDateCol = Column{
|
|
name: projection.UserMetadataColumnCreationDate,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataChangeDateCol = Column{
|
|
name: projection.UserMetadataColumnChangeDate,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataResourceOwnerCol = Column{
|
|
name: projection.UserMetadataColumnResourceOwner,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataInstanceIDCol = Column{
|
|
name: projection.UserMetadataColumnInstanceID,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataSequenceCol = Column{
|
|
name: projection.UserMetadataColumnSequence,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataKeyCol = Column{
|
|
name: projection.UserMetadataColumnKey,
|
|
table: userMetadataTable,
|
|
}
|
|
UserMetadataValueCol = Column{
|
|
name: projection.UserMetadataColumnValue,
|
|
table: userMetadataTable,
|
|
}
|
|
)
|
|
|
|
func (q *Queries) GetUserMetadataByKey(ctx context.Context, shouldTriggerBulk bool, userID, key string, withOwnerRemoved bool, queries ...SearchQuery) (metadata *UserMetadata, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
if shouldTriggerBulk {
|
|
_, traceSpan := tracing.NewNamedSpan(ctx, "TriggerUserMetadataProjection")
|
|
ctx, err = projection.UserMetadataProjection.Trigger(ctx, handler.WithAwaitRunning())
|
|
logging.OnError(err).Debug("trigger failed")
|
|
traceSpan.EndWithError(err)
|
|
}
|
|
|
|
query, scan := prepareUserMetadataQuery(ctx, q.client)
|
|
for _, q := range queries {
|
|
query = q.toQuery(query)
|
|
}
|
|
eq := sq.Eq{
|
|
UserMetadataUserIDCol.identifier(): userID,
|
|
UserMetadataKeyCol.identifier(): key,
|
|
UserMetadataInstanceIDCol.identifier(): authz.GetInstance(ctx).InstanceID(),
|
|
}
|
|
stmt, args, err := query.Where(eq).ToSql()
|
|
if err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-aDGG2", "Errors.Query.SQLStatment")
|
|
}
|
|
|
|
err = q.client.QueryRowContext(ctx, func(row *sql.Row) error {
|
|
metadata, err = scan(row)
|
|
return err
|
|
}, stmt, args...)
|
|
return metadata, err
|
|
}
|
|
|
|
func (q *Queries) SearchUserMetadata(ctx context.Context, shouldTriggerBulk bool, userID string, queries *UserMetadataSearchQueries, withOwnerRemoved bool) (metadata *UserMetadataList, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
if shouldTriggerBulk {
|
|
_, traceSpan := tracing.NewNamedSpan(ctx, "TriggerUserMetadataProjection")
|
|
ctx, err = projection.UserMetadataProjection.Trigger(ctx, handler.WithAwaitRunning())
|
|
logging.OnError(err).Debug("trigger failed")
|
|
traceSpan.EndWithError(err)
|
|
}
|
|
|
|
query, scan := prepareUserMetadataListQuery(ctx, q.client)
|
|
eq := sq.Eq{
|
|
UserMetadataUserIDCol.identifier(): userID,
|
|
UserMetadataInstanceIDCol.identifier(): authz.GetInstance(ctx).InstanceID(),
|
|
}
|
|
stmt, args, err := queries.toQuery(query).Where(eq).ToSql()
|
|
if err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-Egbgd", "Errors.Query.SQLStatment")
|
|
}
|
|
|
|
err = q.client.QueryContext(ctx, func(rows *sql.Rows) error {
|
|
metadata, err = scan(rows)
|
|
return err
|
|
}, stmt, args...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
metadata.State, err = q.latestState(ctx, userMetadataTable)
|
|
return metadata, err
|
|
}
|
|
|
|
func (q *UserMetadataSearchQueries) toQuery(query sq.SelectBuilder) sq.SelectBuilder {
|
|
query = q.SearchRequest.toQuery(query)
|
|
for _, q := range q.Queries {
|
|
query = q.toQuery(query)
|
|
}
|
|
return query
|
|
}
|
|
|
|
func (r *UserMetadataSearchQueries) AppendMyResourceOwnerQuery(orgID string) error {
|
|
query, err := NewUserMetadataResourceOwnerSearchQuery(orgID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
r.Queries = append(r.Queries, query)
|
|
return nil
|
|
}
|
|
|
|
func NewUserMetadataResourceOwnerSearchQuery(value string) (SearchQuery, error) {
|
|
return NewTextQuery(UserMetadataResourceOwnerCol, value, TextEquals)
|
|
}
|
|
|
|
func NewUserMetadataKeySearchQuery(value string, comparison TextComparison) (SearchQuery, error) {
|
|
return NewTextQuery(UserMetadataKeyCol, value, comparison)
|
|
}
|
|
|
|
func prepareUserMetadataQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder, func(*sql.Row) (*UserMetadata, error)) {
|
|
return sq.Select(
|
|
UserMetadataCreationDateCol.identifier(),
|
|
UserMetadataChangeDateCol.identifier(),
|
|
UserMetadataResourceOwnerCol.identifier(),
|
|
UserMetadataSequenceCol.identifier(),
|
|
UserMetadataKeyCol.identifier(),
|
|
UserMetadataValueCol.identifier(),
|
|
).
|
|
From(userMetadataTable.identifier() + db.Timetravel(call.Took(ctx))).
|
|
PlaceholderFormat(sq.Dollar),
|
|
func(row *sql.Row) (*UserMetadata, error) {
|
|
m := new(UserMetadata)
|
|
err := row.Scan(
|
|
&m.CreationDate,
|
|
&m.ChangeDate,
|
|
&m.ResourceOwner,
|
|
&m.Sequence,
|
|
&m.Key,
|
|
&m.Value,
|
|
)
|
|
|
|
if err != nil {
|
|
if errs.Is(err, sql.ErrNoRows) {
|
|
return nil, errors.ThrowNotFound(err, "QUERY-Rgh32", "Errors.Metadata.NotFound")
|
|
}
|
|
return nil, errors.ThrowInternal(err, "QUERY-Hhjt2", "Errors.Internal")
|
|
}
|
|
return m, nil
|
|
}
|
|
}
|
|
|
|
func prepareUserMetadataListQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder, func(*sql.Rows) (*UserMetadataList, error)) {
|
|
return sq.Select(
|
|
UserMetadataCreationDateCol.identifier(),
|
|
UserMetadataChangeDateCol.identifier(),
|
|
UserMetadataResourceOwnerCol.identifier(),
|
|
UserMetadataSequenceCol.identifier(),
|
|
UserMetadataKeyCol.identifier(),
|
|
UserMetadataValueCol.identifier(),
|
|
countColumn.identifier()).
|
|
From(userMetadataTable.identifier() + db.Timetravel(call.Took(ctx))).
|
|
PlaceholderFormat(sq.Dollar),
|
|
func(rows *sql.Rows) (*UserMetadataList, error) {
|
|
metadata := make([]*UserMetadata, 0)
|
|
var count uint64
|
|
for rows.Next() {
|
|
m := new(UserMetadata)
|
|
err := rows.Scan(
|
|
&m.CreationDate,
|
|
&m.ChangeDate,
|
|
&m.ResourceOwner,
|
|
&m.Sequence,
|
|
&m.Key,
|
|
&m.Value,
|
|
&count,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
metadata = append(metadata, m)
|
|
}
|
|
|
|
if err := rows.Close(); err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-sd3gh", "Errors.Query.CloseRows")
|
|
}
|
|
|
|
return &UserMetadataList{
|
|
Metadata: metadata,
|
|
SearchResponse: SearchResponse{
|
|
Count: count,
|
|
},
|
|
}, nil
|
|
}
|
|
}
|