mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 03:24:26 +00:00
58a7eb1f26
# Which Problems Are Solved Improve performance by removing a GetUserByID call. The call also executed a Trigger on projections, which significantly impacted concurrent requests. # How the Problems Are Solved Token creation needs information from the user, such as the resource owner and access token type. For client credentials this is solved in a single search. By getting the user by username (`client_id`), the user details and secret were obtained in a single query. After that verification and token creation can proceed. For JWT profile it is a bit more complex. We didn't know anything about the user until after JWT verification. The verification did a query for the AuthN key and after that we did a GetUserByID to get remaining details. This change uses a joined query when the OIDC library calls the `GetKeyByIDAndClientID` method on the token storage. The found user details are set to the verifieer object and returned after verification is completed. It is safe because the `jwtProfileKeyStorage` is a single-use object as a wrapper around `query.Queries`. This way getting the public key and user details are obtained in a single query. # Additional Changes - Correctly set the `client_id` field with machine's username. # Additional Context - Related to: https://github.com/zitadel/zitadel/issues/8352
540 lines
13 KiB
Go
540 lines
13 KiB
Go
package query
|
|
|
|
import (
|
|
"database/sql"
|
|
"database/sql/driver"
|
|
"errors"
|
|
"fmt"
|
|
"regexp"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
var (
|
|
prepareAuthNKeysStmt = `SELECT projections.authn_keys2.id,` +
|
|
` projections.authn_keys2.creation_date,` +
|
|
` projections.authn_keys2.change_date,` +
|
|
` projections.authn_keys2.resource_owner,` +
|
|
` projections.authn_keys2.sequence,` +
|
|
` projections.authn_keys2.expiration,` +
|
|
` projections.authn_keys2.type,` +
|
|
` COUNT(*) OVER ()` +
|
|
` FROM projections.authn_keys2` +
|
|
` AS OF SYSTEM TIME '-1 ms'`
|
|
prepareAuthNKeysCols = []string{
|
|
"id",
|
|
"creation_date",
|
|
"change_date",
|
|
"resource_owner",
|
|
"sequence",
|
|
"expiration",
|
|
"type",
|
|
"count",
|
|
}
|
|
|
|
prepareAuthNKeysDataStmt = `SELECT projections.authn_keys2.id,` +
|
|
` projections.authn_keys2.creation_date,` +
|
|
` projections.authn_keys2.change_date,` +
|
|
` projections.authn_keys2.resource_owner,` +
|
|
` projections.authn_keys2.sequence,` +
|
|
` projections.authn_keys2.expiration,` +
|
|
` projections.authn_keys2.type,` +
|
|
` projections.authn_keys2.identifier,` +
|
|
` projections.authn_keys2.public_key,` +
|
|
` COUNT(*) OVER ()` +
|
|
` FROM projections.authn_keys2` +
|
|
` AS OF SYSTEM TIME '-1 ms'`
|
|
prepareAuthNKeysDataCols = []string{
|
|
"id",
|
|
"creation_date",
|
|
"change_date",
|
|
"resource_owner",
|
|
"sequence",
|
|
"expiration",
|
|
"type",
|
|
"identifier",
|
|
"public_key",
|
|
"count",
|
|
}
|
|
|
|
prepareAuthNKeyStmt = `SELECT projections.authn_keys2.id,` +
|
|
` projections.authn_keys2.creation_date,` +
|
|
` projections.authn_keys2.change_date,` +
|
|
` projections.authn_keys2.resource_owner,` +
|
|
` projections.authn_keys2.sequence,` +
|
|
` projections.authn_keys2.expiration,` +
|
|
` projections.authn_keys2.type` +
|
|
` FROM projections.authn_keys2` +
|
|
` AS OF SYSTEM TIME '-1 ms'`
|
|
prepareAuthNKeyCols = []string{
|
|
"id",
|
|
"creation_date",
|
|
"change_date",
|
|
"resource_owner",
|
|
"sequence",
|
|
"expiration",
|
|
"type",
|
|
}
|
|
|
|
prepareAuthNKeyPublicKeyStmt = `SELECT projections.authn_keys2.public_key` +
|
|
` FROM projections.authn_keys2` +
|
|
` AS OF SYSTEM TIME '-1 ms'`
|
|
prepareAuthNKeyPublicKeyCols = []string{
|
|
"public_key",
|
|
}
|
|
)
|
|
|
|
func Test_AuthNKeyPrepares(t *testing.T) {
|
|
type want struct {
|
|
sqlExpectations sqlExpectation
|
|
err checkErr
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
prepare interface{}
|
|
want want
|
|
object interface{}
|
|
}{
|
|
{
|
|
name: "prepareAuthNKeysQuery no result",
|
|
prepare: prepareAuthNKeysQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
regexp.QuoteMeta(prepareAuthNKeysStmt),
|
|
nil,
|
|
nil,
|
|
),
|
|
},
|
|
object: &AuthNKeys{AuthNKeys: []*AuthNKey{}},
|
|
},
|
|
{
|
|
name: "prepareAuthNKeysQuery one result",
|
|
prepare: prepareAuthNKeysQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
regexp.QuoteMeta(prepareAuthNKeysStmt),
|
|
prepareAuthNKeysCols,
|
|
[][]driver.Value{
|
|
{
|
|
"id",
|
|
testNow,
|
|
testNow,
|
|
"ro",
|
|
uint64(20211109),
|
|
testNow,
|
|
1,
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &AuthNKeys{
|
|
SearchResponse: SearchResponse{
|
|
Count: 1,
|
|
},
|
|
AuthNKeys: []*AuthNKey{
|
|
{
|
|
ID: "id",
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "ro",
|
|
Sequence: 20211109,
|
|
Expiration: testNow,
|
|
Type: domain.AuthNKeyTypeJSON,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareAuthNKeysQuery multiple result",
|
|
prepare: prepareAuthNKeysQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
regexp.QuoteMeta(prepareAuthNKeysStmt),
|
|
prepareAuthNKeysCols,
|
|
[][]driver.Value{
|
|
{
|
|
"id-1",
|
|
testNow,
|
|
testNow,
|
|
"ro",
|
|
uint64(20211109),
|
|
testNow,
|
|
1,
|
|
},
|
|
{
|
|
"id-2",
|
|
testNow,
|
|
testNow,
|
|
"ro",
|
|
uint64(20211109),
|
|
testNow,
|
|
1,
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &AuthNKeys{
|
|
SearchResponse: SearchResponse{
|
|
Count: 2,
|
|
},
|
|
AuthNKeys: []*AuthNKey{
|
|
{
|
|
ID: "id-1",
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "ro",
|
|
Sequence: 20211109,
|
|
Expiration: testNow,
|
|
Type: domain.AuthNKeyTypeJSON,
|
|
},
|
|
{
|
|
ID: "id-2",
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "ro",
|
|
Sequence: 20211109,
|
|
Expiration: testNow,
|
|
Type: domain.AuthNKeyTypeJSON,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareAuthNKeysQuery sql err",
|
|
prepare: prepareAuthNKeysQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueryErr(
|
|
regexp.QuoteMeta(prepareAuthNKeysStmt),
|
|
sql.ErrConnDone,
|
|
),
|
|
err: func(err error) (error, bool) {
|
|
if !errors.Is(err, sql.ErrConnDone) {
|
|
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
|
}
|
|
return nil, true
|
|
},
|
|
},
|
|
object: nil,
|
|
},
|
|
{
|
|
name: "prepareAuthNKeysDataQuery no result",
|
|
prepare: prepareAuthNKeysDataQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
regexp.QuoteMeta(prepareAuthNKeysDataStmt),
|
|
nil,
|
|
nil,
|
|
),
|
|
},
|
|
object: &AuthNKeysData{AuthNKeysData: []*AuthNKeyData{}},
|
|
},
|
|
{
|
|
name: "prepareAuthNKeysDataQuery one result",
|
|
prepare: prepareAuthNKeysDataQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
regexp.QuoteMeta(prepareAuthNKeysDataStmt),
|
|
prepareAuthNKeysDataCols,
|
|
[][]driver.Value{
|
|
{
|
|
"id",
|
|
testNow,
|
|
testNow,
|
|
"ro",
|
|
uint64(20211109),
|
|
testNow,
|
|
1,
|
|
"identifier",
|
|
[]byte("public"),
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &AuthNKeysData{
|
|
SearchResponse: SearchResponse{
|
|
Count: 1,
|
|
},
|
|
AuthNKeysData: []*AuthNKeyData{
|
|
{
|
|
ID: "id",
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "ro",
|
|
Sequence: 20211109,
|
|
Expiration: testNow,
|
|
Type: domain.AuthNKeyTypeJSON,
|
|
Identifier: "identifier",
|
|
PublicKey: []byte("public"),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareAuthNKeysDataQuery multiple result",
|
|
prepare: prepareAuthNKeysDataQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueries(
|
|
regexp.QuoteMeta(prepareAuthNKeysDataStmt),
|
|
prepareAuthNKeysDataCols,
|
|
[][]driver.Value{
|
|
{
|
|
"id-1",
|
|
testNow,
|
|
testNow,
|
|
"ro",
|
|
uint64(20211109),
|
|
testNow,
|
|
1,
|
|
"identifier1",
|
|
[]byte("public1"),
|
|
},
|
|
{
|
|
"id-2",
|
|
testNow,
|
|
testNow,
|
|
"ro",
|
|
uint64(20211109),
|
|
testNow,
|
|
1,
|
|
"identifier2",
|
|
[]byte("public2"),
|
|
},
|
|
},
|
|
),
|
|
},
|
|
object: &AuthNKeysData{
|
|
SearchResponse: SearchResponse{
|
|
Count: 2,
|
|
},
|
|
AuthNKeysData: []*AuthNKeyData{
|
|
{
|
|
ID: "id-1",
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "ro",
|
|
Sequence: 20211109,
|
|
Expiration: testNow,
|
|
Type: domain.AuthNKeyTypeJSON,
|
|
Identifier: "identifier1",
|
|
PublicKey: []byte("public1"),
|
|
},
|
|
{
|
|
ID: "id-2",
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "ro",
|
|
Sequence: 20211109,
|
|
Expiration: testNow,
|
|
Type: domain.AuthNKeyTypeJSON,
|
|
Identifier: "identifier2",
|
|
PublicKey: []byte("public2"),
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "prepareAuthNKeysDataQuery sql err",
|
|
prepare: prepareAuthNKeysDataQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueryErr(
|
|
regexp.QuoteMeta(prepareAuthNKeysDataStmt),
|
|
sql.ErrConnDone,
|
|
),
|
|
err: func(err error) (error, bool) {
|
|
if !errors.Is(err, sql.ErrConnDone) {
|
|
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
|
}
|
|
return nil, true
|
|
},
|
|
},
|
|
object: (*AuthNKey)(nil),
|
|
},
|
|
{
|
|
name: "prepareAuthNKeyQuery no result",
|
|
prepare: prepareAuthNKeyQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueriesScanErr(
|
|
regexp.QuoteMeta(prepareAuthNKeyStmt),
|
|
nil,
|
|
nil,
|
|
),
|
|
err: func(err error) (error, bool) {
|
|
if !zerrors.IsNotFound(err) {
|
|
return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false
|
|
}
|
|
return nil, true
|
|
},
|
|
},
|
|
object: (*AuthNKey)(nil),
|
|
},
|
|
{
|
|
name: "prepareAuthNKeyQuery found",
|
|
prepare: prepareAuthNKeyQuery,
|
|
want: want{
|
|
sqlExpectations: mockQuery(
|
|
regexp.QuoteMeta(prepareAuthNKeyStmt),
|
|
prepareAuthNKeyCols,
|
|
[]driver.Value{
|
|
"id",
|
|
testNow,
|
|
testNow,
|
|
"ro",
|
|
uint64(20211109),
|
|
testNow,
|
|
1,
|
|
},
|
|
),
|
|
},
|
|
object: &AuthNKey{
|
|
ID: "id",
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "ro",
|
|
Sequence: 20211109,
|
|
Expiration: testNow,
|
|
Type: domain.AuthNKeyTypeJSON,
|
|
},
|
|
},
|
|
{
|
|
name: "prepareAuthNKeyQuery sql err",
|
|
prepare: prepareAuthNKeyQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueryErr(
|
|
regexp.QuoteMeta(prepareAuthNKeyStmt),
|
|
sql.ErrConnDone,
|
|
),
|
|
err: func(err error) (error, bool) {
|
|
if !errors.Is(err, sql.ErrConnDone) {
|
|
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
|
}
|
|
return nil, true
|
|
},
|
|
},
|
|
object: (*AuthNKey)(nil),
|
|
},
|
|
{
|
|
name: "prepareAuthNKeyPublicKeyQuery no result",
|
|
prepare: prepareAuthNKeyPublicKeyQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueriesScanErr(
|
|
regexp.QuoteMeta(prepareAuthNKeyPublicKeyStmt),
|
|
nil,
|
|
nil,
|
|
),
|
|
err: func(err error) (error, bool) {
|
|
if !zerrors.IsNotFound(err) {
|
|
return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false
|
|
}
|
|
return nil, true
|
|
},
|
|
},
|
|
object: ([]byte)(nil),
|
|
},
|
|
{
|
|
name: "prepareAuthNKeyPublicKeyQuery found",
|
|
prepare: prepareAuthNKeyPublicKeyQuery,
|
|
want: want{
|
|
sqlExpectations: mockQuery(
|
|
regexp.QuoteMeta(prepareAuthNKeyPublicKeyStmt),
|
|
prepareAuthNKeyPublicKeyCols,
|
|
[]driver.Value{
|
|
[]byte("publicKey"),
|
|
},
|
|
),
|
|
},
|
|
object: []byte("publicKey"),
|
|
},
|
|
{
|
|
name: "prepareAuthNKeyPublicKeyQuery sql err",
|
|
prepare: prepareAuthNKeyPublicKeyQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueryErr(
|
|
regexp.QuoteMeta(prepareAuthNKeyPublicKeyStmt),
|
|
sql.ErrConnDone,
|
|
),
|
|
err: func(err error) (error, bool) {
|
|
if !errors.Is(err, sql.ErrConnDone) {
|
|
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
|
}
|
|
return nil, true
|
|
},
|
|
},
|
|
object: ([]byte)(nil),
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
assertPrepare(t, tt.prepare, tt.object, tt.want.sqlExpectations, tt.want.err, defaultPrepareArgs...)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestQueries_GetAuthNKeyUser(t *testing.T) {
|
|
expQuery := regexp.QuoteMeta(authNKeyUserQuery)
|
|
cols := []string{"user_id", "resource_owner", "username", "access_token_type", "public_key"}
|
|
pubkey := []byte(`-----BEGIN RSA PUBLIC KEY-----
|
|
MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2ufAL1b72bIy1ar+Ws6b
|
|
GohJJQFB7dfRapDqeqM8Ukp6CVdPzq/pOz1viAq50yzWZJryF+2wshFAKGF9A2/B
|
|
2Yf9bJXPZ/KbkFrYT3NTvYDkvlaSTl9mMnzrU29s48F1PTWKfB+C3aMsOEG1BufV
|
|
s63qF4nrEPjSbhljIco9FZq4XppIzhMQ0fDdA/+XygCJqvuaL0LibM1KrlUdnu71
|
|
YekhSJjEPnvOisXIk4IXywoGIOwtjxkDvNItQvaMVldr4/kb6uvbgdWwq5EwBZXq
|
|
low2kyJov38V4Uk2I8kuXpLcnrpw5Tio2ooiUE27b0vHZqBKOei9Uo88qCrn3EKx
|
|
6QIDAQAB
|
|
-----END RSA PUBLIC KEY-----`)
|
|
|
|
tests := []struct {
|
|
name string
|
|
mock sqlExpectation
|
|
want *AuthNKeyUser
|
|
wantErr error
|
|
}{
|
|
{
|
|
name: "no rows",
|
|
mock: mockQueryErr(expQuery, sql.ErrNoRows, "instanceID", "keyID", "userID"),
|
|
wantErr: zerrors.ThrowNotFound(sql.ErrNoRows, "QUERY-Tha6f", "Errors.AuthNKey.NotFound"),
|
|
},
|
|
{
|
|
name: "internal error",
|
|
mock: mockQueryErr(expQuery, sql.ErrConnDone, "instanceID", "keyID", "userID"),
|
|
wantErr: zerrors.ThrowInternal(sql.ErrConnDone, "QUERY-aen2A", "Errors.Internal"),
|
|
},
|
|
{
|
|
name: "success",
|
|
mock: mockQuery(expQuery, cols,
|
|
[]driver.Value{"userID", "orgID", "username", domain.OIDCTokenTypeJWT, pubkey},
|
|
"instanceID", "keyID", "userID",
|
|
),
|
|
want: &AuthNKeyUser{
|
|
UserID: "userID",
|
|
ResourceOwner: "orgID",
|
|
Username: "username",
|
|
TokenType: domain.OIDCTokenTypeJWT,
|
|
PublicKey: pubkey,
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
execMock(t, tt.mock, func(db *sql.DB) {
|
|
q := &Queries{
|
|
client: &database.DB{
|
|
DB: db,
|
|
Database: &prepareDB{},
|
|
},
|
|
}
|
|
ctx := authz.NewMockContext("instanceID", "orgID", "userID")
|
|
got, err := q.GetAuthNKeyUser(ctx, "keyID", "userID")
|
|
require.ErrorIs(t, err, tt.wantErr)
|
|
assert.Equal(t, tt.want, got)
|
|
})
|
|
})
|
|
}
|
|
}
|