Skip to content

OCPBUGS-78403: Do not return error when an IdP returns 500 during a grant check #856

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
openshift-merge-bot merged 1 commit into from
Mar 27, 2026
Merged

OCPBUGS-78403: Do not return error when an IdP returns 500 during a grant check #856

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions pkg/controllers/configobservation/oauth/idp_conversions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ func convertIdentityProviders(
secretsLister corelistersv1.SecretLister,
identityProviders []configv1.IdentityProvider,
) ([]interface{}, *datasync.ConfigSyncData, []error) {

converted := []osinv1.IdentityProvider{}
syncData := datasync.NewConfigSyncData()
errs := []error{}
Expand Down Expand Up @@ -426,7 +425,8 @@ func checkOIDCPasswordGrantFlow(
defer resp.Body.Close()

if resp.StatusCode >= 500 && resp.StatusCode <= 599 {
return false, fmt.Errorf("OIDC token endpoint returned server error %d (%s)", resp.StatusCode, tokenURL)
klog.Errorf("OIDC token endpoint returned server error %d (%s)", resp.StatusCode, tokenURL)
return false, nil // no error returned so that observe_idps.go does not see this and fall back to existing config - it should proceed
}

respJSON := json.NewDecoder(resp.Body)
Expand Down
4 changes: 2 additions & 2 deletions pkg/controllers/configobservation/oauth/idp_conversions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ func TestCheckOIDCPasswordGrantFlowCaching(t *testing.T) {
configv1.SecretNameReference{Name: "test-secret"},
)

require.Error(t, err)
require.NoError(t, err)
require.False(t, result)
require.NotContains(t, oidcPasswordChecks, "test-version-1")
})
Expand Down Expand Up @@ -351,7 +351,7 @@ func TestCheckOIDCPasswordGrantFlowCaching(t *testing.T) {
configv1.ConfigMapNameReference{Name: ""},
configv1.SecretNameReference{Name: "test-secret"},
)
require.Error(t, err)
require.NoError(t, err)
require.False(t, res1)
require.NotContains(t, oidcPasswordChecks, "test-version-1")

Expand Down