Allow IAS SSO without email and provide explicit identity linking

This commit is contained in:
Aleksandr Meshchryakov
2026-09-28 13:59:19 +02:00
parent 13511771a2
commit 951abfb843
10 changed files with 351 additions and 17 deletions

View File

@@ -30,7 +30,7 @@ class SsoClaims:
issuer: str
subject: str
username: str
email: str
email: str | None
first_name: str
middle_name: str
last_name: str
@@ -75,7 +75,6 @@ def _decode_sso_payload(encoded_token: str) -> dict:
"sso_target",
"user_id",
"username",
"email",
]
},
)
@@ -102,6 +101,23 @@ def _validate_token_lifetime(payload: dict) -> tuple[int, int]:
return issued_at, expires_at
def _optional_email(payload: dict) -> str | None:
email = payload.get("email")
if email is None:
return None
if not isinstance(email, str):
raise SsoAuthenticationError("Некорректный email SSO-пользователя.")
email = email.strip()
if not email:
return None
try:
validate_email(email)
User._meta.get_field("email").run_validators(email)
except DjangoValidationError as exc:
raise SsoAuthenticationError("Некорректный email SSO-пользователя.") from exc
return email
def verify_sso_token(encoded_token: str) -> SsoClaims:
"""Проверяет ES256 SSO JWT и возвращает только нужные локальному сервису claims."""
payload = _decode_sso_payload(encoded_token)
@@ -114,13 +130,11 @@ def verify_sso_token(encoded_token: str) -> SsoClaims:
_, expires_at = _validate_token_lifetime(payload)
username = payload.get("username")
email = payload.get("email")
email = _optional_email(payload)
jti = payload.get("jti")
subject = payload.get("user_id")
if not isinstance(username, str) or not username.strip():
raise SsoAuthenticationError("В SSO-токене отсутствует username.")
if not isinstance(email, str) or not email.strip():
raise SsoAuthenticationError("В SSO-токене отсутствует email.")
if not isinstance(jti, str) or not jti.strip():
raise SsoAuthenticationError("В SSO-токене отсутствует jti.")
if isinstance(subject, bool) or not isinstance(subject, int | str):
@@ -129,7 +143,6 @@ def verify_sso_token(encoded_token: str) -> SsoClaims:
raise SsoAuthenticationError("В SSO-токене отсутствует user_id.")
try:
validate_email(email)
User._meta.get_field("username").run_validators(username)
except DjangoValidationError as exc:
raise SsoAuthenticationError(
@@ -160,9 +173,10 @@ def reserve_sso_token(claims: SsoClaims) -> None:
def _ensure_user_claims_available(claims: SsoClaims, *, exclude_user_id=None) -> None:
conflicts = User.objects.filter(
Q(username=claims.username) | Q(email__iexact=claims.email)
)
query = Q(username=claims.username)
if claims.email is not None:
query |= Q(email__iexact=claims.email)
conflicts = User.objects.filter(query)
if exclude_user_id is not None:
conflicts = conflicts.exclude(id=exclude_user_id)
if conflicts.exists():
@@ -186,7 +200,11 @@ def provision_sso_user(claims: SsoClaims):
_ensure_user_claims_available(claims, exclude_user_id=user.id)
else:
username_user = User.objects.filter(username=claims.username).first()
email_users = list(User.objects.filter(email__iexact=claims.email)[:2])
email_users = (
list(User.objects.filter(email__iexact=claims.email)[:2])
if claims.email is not None
else []
)
if username_user is not None or email_users:
if (
username_user is None
@@ -200,7 +218,11 @@ def provision_sso_user(claims: SsoClaims):
if not user.is_active:
raise SsoAuthenticationError("Локальная учётная запись отключена.")
else:
user = User(username=claims.username, email=claims.email, is_verified=True)
user = User(
username=claims.username,
email=claims.email,
is_verified=claims.email is not None,
)
user.set_unusable_password()
user.save()
@@ -212,8 +234,9 @@ def provision_sso_user(claims: SsoClaims):
)
user.username = claims.username
user.email = claims.email
user.is_verified = True
if claims.email is not None:
user.email = claims.email
user.is_verified = True
user.save(update_fields=["username", "email", "is_verified", "updated_at"])
profile = user.profile
profile.first_name = claims.first_name