π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-4943] refactor: streamline URL construction in authentication views (#7806)
Nikhil4d17637edf07
diff --git a/apps/api/plane/authentication/views/space/email.py b/apps/api/plane/authentication/views/space/email.pyindex cd0954db83..d247f6e989 100644--- a/apps/api/plane/authentication/views/space/email.py+++ b/apps/api/plane/authentication/views/space/email.py@@ -14,7 +14,7 @@ from plane.authentication.adapter.error import (AUTHENTICATION_ERROR_CODES,AuthenticationException,)-from plane.utils.path_validator import get_safe_redirect_url+from plane.utils.path_validator import get_safe_redirect_url, validate_next_pathclass SignInAuthSpaceEndpoint(View):@@ -198,11 +198,8 @@ class SignUpAuthSpaceEndpoint(View):# Login the user and record his device infouser_login(request=request, user=user, is_space=True)# redirect to referer path- url = get_safe_redirect_url(- base_url=base_host(request=request, is_space=True),- next_path=next_path,- params={}- )+ next_path = validate_next_path(next_path=next_path)+ url = f"{base_host(request=request, is_space=True).rstrip("/")}{next_path}"return HttpResponseRedirect(url)except AuthenticationException as e:params = e.get_error_dict()diff --git a/apps/api/plane/authentication/views/space/github.py b/apps/api/plane/authentication/views/space/github.pyindex e3b64e8a0d..dd148b8c10 100644--- a/apps/api/plane/authentication/views/space/github.py+++ b/apps/api/plane/authentication/views/space/github.py@@ -14,7 +14,7 @@ from plane.authentication.adapter.error import (AUTHENTICATION_ERROR_CODES,AuthenticationException,)-from plane.utils.path_validator import get_safe_redirect_url+from plane.utils.path_validator import get_safe_redirect_url, validate_next_pathclass GitHubOauthInitiateSpaceEndpoint(View):@@ -93,11 +93,8 @@ class GitHubCallbackSpaceEndpoint(View):user_login(request=request, user=user, is_space=True)# Process workspace and project invitations# redirect to referer path- url = get_safe_redirect_url(- base_url=base_host(request=request, is_space=True),- next_path=next_path,- params=params- )+ next_path = validate_next_path(next_path=next_path)+ url = f"{base_host(request=request, is_space=True).rstrip("/")}{next_path}"return HttpResponseRedirect(url)except AuthenticationException as e:params = e.get_error_dict()diff --git a/apps/api/plane/authentication/views/space/gitlab.py b/apps/api/plane/authentication/views/space/gitlab.pyindex a63466005f..77a10a9147 100644--- a/apps/api/plane/authentication/views/space/gitlab.py+++ b/apps/api/plane/authentication/views/space/gitlab.py@@ -14,7 +14,7 @@ from plane.authentication.adapter.error import (AUTHENTICATION_ERROR_CODES,AuthenticationException,)-from plane.utils.path_validator import get_safe_redirect_url+from plane.utils.path_validator import get_safe_redirect_url, validate_next_pathclass GitLabOauthInitiateSpaceEndpoint(View):@@ -94,11 +94,8 @@ class GitLabCallbackSpaceEndpoint(View):user_login(request=request, user=user, is_space=True)# Process workspace and project invitations# redirect to referer path- url = get_safe_redirect_url(- base_url=base_host(request=request, is_space=True),- next_path=next_path,- params=params- )+ next_path = validate_next_path(next_path=next_path)+ url = f"{base_host(request=request, is_space=True).rstrip("/")}{next_path}"return HttpResponseRedirect(url)except AuthenticationException as e:params = e.get_error_dict()diff --git a/apps/api/plane/authentication/views/space/google.py b/apps/api/plane/authentication/views/space/google.pyindex 7b9728762f..d8fef9da45 100644--- a/apps/api/plane/authentication/views/space/google.py+++ b/apps/api/plane/authentication/views/space/google.py@@ -14,7 +14,7 @@ from plane.authentication.adapter.error import (AuthenticationException,AUTHENTICATION_ERROR_CODES,)-from plane.utils.path_validator import get_safe_redirect_url+from plane.utils.path_validator import get_safe_redirect_url, validate_next_pathclass GoogleOauthInitiateSpaceEndpoint(View):@@ -90,11 +90,8 @@ class GoogleCallbackSpaceEndpoint(View):# Login the user and record his device infouser_login(request=request, user=user, is_space=True)# redirect to referer path- url = get_safe_redirect_url(- base_url=base_host(request=request, is_space=True),- next_path=next_path,- params=params- )+ next_path = validate_next_path(next_path=next_path)+ url = f"{base_host(request=request, is_space=True).rstrip("/")}{next_path}"return HttpResponseRedirect(url)except AuthenticationException as e:params = e.get_error_dict()diff --git a/apps/api/plane/authentication/views/space/magic.py b/apps/api/plane/authentication/views/space/magic.pyindex 0a5f2b42c9..f50274a4a2 100644--- a/apps/api/plane/authentication/views/space/magic.py+++ b/apps/api/plane/authentication/views/space/magic.py@@ -20,7 +20,7 @@ from plane.authentication.adapter.error import (AuthenticationException,AUTHENTICATION_ERROR_CODES,)-from plane.utils.path_validator import get_safe_redirect_url+from plane.utils.path_validator import get_safe_redirect_url, validate_next_pathclass MagicGenerateSpaceEndpoint(APIView):@@ -94,9 +94,8 @@ class MagicSignInSpaceEndpoint(View):# Login the user and record his device infouser_login(request=request, user=user, is_space=True)# redirect to referer path- url = get_safe_redirect_url(- base_url=base_host(request=request, is_space=True), next_path=next_path- )+ next_path = validate_next_path(next_path=next_path)+ url = f"{base_host(request=request, is_space=True).rstrip("/")}{next_path}"return HttpResponseRedirect(url)except AuthenticationException as e:@@ -154,9 +153,8 @@ class MagicSignUpSpaceEndpoint(View):# Login the user and record his device infouser_login(request=request, user=user, is_space=True)# redirect to referer path- url = get_safe_redirect_url(- base_url=base_host(request=request, is_space=True), next_path=next_path- )+ next_path = validate_next_path(next_path=next_path)+ url = f"{base_host(request=request, is_space=True).rstrip("/")}{next_path}"return HttpResponseRedirect(url)except AuthenticationException as e:diff --git a/apps/api/plane/utils/path_validator.py b/apps/api/plane/utils/path_validator.pyindex ebac7ca0be..e5bf7aeb2a 100644--- a/apps/api/plane/utils/path_validator.py+++ b/apps/api/plane/utils/path_validator.py@@ -1,7 +1,6 @@# Python importsfrom urllib.parse import urlparse-def _contains_suspicious_patterns(path: str) -> bool:"""Check for suspicious patterns that might indicate malicious intent.@@ -84,15 +83,16 @@ def get_safe_redirect_url(base_url: str, next_path: str = "", params: dict = {})Returns:str: The safe redirect URL"""- from urllib.parse import urlencode+ from urllib.parse import urlencode, quote# Validate the next pathvalidated_path = validate_next_path(next_path)# Add the next path to the parameters- if validated_path:- params["next_path"] = validated_path+ base_url = base_url.rstrip('/')+ if params:+ encoded_params = urlencode(params)+ return f"{base_url}/?next_path={validated_path}&{encoded_params}"- # Return the safe redirect URL- return f"{base_url.rstrip('/')}?{urlencode(params)}"+ return f"{base_url}/?next_path={validated_path}"\ No newline at end of file