mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-25 09:07:48 +00:00
f3e6f3b23b
* feat(command): remove org * refactor: imports, unused code, error handling * reduce org removed in action * add org deletion to projections * add org removal to projections * add org removal to projections * org removed projection * lint import * projections * fix: table names in tests * fix: table names in tests * logging * add org state * fix(domain): add Owner removed to object details * feat(ListQuery): add with owner removed * fix(org-delete): add bool to functions to select with owner removed * fix(org-delete): add bools to user grants with events to determine if dependencies lost owner * fix(org-delete): add unit tests for owner removed and org removed events * fix(org-delete): add handling of org remove for grants and members * fix(org-delete): correction of unit tests for owner removed * fix(org-delete): update projections, unit tests and get functions * fix(org-delete): add change date to authnkeys and owner removed to org metadata * fix(org-delete): include owner removed for login names * fix(org-delete): some column fixes in projections and build for queries with owner removed * indexes * fix(org-delete): include review changes * fix(org-delete): change user projection name after merge * fix(org-delete): include review changes for project grant where no project owner is necessary * fix(org-delete): include auth and adminapi tables with owner removed information * fix(org-delete): cleanup username and orgdomain uniqueconstraints when org is removed * fix(org-delete): add permissions for org.remove * remove unnecessary unique constraints * fix column order in primary keys * fix(org-delete): include review changes * fix(org-delete): add owner removed indexes and chang setup step to create tables * fix(org-delete): move PK order of instance_id and change added user_grant from review * fix(org-delete): no params for prepareUserQuery * change to step 6 * merge main * fix(org-delete): OldUserName rename to private * fix linting * cleanup * fix: remove org test * create prerelease * chore: delete org-delete as prerelease Co-authored-by: Stefan Benz <stefan@caos.ch> Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Fabi <38692350+hifabienne@users.noreply.github.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
217 lines
7.8 KiB
Go
217 lines
7.8 KiB
Go
package projection
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/errors"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/eventstore/handler"
|
|
"github.com/zitadel/zitadel/internal/eventstore/handler/crdb"
|
|
"github.com/zitadel/zitadel/internal/repository/instance"
|
|
"github.com/zitadel/zitadel/internal/repository/keypair"
|
|
)
|
|
|
|
const (
|
|
KeyProjectionTable = "projections.keys4"
|
|
KeyPrivateTable = KeyProjectionTable + "_" + privateKeyTableSuffix
|
|
KeyPublicTable = KeyProjectionTable + "_" + publicKeyTableSuffix
|
|
CertificateTable = KeyProjectionTable + "_" + certificateTableSuffix
|
|
|
|
KeyColumnID = "id"
|
|
KeyColumnCreationDate = "creation_date"
|
|
KeyColumnChangeDate = "change_date"
|
|
KeyColumnResourceOwner = "resource_owner"
|
|
KeyColumnInstanceID = "instance_id"
|
|
KeyColumnSequence = "sequence"
|
|
KeyColumnAlgorithm = "algorithm"
|
|
KeyColumnUse = "use"
|
|
|
|
privateKeyTableSuffix = "private"
|
|
KeyPrivateColumnID = "id"
|
|
KeyPrivateColumnInstanceID = "instance_id"
|
|
KeyPrivateColumnExpiry = "expiry"
|
|
KeyPrivateColumnKey = "key"
|
|
|
|
publicKeyTableSuffix = "public"
|
|
KeyPublicColumnID = "id"
|
|
KeyPublicColumnInstanceID = "instance_id"
|
|
KeyPublicColumnExpiry = "expiry"
|
|
KeyPublicColumnKey = "key"
|
|
|
|
certificateTableSuffix = "certificate"
|
|
CertificateColumnID = "id"
|
|
CertificateColumnInstanceID = "instance_id"
|
|
CertificateColumnExpiry = "expiry"
|
|
CertificateColumnCertificate = "certificate"
|
|
)
|
|
|
|
type keyProjection struct {
|
|
crdb.StatementHandler
|
|
encryptionAlgorithm crypto.EncryptionAlgorithm
|
|
certEncryptionAlgorithm crypto.EncryptionAlgorithm
|
|
}
|
|
|
|
func newKeyProjection(ctx context.Context, config crdb.StatementHandlerConfig, keyEncryptionAlgorithm crypto.EncryptionAlgorithm, certEncryptionAlgorithm crypto.EncryptionAlgorithm) *keyProjection {
|
|
p := new(keyProjection)
|
|
config.ProjectionName = KeyProjectionTable
|
|
config.Reducers = p.reducers()
|
|
config.InitCheck = crdb.NewMultiTableCheck(
|
|
crdb.NewTable([]*crdb.Column{
|
|
crdb.NewColumn(KeyColumnID, crdb.ColumnTypeText),
|
|
crdb.NewColumn(KeyColumnCreationDate, crdb.ColumnTypeTimestamp),
|
|
crdb.NewColumn(KeyColumnChangeDate, crdb.ColumnTypeTimestamp),
|
|
crdb.NewColumn(KeyColumnResourceOwner, crdb.ColumnTypeText),
|
|
crdb.NewColumn(KeyColumnInstanceID, crdb.ColumnTypeText),
|
|
crdb.NewColumn(KeyColumnSequence, crdb.ColumnTypeInt64),
|
|
crdb.NewColumn(KeyColumnAlgorithm, crdb.ColumnTypeText, crdb.Default("")),
|
|
crdb.NewColumn(KeyColumnUse, crdb.ColumnTypeEnum, crdb.Default(0)),
|
|
},
|
|
crdb.NewPrimaryKey(KeyColumnInstanceID, KeyColumnID),
|
|
),
|
|
crdb.NewSuffixedTable([]*crdb.Column{
|
|
crdb.NewColumn(KeyPrivateColumnID, crdb.ColumnTypeText),
|
|
crdb.NewColumn(KeyPrivateColumnInstanceID, crdb.ColumnTypeText),
|
|
crdb.NewColumn(KeyPrivateColumnExpiry, crdb.ColumnTypeTimestamp),
|
|
crdb.NewColumn(KeyPrivateColumnKey, crdb.ColumnTypeJSONB),
|
|
},
|
|
crdb.NewPrimaryKey(KeyPrivateColumnInstanceID, KeyPrivateColumnID),
|
|
privateKeyTableSuffix,
|
|
crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys()),
|
|
),
|
|
crdb.NewSuffixedTable([]*crdb.Column{
|
|
crdb.NewColumn(KeyPublicColumnID, crdb.ColumnTypeText),
|
|
crdb.NewColumn(KeyPublicColumnInstanceID, crdb.ColumnTypeText),
|
|
crdb.NewColumn(KeyPublicColumnExpiry, crdb.ColumnTypeTimestamp),
|
|
crdb.NewColumn(KeyPublicColumnKey, crdb.ColumnTypeBytes),
|
|
},
|
|
crdb.NewPrimaryKey(KeyPublicColumnInstanceID, KeyPublicColumnID),
|
|
publicKeyTableSuffix,
|
|
crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys()),
|
|
),
|
|
crdb.NewSuffixedTable([]*crdb.Column{
|
|
crdb.NewColumn(CertificateColumnID, crdb.ColumnTypeText),
|
|
crdb.NewColumn(CertificateColumnInstanceID, crdb.ColumnTypeText),
|
|
crdb.NewColumn(CertificateColumnExpiry, crdb.ColumnTypeTimestamp),
|
|
crdb.NewColumn(CertificateColumnCertificate, crdb.ColumnTypeBytes),
|
|
},
|
|
crdb.NewPrimaryKey(CertificateColumnInstanceID, CertificateColumnID),
|
|
certificateTableSuffix,
|
|
crdb.WithForeignKey(crdb.NewForeignKeyOfPublicKeys()),
|
|
),
|
|
)
|
|
p.encryptionAlgorithm = keyEncryptionAlgorithm
|
|
p.certEncryptionAlgorithm = certEncryptionAlgorithm
|
|
p.StatementHandler = crdb.NewStatementHandler(ctx, config)
|
|
|
|
return p
|
|
}
|
|
|
|
func (p *keyProjection) reducers() []handler.AggregateReducer {
|
|
return []handler.AggregateReducer{
|
|
{
|
|
Aggregate: keypair.AggregateType,
|
|
EventRedusers: []handler.EventReducer{
|
|
{
|
|
Event: keypair.AddedEventType,
|
|
Reduce: p.reduceKeyPairAdded,
|
|
},
|
|
{
|
|
Event: keypair.AddedCertificateEventType,
|
|
Reduce: p.reduceCertificateAdded,
|
|
},
|
|
},
|
|
},
|
|
{
|
|
Aggregate: instance.AggregateType,
|
|
EventRedusers: []handler.EventReducer{
|
|
{
|
|
Event: instance.InstanceRemovedEventType,
|
|
Reduce: reduceInstanceRemovedHelper(KeyColumnInstanceID),
|
|
},
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func (p *keyProjection) reduceKeyPairAdded(event eventstore.Event) (*handler.Statement, error) {
|
|
e, ok := event.(*keypair.AddedEvent)
|
|
if !ok {
|
|
return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SAbr2", "reduce.wrong.event.type %s", keypair.AddedEventType)
|
|
}
|
|
if e.PrivateKey.Expiry.Before(time.Now()) && e.PublicKey.Expiry.Before(time.Now()) {
|
|
return crdb.NewNoOpStatement(e), nil
|
|
}
|
|
creates := []func(eventstore.Event) crdb.Exec{
|
|
crdb.AddCreateStatement(
|
|
[]handler.Column{
|
|
handler.NewCol(KeyColumnID, e.Aggregate().ID),
|
|
handler.NewCol(KeyColumnCreationDate, e.CreationDate()),
|
|
handler.NewCol(KeyColumnChangeDate, e.CreationDate()),
|
|
handler.NewCol(KeyColumnResourceOwner, e.Aggregate().ResourceOwner),
|
|
handler.NewCol(KeyColumnInstanceID, e.Aggregate().InstanceID),
|
|
handler.NewCol(KeyColumnSequence, e.Sequence()),
|
|
handler.NewCol(KeyColumnAlgorithm, e.Algorithm),
|
|
handler.NewCol(KeyColumnUse, e.Usage),
|
|
},
|
|
),
|
|
}
|
|
if e.PrivateKey.Expiry.After(time.Now()) {
|
|
creates = append(creates, crdb.AddCreateStatement(
|
|
[]handler.Column{
|
|
handler.NewCol(KeyPrivateColumnID, e.Aggregate().ID),
|
|
handler.NewCol(KeyPrivateColumnInstanceID, e.Aggregate().InstanceID),
|
|
handler.NewCol(KeyPrivateColumnExpiry, e.PrivateKey.Expiry),
|
|
handler.NewCol(KeyPrivateColumnKey, e.PrivateKey.Key),
|
|
},
|
|
crdb.WithTableSuffix(privateKeyTableSuffix),
|
|
))
|
|
}
|
|
if e.PublicKey.Expiry.After(time.Now()) {
|
|
publicKey, err := crypto.Decrypt(e.PublicKey.Key, p.encryptionAlgorithm)
|
|
if err != nil {
|
|
return nil, errors.ThrowInternal(err, "HANDL-DAg2f", "cannot decrypt public key")
|
|
}
|
|
creates = append(creates, crdb.AddCreateStatement(
|
|
[]handler.Column{
|
|
handler.NewCol(KeyPublicColumnID, e.Aggregate().ID),
|
|
handler.NewCol(KeyPublicColumnInstanceID, e.Aggregate().InstanceID),
|
|
handler.NewCol(KeyPublicColumnExpiry, e.PublicKey.Expiry),
|
|
handler.NewCol(KeyPublicColumnKey, publicKey),
|
|
},
|
|
crdb.WithTableSuffix(publicKeyTableSuffix),
|
|
))
|
|
}
|
|
|
|
return crdb.NewMultiStatement(e, creates...), nil
|
|
}
|
|
|
|
func (p *keyProjection) reduceCertificateAdded(event eventstore.Event) (*handler.Statement, error) {
|
|
e, ok := event.(*keypair.AddedCertificateEvent)
|
|
if !ok {
|
|
return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-SAbr09", "reduce.wrong.event.type %s", keypair.AddedCertificateEventType)
|
|
}
|
|
|
|
if e.Certificate.Expiry.Before(time.Now()) {
|
|
return crdb.NewNoOpStatement(e), nil
|
|
}
|
|
|
|
certificate, err := crypto.Decrypt(e.Certificate.Key, p.certEncryptionAlgorithm)
|
|
if err != nil {
|
|
return nil, errors.ThrowInternal(err, "HANDL-Dajwig2f", "cannot decrypt certificate")
|
|
}
|
|
|
|
creates := []func(eventstore.Event) crdb.Exec{crdb.AddCreateStatement(
|
|
[]handler.Column{
|
|
handler.NewCol(CertificateColumnID, e.Aggregate().ID),
|
|
handler.NewCol(CertificateColumnInstanceID, e.Aggregate().InstanceID),
|
|
handler.NewCol(CertificateColumnExpiry, e.Certificate.Expiry),
|
|
handler.NewCol(CertificateColumnCertificate, certificate),
|
|
},
|
|
crdb.WithTableSuffix(certificateTableSuffix),
|
|
)}
|
|
|
|
return crdb.NewMultiStatement(e, creates...), nil
|
|
}
|