Skip to content

[v12] include url and saml connector name in entity descriptor url errors #33669

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
stevenGravy merged 5 commits into from
Oct 19, 2023
Merged

[v12] include url and saml connector name in entity descriptor url errors #33669

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00e9abe
include url and saml connector name in entity descriptor url errors
stevenGravy Oct 11, 2023
3b65f4f
update error message
stevenGravy Oct 18, 2023
76e910d
update variable output in trace
stevenGravy Oct 18, 2023
d6f02eb
update message output
stevenGravy Oct 18, 2023
405af42
Merge branch 'branch/v12' into bot/backport-33278-branch/v12
zmb3 Oct 19, 2023
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
6 changes: 3 additions & 3 deletions lib/services/saml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,18 @@ func ValidateSAMLConnector(sc types.SAMLConnector, rg RoleGetter) error {
if sc.GetEntityDescriptorURL() != "" {
resp, err := http.Get(sc.GetEntityDescriptorURL())
if err != nil {
return trace.Wrap(err)
return trace.WrapWithMessage(err, "unable to fetch entity descriptor from %v for SAML connector %v", sc.GetEntityDescriptorURL(), sc.GetName())
}
if resp.StatusCode != http.StatusOK {
return trace.BadParameter("status code %v when fetching from %q", resp.StatusCode, sc.GetEntityDescriptorURL())
return trace.BadParameter("status code %v when fetching from %v for SAML connector %v", resp.StatusCode, sc.GetEntityDescriptorURL(), sc.GetName())
}
defer resp.Body.Close()
body, err := utils.ReadAtMost(resp.Body, teleport.MaxHTTPResponseSize)
if err != nil {
return trace.Wrap(err)
}
sc.SetEntityDescriptor(string(body))
log.Debugf("[SAML] Successfully fetched entity descriptor from %q", sc.GetEntityDescriptorURL())
log.Debugf("[SAML] Successfully fetched entity descriptor from %v for connector %v", sc.GetEntityDescriptorURL(), sc.GetName())
}

if sc.GetEntityDescriptor() != "" {
Expand Down