mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +00:00
# Which Problems Are Solved Sessions created through login UI (v1) automatically get assigned an ID after creation. This change was introduced with the OIDC back-channel logout implementation. Sessions created before that don't have an ID and are updated on the next (re-)authentication. A customer now reached out, that a logout from Console was resulting in an error. This is due to at least one session not having an ID (<null> in sql) in the same user agent. # How the Problems Are Solved Since the sessionID is not used in the specific situation, we just assign the userID as sessionID. This way all sessions are properly terminated. # Additional Changes None # Additional Context - relates to support request - requires backport to v4.x
197 lines
5.2 KiB
Go
197 lines
5.2 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 string
|
|
var sessionID sql.NullString
|
|
err := rows.Scan(
|
|
&userAgentID,
|
|
&userID,
|
|
&sessionID,
|
|
)
|
|
if err != nil {
|
|
return "", nil, err
|
|
}
|
|
// Sessions created before back-channel logout implementation and never updated
|
|
// since then, don't have an ID.
|
|
// In this case, we use the userID as sessionID to ensure uniqueness in the map.
|
|
// The ID will not be used for logout process itself.
|
|
if !sessionID.Valid {
|
|
sessionID.String = userID
|
|
}
|
|
sessions[sessionID.String] = 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
|
|
}
|