mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 11:34:26 +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>
155 lines
3.6 KiB
Go
155 lines
3.6 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/crypto"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/errors"
|
|
"github.com/zitadel/zitadel/internal/query/projection"
|
|
)
|
|
|
|
type Certificate interface {
|
|
Key
|
|
Expiry() time.Time
|
|
Key() *crypto.CryptoValue
|
|
Certificate() []byte
|
|
}
|
|
|
|
type Certificates struct {
|
|
SearchResponse
|
|
Certificates []Certificate
|
|
}
|
|
|
|
type rsaCertificate struct {
|
|
key
|
|
expiry time.Time
|
|
privateKey *crypto.CryptoValue
|
|
certificate []byte
|
|
}
|
|
|
|
func (c *rsaCertificate) Expiry() time.Time {
|
|
return c.expiry
|
|
}
|
|
|
|
func (c *rsaCertificate) Key() *crypto.CryptoValue {
|
|
return c.privateKey
|
|
}
|
|
|
|
func (c *rsaCertificate) Certificate() []byte {
|
|
return c.certificate
|
|
}
|
|
|
|
var (
|
|
certificateTable = table{
|
|
name: projection.CertificateTable,
|
|
instanceIDCol: projection.CertificateColumnInstanceID,
|
|
}
|
|
CertificateColID = Column{
|
|
name: projection.CertificateColumnID,
|
|
table: certificateTable,
|
|
}
|
|
CertificateColExpiry = Column{
|
|
name: projection.CertificateColumnExpiry,
|
|
table: certificateTable,
|
|
}
|
|
CertificateColCertificate = Column{
|
|
name: projection.CertificateColumnCertificate,
|
|
table: certificateTable,
|
|
}
|
|
)
|
|
|
|
func (q *Queries) ActiveCertificates(ctx context.Context, t time.Time, usage domain.KeyUsage) (*Certificates, error) {
|
|
query, scan := prepareCertificateQuery()
|
|
if t.IsZero() {
|
|
t = time.Now()
|
|
}
|
|
stmt, args, err := query.Where(
|
|
sq.And{
|
|
sq.Eq{
|
|
KeyColInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(),
|
|
KeyColUse.identifier(): usage,
|
|
},
|
|
sq.Gt{CertificateColExpiry.identifier(): t},
|
|
sq.Gt{KeyPrivateColExpiry.identifier(): t},
|
|
},
|
|
).OrderBy(KeyPrivateColExpiry.identifier()).ToSql()
|
|
if err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-SDfkg", "Errors.Query.SQLStatement")
|
|
}
|
|
|
|
rows, err := q.client.QueryContext(ctx, stmt, args...)
|
|
if err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-Sgan4", "Errors.Internal")
|
|
}
|
|
keys, err := scan(rows)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
keys.LatestSequence, err = q.latestSequence(ctx, keyTable)
|
|
if !errors.IsNotFound(err) {
|
|
return keys, err
|
|
}
|
|
return keys, nil
|
|
}
|
|
|
|
func prepareCertificateQuery() (sq.SelectBuilder, func(*sql.Rows) (*Certificates, error)) {
|
|
return sq.Select(
|
|
KeyColID.identifier(),
|
|
KeyColCreationDate.identifier(),
|
|
KeyColChangeDate.identifier(),
|
|
KeyColSequence.identifier(),
|
|
KeyColResourceOwner.identifier(),
|
|
KeyColAlgorithm.identifier(),
|
|
KeyColUse.identifier(),
|
|
CertificateColExpiry.identifier(),
|
|
CertificateColCertificate.identifier(),
|
|
KeyPrivateColKey.identifier(),
|
|
countColumn.identifier(),
|
|
).From(keyTable.identifier()).
|
|
LeftJoin(join(CertificateColID, KeyColID)).
|
|
LeftJoin(join(KeyPrivateColID, KeyColID)).
|
|
PlaceholderFormat(sq.Dollar),
|
|
func(rows *sql.Rows) (*Certificates, error) {
|
|
certificates := make([]Certificate, 0)
|
|
var count uint64
|
|
for rows.Next() {
|
|
k := new(rsaCertificate)
|
|
err := rows.Scan(
|
|
&k.id,
|
|
&k.creationDate,
|
|
&k.changeDate,
|
|
&k.sequence,
|
|
&k.resourceOwner,
|
|
&k.algorithm,
|
|
&k.use,
|
|
&k.expiry,
|
|
&k.certificate,
|
|
&k.privateKey,
|
|
&count,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
certificates = append(certificates, k)
|
|
}
|
|
|
|
if err := rows.Close(); err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-rKd6k", "Errors.Query.CloseRows")
|
|
}
|
|
|
|
return &Certificates{
|
|
Certificates: certificates,
|
|
SearchResponse: SearchResponse{
|
|
Count: count,
|
|
},
|
|
}, nil
|
|
}
|
|
}
|