mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-13 10:48:32 +00:00

# Which Problems Are Solved When using implicit flow through the session API and a login UI on a custom domain (proxy), the tokens were signed by the API domain of the instance, rather than the public (proxy) domain. The SAML response had the same issue. Additionally, the saml library had an issue and lost the issuer context. This prevented also a successful login through the hosted login UI. # How the Problems Are Solved - The issuer of the SAML and Auth request is persisted to provide the information when signing the responses and tokens. - The SAML library is updated to the latest version. # Additional Changes None # Additional Context None
134 lines
5.0 KiB
Go
134 lines
5.0 KiB
Go
package saml
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/zitadel/logging"
|
|
"github.com/zitadel/saml/pkg/provider"
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/grpc/object/v2"
|
|
http_utils "github.com/zitadel/zitadel/internal/api/http"
|
|
"github.com/zitadel/zitadel/internal/api/saml"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
saml_pb "github.com/zitadel/zitadel/pkg/grpc/saml/v2"
|
|
)
|
|
|
|
func (s *Server) GetSAMLRequest(ctx context.Context, req *saml_pb.GetSAMLRequestRequest) (*saml_pb.GetSAMLRequestResponse, error) {
|
|
authRequest, err := s.query.SamlRequestByID(ctx, true, req.GetSamlRequestId(), true)
|
|
if err != nil {
|
|
logging.WithError(err).Error("query samlRequest by ID")
|
|
return nil, err
|
|
}
|
|
return &saml_pb.GetSAMLRequestResponse{
|
|
SamlRequest: samlRequestToPb(authRequest),
|
|
}, nil
|
|
}
|
|
|
|
func samlRequestToPb(a *query.SamlRequest) *saml_pb.SAMLRequest {
|
|
return &saml_pb.SAMLRequest{
|
|
Id: a.ID,
|
|
CreationDate: timestamppb.New(a.CreationDate),
|
|
}
|
|
}
|
|
|
|
func (s *Server) CreateResponse(ctx context.Context, req *saml_pb.CreateResponseRequest) (*saml_pb.CreateResponseResponse, error) {
|
|
switch v := req.GetResponseKind().(type) {
|
|
case *saml_pb.CreateResponseRequest_Error:
|
|
return s.failSAMLRequest(ctx, req.GetSamlRequestId(), v.Error)
|
|
case *saml_pb.CreateResponseRequest_Session:
|
|
return s.linkSessionToSAMLRequest(ctx, req.GetSamlRequestId(), v.Session)
|
|
default:
|
|
return nil, zerrors.ThrowUnimplementedf(nil, "SAMLv2-0Tfak3fBS0", "verification oneOf %T in method CreateResponse not implemented", v)
|
|
}
|
|
}
|
|
|
|
func (s *Server) failSAMLRequest(ctx context.Context, samlRequestID string, ae *saml_pb.AuthorizationError) (*saml_pb.CreateResponseResponse, error) {
|
|
details, aar, err := s.command.FailSAMLRequest(ctx, samlRequestID, errorReasonToDomain(ae.GetError()))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
authReq := &saml.AuthRequestV2{CurrentSAMLRequest: aar}
|
|
url, body, err := s.idp.CreateErrorResponse(authReq, errorReasonToDomain(ae.GetError()), ae.GetErrorDescription())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return createCallbackResponseFromBinding(details, url, body, authReq.RelayState), nil
|
|
}
|
|
|
|
func (s *Server) checkPermission(ctx context.Context, issuer string, userID string) error {
|
|
permission, err := s.query.CheckProjectPermissionByEntityID(ctx, issuer, userID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if !permission.HasProjectChecked {
|
|
return zerrors.ThrowPermissionDenied(nil, "SAML-foSyH49RvL", "Errors.User.ProjectRequired")
|
|
}
|
|
if !permission.ProjectRoleChecked {
|
|
return zerrors.ThrowPermissionDenied(nil, "SAML-foSyH49RvL", "Errors.User.GrantRequired")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (s *Server) linkSessionToSAMLRequest(ctx context.Context, samlRequestID string, session *saml_pb.Session) (*saml_pb.CreateResponseResponse, error) {
|
|
details, aar, err := s.command.LinkSessionToSAMLRequest(ctx, samlRequestID, session.GetSessionId(), session.GetSessionToken(), true, s.checkPermission)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
authReq := &saml.AuthRequestV2{CurrentSAMLRequest: aar}
|
|
responseIssuer := authReq.ResponseIssuer
|
|
if responseIssuer == "" {
|
|
responseIssuer = http_utils.DomainContext(ctx).Origin()
|
|
}
|
|
ctx = provider.ContextWithIssuer(ctx, responseIssuer)
|
|
url, body, err := s.idp.CreateResponse(ctx, authReq)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return createCallbackResponseFromBinding(details, url, body, authReq.RelayState), nil
|
|
}
|
|
|
|
func createCallbackResponseFromBinding(details *domain.ObjectDetails, url string, body string, relayState string) *saml_pb.CreateResponseResponse {
|
|
resp := &saml_pb.CreateResponseResponse{
|
|
Details: object.DomainToDetailsPb(details),
|
|
Url: url,
|
|
}
|
|
|
|
if body != "" {
|
|
resp.Binding = &saml_pb.CreateResponseResponse_Post{
|
|
Post: &saml_pb.PostResponse{
|
|
RelayState: relayState,
|
|
SamlResponse: body,
|
|
},
|
|
}
|
|
} else {
|
|
resp.Binding = &saml_pb.CreateResponseResponse_Redirect{Redirect: &saml_pb.RedirectResponse{}}
|
|
}
|
|
return resp
|
|
}
|
|
|
|
func errorReasonToDomain(errorReason saml_pb.ErrorReason) domain.SAMLErrorReason {
|
|
switch errorReason {
|
|
case saml_pb.ErrorReason_ERROR_REASON_UNSPECIFIED:
|
|
return domain.SAMLErrorReasonUnspecified
|
|
case saml_pb.ErrorReason_ERROR_REASON_VERSION_MISSMATCH:
|
|
return domain.SAMLErrorReasonVersionMissmatch
|
|
case saml_pb.ErrorReason_ERROR_REASON_AUTH_N_FAILED:
|
|
return domain.SAMLErrorReasonAuthNFailed
|
|
case saml_pb.ErrorReason_ERROR_REASON_INVALID_ATTR_NAME_OR_VALUE:
|
|
return domain.SAMLErrorReasonInvalidAttrNameOrValue
|
|
case saml_pb.ErrorReason_ERROR_REASON_INVALID_NAMEID_POLICY:
|
|
return domain.SAMLErrorReasonInvalidNameIDPolicy
|
|
case saml_pb.ErrorReason_ERROR_REASON_REQUEST_DENIED:
|
|
return domain.SAMLErrorReasonRequestDenied
|
|
case saml_pb.ErrorReason_ERROR_REASON_REQUEST_UNSUPPORTED:
|
|
return domain.SAMLErrorReasonRequestUnsupported
|
|
case saml_pb.ErrorReason_ERROR_REASON_UNSUPPORTED_BINDING:
|
|
return domain.SAMLErrorReasonUnsupportedBinding
|
|
default:
|
|
return domain.SAMLErrorReasonUnspecified
|
|
}
|
|
}
|