* fix (auth/ldap): fix which DEK is used for oplog during authenticate * chore: update go-kms-wrapping dep for new extras/kms changes The latest version supports setting a table name prefix for a kms which is needed to fix our oplog DEK problem * chore: update extras/kms dep This latest version supports an optional TableNamePrefix which is required to fix our existing oplog DEK issue. * fix (oplog): schema oplog DEK fix These changes will allow use to store the oplog DEK in it's own set of tables, so they won't get deleted when a scope is deleted * fix (kms): move oplog DEK into its own internal kms * tests: update tests to be compatible with oplog fix * tests: remove migration tests which are incompatible with oplog fix These tests no longer work because they are missing the required schema changes for the oplog fix
128 lines
4.6 KiB
Go
128 lines
4.6 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package oidc
|
|
|
|
import (
|
|
"context"
|
|
"crypto/x509"
|
|
"errors"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/DATA-DOG/go-sqlmock"
|
|
"github.com/hashicorp/boundary/internal/db"
|
|
"github.com/hashicorp/boundary/internal/iam"
|
|
"github.com/hashicorp/boundary/internal/kms"
|
|
"github.com/hashicorp/go-kms-wrapping/extras/kms/v2/migrations"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestRewrap_authMethodRewrapFn(t *testing.T) {
|
|
ctx := context.Background()
|
|
t.Run("errors-on-query-error", func(t *testing.T) {
|
|
conn, mock := db.TestSetupWithMock(t)
|
|
wrapper := db.TestWrapper(t)
|
|
mock.ExpectQuery(
|
|
`SELECT \* FROM "kms_schema_version" WHERE 1=1 ORDER BY "kms_schema_version"\."version" LIMIT 1`,
|
|
).WillReturnRows(sqlmock.NewRows([]string{"version", "create_time"}).AddRow(migrations.Version, time.Now()))
|
|
mock.ExpectQuery(
|
|
`SELECT \* FROM "kms_oplog_schema_version" WHERE 1=1 ORDER BY "kms_oplog_schema_version"."version" LIMIT 1`,
|
|
).WillReturnRows(sqlmock.NewRows([]string{"version", "create_time"}).AddRow(migrations.Version, time.Now()))
|
|
kmsCache := kms.TestKms(t, conn, wrapper)
|
|
rw := db.New(conn)
|
|
mock.ExpectQuery(
|
|
`SELECT \* FROM "auth_oidc_method" WHERE scope_id=\$1 and key_id=\$2`,
|
|
).WillReturnError(errors.New("Query error"))
|
|
err := authMethodRewrapFn(ctx, "some_id", "some_scope", rw, rw, kmsCache)
|
|
require.Error(t, err)
|
|
})
|
|
t.Run("success", func(t *testing.T) {
|
|
conn, _ := db.TestSetup(t, "postgres")
|
|
wrapper := db.TestWrapper(t)
|
|
kmsCache := kms.TestKms(t, conn, wrapper)
|
|
rw := db.New(conn)
|
|
org, _ := iam.TestScopes(t, iam.TestRepo(t, conn, wrapper))
|
|
|
|
convertAlg := func(alg ...Alg) []string {
|
|
s := make([]string, 0, len(alg))
|
|
for _, a := range alg {
|
|
s = append(s, string(a))
|
|
}
|
|
return s
|
|
}
|
|
|
|
// fetch the current key version
|
|
kmsWrapper, err := kmsCache.GetWrapper(ctx, org.Scope.GetPublicId(), kms.KeyPurposeDatabase)
|
|
assert.NoError(t, err)
|
|
|
|
currentKeyVersion, err := kmsWrapper.KeyId(ctx)
|
|
assert.NoError(t, err)
|
|
|
|
// perform the setup for the authmethod
|
|
algs := []Alg{RS256, ES256}
|
|
cbs := TestConvertToUrls(t, "https://www.alice.com/callback")[0]
|
|
auds := []string{"alice-rp", "bob-rp"}
|
|
cert1, pem1 := testGenerateCA(t, "localhost")
|
|
cert2, pem2 := testGenerateCA(t, "localhost")
|
|
certs := []*x509.Certificate{cert1, cert2}
|
|
pems := []string{pem1, pem2}
|
|
am, err := NewAuthMethod(
|
|
ctx,
|
|
org.PublicId,
|
|
"alice-rp",
|
|
"alice-secret", WithAudClaims("alice-rp"),
|
|
WithAudClaims(auds...),
|
|
WithIssuer(TestConvertToUrls(t, "https://www.alice.com")[0]),
|
|
WithApiUrl(cbs),
|
|
WithSigningAlgs(algs...),
|
|
WithCertificates(certs...),
|
|
WithName("alice's restaurant"),
|
|
WithDescription("it's a good place to eat"),
|
|
WithClaimsScopes("email", "profile"),
|
|
WithAccountClaimMap(map[string]AccountToClaim{"display_name": ToNameClaim, "oid": ToSubClaim}),
|
|
)
|
|
assert.NoError(t, err)
|
|
assert.Equal(t, am.SigningAlgs, convertAlg(algs...))
|
|
assert.Equal(t, am.ApiUrl, cbs.String())
|
|
assert.Equal(t, "https://www.alice.com", am.Issuer)
|
|
assert.Equal(t, am.AudClaims, auds)
|
|
assert.Equal(t, am.Certificates, pems)
|
|
assert.Equal(t, am.OperationalState, string(InactiveState))
|
|
|
|
// CreateAuthMethod to store it, both from oidc repo
|
|
repo, err := NewRepository(ctx, rw, rw, kmsCache)
|
|
assert.NoError(t, err)
|
|
|
|
authMethod, err := repo.CreateAuthMethod(ctx, am)
|
|
assert.NoError(t, err)
|
|
assert.NotNil(t, authMethod)
|
|
assert.Equal(t, authMethod.KeyId, currentKeyVersion)
|
|
|
|
// now things are stored in the db, we can rotate and rewrap
|
|
assert.NoError(t, kmsCache.RotateKeys(ctx, org.Scope.GetPublicId()))
|
|
assert.NoError(t, authMethodRewrapFn(ctx, authMethod.KeyId, org.Scope.GetPublicId(), rw, rw, kmsCache))
|
|
|
|
// fetch the new key version
|
|
kmsWrapper, err = kmsCache.GetWrapper(ctx, org.Scope.GetPublicId(), kms.KeyPurposeDatabase)
|
|
assert.NoError(t, err)
|
|
newKeyVersion, err := kmsWrapper.KeyId(ctx)
|
|
assert.NoError(t, err)
|
|
|
|
// fetching the latest auth method itself
|
|
ams, err := repo.getAuthMethods(ctx, authMethod.GetPublicId(), []string{})
|
|
assert.NoError(t, err)
|
|
got := ams[0]
|
|
|
|
// since getAuthMethods automatically decrypts the secret, all we need to do is make sure
|
|
// that it's correct and that it uses the newest key version id
|
|
assert.NotEmpty(t, got.KeyId)
|
|
assert.Equal(t, newKeyVersion, got.KeyId)
|
|
assert.Equal(t, "alice-secret", got.ClientSecret)
|
|
assert.NotEqual(t, authMethod.CtClientSecret, got.CtClientSecret)
|
|
assert.NotEmpty(t, got.ClientSecretHmac)
|
|
assert.Equal(t, authMethod.ClientSecretHmac, got.ClientSecretHmac)
|
|
})
|
|
}
|