mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-12 02:48:30 +00:00

This PR summarizes multiple changes specifically only available with ZITADEL v3: - feat: Web Keys management (https://github.com/zitadel/zitadel/pull/9526) - fix(cmd): ensure proper working of mirror (https://github.com/zitadel/zitadel/pull/9509) - feat(Authz): system user support for permission check v2 (https://github.com/zitadel/zitadel/pull/9640) - chore(license): change from Apache to AGPL (https://github.com/zitadel/zitadel/pull/9597) - feat(console): list v2 sessions (https://github.com/zitadel/zitadel/pull/9539) - fix(console): add loginV2 feature flag (https://github.com/zitadel/zitadel/pull/9682) - fix(feature flags): allow reading "own" flags (https://github.com/zitadel/zitadel/pull/9649) - feat(console): add Actions V2 UI (https://github.com/zitadel/zitadel/pull/9591) BREAKING CHANGE - feat(webkey): migrate to v2beta API (https://github.com/zitadel/zitadel/pull/9445) - chore!: remove CockroachDB Support (https://github.com/zitadel/zitadel/pull/9444) - feat(actions): migrate to v2beta API (https://github.com/zitadel/zitadel/pull/9489) --------- Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com> Co-authored-by: Silvan <27845747+adlerhurst@users.noreply.github.com> Co-authored-by: Ramon <mail@conblem.me> Co-authored-by: Elio Bischof <elio@zitadel.com> Co-authored-by: Kenta Yamaguchi <56732734+KEY60228@users.noreply.github.com> Co-authored-by: Harsha Reddy <harsha.reddy@klaviyo.com> Co-authored-by: Livio Spring <livio@zitadel.com> Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Iraq <66622793+kkrime@users.noreply.github.com> Co-authored-by: Florian Forster <florian@zitadel.com> Co-authored-by: Tim Möhlmann <tim+github@zitadel.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Max Peintner <peintnerm@gmail.com>
158 lines
3.7 KiB
Go
158 lines
3.7 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/query/projection"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
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 crypto.KeyUsage) (certs *Certificates, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
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, zerrors.ThrowInternal(err, "QUERY-SDfkg", "Errors.Query.SQLStatement")
|
|
}
|
|
|
|
err = q.client.QueryContext(ctx, func(rows *sql.Rows) error {
|
|
certs, err = scan(rows)
|
|
return err
|
|
}, stmt, args...)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-Sgan4", "Errors.Internal")
|
|
}
|
|
|
|
certs.State, err = q.latestState(ctx, keyTable)
|
|
if !zerrors.IsNotFound(err) {
|
|
return certs, err
|
|
}
|
|
return certs, 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, zerrors.ThrowInternal(err, "QUERY-rKd6k", "Errors.Query.CloseRows")
|
|
}
|
|
|
|
return &Certificates{
|
|
Certificates: certificates,
|
|
SearchResponse: SearchResponse{
|
|
Count: count,
|
|
},
|
|
}, nil
|
|
}
|
|
}
|