mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 23:27:31 +00:00

# Which Problems Are Solved Currently if a user signs in using an IdP, once they sign out of Zitadel, the corresponding IdP session is not terminated. This can be the desired behavior. In some cases, e.g. when using a shared computer it results in a potential security risk, since a follower user might be able to sign in as the previous using the still open IdP session. # How the Problems Are Solved - Admins can enabled a federated logout option on SAML IdPs through the Admin and Management APIs. - During the termination of a login V1 session using OIDC end_session endpoint, Zitadel will check if an IdP was used to authenticate that session. - In case there was a SAML IdP used with Federated Logout enabled, it will intercept the logout process, store the information into the shared cache and redirect to the federated logout endpoint in the V1 login. - The V1 login federated logout endpoint checks every request on an existing cache entry. On success it will create a SAML logout request for the used IdP and either redirect or POST to the configured SLO endpoint. The cache entry is updated with a `redirected` state. - A SLO endpoint is added to the `/idp` handlers, which will handle the SAML logout responses. At the moment it will check again for an existing federated logout entry (with state `redirected`) in the cache. On success, the user is redirected to the initially provided `post_logout_redirect_uri` from the end_session request. # Additional Changes None # Additional Context - This PR merges the https://github.com/zitadel/zitadel/pull/9841 and https://github.com/zitadel/zitadel/pull/9854 to main, additionally updating the docs on Entra ID SAML. - closes #9228 - backport to 3.x --------- Co-authored-by: Silvan <27845747+adlerhurst@users.noreply.github.com> Co-authored-by: Zach Hirschtritt <zachary.hirschtritt@klaviyo.com>
189 lines
4.9 KiB
Go
189 lines
4.9 KiB
Go
package view
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
_ "embed"
|
|
"errors"
|
|
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
"github.com/zitadel/zitadel/internal/user/repository/view/model"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
//go:embed user_session_by_id.sql
|
|
var userSessionByIDsQuery string
|
|
|
|
//go:embed user_session.sql
|
|
var userSessionByIDQuery string
|
|
|
|
//go:embed user_sessions_by_user_agent.sql
|
|
var userSessionsByUserAgentQuery string
|
|
|
|
//go:embed user_agent_by_user_session_id.sql
|
|
var userAgentByUserSessionIDQuery string
|
|
|
|
//go:embed active_user_sessions_by_session_id.sql
|
|
var activeUserSessionsBySessionIDQuery string
|
|
|
|
func UserSessionByIDs(ctx context.Context, db *database.DB, agentID, userID, instanceID string) (userSession *model.UserSessionView, err error) {
|
|
err = db.QueryRowContext(
|
|
ctx,
|
|
func(row *sql.Row) error {
|
|
userSession, err = scanUserSession(row)
|
|
return err
|
|
},
|
|
userSessionByIDsQuery,
|
|
agentID,
|
|
userID,
|
|
instanceID,
|
|
)
|
|
return userSession, err
|
|
}
|
|
|
|
func UserSessionByID(ctx context.Context, db *database.DB, userSessionID, instanceID string) (userSession *model.UserSessionView, err error) {
|
|
err = db.QueryRowContext(
|
|
ctx,
|
|
func(row *sql.Row) error {
|
|
userSession, err = scanUserSession(row)
|
|
return err
|
|
},
|
|
userSessionByIDQuery,
|
|
userSessionID,
|
|
instanceID,
|
|
)
|
|
return userSession, err
|
|
}
|
|
|
|
func UserSessionsByAgentID(ctx context.Context, db *database.DB, agentID, instanceID string) (userSessions []*model.UserSessionView, err error) {
|
|
err = db.QueryContext(
|
|
ctx,
|
|
func(rows *sql.Rows) error {
|
|
userSessions, err = scanUserSessions(rows)
|
|
return err
|
|
},
|
|
userSessionsByUserAgentQuery,
|
|
agentID,
|
|
instanceID,
|
|
)
|
|
return userSessions, err
|
|
}
|
|
|
|
func UserAgentIDBySessionID(ctx context.Context, db *database.DB, sessionID, instanceID string) (userAgentID string, err error) {
|
|
err = db.QueryRowContext(
|
|
ctx,
|
|
func(row *sql.Row) error {
|
|
return row.Scan(&userAgentID)
|
|
},
|
|
userAgentByUserSessionIDQuery,
|
|
sessionID,
|
|
instanceID,
|
|
)
|
|
return userAgentID, err
|
|
}
|
|
|
|
// ActiveUserSessionsBySessionID returns all sessions (sessionID:userID map) with an active session on the same user agent (its id is also returned) based on a sessionID
|
|
func ActiveUserSessionsBySessionID(ctx context.Context, db *database.DB, sessionID, instanceID string) (userAgentID string, sessions map[string]string, err error) {
|
|
err = db.QueryContext(
|
|
ctx,
|
|
func(rows *sql.Rows) error {
|
|
userAgentID, sessions, err = scanActiveUserAgentUserIDs(rows)
|
|
return err
|
|
},
|
|
activeUserSessionsBySessionIDQuery,
|
|
sessionID,
|
|
instanceID,
|
|
)
|
|
return userAgentID, sessions, err
|
|
}
|
|
|
|
func scanActiveUserAgentUserIDs(rows *sql.Rows) (userAgentID string, sessions map[string]string, err error) {
|
|
sessions = make(map[string]string)
|
|
for rows.Next() {
|
|
var userID, sessionID string
|
|
err := rows.Scan(
|
|
&userAgentID,
|
|
&userID,
|
|
&sessionID,
|
|
)
|
|
if err != nil {
|
|
return "", nil, err
|
|
}
|
|
sessions[sessionID] = userID
|
|
}
|
|
if err := rows.Close(); err != nil {
|
|
return "", nil, zerrors.ThrowInternal(err, "VIEW-Sbrws", "Errors.Query.CloseRows")
|
|
}
|
|
return userAgentID, sessions, nil
|
|
}
|
|
|
|
func scanUserSession(row *sql.Row) (*model.UserSessionView, error) {
|
|
session := new(model.UserSessionView)
|
|
err := row.Scan(
|
|
&session.CreationDate,
|
|
&session.ChangeDate,
|
|
&session.ResourceOwner,
|
|
&session.State,
|
|
&session.UserAgentID,
|
|
&session.UserID,
|
|
&session.UserName,
|
|
&session.LoginName,
|
|
&session.DisplayName,
|
|
&session.AvatarKey,
|
|
&session.SelectedIDPConfigID,
|
|
&session.PasswordVerification,
|
|
&session.PasswordlessVerification,
|
|
&session.ExternalLoginVerification,
|
|
&session.SecondFactorVerification,
|
|
&session.SecondFactorVerificationType,
|
|
&session.MultiFactorVerification,
|
|
&session.MultiFactorVerificationType,
|
|
&session.Sequence,
|
|
&session.InstanceID,
|
|
&session.ID,
|
|
)
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return nil, zerrors.ThrowNotFound(nil, "VIEW-NGBs1", "Errors.UserSession.NotFound")
|
|
}
|
|
return session, err
|
|
}
|
|
|
|
func scanUserSessions(rows *sql.Rows) ([]*model.UserSessionView, error) {
|
|
sessions := make([]*model.UserSessionView, 0)
|
|
for rows.Next() {
|
|
session := new(model.UserSessionView)
|
|
err := rows.Scan(
|
|
&session.CreationDate,
|
|
&session.ChangeDate,
|
|
&session.ResourceOwner,
|
|
&session.State,
|
|
&session.UserAgentID,
|
|
&session.UserID,
|
|
&session.UserName,
|
|
&session.LoginName,
|
|
&session.DisplayName,
|
|
&session.AvatarKey,
|
|
&session.SelectedIDPConfigID,
|
|
&session.PasswordVerification,
|
|
&session.PasswordlessVerification,
|
|
&session.ExternalLoginVerification,
|
|
&session.SecondFactorVerification,
|
|
&session.SecondFactorVerificationType,
|
|
&session.MultiFactorVerification,
|
|
&session.MultiFactorVerificationType,
|
|
&session.Sequence,
|
|
&session.InstanceID,
|
|
&session.ID,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
sessions = append(sessions, session)
|
|
}
|
|
|
|
if err := rows.Close(); err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "VIEW-FSF3g", "Errors.Query.CloseRows")
|
|
}
|
|
return sessions, nil
|
|
}
|