Skip to content

fix(sp): no check for InResponseTo for if IDPInitiated is true #259

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
Feb 2, 2020
Merged

fix(sp): no check for InResponseTo for if IDPInitiated is true #259

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
39 changes: 20 additions & 19 deletions service_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,16 +514,18 @@ func (sp *ServiceProvider) ParseXMLResponse(decodedResponseXML []byte, possibleR
return nil, retErr
}

if sp.AllowIDPInitiated && len(possibleRequestIDs) == 0 {
possibleRequestIDs = append([]string{""})
}

requestIDvalid := false
for _, possibleRequestID := range possibleRequestIDs {
if resp.InResponseTo == possibleRequestID {
requestIDvalid = true

if sp.AllowIDPInitiated {
requestIDvalid = true
} else {
for _, possibleRequestID := range possibleRequestIDs {
if resp.InResponseTo == possibleRequestID {
requestIDvalid = true
}
}
}

if !requestIDvalid {
retErr.PrivateErr = fmt.Errorf("`InResponseTo` does not match any of the possible request IDs (expected %v)", possibleRequestIDs)
return nil, retErr
Expand Down Expand Up @@ -843,7 +845,7 @@ func (sp *ServiceProvider) ValidateLogoutResponseRequest(req *http.Request) erro
if err != nil {
return fmt.Errorf("unable to parse form: %v", err)
}

return sp.ValidateLogoutResponseForm(req.PostForm.Get("SAMLResponse"))
}

Expand All @@ -855,11 +857,11 @@ func (sp *ServiceProvider) ValidateLogoutResponseForm(postFormData string) error
}

var resp LogoutResponse

if err := xml.Unmarshal(rawResponseBuf, &resp); err != nil {
return fmt.Errorf("cannot unmarshal response: %s", err)
}

if err := sp.validateLogoutResponse(&resp); err != nil {
return err
}
Expand All @@ -868,7 +870,7 @@ func (sp *ServiceProvider) ValidateLogoutResponseForm(postFormData string) error
if err := doc.ReadFromBytes(rawResponseBuf); err != nil {
return err
}

responseEl := doc.Root()
if err = sp.validateSigned(responseEl); err != nil {
return err
Expand All @@ -887,20 +889,20 @@ func (sp *ServiceProvider) ValidateLogoutResponseRedirect(queryParameterData str
}

gr := flate.NewReader(bytes.NewBuffer(rawResponseBuf))

decoder := xml.NewDecoder(gr)

var resp LogoutResponse

err = decoder.Decode(&resp)
if err != nil {
return fmt.Errorf("unable to flate decode: %s", err)
}

if err := sp.validateLogoutResponse(&resp); err != nil {
return err
}

doc := etree.NewDocument()
if _, err := doc.ReadFrom(gr); err != nil {
return err
Expand All @@ -914,7 +916,6 @@ func (sp *ServiceProvider) ValidateLogoutResponseRedirect(queryParameterData str
return nil
}


// validateLogoutResponse validates the LogoutResponse fields. Returns a nil error if the LogoutResponse is valid.
func (sp *ServiceProvider) validateLogoutResponse(resp *LogoutResponse) error {
if resp.Destination != sp.SloURL.String() {
Expand All @@ -931,6 +932,6 @@ func (sp *ServiceProvider) validateLogoutResponse(resp *LogoutResponse) error {
if resp.Status.StatusCode.Value != StatusSuccess {
return fmt.Errorf("status code was not %s", StatusSuccess)
}

return nil
}
}