fix: validate SAML metadata before updating it in the login flow - #2704
Open
cstockton wants to merge 1 commit into
Open
fix: validate SAML metadata before updating it in the login flow#2704cstockton wants to merge 1 commit into
cstockton wants to merge 1 commit into
Conversation
The SAML ACS handler refetches IdP metadata from metadata_url once it's stale and writes it straight into metadata_xml with no validation. If that fetch returns HTTP 200 with unexpected content the invalid metadata gets persisted over the last known good copy. The admin update path already had these checks, I kept the error message identical to that flow.
xlgmokha
approved these changes
Aug 17, 2026
| rawMetadata, err := fetchSAMLMetadata(ctx, *ssoProvider.SAMLProvider.MetadataURL) | ||
| url := *ssoProvider.SAMLProvider.MetadataURL | ||
| rawMetadata, parsedMetadata, err := getSAMLMetadata(ctx, url) | ||
| if err == nil && parsedMetadata.EntityID != ssoProvider.SAMLProvider.EntityID { |
| url := *ssoProvider.SAMLProvider.MetadataURL | ||
| rawMetadata, parsedMetadata, err := getSAMLMetadata(ctx, url) | ||
| if err == nil && parsedMetadata.EntityID != ssoProvider.SAMLProvider.EntityID { | ||
| return apierrors.NewBadRequestError(apierrors.ErrorCodeSAMLEntityIDMismatch, "SAML Metadata can be updated only if the EntityID matches for the provider; expected '%s' but got '%s'", ssoProvider.SAMLProvider.EntityID, parsedMetadata.EntityID) |
Contributor
There was a problem hiding this comment.
question: does this error get leaked to the user-agent?
|
|
||
| var userProvidedData provider.UserProvidedData | ||
|
|
||
| userProvidedData.Emails = append(userProvidedData.Emails, provider.Email{ |
Contributor
There was a problem hiding this comment.
question: are we intentionally replacing the email instead of adding it?
| return data, nil | ||
| } | ||
|
|
||
| func getSAMLMetadata(ctx context.Context, url string) ([]byte, *saml.EntityDescriptor, error) { |
Contributor
There was a problem hiding this comment.
praise: Nice refactoring!
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The SAML ACS handler refetches IdP metadata from metadata_url once it's stale and writes it straight into metadata_xml with no validation. If that fetch returns HTTP 200 with unexpected content the invalid metadata gets persisted over the last known good copy.
The admin update path already had these checks, I kept the error message identical to that flow.