Skip to content

NO-JIRA: Update OIDC e2e test to expect admission-time validation error of invalid CEL expression #797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2025
+48 −25
Merged

NO-JIRA: Update OIDC e2e test to expect admission-time validation error of invalid CEL expression #797

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 48 additions & 25 deletions test/e2e-oidc/external_oidc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ const (
)

func TestExternalOIDCWithKeycloak(t *testing.T) {
testCtx, cancel := context.WithCancel(context.Background())
defer cancel()

testCtx := t.Context()
testClient, err := newTestClient(t, testCtx)
require.NoError(t, err)

Expand Down Expand Up @@ -150,26 +148,12 @@ func TestExternalOIDCWithKeycloak(t *testing.T) {
require.NoError(t, waitErr, "failed to wait for auth configmap to get deleted: %v", err)
})

t.Run("invalid OIDC config degrades auth operator", func(t *testing.T) {
t.Run("invalid CEL expression rejects auth CR admission", func(t *testing.T) {
for _, tt := range []struct {
name string
specUpdate func(*configv1.AuthenticationSpec)
requireFeatureGates []configv1.FeatureGateName
}{
{
name: "invalid issuer CA bundle",
specUpdate: func(s *configv1.AuthenticationSpec) {
s.OIDCProviders[0].Issuer.CertificateAuthority.Name = "invalid-ca-bundle"
},
requireFeatureGates: []configv1.FeatureGateName{},
},
{
name: "invalid issuer URL",
specUpdate: func(s *configv1.AuthenticationSpec) {
s.OIDCProviders[0].Issuer.URL = "https://invalid-idp.testing"
},
requireFeatureGates: []configv1.FeatureGateName{},
},
{
name: "uncompilable CEL expression for uid claim mapping",
specUpdate: func(s *configv1.AuthenticationSpec) {
Expand Down Expand Up @@ -198,13 +182,47 @@ func TestExternalOIDCWithKeycloak(t *testing.T) {
t.Skipf("skipping as required feature gate %q is not enabled", fg)
}
}
_, err := testClient.updateAuthResource(t, testCtx, testSpec, tt.specUpdate)
require.Error(t, err, "uncompilable CEL expression should return in admission error")
})
}
})

t.Run("invalid OIDC config degrades auth operator", func(t *testing.T) {
for _, tt := range []struct {
name string
specUpdate func(*configv1.AuthenticationSpec)
requireFeatureGates []configv1.FeatureGateName
}{
{
name: "invalid issuer CA bundle",
specUpdate: func(s *configv1.AuthenticationSpec) {
s.OIDCProviders[0].Issuer.CertificateAuthority.Name = "invalid-ca-bundle"
},
requireFeatureGates: []configv1.FeatureGateName{},
},
{
name: "invalid issuer URL",
specUpdate: func(s *configv1.AuthenticationSpec) {
s.OIDCProviders[0].Issuer.URL = "https://invalid-idp.testing"
},
requireFeatureGates: []configv1.FeatureGateName{},
},
} {
t.Run(tt.name, func(t *testing.T) {
for _, fg := range tt.requireFeatureGates {
if !featureGateEnabled(testCtx, testClient.configClient, fg) {
t.Skipf("skipping as required feature gate %q is not enabled", fg)
}
}

err := testClient.authResourceRollback(testCtx, origAuthSpec)
require.NoError(t, err, "failed to roll back auth resource")

testClient.checkPreconditions(t, testCtx, typeOAuth, operatorAvailable, nil)

testClient.updateAuthResource(t, testCtx, testSpec, tt.specUpdate)
_, err = testClient.updateAuthResource(t, testCtx, testSpec, tt.specUpdate)
require.NoError(t, err, "failed to update authentication/cluster")

require.NoError(t, test.WaitForClusterOperatorDegraded(t, testClient.configClient.ConfigV1(), "authentication"))

Expand Down Expand Up @@ -237,13 +255,14 @@ func TestExternalOIDCWithKeycloak(t *testing.T) {
testClient.checkPreconditions(t, testCtx, nil, operatorAvailable, operatorAvailable)

kasOriginalRevision := testClient.kasLatestAvailableRevision(t, testCtx)
auth := testClient.updateAuthResource(t, testCtx, testSpec, func(baseSpec *configv1.AuthenticationSpec) {
auth, err := testClient.updateAuthResource(t, testCtx, testSpec, func(baseSpec *configv1.AuthenticationSpec) {
baseSpec.OIDCProviders[0].ClaimMappings.Username = configv1.UsernameClaimMapping{
Claim: tt.claim,
PrefixPolicy: tt.prefixPolicy,
Prefix: tt.prefix,
}
})
require.NoError(t, err, "failed to update authentication/cluster")

require.NoError(t, test.WaitForClusterOperatorStatusAlwaysAvailable(t, testCtx, testClient.configClient.ConfigV1(), "authentication"))
require.NoError(t, test.WaitForClusterOperatorStatusAlwaysAvailable(t, testCtx, testClient.configClient.ConfigV1(), "kube-apiserver"))
Expand Down Expand Up @@ -288,13 +307,14 @@ func TestExternalOIDCWithKeycloak(t *testing.T) {
testClient.checkPreconditions(t, testCtx, nil, operatorAvailable, operatorAvailable)

kasOriginalRevision := testClient.kasLatestAvailableRevision(t, testCtx)
auth := testClient.updateAuthResource(t, testCtx, testSpec, func(baseSpec *configv1.AuthenticationSpec) {
auth, err := testClient.updateAuthResource(t, testCtx, testSpec, func(baseSpec *configv1.AuthenticationSpec) {
baseSpec.OIDCProviders[0].ClaimMappings.Username = configv1.UsernameClaimMapping{
Claim: "unknown",
PrefixPolicy: configv1.NoPrefix,
Prefix: nil,
}
})
require.NoError(t, err, "failed to update authentication/cluster")

require.NoError(t, test.WaitForClusterOperatorStatusAlwaysAvailable(t, testCtx, testClient.configClient.ConfigV1(), "authentication"))
require.NoError(t, test.WaitForClusterOperatorStatusAlwaysAvailable(t, testCtx, testClient.configClient.ConfigV1(), "kube-apiserver"))
Expand Down Expand Up @@ -559,21 +579,24 @@ func (tc *testClient) getAuth(t *testing.T, ctx context.Context) *configv1.Authe
}

// updateAuthResource deep-copies the baseSpec, applies updates to the copy and persists them in the auth resource
func (tc *testClient) updateAuthResource(t *testing.T, ctx context.Context, baseSpec *configv1.AuthenticationSpec, updateAuthSpec func(baseSpec *configv1.AuthenticationSpec)) *configv1.Authentication {
func (tc *testClient) updateAuthResource(t *testing.T, ctx context.Context, baseSpec *configv1.AuthenticationSpec, updateAuthSpec func(baseSpec *configv1.AuthenticationSpec)) (*configv1.Authentication, error) {
auth := tc.getAuth(t, ctx)
if updateAuthSpec == nil {
return auth
return auth, nil
}

spec := baseSpec.DeepCopy()
updateAuthSpec(spec)

auth.Spec = *spec
auth, err := tc.configClient.ConfigV1().Authentications().Update(ctx, auth, metav1.UpdateOptions{})
require.NoError(t, err, "failed to update authentication/cluster")
if err != nil {
return nil, err
}

require.True(t, equality.Semantic.DeepEqual(auth.Spec, *spec))

return auth
return auth, nil
}

func (tc *testClient) checkPreconditions(t *testing.T, ctx context.Context, authType *configv1.AuthenticationType, caoStatus []configv1.ClusterOperatorStatusCondition, kasoStatus []configv1.ClusterOperatorStatusCondition) {
Expand Down