auth: Migrate to @typed_endpoint.

Since this is the last has_request_variables endpoint outside tests,
more test_openapi code needs to be deleted in this transition.
This commit is contained in:
bedo
2024-07-17 01:56:17 +03:00
committed by Tim Abbott
parent a8ecba8ab8
commit 3da91e951c
3 changed files with 61 additions and 88 deletions

View File

@@ -23,6 +23,7 @@ from django.utils.http import url_has_allowed_host_and_scheme
from django.utils.translation import gettext as _
from django.views.decorators.csrf import csrf_exempt
from django.views.decorators.http import require_safe
from pydantic import Json
from social_django.utils import load_backend, load_strategy
from two_factor.forms import BackupTokenForm
from two_factor.views import LoginView as BaseTwoFactorLoginView
@@ -59,15 +60,16 @@ from zerver.lib.mobile_auth_otp import otp_encrypt_api_key
from zerver.lib.push_notifications import push_notifications_configured
from zerver.lib.pysa import mark_sanitized
from zerver.lib.realm_icon import realm_icon_url
from zerver.lib.request import REQ, RequestNotes, has_request_variables
from zerver.lib.request import RequestNotes
from zerver.lib.response import json_success
from zerver.lib.sessions import set_expirable_session_var
from zerver.lib.subdomains import get_subdomain, is_subdomain_root_or_alias
from zerver.lib.typed_endpoint import typed_endpoint
from zerver.lib.url_encoding import append_url_query_string
from zerver.lib.user_agent import parse_user_agent
from zerver.lib.users import get_api_key, get_users_for_api, is_2fa_verified
from zerver.lib.utils import has_api_key_format
from zerver.lib.validator import check_bool, validate_login_email
from zerver.lib.validator import validate_login_email
from zerver.models import (
MultiuseInvite,
PreregistrationRealm,
@@ -508,12 +510,13 @@ def create_response_for_otp_flow(
@log_view_func
@has_request_variables
@typed_endpoint
def remote_user_sso(
request: HttpRequest,
mobile_flow_otp: str | None = REQ(default=None),
desktop_flow_otp: str | None = REQ(default=None),
next: str = REQ(default="/"),
*,
mobile_flow_otp: str | None = None,
desktop_flow_otp: str | None = None,
next: str = "/",
) -> HttpResponse:
subdomain = get_subdomain(request)
try:
@@ -562,9 +565,8 @@ def remote_user_sso(
return login_or_register_remote_user(request, result)
@has_request_variables
def get_email_and_realm_from_jwt_authentication_request(
request: HttpRequest, json_web_token: str
request: HttpRequest, *, json_web_token: str
) -> tuple[str, Realm]:
realm = get_realm_from_request(request)
if realm is None:
@@ -595,9 +597,11 @@ def get_email_and_realm_from_jwt_authentication_request(
@csrf_exempt
@require_post
@log_view_func
@has_request_variables
def remote_user_jwt(request: HttpRequest, token: str = REQ(default="")) -> HttpResponse:
email, realm = get_email_and_realm_from_jwt_authentication_request(request, token)
@typed_endpoint
def remote_user_jwt(request: HttpRequest, *, token: str = "") -> HttpResponse:
email, realm = get_email_and_realm_from_jwt_authentication_request(
request, json_web_token=token
)
user_profile = authenticate(username=email, realm=realm, use_dummy_backend=True)
if user_profile is None:
@@ -611,17 +615,22 @@ def remote_user_jwt(request: HttpRequest, token: str = REQ(default="")) -> HttpR
return login_or_register_remote_user(request, result)
@has_request_variables
@typed_endpoint
def oauth_redirect_to_root(
request: HttpRequest,
url: str,
sso_type: str,
is_signup: bool = False,
extra_url_params: Mapping[str, str] = {},
next: str | None = REQ(default=None),
multiuse_object_key: str = REQ(default=""),
mobile_flow_otp: str | None = REQ(default=None),
desktop_flow_otp: str | None = REQ(default=None),
is_signup: bool,
extra_url_params: Mapping[str, str],
# Protect the above parameters from being processed as kwargs
# provided by @typed_endpoint by marking them as mandatory
# positional parameters.
/,
*,
next: str | None = None,
multiuse_object_key: str = "",
mobile_flow_otp: str | None = None,
desktop_flow_otp: str | None = None,
) -> HttpResponse:
main_site_url = settings.ROOT_DOMAIN_URI + url
if settings.SOCIAL_AUTH_SUBDOMAIN is not None and sso_type == "social":
@@ -716,7 +725,13 @@ def start_social_login(
if not (getattr(settings, key_setting) and getattr(settings, secret_setting)):
return config_error(request, backend)
return oauth_redirect_to_root(request, backend_url, "social", extra_url_params=extra_url_params)
return oauth_redirect_to_root(
request,
backend_url,
"social",
False,
extra_url_params,
)
@handle_desktop_flow
@@ -738,7 +753,11 @@ def start_social_signup(
return config_error(request, "saml")
extra_url_params = {"idp": extra_arg}
return oauth_redirect_to_root(
request, backend_url, "social", is_signup=True, extra_url_params=extra_url_params
request,
backend_url,
"social",
True,
extra_url_params,
)
@@ -862,11 +881,12 @@ class TwoFactorLoginView(BaseTwoFactorLoginView):
return super().done(form_list, **kwargs)
@has_request_variables
@typed_endpoint
def login_page(
request: HttpRequest,
/,
next: str = REQ(default="/"),
*,
next: str = "/",
**kwargs: Any,
) -> HttpResponse:
if get_subdomain(request) == settings.SOCIAL_AUTH_SUBDOMAIN:
@@ -1021,13 +1041,16 @@ def get_api_key_fetch_authenticate_failure(return_data: dict[str, bool]) -> Json
@csrf_exempt
@require_post
@has_request_variables
@typed_endpoint
def jwt_fetch_api_key(
request: HttpRequest,
include_profile: bool = REQ(default=False, json_validator=check_bool),
token: str = REQ(default=""),
*,
include_profile: Json[bool] = False,
token: str = "",
) -> HttpResponse:
remote_email, realm = get_email_and_realm_from_jwt_authentication_request(request, token)
remote_email, realm = get_email_and_realm_from_jwt_authentication_request(
request, json_web_token=token
)
return_data: dict[str, bool] = {}
@@ -1062,10 +1085,8 @@ def jwt_fetch_api_key(
@csrf_exempt
@require_post
@has_request_variables
def api_fetch_api_key(
request: HttpRequest, username: str = REQ(), password: str = REQ()
) -> HttpResponse:
@typed_endpoint
def api_fetch_api_key(request: HttpRequest, *, username: str, password: str) -> HttpResponse:
return_data: dict[str, bool] = {}
realm = get_realm_from_request(request)
@@ -1160,9 +1181,9 @@ def api_get_server_settings(request: HttpRequest) -> HttpResponse:
return json_success(request, data=result)
@has_request_variables
@typed_endpoint
def json_fetch_api_key(
request: HttpRequest, user_profile: UserProfile, password: str = REQ(default="")
request: HttpRequest, user_profile: UserProfile, *, password: str = ""
) -> HttpResponse:
realm = get_realm_from_request(request)
if realm is None: