diff --git a/e b/e index 13550bd2e63d4..4ac202b053108 160000 --- a/e +++ b/e @@ -1 +1 @@ -Subproject commit 13550bd2e63d47f75d2f7db5c2c11e3f9738ca60 +Subproject commit 4ac202b0531085d65d96a8040ccb93d3ca27dab3 diff --git a/lib/auth/apiserver.go b/lib/auth/apiserver.go index 68004edad9202..9d7fdbf0410ae 100644 --- a/lib/auth/apiserver.go +++ b/lib/auth/apiserver.go @@ -161,7 +161,6 @@ func NewAPIServer(config *APIConfig) (http.Handler, error) { // SSO validation handlers srv.POST("/:version/oidc/requests/validate", srv.WithAuth(srv.validateOIDCAuthCallback)) - srv.POST("/:version/saml/requests/validate", srv.WithAuth(srv.validateSAMLResponse)) srv.POST("/:version/github/requests/validate", srv.WithAuth(srv.validateGithubAuthCallback)) // Audit logs AKA events @@ -778,40 +777,6 @@ func (s *APIServer) validateOIDCAuthCallback(auth ClientI, w http.ResponseWriter return &raw, nil } -func (s *APIServer) validateSAMLResponse(auth ClientI, w http.ResponseWriter, r *http.Request, p httprouter.Params, version string) (interface{}, error) { - var req *ValidateSAMLResponseReq - if err := httplib.ReadJSON(r, &req); err != nil { - return nil, trace.Wrap(err) - } - response, err := auth.ValidateSAMLResponse(r.Context(), req.Response, req.ConnectorID) - if err != nil { - return nil, trace.Wrap(err) - } - raw := SAMLAuthRawResponse{ - Username: response.Username, - Identity: response.Identity, - Cert: response.Cert, - Req: response.Req, - TLSCert: response.TLSCert, - } - if response.Session != nil { - rawSession, err := services.MarshalWebSession(response.Session, services.WithVersion(version)) - if err != nil { - return nil, trace.Wrap(err) - } - raw.Session = rawSession - } - raw.HostSigners = make([]json.RawMessage, len(response.HostSigners)) - for i, ca := range response.HostSigners { - data, err := services.MarshalCertAuthority(ca, services.WithVersion(version)) - if err != nil { - return nil, trace.Wrap(err) - } - raw.HostSigners[i] = data - } - return &raw, nil -} - // validateGithubAuthCallbackReq is a request to validate Github OAuth2 callback type validateGithubAuthCallbackReq struct { // Query is the callback query string